From 1a6a119f35d4f647bdc8a74981b125ba2c54c3a5 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Wed, 10 Jan 2024 21:36:02 +0530 Subject: [PATCH] feat: students and assessment tab in dashboard --- frontend/package.json | 12 +- frontend/src/components/Assessments.vue | 51 +- frontend/src/components/BatchDashboard.vue | 17 +- frontend/src/components/BatchOverlay.vue | 20 +- frontend/src/components/BatchStudents.vue | 153 + .../src/components/Controls/Autocomplete.vue | 277 ++ frontend/src/components/Controls/Link.vue | 146 + frontend/src/components/Controls/Rating.vue | 38 + frontend/src/components/CourseReviews.vue | 235 +- frontend/src/components/EvaluationModal.vue | 185 ++ .../src/components/Icons/IndicatorIcon.vue | 18 + frontend/src/components/LiveClass.vue | 110 + frontend/src/components/LiveClassModal.vue | 227 ++ frontend/src/components/Rating.vue | 35 - frontend/src/components/ReviewModal.vue | 136 +- frontend/src/components/StudentModal.vue | 70 + .../src/components/UpcomingEvaluations.vue | 52 +- frontend/src/pages/Batch.vue | 71 +- frontend/src/pages/Lesson.vue | 2 +- frontend/src/utils/dayjs.js | 4 + frontend/src/utils/index.js | 140 + frontend/vite.config.js | 6 +- frontend/yarn.lock | 1376 +++++---- .../course_evaluator/course_evaluator.py | 7 +- lms/lms/doctype/lms_batch/lms_batch.py | 9 +- .../lms_certificate_request.json | 12 +- .../lms_live_class/lms_live_class.json | 11 +- lms/lms/utils.py | 82 +- .../{Batch.6cc6d79c.js => Batch.3bb9da4e.js} | 14 +- ...il.c5dd0840.js => BatchDetail.9bef2d15.js} | 14 +- ...atches.f9864378.js => Batches.6064501b.js} | 10 +- ...ard.6a41330a.js => CourseCard.bf057db6.js} | 8 +- ...l.f6fd1d68.js => CourseDetail.e391d1e0.js} | 12 +- ....df6c648a.js => CourseOutline.2110618a.js} | 4 +- ...ourses.3f5a0719.js => Courses.52ce2794.js} | 12 +- ...olor.36dc819b.js => FontColor.8609c26d.js} | 2 +- .../{Home.6f16d409.js => Home.28a136f6.js} | 2 +- ...ge.e76004a5.js => InsertImage.8746762f.js} | 2 +- ...ink.f5e0056f.js => InsertLink.bddcb61b.js} | 2 +- ...eo.3e2cfdfa.js => InsertVideo.1f3698d7.js} | 2 +- ...{Lesson.c80fc3b7.js => Lesson.19d410ae.js} | 10 +- ...tar.b64a03ac.js => UserAvatar.3cd4adb4.js} | 2 +- .../{clock.4d13ba48.js => clock.b36d19aa.js} | 2 +- ...e-ui.f2211ca2.js => frappe-ui.a747cf9c.js} | 2699 +++++++++-------- .../{index.43e529db.js => index.51e5b051.js} | 92 +- .../{index.05189aed.js => index.6f049c1a.js} | 2 +- ...{index.64bc1bc1.css => index.7337873e.css} | 2 +- .../{plus.8f4bce9f.js => plus.d245902e.js} | 2 +- .../{star.d3e8ecca.js => star.d358f014.js} | 2 +- lms/public/frontend/index.html | 6 +- yarn.lock | 4 - 51 files changed, 4084 insertions(+), 2325 deletions(-) create mode 100644 frontend/src/components/BatchStudents.vue create mode 100644 frontend/src/components/Controls/Autocomplete.vue create mode 100644 frontend/src/components/Controls/Link.vue create mode 100644 frontend/src/components/Controls/Rating.vue create mode 100644 frontend/src/components/EvaluationModal.vue create mode 100644 frontend/src/components/Icons/IndicatorIcon.vue create mode 100644 frontend/src/components/LiveClass.vue create mode 100644 frontend/src/components/LiveClassModal.vue delete mode 100644 frontend/src/components/Rating.vue create mode 100644 frontend/src/components/StudentModal.vue rename lms/public/frontend/assets/{Batch.6cc6d79c.js => Batch.3bb9da4e.js} (98%) rename lms/public/frontend/assets/{BatchDetail.c5dd0840.js => BatchDetail.9bef2d15.js} (97%) rename lms/public/frontend/assets/{Batches.f9864378.js => Batches.6064501b.js} (97%) rename lms/public/frontend/assets/{CourseCard.6a41330a.js => CourseCard.bf057db6.js} (97%) rename lms/public/frontend/assets/{CourseDetail.f6fd1d68.js => CourseDetail.e391d1e0.js} (98%) rename lms/public/frontend/assets/{CourseOutline.df6c648a.js => CourseOutline.2110618a.js} (98%) rename lms/public/frontend/assets/{Courses.3f5a0719.js => Courses.52ce2794.js} (97%) rename lms/public/frontend/assets/{FontColor.36dc819b.js => FontColor.8609c26d.js} (99%) rename lms/public/frontend/assets/{Home.6f16d409.js => Home.28a136f6.js} (97%) rename lms/public/frontend/assets/{InsertImage.e76004a5.js => InsertImage.8746762f.js} (98%) rename lms/public/frontend/assets/{InsertLink.f5e0056f.js => InsertLink.bddcb61b.js} (98%) rename lms/public/frontend/assets/{InsertVideo.3e2cfdfa.js => InsertVideo.1f3698d7.js} (99%) rename lms/public/frontend/assets/{Lesson.c80fc3b7.js => Lesson.19d410ae.js} (99%) rename lms/public/frontend/assets/{UserAvatar.b64a03ac.js => UserAvatar.3cd4adb4.js} (94%) rename lms/public/frontend/assets/{clock.4d13ba48.js => clock.b36d19aa.js} (92%) rename lms/public/frontend/assets/{frappe-ui.f2211ca2.js => frappe-ui.a747cf9c.js} (96%) rename lms/public/frontend/assets/{index.43e529db.js => index.51e5b051.js} (95%) rename lms/public/frontend/assets/{index.05189aed.js => index.6f049c1a.js} (94%) rename lms/public/frontend/assets/{index.64bc1bc1.css => index.7337873e.css} (57%) rename lms/public/frontend/assets/{plus.8f4bce9f.js => plus.d245902e.js} (80%) rename lms/public/frontend/assets/{star.d3e8ecca.js => star.d358f014.js} (81%) delete mode 100644 yarn.lock diff --git a/frontend/package.json b/frontend/package.json index cd667b92..482505e4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,25 +3,25 @@ "private": true, "version": "0.0.0", "scripts": { - "dev": "vite", + "dev": "vite --host", "build": "vite build", "preview": "vite preview" }, "dependencies": { + "dayjs": "^1.11.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.16", + "frappe-ui": "^0.1.22", "lucide-vue-next": "^0.259.0", + "markdown-it": "^14.0.0", "pinia": "^2.0.33", "tailwindcss": "^3.2.7", "vue": "^3.2.25", - "dayjs": "^1.11.6", - "vue-router": "^4.0.12", - "markdown-it": "^14.0.0" + "vue-router": "^4.0.12" }, "devDependencies": { "@vitejs/plugin-vue": "^2.0.0", "autoprefixer": "^10.4.2", "postcss": "^8.4.5", - "vite": "^3.0.0" + "vite": "^5.0.11" } } diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue index f60316c7..8e963659 100644 --- a/frontend/src/components/Assessments.vue +++ b/frontend/src/components/Assessments.vue @@ -3,10 +3,10 @@
{{ __('Assessments') }}
-
+
@@ -18,30 +18,59 @@
diff --git a/frontend/src/components/BatchDashboard.vue b/frontend/src/components/BatchDashboard.vue index 203dedca..3c1b6aad 100644 --- a/frontend/src/components/BatchDashboard.vue +++ b/frontend/src/components/BatchDashboard.vue @@ -1,17 +1,26 @@ diff --git a/frontend/src/components/BatchOverlay.vue b/frontend/src/components/BatchOverlay.vue index 3ddb3c7a..421b2177 100644 --- a/frontend/src/components/BatchOverlay.vue +++ b/frontend/src/components/BatchOverlay.vue @@ -35,11 +35,21 @@ {{ formatTime(batch.data.end_time) }}
- + + + +
+ {{ __('Students') }} +
+
+ + + + + + + + + + + + + + + +
+ + + diff --git a/frontend/src/components/Controls/Autocomplete.vue b/frontend/src/components/Controls/Autocomplete.vue new file mode 100644 index 00000000..eb9a5b08 --- /dev/null +++ b/frontend/src/components/Controls/Autocomplete.vue @@ -0,0 +1,277 @@ + + + diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue new file mode 100644 index 00000000..8ce30846 --- /dev/null +++ b/frontend/src/components/Controls/Link.vue @@ -0,0 +1,146 @@ + + + diff --git a/frontend/src/components/Controls/Rating.vue b/frontend/src/components/Controls/Rating.vue new file mode 100644 index 00000000..5e6e3e6c --- /dev/null +++ b/frontend/src/components/Controls/Rating.vue @@ -0,0 +1,38 @@ + + + diff --git a/frontend/src/components/CourseReviews.vue b/frontend/src/components/CourseReviews.vue index aaac3016..d2440cba 100644 --- a/frontend/src/components/CourseReviews.vue +++ b/frontend/src/components/CourseReviews.vue @@ -1,125 +1,146 @@ \ No newline at end of file + diff --git a/frontend/src/components/EvaluationModal.vue b/frontend/src/components/EvaluationModal.vue new file mode 100644 index 00000000..552003ac --- /dev/null +++ b/frontend/src/components/EvaluationModal.vue @@ -0,0 +1,185 @@ + + diff --git a/frontend/src/components/Icons/IndicatorIcon.vue b/frontend/src/components/Icons/IndicatorIcon.vue new file mode 100644 index 00000000..492fdc1f --- /dev/null +++ b/frontend/src/components/Icons/IndicatorIcon.vue @@ -0,0 +1,18 @@ + diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue new file mode 100644 index 00000000..a94bc1b7 --- /dev/null +++ b/frontend/src/components/LiveClass.vue @@ -0,0 +1,110 @@ + + diff --git a/frontend/src/components/LiveClassModal.vue b/frontend/src/components/LiveClassModal.vue new file mode 100644 index 00000000..389ad1da --- /dev/null +++ b/frontend/src/components/LiveClassModal.vue @@ -0,0 +1,227 @@ +