From 3025ea9a7b83098e95c4f7ce7f6811760ffdd39a Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Mon, 26 May 2025 10:05:36 +0000 Subject: [PATCH 01/90] chore(release): Bumped to Version 2.29.0 --- lms/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/__init__.py b/lms/__init__.py index f604b6f4..ccaf0f03 100644 --- a/lms/__init__.py +++ b/lms/__init__.py @@ -1 +1 @@ -__version__ = "2.28.1" +__version__ = "2.29.0" From d5b882d3f82528543705435398944efd3bbc214a Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 26 May 2025 18:08:17 +0530 Subject: [PATCH 02/90] feat: multiple zoom accounts --- frontend/src/components/BatchCard.vue | 2 +- frontend/src/components/JobCard.vue | 2 +- frontend/src/components/LiveClass.vue | 42 +++++-- .../src/components/Modals/LiveClassModal.vue | 84 ++++++++------ frontend/src/pages/Batch.vue | 5 +- frontend/src/pages/BatchForm.vue | 6 + lms/lms/doctype/lms_batch/lms_batch.json | 9 +- lms/lms/doctype/lms_batch/lms_batch.py | 21 +++- .../lms_live_class/lms_live_class.json | 33 ++++-- lms/lms/doctype/lms_zoom_settings/__init__.py | 0 .../lms_zoom_settings/lms_zoom_settings.js | 8 ++ .../lms_zoom_settings/lms_zoom_settings.json | 103 ++++++++++++++++++ .../lms_zoom_settings/lms_zoom_settings.py | 9 ++ .../test_lms_zoom_settings.py | 30 +++++ lms/lms/utils.py | 1 + lms/patches.txt | 5 +- .../v2_0/link_zoom_account_to_batch.py | 11 ++ .../v2_0/link_zoom_account_to_live_class.py | 16 +++ lms/patches/v2_0/move_zoom_settings.py | 27 +++++ 19 files changed, 351 insertions(+), 63 deletions(-) create mode 100644 lms/lms/doctype/lms_zoom_settings/__init__.py create mode 100644 lms/lms/doctype/lms_zoom_settings/lms_zoom_settings.js create mode 100644 lms/lms/doctype/lms_zoom_settings/lms_zoom_settings.json create mode 100644 lms/lms/doctype/lms_zoom_settings/lms_zoom_settings.py create mode 100644 lms/lms/doctype/lms_zoom_settings/test_lms_zoom_settings.py create mode 100644 lms/patches/v2_0/link_zoom_account_to_batch.py create mode 100644 lms/patches/v2_0/link_zoom_account_to_live_class.py create mode 100644 lms/patches/v2_0/move_zoom_settings.py diff --git a/frontend/src/components/BatchCard.vue b/frontend/src/components/BatchCard.vue index 46b3095b..d1c4c175 100644 --- a/frontend/src/components/BatchCard.vue +++ b/frontend/src/components/BatchCard.vue @@ -1,6 +1,6 @@ diff --git a/frontend/src/components/Settings/EmailTemplates.vue b/frontend/src/components/Settings/EmailTemplates.vue index d3573d75..be252c31 100644 --- a/frontend/src/components/Settings/EmailTemplates.vue +++ b/frontend/src/components/Settings/EmailTemplates.vue @@ -5,9 +5,9 @@
{{ label }}
-
+
From 9b0673bf9271d81fa78c8fe69343edb55fd4b89c Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 27 May 2025 23:01:04 +0530 Subject: [PATCH 23/90] feat: zoom attendance --- frontend/components.d.ts | 1 + frontend/src/components/LiveClass.vue | 71 +++++++++-- .../components/Modals/LiveClassAttendance.vue | 91 ++++++++++++++ .../src/components/Modals/LiveClassModal.vue | 38 +++--- lms/hooks.py | 1 + lms/lms/doctype/lms_batch/lms_batch.py | 2 + .../lms_live_class/lms_live_class.json | 40 +++++- .../doctype/lms_live_class/lms_live_class.py | 56 +++++++++ .../lms_live_class_participant/__init__.py | 0 .../lms_live_class_participant.js | 8 ++ .../lms_live_class_participant.json | 116 ++++++++++++++++++ .../lms_live_class_participant.py | 9 ++ .../test_lms_live_class_participant.py | 30 +++++ 13 files changed, 427 insertions(+), 36 deletions(-) create mode 100644 frontend/src/components/Modals/LiveClassAttendance.vue create mode 100644 lms/lms/doctype/lms_live_class_participant/__init__.py create mode 100644 lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.js create mode 100644 lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json create mode 100644 lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.py create mode 100644 lms/lms/doctype/lms_live_class_participant/test_lms_live_class_participant.py diff --git a/frontend/components.d.ts b/frontend/components.d.ts index cdce130e..c2c899fa 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -65,6 +65,7 @@ declare module 'vue' { LessonHelp: typeof import('./src/components/LessonHelp.vue')['default'] Link: typeof import('./src/components/Controls/Link.vue')['default'] LiveClass: typeof import('./src/components/LiveClass.vue')['default'] + LiveClassAttendance: typeof import('./src/components/Modals/LiveClassAttendance.vue')['default'] LiveClassModal: typeof import('./src/components/Modals/LiveClassModal.vue')['default'] LMSLogo: typeof import('./src/components/Icons/LMSLogo.vue')['default'] Members: typeof import('./src/components/Settings/Members.vue')['default'] diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue index f8f7c606..78c032d2 100644 --- a/frontend/src/components/LiveClass.vue +++ b/frontend/src/components/LiveClass.vue @@ -22,10 +22,18 @@
-
+
{{ cls.title }} @@ -33,7 +41,7 @@
{{ cls.description }}
-
+
@@ -43,11 +51,12 @@
- {{ formatTime(cls.time) }} + {{ formatTime(cls.time) }} - + {{ dayjs(getClassEnd(cls)).format('HH:mm') }}
-
- - - {{ __('This class has ended') }} - -
+ +
+ + + {{ __('Ended') }} + +
+
@@ -88,9 +103,11 @@ v-model="showLiveClassModal" v-model:reloadLiveClasses="liveClasses" /> + +