From 7dccef6b10ce30b49557328f0d77f2ccde3237e9 Mon Sep 17 00:00:00 2001 From: Om vataliya Date: Fri, 9 Jan 2026 23:45:29 +0530 Subject: [PATCH 1/7] fix: Add missing /lms prefix to assignment submission notification links Fixes #1969 - Added /lms prefix to notification link in lms_assignment_submission.py - Added /lms prefix to assessment URL in utils.py - Ensures consistent routing with other notification links (courses, billing, etc.) - Resolves 404 errors when users click 'View' on assignment submission notifications --- .../lms_assignment_submission.py | 8 +------- lms/lms/utils.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py index 52b08357..1d64b952 100644 --- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py +++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py @@ -73,13 +73,7 @@ class LMSAssignmentSubmission(Document): "for_user": self.owner, "from_user": self.evaluator, "type": "Alert", - "link": f"/assignment-submission/{self.assignment}/{self.name}", - } - ) - make_notification_logs(notification, [self.member]) - - -@frappe.whitelist() + "link": f"/lms/assignment-submission/{self.assignment}/{self.name}", def upload_assignment( assignment_attachment=None, answer=None, diff --git a/lms/lms/utils.py b/lms/lms/utils.py index 3d404b6e..1f5ea904 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -1269,7 +1269,7 @@ def get_assignment_details(assessment, member): assessment.edit_url = f"/assignments/{assessment.assessment_name}" submission_name = existing_submission if existing_submission else "new-submission" - assessment.url = f"/assignment-submission/{assessment.assessment_name}/{submission_name}" + assessment.url = f"/lms/assignment-submission/{assessment.assessment_name}/{submission_name}" return assessment From 8ff339b7edacfc7354157fb0106162c45667c746 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 09:24:24 +0530 Subject: [PATCH 2/7] fix: misc issues --- .../src/components/UpcomingEvaluations.vue | 43 ++++++++++++++++--- frontend/src/pages/Batch.vue | 15 +------ frontend/yarn.lock | 6 +-- .../lms_batch_enrollment.json | 14 +++++- .../lms_batch_feedback.json | 26 ++++++++++- .../lms_live_class/lms_live_class.json | 14 +++++- .../doctype/lms_live_class/lms_live_class.py | 12 ++++-- .../lms_live_class_participant.json | 28 +++++++++++- 8 files changed, 126 insertions(+), 32 deletions(-) diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue index edc5551c..438a6651 100644 --- a/frontend/src/components/UpcomingEvaluations.vue +++ b/frontend/src/components/UpcomingEvaluations.vue @@ -4,15 +4,30 @@
{{ __('Upcoming Evaluations') }}
- +
+ {{ __('The last day to schedule your evaluations is ') }} + + {{ dayjs(endDate).format('DD MMMM YYYY') }} . + {{ __('Please make sure to schedule your evaluation before this date.') }} +
+
+ {{ + __( + 'The deadline to schedule evaluations has passed. Please contact the Instructor for assistance.' + ) + }} +
-
+
{{ __('Schedule an evaluation to get certified.') }}
@@ -125,6 +140,7 @@ import { formatTime } from '@/utils' import { Button, createResource, call } from 'frappe-ui' import EvaluationModal from '@/components/Modals/EvaluationModal.vue' import { Menu, MenuButton, MenuItems, MenuItem } from '@headlessui/vue' +import IsSameOrAfter from 'dayjs/esm/plugin/IsSameOrAfter' const dayjs = inject('$dayjs') const showEvalModal = ref(false) @@ -173,6 +189,19 @@ const evaluationCourses = computed(() => { }) }) +const canScheduleEvals = computed(() => { + return ( + upcoming_evals.data?.length != evaluationCourses.length && + !props.forHome && + !endDateHasPassed.value + ) +}) + +const endDateHasPassed = computed(() => { + dayjs.extend(IsSameOrAfter) + return dayjs().isSameOrAfter(dayjs(props.endDate), 'day') +}) + const cancelEvaluation = (evl) => { $dialog({ title: __('Cancel this evaluation?'), diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue index bf3b1135..ad5c47bb 100644 --- a/frontend/src/pages/Batch.vue +++ b/frontend/src/pages/Batch.vue @@ -144,20 +144,7 @@ -
- {{ __('The last day to schedule your evaluations is ') }} - - {{ - dayjs(batch.data.evaluation_end_date).format('DD MMMM YYYY') - }} . - {{ - __('Please make sure to schedule your evaluation before this date.') - }} -
+
{{ __('Feedback') }} diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 95621ac6..3dc3918b 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1896,9 +1896,9 @@ integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg== "@types/node@*": - version "25.0.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.7.tgz#afd2f0d34358631a287c6726dabe0c845abc2bae" - integrity sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w== + version "25.0.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.8.tgz#e54e00f94fe1db2497b3e42d292b8376a2678c8d" + integrity sha512-powIePYMmC3ibL0UJ2i2s0WIbq6cg6UyVFQxSCpaPxxzAaziRfimGivjdF943sSGV6RADVbk0Nvlm5P/FB44Zg== dependencies: undici-types "~7.16.0" diff --git a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json index c9f3e793..a2f05643 100644 --- a/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json +++ b/lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json @@ -73,7 +73,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-12-04 12:53:38.246250", + "modified": "2026-01-14 08:53:16.672825", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS Batch Enrollment", @@ -108,6 +108,18 @@ "if_owner": 1, "read": 1, "role": "LMS Student" + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Batch Evaluator", + "share": 1, + "write": 1 } ], "row_format": "Dynamic", diff --git a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json index 89e99c33..683a8876 100644 --- a/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json +++ b/lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json @@ -76,7 +76,7 @@ "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2025-05-21 15:58:51.667270", + "modified": "2026-01-14 08:53:38.088168", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS Batch Feedback", @@ -105,6 +105,30 @@ "role": "LMS Student", "share": 1, "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Moderator", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Batch Evaluator", + "share": 1, + "write": 1 } ], "row_format": "Dynamic", diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.json b/lms/lms/doctype/lms_live_class/lms_live_class.json index e734da4a..d71727ed 100644 --- a/lms/lms/doctype/lms_live_class/lms_live_class.json +++ b/lms/lms/doctype/lms_live_class/lms_live_class.json @@ -177,7 +177,7 @@ "link_fieldname": "live_class" } ], - "modified": "2025-05-27 14:44:35.679712", + "modified": "2026-01-14 08:54:07.684781", "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS Live Class", @@ -215,6 +215,18 @@ "report": 1, "role": "LMS Student", "share": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Batch Evaluator", + "share": 1, + "write": 1 } ], "row_format": "Dynamic", diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py index f54372fc..dc6dfa2f 100644 --- a/lms/lms/doctype/lms_live_class/lms_live_class.py +++ b/lms/lms/doctype/lms_live_class/lms_live_class.py @@ -155,11 +155,17 @@ def create_attendance(live_class, data): doc = frappe.new_doc("LMS Live Class Participant") doc.live_class = live_class.name doc.member = participant.get("user_email") - doc.joined_at = participant.get("join_time") - doc.left_at = participant.get("leave_time") - doc.duration = participant.get("duration") + doc.joined_at = get_datetime(participant.get("join_time")) + doc.left_at = get_datetime(participant.get("leave_time")) + doc.duration = get_minutes(participant.get("duration")) doc.insert() def update_attendees_count(live_class, data): frappe.db.set_value("LMS Live Class", live_class.name, "attendees", len(data)) + + +def get_minutes(duration_in_seconds): + if duration_in_seconds: + return int(duration_in_seconds) // 60 + return 0 diff --git a/lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json b/lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json index 7dff5dfd..f1117c12 100644 --- a/lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json +++ b/lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json @@ -89,8 +89,8 @@ "grid_page_length": 50, "index_web_pages_for_search": 1, "links": [], - "modified": "2025-05-27 22:32:24.196643", - "modified_by": "Administrator", + "modified": "2026-01-14 08:54:21.421321", + "modified_by": "sayali@frappe.io", "module": "LMS", "name": "LMS Live Class Participant", "owner": "Administrator", @@ -106,6 +106,30 @@ "role": "System Manager", "share": 1, "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Moderator", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Batch Evaluator", + "share": 1, + "write": 1 } ], "row_format": "Dynamic", From 6a5978fed6b62fca8d7d20d3923d6b028da919b5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 09:45:44 +0530 Subject: [PATCH 3/7] fix: instructor notes menu position in lesson form --- frontend/src/pages/LessonForm.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue index b3a3f8a8..940fea45 100644 --- a/frontend/src/pages/LessonForm.vue +++ b/frontend/src/pages/LessonForm.vue @@ -667,6 +667,15 @@ iframe { padding: 8px; } +.codex-editor--narrow .ce-toolbox .ce-popover { + right: unset; + left: initial; +} + +.ce-popover { + border-radius: 12px; +} + .cdx-search-field { border: none; } From a7bcc53e0a4ff57f804e6292cc8a06fd2239cb29 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 10:08:21 +0530 Subject: [PATCH 4/7] fix: dayjs condition for evaluation end date --- frontend/src/components/UpcomingEvaluations.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue index 438a6651..6bb0e8ec 100644 --- a/frontend/src/components/UpcomingEvaluations.vue +++ b/frontend/src/components/UpcomingEvaluations.vue @@ -140,7 +140,6 @@ import { formatTime } from '@/utils' import { Button, createResource, call } from 'frappe-ui' import EvaluationModal from '@/components/Modals/EvaluationModal.vue' import { Menu, MenuButton, MenuItems, MenuItem } from '@headlessui/vue' -import IsSameOrAfter from 'dayjs/esm/plugin/IsSameOrAfter' const dayjs = inject('$dayjs') const showEvalModal = ref(false) @@ -198,8 +197,7 @@ const canScheduleEvals = computed(() => { }) const endDateHasPassed = computed(() => { - dayjs.extend(IsSameOrAfter) - return dayjs().isSameOrAfter(dayjs(props.endDate), 'day') + return dayjs().isSameOrAfter(dayjs(props.endDate)) }) const cancelEvaluation = (evl) => { From da87845a4c2ca1dbe2609587b111f45cea1fa77b Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 12:37:49 +0530 Subject: [PATCH 5/7] chore: changed frappe dependency version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 34a916e2..0ac33331 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,4 +66,4 @@ indent-style = "tab" docstring-code-format = true [tool.bench.frappe-dependencies] -frappe = ">=15.0.0,<17.0.0" \ No newline at end of file +frappe = ">=15.0.0,<17.0.0-dev" \ No newline at end of file From 6d988eb2b4be6584e44db30e7d49a9a3e89ddddd Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 14:01:21 +0530 Subject: [PATCH 6/7] chore: changed frappe dependency version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0ac33331..1463f1bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,4 +66,4 @@ indent-style = "tab" docstring-code-format = true [tool.bench.frappe-dependencies] -frappe = ">=15.0.0,<17.0.0-dev" \ No newline at end of file +frappe = ">=15.0.0,<=17.0.0-dev" \ No newline at end of file From e7ccf0a711d0e0ab5e6b28b7a1e4e0510b6b9543 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 14 Jan 2026 17:54:23 +0530 Subject: [PATCH 7/7] fix: sanitize image filename before saving for course and jobs --- frontend/src/components/Controls/Uploader.vue | 2 +- frontend/src/pages/BatchForm.vue | 17 ++-- frontend/src/pages/CourseForm.vue | 98 +++---------------- frontend/src/pages/JobForm.vue | 79 ++------------- 4 files changed, 33 insertions(+), 163 deletions(-) diff --git a/frontend/src/components/Controls/Uploader.vue b/frontend/src/components/Controls/Uploader.vue index 73643892..8c83ff4c 100644 --- a/frontend/src/components/Controls/Uploader.vue +++ b/frontend/src/components/Controls/Uploader.vue @@ -70,7 +70,7 @@ const props = withDefaults( modelValue: string label?: string description?: string - type: 'image' | 'video' + type?: 'image' | 'video' required?: boolean }>(), { diff --git a/frontend/src/pages/BatchForm.vue b/frontend/src/pages/BatchForm.vue index e88b1aa6..1a694f3a 100644 --- a/frontend/src/pages/BatchForm.vue +++ b/frontend/src/pages/BatchForm.vue @@ -281,22 +281,13 @@ import { import { Breadcrumbs, FormControl, - FileUploader, Button, TextEditor, createResource, usePageMeta, toast, call, - Toast, } from 'frappe-ui' -import { useRouter } from 'vue-router' -import { Image, Trash2 } from 'lucide-vue-next' -import { capture } from '@/telemetry' -import { useOnboarding } from 'frappe-ui/frappe' -import { sessionStore } from '../stores/session' -import MultiSelect from '@/components/Controls/MultiSelect.vue' -import Link from '@/components/Controls/Link.vue' import { escapeHTML, getMetaInfo, @@ -304,7 +295,14 @@ import { sanitizeHTML, updateMetaInfo, } from '@/utils' +import { useRouter } from 'vue-router' +import { Trash2 } from 'lucide-vue-next' +import { capture } from '@/telemetry' +import { useOnboarding } from 'frappe-ui/frappe' +import { sessionStore } from '../stores/session' import Uploader from '@/components/Controls/Uploader.vue' +import MultiSelect from '@/components/Controls/MultiSelect.vue' +import Link from '@/components/Controls/Link.vue' const router = useRouter() const user = inject('$user') @@ -466,6 +464,7 @@ const validateFields = () => { !['description', 'batch_details'].includes(key) && typeof batch[key] === 'string' ) { + console.log(key) batch[key] = escapeHTML(batch[key]) } }) diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue index 5a412e1c..339d35d3 100644 --- a/frontend/src/pages/CourseForm.vue +++ b/frontend/src/pages/CourseForm.vue @@ -75,58 +75,11 @@
-
-
- {{ __('Course Image') }} -
- - - -
-
- -
- -
- {{ - __('Appears on the course card in the course list') - }} -
-
-
-
-
+ ({ instructor: instructor, })), @@ -471,7 +423,7 @@ const courseEditResource = createResource({ doctype: 'LMS Course', name: values.course, fieldname: { - image: course.course_image?.file_url || '', + image: course.image, instructors: instructors.value.map((instructor) => ({ instructor: instructor, })), @@ -521,24 +473,10 @@ const courseResource = createResource({ course[key] = course[key] ? true : false } - if (data.image) imageResource.reload({ image: data.image }) check_permission() }, }) -const imageResource = createResource({ - url: 'lms.lms.api.get_file_info', - makeParams(values) { - return { - file_url: values.image, - } - }, - auto: false, - onSuccess(data) { - course.course_image = data - }, -}) - const validateFields = () => { course.description = sanitizeHTML(course.description) @@ -655,14 +593,6 @@ const removeTag = (tag) => { newTag.value = '' } -const saveImage = (file) => { - course.course_image = file -} - -const removeImage = () => { - course.course_image = null -} - const check_permission = () => { let user_is_instructor = false if (user.data?.is_moderator) return diff --git a/frontend/src/pages/JobForm.vue b/frontend/src/pages/JobForm.vue index c81d5c62..3b850371 100644 --- a/frontend/src/pages/JobForm.vue +++ b/frontend/src/pages/JobForm.vue @@ -83,47 +83,11 @@ class="mb-4" :required="true" /> - - - - -
-
-
- -
-
- - {{ job.image.file_name }} - - - {{ getFileSize(job.image.file_size) }} - -
- -
-
+
@@ -150,15 +114,14 @@ import { createResource, Button, TextEditor, - FileUploader, usePageMeta, toast, } from 'frappe-ui' import { computed, onMounted, reactive, inject } from 'vue' -import { FileText, X } from 'lucide-vue-next' import { sessionStore } from '@/stores/session' import { useRouter } from 'vue-router' -import { escapeHTML, getFileSize, sanitizeHTML, validateFile } from '@/utils' +import { escapeHTML, sanitizeHTML } from '@/utils' +import Uploader from '@/components/Controls/Uploader.vue' const user = inject('$user') const router = useRouter() @@ -177,7 +140,7 @@ const newJob = createResource({ return { doc: { doctype: 'Job Opportunity', - company_logo: job.image?.file_url, + company_logo: job.company_logo, ...job, }, } @@ -191,7 +154,7 @@ const updateJob = createResource({ doctype: 'Job Opportunity', name: props.jobName, fieldname: { - company_logo: job.image.file_url, + company_logo: job.company_logo, ...job, }, } @@ -215,20 +178,6 @@ const jobDetail = createResource({ Object.keys(data).forEach((key) => { if (Object.hasOwn(job, key)) job[key] = data[key] }) - if (data.company_logo) imageResource.reload({ image: data.company_logo }) - }, -}) - -const imageResource = createResource({ - url: 'lms.lms.api.get_file_info', - makeParams(values) { - return { - file_url: values.image, - } - }, - auto: false, - onSuccess(data) { - job.image = data }, }) @@ -241,7 +190,7 @@ const job = reactive({ status: 'Open', company_name: '', company_website: '', - image: null, + company_logo: null, description: '', company_email_address: '', }) @@ -322,14 +271,6 @@ const validateJobFields = () => { }) } -const saveImage = (file) => { - job.image = file -} - -const removeImage = () => { - job.image = null -} - const jobTypes = computed(() => { return [ { label: 'Full Time', value: 'Full Time' },