eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: changed sorting order of batch list

Browse Source
This commit is contained in:
Jannat Patel
2025-01-15 12:31:23 +05:30
parent 8401e86acb
commit 5c8378f2d4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/pages/Batches.vue
View File

@@ -55,7 +55,7 @@
</router-link> </router-link>
</div> </div>
<div <div
v-else v-else-if="!batches.list.loading"
class="flex flex-col items-center justify-center text-sm text-gray-600 italic mt-48" class="flex flex-col items-center justify-center text-sm text-gray-600 italic mt-48"
> >
<BookOpen class="size-10 mx-auto stroke-1.5 text-gray-500" /> <BookOpen class="size-10 mx-auto stroke-1.5 text-gray-500" />
@@ -101,7 +101,8 @@ const categories = ref([])
const currentCategory = ref(null) const currentCategory = ref(null)
const title = ref('') const title = ref('')
const filters = ref({}) const filters = ref({})
const currentTab = ref('All') const currentTab = ref(user.data?.is_student ? 'All' : 'Upcoming')
const orderBy = ref('start_date')
onMounted(() => { onMounted(() => {
setFiltersFromQuery() setFiltersFromQuery()
@@ -141,6 +142,7 @@ const updateBatches = () => {
updateFilters() updateFilters()
batches.update({ batches.update({
filters: filters.value, filters: filters.value,
orderBy: orderBy.value,
}) })
batches.reload() batches.reload()
} }
@@ -170,18 +172,22 @@ const updateTitleFilter = () => {
} }
const updateTabFilter = () => { const updateTabFilter = () => {
orderBy.value = 'start_date'
if (!user.data) { if (!user.data) {
return return
} }
if (currentTab.value == 'Enrolled' && user.data?.is_student) { if (currentTab.value == 'Enrolled' && user.data?.is_student) {
filters.value['enrolled'] = 1 filters.value['enrolled'] = 1
orderBy.value = 'start_date desc'
} else if (user.data?.is_student) { } else if (user.data?.is_student) {
delete filters.value['enrolled'] delete filters.value['enrolled']
} else { } else {
delete filters.value['start_date'] delete filters.value['start_date']
delete filters.value['published'] delete filters.value['published']
orderBy.value = 'start_date desc'
if (currentTab.value == 'Upcoming') { if (currentTab.value == 'Upcoming') {
filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')] filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')]
orderBy.value = 'start_date'
} else if (currentTab.value == 'Archived') { } else if (currentTab.value == 'Archived') {
filters.value['start_date'] = ['<', dayjs().format('YYYY-MM-DD')] filters.value['start_date'] = ['<', dayjs().format('YYYY-MM-DD')]
} else if (currentTab.value == 'Unpublished') { } else if (currentTab.value == 'Unpublished') {

4
lms/lms/utils.py
View File

@@ -1851,7 +1851,7 @@ def enroll_in_program_course(program, course):
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def get_batches(filters=None, start=0, page_length=20): def get_batches(filters=None, start=0, page_length=20, order_by="start_date"):
if not filters: if not filters:
filters = {} filters = {}
@@ -1884,7 +1884,7 @@ def get_batches(filters=None, start=0, page_length=20):
"published", "published",
"category", "category",
], ],
order_by="start_date desc", order_by=order_by,
start=start, start=start,
page_length=page_length, page_length=page_length,
) )