MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: improved search result sorting

Browse Source
This commit is contained in:
Jannat Patel
2026-01-01 12:06:15 +05:30
parent edc6007fb6
commit 7a24a83d9e
3 changed files with 104 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/pages/Search/Search.vue
View File

@@ -168,10 +168,22 @@ const generateSearchResults = () => {
searchResults.value.push(item)
})
})
//searchResults.value.sort((a, b) => b.score - a.score)
sortResults()
}
}
const sortResults = () => {
searchResults.value.sort((a, b) => {
const dateA = new Date(
a.published_on || a.start_date || a.creation || a.modified
).getTime()
const dateB = new Date(
b.published_on || b.start_date || b.creation || b.modified
).getTime()
return dateB - dateA
})
}
const navigate = (result: any) => {
if (result.doctype == 'LMS Course') {
router.push({

23
lms/command_palette.py
View File

@@ -17,9 +17,20 @@ def search_sqlite(query: str):
def prepare_search_results(result):
groups = get_grouped_results(result)
out = []
for key in groups:
groups[key] = remove_duplicates(groups[key])
groups[key].sort(key=lambda x: x.get("modified"), reverse=True)
out.append({"title": key, "items": groups[key]})
return out
def get_grouped_results(result):
roles = frappe.get_roles()
groups = {}
for r in result["results"]:
doctype = r["doctype"]
if doctype == "LMS Course" and can_access_course(r, roles):
@@ -31,14 +42,7 @@ def prepare_search_results(result):
elif doctype == "Job Opportunity" and can_access_job(r, roles):
r["author_info"] = get_instructor_info(doctype, r)
groups.setdefault("Job Opportunities", []).append(r)
out = []
for key in groups:
groups[key] = remove_duplicates(groups[key])
groups[key].sort(key=lambda x: x.get("modified"), reverse=True)
out.append({"title": key, "items": groups[key]})
return out
return groups
def remove_duplicates(items):
@@ -52,7 +56,6 @@ def remove_duplicates(items):
def can_access_course(course, roles):
print(course.get("name"), course.get("published"))
if can_create_course(roles):
return True
elif course.get("published"):

149
lms/sqlite.py
View File

@@ -2,7 +2,7 @@ from contextlib import suppress
import frappe
from frappe.search.sqlite_search import SQLiteSearch, SQLiteSearchIndexMissingError
from frappe.utils import get_datetime, nowdate
from frappe.utils import get_datetime, getdate, nowdate
class LearningSearch(SQLiteSearch):
@@ -74,42 +74,54 @@ class LearningSearch(SQLiteSearch):
},
}
COURSE_FIELDS = [
"name",
"title",
"description",
"short_introduction",
"category",
"published",
"published_on",
"creation",
"modified",
"owner",
]
BATCH_FIELDS = [
"name",
"title",
"description",
"batch_details",
"category",
"start_date",
"creation",
"modified",
"owner",
"published",
]
JOB_FIELDS = [
"name",
"job_title",
"company_name",
"description",
"creation",
"modified",
"owner",
]
INSTRUCTOR_FIELDS = [
"name",
"instructor",
"parent",
"parenttype",
]
DOCTYPE_FIELDS = {
"LMS Course": [
"name",
"title",
"description",
"short_introduction",
"category",
"creation",
"modified",
"owner",
],
"LMS Batch": [
"name",
"title",
"description",
"batch_details",
"category",
"creation",
"modified",
"owner",
],
"Job Opportunity": [
"name",
"job_title",
"company_name",
"description",
"creation",
"modified",
"owner",
],
"Course Instructor": [
"name",
"instructor",
"parent",
"parenttype",
],
"LMS Course": COURSE_FIELDS,
"LMS Batch": BATCH_FIELDS,
"Job Opportunity": JOB_FIELDS,
"Course Instructor": INSTRUCTOR_FIELDS,
}
def build_index(self):
@@ -127,41 +139,35 @@ class LearningSearch(SQLiteSearch):
return None
if doc.doctype == "Course Instructor":
instructor = frappe.db.get_value("User", doc.instructor, "full_name")
if doc.parenttype == "LMS Course":
details = frappe.db.get_value(
"LMS Course",
doc.parent,
["name", "title", "description", "published_on", "modified", "published"],
as_dict=True,
)
document["published_on"] = details.get("published_on")
elif doc.parenttype == "LMS Batch":
details = frappe.db.get_value(
"LMS Batch",
doc.parent,
["name", "title", "batch_details as description", "start_date", "modified", "published"],
as_dict=True,
)
document["start_date"] = details.get("start_date")
if details:
document["doctype"] = doc.parenttype
document["name"] = doc.parent
document["title"] = self._process_content(details.title)
document["content"] = self._process_content(
f"Instructor: {instructor}\n{details.description}\n{doc.instructor}"
)
document["modified"] = self.get_modified_date(details, doc.parenttype)
document["published"] = details.get("published", 0)
document = self.get_instructor_details(doc, document)
else:
if not document.get("modified"):
document["modified"] = self.get_modified_date(doc, doc.doctype)
self.set_modified_date(doc, doc.doctype, document)
return document
def get_modified_date(self, details, doctype):
def get_instructor_details(self, doc, document):
instructor = frappe.db.get_value("User", doc.instructor, "full_name")
fields = self.COURSE_FIELDS if doc.parenttype == "LMS Course" else self.BATCH_FIELDS
details = frappe.db.get_value(doc.parenttype, doc.parent, fields, as_dict=True)
if details:
document["doctype"] = doc.parenttype
document["name"] = doc.parent
document["title"] = self._process_content(details.title)
document["published"] = details.get("published", 0)
document["content"] = self._process_content(
f"Instructor: {instructor}\n{details.description}\n{doc.instructor}"
)
self.set_modified_date(details, doc.parenttype, document)
if doc.parenttype == "LMS Course":
document["published_on"] = details.get("published_on")
elif doc.parenttype == "LMS Batch":
document["start_date"] = details.get("start_date")
return document
def set_modified_date(self, details, doctype, document):
modified_value = None
if doctype == "LMS Course":
modified_value = details.get("published_on")
@@ -170,13 +176,14 @@ class LearningSearch(SQLiteSearch):
if not modified_value:
modified_value = frappe.db.get_value(doctype, details.name, "creation")
print(details.name, modified_value)
modified_value = get_datetime(modified_value)
print(modified_value)
modified_value = modified_value.timestamp()
print(modified_value)
return modified_value
if doctype == "LMS Course":
document["published_on"] = getdate(modified_value)
elif doctype == "LMS Batch":
document["start_date"] = getdate(modified_value)
document["modified"] = modified_value.timestamp()
@SQLiteSearch.scoring_function
def get_doctype_boost(self, row, query, query_words):