From 5c8378f2d4014673a7d2693f149f1915e94af8a9 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 15 Jan 2025 12:31:23 +0530 Subject: [PATCH 01/34] fix: changed sorting order of batch list --- frontend/src/pages/Batches.vue | 10 ++++++++-- lms/lms/utils.py | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue index 9e69eb72..f2868bb4 100644 --- a/frontend/src/pages/Batches.vue +++ b/frontend/src/pages/Batches.vue @@ -55,7 +55,7 @@
@@ -101,7 +101,8 @@ const categories = ref([]) const currentCategory = ref(null) const title = ref('') const filters = ref({}) -const currentTab = ref('All') +const currentTab = ref(user.data?.is_student ? 'All' : 'Upcoming') +const orderBy = ref('start_date') onMounted(() => { setFiltersFromQuery() @@ -141,6 +142,7 @@ const updateBatches = () => { updateFilters() batches.update({ filters: filters.value, + orderBy: orderBy.value, }) batches.reload() } @@ -170,18 +172,22 @@ const updateTitleFilter = () => { } const updateTabFilter = () => { + orderBy.value = 'start_date' if (!user.data) { return } if (currentTab.value == 'Enrolled' && user.data?.is_student) { filters.value['enrolled'] = 1 + orderBy.value = 'start_date desc' } else if (user.data?.is_student) { delete filters.value['enrolled'] } else { delete filters.value['start_date'] delete filters.value['published'] + orderBy.value = 'start_date desc' if (currentTab.value == 'Upcoming') { filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')] + orderBy.value = 'start_date' } else if (currentTab.value == 'Archived') { filters.value['start_date'] = ['<', dayjs().format('YYYY-MM-DD')] } else if (currentTab.value == 'Unpublished') { diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 24411553..bc02ac79 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -1851,7 +1851,7 @@ def enroll_in_program_course(program, course): @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: filters = {} @@ -1884,7 +1884,7 @@ def get_batches(filters=None, start=0, page_length=20): "published", "category", ], - order_by="start_date desc", + order_by=order_by, start=start, page_length=page_length, ) From f4421d362cacf00612ed461c09ca2e181f655f01 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 15 Jan 2025 16:15:04 +0530 Subject: [PATCH 02/34] fix: batch list responsive cards --- frontend/src/pages/Batches.vue | 43 +++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue index f2868bb4..adc0930a 100644 --- a/frontend/src/pages/Batches.vue +++ b/frontend/src/pages/Batches.vue @@ -19,34 +19,44 @@
-
+
{{ __('All Batches') }}
-
+
- -
- +
-
+
{ orderBy.value = 'start_date desc' if (currentTab.value == 'Upcoming') { filters.value['start_date'] = ['>=', dayjs().format('YYYY-MM-DD')] + filters.value['published'] = 1 orderBy.value = 'start_date' } else if (currentTab.value == 'Archived') { filters.value['start_date'] = ['<', dayjs().format('YYYY-MM-DD')] From b4c7338b76d1e48ab4976b9c6e3864f4ac97ffcf Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 16 Jan 2025 11:43:56 +0530 Subject: [PATCH 03/34] fix: batch listing for current day batches --- frontend/index.html | 2 +- frontend/src/pages/Batches.vue | 16 +++++++-- .../lms_certificate/lms_certificate.json | 5 ++- lms/lms/utils.py | 35 +++++++++++++++++++ lms/www/lms.py | 1 + 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 1512b016..0ce72b41 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -2,7 +2,7 @@ - + Frappe Learning diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue index adc0930a..85512640 100644 --- a/frontend/src/pages/Batches.vue +++ b/frontend/src/pages/Batches.vue @@ -38,10 +38,10 @@ v-model="title" :placeholder="__('Search by Title')" type="text" - class="min-w-40 lg:min-w-0 lg:w-32" + class="min-w-40 lg:min-w-0 lg:w-32 xl:w-40" @input="updateBatches()" /> -
+