Compare commits

...

1227 Commits

Author SHA1 Message Date
Frappe PR Bot
a8690e41e6 chore(release): Bumped to Version 2.23.0 2025-02-19 05:29:30 +00:00
Jannat Patel
cda42b9ec5 Merge pull request #1325 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-19 08:49:19 +05:30
Jannat Patel
21a75fdd6d chore: Bosnian translations 2025-02-18 23:05:44 +05:30
Jannat Patel
a90a1e9855 chore: Persian translations 2025-02-18 23:05:43 +05:30
Jannat Patel
2a046e2e8b chore: German translations 2025-02-18 23:05:40 +05:30
Jannat Patel
bb41656d81 Merge branch 'develop' of https://github.com/frappe/lms into develop 2025-02-18 19:12:23 +05:30
Jannat Patel
a88a107718 fix: batch confirmation email template 2025-02-18 19:12:04 +05:30
Jannat Patel
2d21469f91 Merge pull request #1324 from pateljannat/issues-78
fix: redirect users to the batch page after login
2025-02-18 18:29:51 +05:30
Jannat Patel
960ebe4a79 fix: redirect users to the batch page after login 2025-02-18 18:10:33 +05:30
Jannat Patel
46dba0c394 Merge pull request #1323 from pateljannat/batch-reminders
feat: batch start and live class reminder
2025-02-18 17:34:44 +05:30
Jannat Patel
ba27e8ca95 fix: send live class reminder on the day of the class 2025-02-18 17:26:40 +05:30
Jannat Patel
30574ea0fd feat: batch start and live class reminder 2025-02-18 17:22:52 +05:30
Jannat Patel
c3c985c4a1 Merge pull request #1322 from pateljannat/certification-batches
feat: filter certification batches
2025-02-18 17:05:16 +05:30
Jannat Patel
7b3d2d8812 feat: filter certification batches 2025-02-18 15:57:55 +05:30
Jannat Patel
d573a9f008 Merge pull request #1320 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-18 12:41:05 +05:30
Jannat Patel
85a05f56b2 chore: Esperanto translations 2025-02-17 22:33:51 +05:30
Jannat Patel
904adfb905 chore: Bosnian translations 2025-02-17 22:33:50 +05:30
Jannat Patel
b2201c29fd chore: Persian translations 2025-02-17 22:33:48 +05:30
Jannat Patel
fe01f68623 chore: Chinese Simplified translations 2025-02-17 22:33:47 +05:30
Jannat Patel
531c8ebe94 chore: Turkish translations 2025-02-17 22:33:45 +05:30
Jannat Patel
52dfb5a360 chore: Swedish translations 2025-02-17 22:33:44 +05:30
Jannat Patel
7e04e7e461 chore: Russian translations 2025-02-17 22:33:42 +05:30
Jannat Patel
bce47f606d chore: Polish translations 2025-02-17 22:33:41 +05:30
Jannat Patel
4dc1fdfdd8 chore: Hungarian translations 2025-02-17 22:33:40 +05:30
Jannat Patel
9a852b52bc chore: German translations 2025-02-17 22:33:38 +05:30
Jannat Patel
71a57b1fc0 chore: Arabic translations 2025-02-17 22:33:37 +05:30
Jannat Patel
d634598db1 chore: Spanish translations 2025-02-17 22:33:35 +05:30
Jannat Patel
6377d682a4 chore: French translations 2025-02-17 22:33:33 +05:30
Jannat Patel
6e1acfdc24 Merge pull request #1316 from FahidLatheef/fix/quiz-maximum-attempts
fix: fixed bug in which user can submit quiz over the maximum limit allowed
2025-02-17 19:59:57 +05:30
Jannat Patel
30ec1dfd7c Merge pull request #1319 from pateljannat/assignment-grading-comment-field
feat: assignment comments is now text editor
2025-02-17 19:56:22 +05:30
Jannat Patel
3d209024dd fix: height of batch page 2025-02-17 19:45:45 +05:30
Jannat Patel
9ce64a037d fix: increased column width for grading 2025-02-17 19:41:24 +05:30
Jannat Patel
43117bc035 feat:assignment comments is now text editor 2025-02-17 19:28:50 +05:30
Jannat Patel
2af704043e Merge pull request #1318 from pateljannat/batch-email-template
feat: batch specific email templates
2025-02-17 18:36:05 +05:30
Jannat Patel
fa14ffdcba feat: batch specific email templates 2025-02-17 18:17:50 +05:30
Jannat Patel
492b715ea0 Merge pull request #1317 from pateljannat/trial-signup
feat: billing banner for FC trial sites
2025-02-17 16:00:46 +05:30
Jannat Patel
d452e20b8a feat: show trial banner only if fc site 2025-02-17 15:39:15 +05:30
Jannat Patel
6b634c15d9 feat: billing banner for FC trial sites 2025-02-17 15:07:31 +05:30
Jannat Patel
eeaec3369f Merge pull request #1313 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-17 11:10:39 +05:30
Jannat Patel
ce1eece90d Merge pull request #1312 from frappe/pot_develop_2025-02-14
chore: update POT file
2025-02-17 11:05:48 +05:30
Jannat Patel
030bff6592 chore: Bosnian translations 2025-02-16 22:32:22 +05:30
Jannat Patel
65de46a59e chore: Swedish translations 2025-02-16 22:32:18 +05:30
Fahid Latheef Alungal
974f67aefe fix: validate if submission exceeds the allowed limit in backend 2025-02-16 19:29:03 +05:30
Fahid Latheef Alungal
e374ae3229 fix: fixed spelling nextQuetion -> nextQuestion 2025-02-16 18:28:48 +05:30
Fahid Latheef Alungal
8b1058e577 fix: fixed issue in which submissions are not reflected gracefully until page reload
ListView throws error if initialized without emptyState which was causing the component to not reload when number of submissions was 0.
2025-02-16 18:27:38 +05:30
Fahid Latheef Alungal
aaa2eea5e6 fix: fixed incomplete router initialization in Quiz.vue which was allowing user to submit quiz multiple times 2025-02-16 18:19:14 +05:30
Fahid Latheef Alungal
54047e3c2c fix: fix spelling typo Maximun Attempts -> Maximum Attempts 2025-02-16 16:10:14 +05:30
Fahid Latheef Alungal
50fe94e47b fix: fix yarn dev not working due to const variable re-assignment
It was causing this error

  ✘ [ERROR] Cannot assign to "isLoggedIn" because it is a constant

    src/router.js:230:2:
      230 │     isLoggedIn = false
          ╵     ~~~~~~~~~~

  The symbol "isLoggedIn" was declared a constant here:

    src/router.js:222:7:
      222 │   const { isLoggedIn } = sessionStore()
          ╵         ^
2025-02-16 16:08:35 +05:30
Jannat Patel
6999f6641a chore: Bosnian translations 2025-02-15 22:29:52 +05:30
frappe-pr-bot
c2b12aa65f chore: update POT file 2025-02-14 16:04:13 +00:00
Jannat Patel
1a731b6908 Merge pull request #1311 from pateljannat/issues-77
fix: students should have access private batch if enrolled
2025-02-14 20:21:54 +05:30
Jannat Patel
837d050628 fix: students should be able to access private batch if they are enrolled 2025-02-14 20:10:32 +05:30
Jannat Patel
8b00bec49c fix: students should be able to access private batch if they are enrolled 2025-02-14 20:04:37 +05:30
Jannat Patel
9ade643af0 Merge pull request #1310 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-14 17:06:53 +05:30
Jannat Patel
a29b92a886 chore: Bosnian translations 2025-02-13 22:17:06 +05:30
Jannat Patel
e2c28e211f Merge pull request #1309 from pateljannat/issues-76
fix: misc batch issues
2025-02-13 21:26:17 +05:30
Jannat Patel
65f5b6a0a4 fix: delete unused custom fields from web form 2025-02-13 17:23:57 +05:30
Frappe PR Bot
905e240fb9 chore(release): Bumped to Version 2.22.0 2025-02-13 11:52:52 +00:00
Jannat Patel
75cea1ab78 fix: delete unused custom fields from web form 2025-02-13 17:21:14 +05:30
Jannat Patel
dd3da3dd49 Merge pull request #1305 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-13 17:06:23 +05:30
Jannat Patel
5ab9131629 fix: misc batch issues 2025-02-13 16:57:21 +05:30
Jannat Patel
8f1c9612b7 fix: payment reminder template issue 2025-02-13 08:57:13 +05:30
Jannat Patel
15a12d2518 Merge pull request #1306 from pateljannat/issues-75
fix: misc ui fixes
2025-02-13 07:36:38 +05:30
Jannat Patel
e83734e0e4 fix: misc ui fixes 2025-02-12 22:54:23 +05:30
Jannat Patel
f2a95af45c chore: Bosnian translations 2025-02-12 22:14:17 +05:30
Jannat Patel
1bb61d0c1d chore: Persian translations 2025-02-12 22:14:15 +05:30
Jannat Patel
51fb4f2296 chore: Swedish translations 2025-02-12 22:14:12 +05:30
Jannat Patel
5f0f625c0f chore: Spanish translations 2025-02-12 22:14:05 +05:30
Jannat Patel
ea7b803905 fix: set email sent in batch enrollment 2025-02-12 13:34:28 +05:30
Jannat Patel
76af3921dd fix: set email sent in batch enrollment 2025-02-12 13:34:00 +05:30
Jannat Patel
e2f999fc31 Merge pull request #1304 from pateljannat/issues-74
fix: misc batch flow changes
2025-02-12 13:15:14 +05:30
Jannat Patel
f63d57c4a9 fix: when checking for duplicates, ignore same document 2025-02-12 13:09:22 +05:30
Jannat Patel
ee73790127 fix: announcements should to go one student at a time 2025-02-12 12:46:57 +05:30
Jannat Patel
1c3e84e9bb fix: misc batch flow changes 2025-02-12 12:24:31 +05:30
Jannat Patel
451a151ce0 Merge pull request #1302 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-12 11:02:49 +05:30
Jannat Patel
1ac4f819ec chore: Bosnian translations 2025-02-11 22:17:23 +05:30
Jannat Patel
526eba0129 chore: Persian translations 2025-02-11 22:17:21 +05:30
Jannat Patel
8638e0a1f9 Merge pull request #1301 from pateljannat/dark-mode
feat: dark mode
2025-02-11 18:40:08 +05:30
Jannat Patel
69c1093c93 fix: badge color on batch overlay 2025-02-11 18:30:13 +05:30
Jannat Patel
74cd0a4d40 fix: added get certified button on certified participants list 2025-02-11 18:29:29 +05:30
Jannat Patel
e28fc3bee6 fix: calendar background and assignment text color 2025-02-11 16:28:25 +05:30
Jannat Patel
879dfac111 Merge pull request #1300 from pateljannat/issues-73
fix: misc batch enrollment issues
2025-02-11 15:02:14 +05:30
Jannat Patel
b6cfcd797b fix: pluck only member for to validate batch course membership 2025-02-11 14:55:44 +05:30
Jannat Patel
2ea73888f0 fix: changed naming for LMS Payment 2025-02-11 14:49:04 +05:30
Jannat Patel
f43331967c fix: misc batch enrollment issues 2025-02-11 13:28:49 +05:30
Jannat Patel
9da1249e51 Merge pull request #1298 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-11 12:40:58 +05:30
Jannat Patel
2342dfe452 fix: dark mode for course and batch tags 2025-02-11 10:52:37 +05:30
Jannat Patel
e24d22c348 chore: Esperanto translations 2025-02-10 21:39:15 +05:30
Jannat Patel
533d9545de chore: Bosnian translations 2025-02-10 21:39:14 +05:30
Jannat Patel
03c0c3c821 chore: Persian translations 2025-02-10 21:39:12 +05:30
Jannat Patel
05be628afb chore: Chinese Simplified translations 2025-02-10 21:39:10 +05:30
Jannat Patel
cb2dc3e645 chore: Turkish translations 2025-02-10 21:39:09 +05:30
Jannat Patel
25f3d2fb9f chore: Swedish translations 2025-02-10 21:39:07 +05:30
Jannat Patel
db39a6416c chore: Russian translations 2025-02-10 21:39:05 +05:30
Jannat Patel
48e0787344 chore: Polish translations 2025-02-10 21:39:04 +05:30
Jannat Patel
838de2f692 chore: Hungarian translations 2025-02-10 21:39:02 +05:30
Jannat Patel
1953d89e3c chore: German translations 2025-02-10 21:39:00 +05:30
Jannat Patel
d0898d4c75 chore: Arabic translations 2025-02-10 21:38:59 +05:30
Jannat Patel
f01bb1aecb chore: Spanish translations 2025-02-10 21:38:57 +05:30
Jannat Patel
bbdbda4942 chore: French translations 2025-02-10 21:38:56 +05:30
Jannat Patel
7741696011 Merge branch 'develop' of https://github.com/frappe/lms into dark-mode 2025-02-10 19:18:26 +05:30
Jannat Patel
2d4567bfbd Merge pull request #1297 from pateljannat/issues-72
fix: check for duplicates before creating batch enrollment in patch
2025-02-10 18:03:31 +05:30
Jannat Patel
8f643dae27 style: fix formatting 2025-02-10 17:37:08 +05:30
Jannat Patel
81e287ffe5 fix: check for duplicates before creating batch enrollment in patch 2025-02-10 17:31:11 +05:30
Jannat Patel
5543aa5e02 chore: resolved conflicts 2025-02-10 16:48:02 +05:30
Jannat Patel
b5a7b4cd2c Merge pull request #1296 from pateljannat/batch-students-refactor
refactor: LMS Batch Enrollment to store batch students
2025-02-10 16:42:09 +05:30
Jannat Patel
8857ce8146 fix: set confirmation_email_sent after sending email 2025-02-10 16:30:31 +05:30
Jannat Patel
bfbc5f600f Merge pull request #1295 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-10 16:16:57 +05:30
Jannat Patel
a8fa42db00 Merge pull request #1294 from frappe/pot_develop_2025-02-07
chore: update POT file
2025-02-10 16:16:44 +05:30
Jannat Patel
4ee2bfcf32 style: formattin 2025-02-10 16:16:11 +05:30
Jannat Patel
ab98884f77 refactor: replaced Batch Student child table with LMS Batch Enrollment doctype 2025-02-10 16:15:28 +05:30
Jannat Patel
dbf443300b feat: dark mode 2025-02-10 10:51:21 +05:30
Jannat Patel
dbf44a7a85 chore: Bosnian translations 2025-02-09 21:42:25 +05:30
Jannat Patel
2818c95795 chore: Swedish translations 2025-02-09 21:42:20 +05:30
Jannat Patel
27a13a6151 chore: Bosnian translations 2025-02-08 21:41:18 +05:30
Jannat Patel
9f974786f2 chore: Persian translations 2025-02-08 21:41:17 +05:30
Jannat Patel
2f2f41ac3c chore: Bosnian translations 2025-02-07 21:41:18 +05:30
frappe-pr-bot
d5d30f683a chore: update POT file 2025-02-07 16:03:56 +00:00
Jannat Patel
56007aa4ba Merge pull request #1293 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-07 14:47:50 +05:30
Jannat Patel
d489e08718 chore: Bosnian translations 2025-02-06 21:26:13 +05:30
Jannat Patel
16b9356944 Merge pull request #1292 from pateljannat/hide-public-pages
feat: configuration to allow guest access
2025-02-06 12:41:45 +05:30
Jannat Patel
ba26826896 feat: configuration to allow guest access 2025-02-06 12:14:24 +05:30
Jannat Patel
49631b6e56 Merge pull request #1291 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-06 11:11:23 +05:30
Jannat Patel
ae2bffc56d chore: Bosnian translations 2025-02-05 21:27:59 +05:30
Jannat Patel
47e51c4787 chore: Swedish translations 2025-02-05 21:27:55 +05:30
Jannat Patel
06ef289427 Merge pull request #1286 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-05 14:49:32 +05:30
Jannat Patel
4190f39993 chore: Bosnian translations 2025-02-04 20:35:56 +05:30
Jannat Patel
26a22375c8 chore: Persian translations 2025-02-04 20:35:54 +05:30
Jannat Patel
0c174caf86 Merge pull request #1285 from pateljannat/jobs-order
fix: misc issues
2025-02-04 12:14:38 +05:30
Jannat Patel
661748adc1 style: improved formatting 2025-02-04 11:27:21 +05:30
Jannat Patel
73f24339e3 Merge pull request #1284 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-04 11:19:37 +05:30
Jannat Patel
9775d7425c fix: changed heatmap base days back to 200 2025-02-04 11:19:13 +05:30
Jannat Patel
3ff6c96273 fix: top aligned all batch feedback rows 2025-02-04 11:15:39 +05:30
Jannat Patel
f9706f10e1 feat: reminder notification for incomplete payments 2025-02-04 09:55:10 +05:30
Jannat Patel
e9a20c61d5 chore: Bosnian translations 2025-02-03 20:01:03 +05:30
Jannat Patel
f3ee1a84dd chore: Persian translations 2025-02-03 20:01:01 +05:30
Jannat Patel
381ca43c01 Merge pull request #1269 from FahidLatheef/feat/persistent-sidebar
ui: added persistent Sidebar Collapsibility and Sidebar Webpages
2025-02-03 11:16:57 +05:30
Jannat Patel
8cc16dc51b Merge pull request #1279 from frappe/pot_develop_2025-01-31
chore: update POT file
2025-02-03 11:14:46 +05:30
Jannat Patel
4337603e33 Merge pull request #1280 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-02-03 11:14:35 +05:30
Jannat Patel
5c39acb745 chore: Bosnian translations 2025-02-02 19:51:26 +05:30
Jannat Patel
1b584f0b88 chore: Bosnian translations 2025-02-01 19:30:44 +05:30
frappe-pr-bot
68a28ef6d4 chore: update POT file 2025-01-31 16:04:05 +00:00
Jannat Patel
867df7f2c7 Merge pull request #1278 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-31 20:32:09 +05:30
Jannat Patel
c18e84bb8e chore: Bosnian translations 2025-01-31 18:45:28 +05:30
Jannat Patel
3fc1fd9dbc Merge pull request #1272 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-29 19:30:00 +05:30
Jannat Patel
bc284c327c chore: Esperanto translations 2025-01-28 17:47:24 +05:30
Jannat Patel
85961c76fb chore: Bosnian translations 2025-01-28 17:47:23 +05:30
Jannat Patel
1c11a5964b chore: Persian translations 2025-01-28 17:47:21 +05:30
Jannat Patel
4d1ba4ea3f chore: Chinese Simplified translations 2025-01-28 17:47:20 +05:30
Jannat Patel
6d3e24fce9 chore: Turkish translations 2025-01-28 17:47:18 +05:30
Jannat Patel
de37ec5704 chore: Swedish translations 2025-01-28 17:47:17 +05:30
Jannat Patel
745592432c chore: Russian translations 2025-01-28 17:47:16 +05:30
Jannat Patel
cf47965e8c chore: Polish translations 2025-01-28 17:47:14 +05:30
Jannat Patel
3d64872352 chore: Hungarian translations 2025-01-28 17:47:13 +05:30
Jannat Patel
b89ad4204c chore: German translations 2025-01-28 17:47:12 +05:30
Jannat Patel
71e9ba849d chore: Arabic translations 2025-01-28 17:47:10 +05:30
Jannat Patel
1d412175c6 chore: Spanish translations 2025-01-28 17:47:09 +05:30
Jannat Patel
b282a37a04 chore: French translations 2025-01-28 17:47:07 +05:30
Jannat Patel
5f6d0bcf25 Merge pull request #1270 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-27 21:05:52 +05:30
Jannat Patel
74c2d5eb06 Merge pull request #1268 from frappe/pot_develop_2025-01-24
chore: update POT file
2025-01-27 21:05:36 +05:30
Jannat Patel
4618d3b30e chore: French translations 2025-01-27 17:22:08 +05:30
Jannat Patel
9e32e8f499 chore: Persian translations 2025-01-25 17:22:38 +05:30
Jannat Patel
f47e2e758b chore: Turkish translations 2025-01-25 17:22:37 +05:30
Fahid Latheef Alungal
9e03e30bd8 ui: added persistent Sidebar Collapsibility and Sidebar Webpages 2025-01-25 11:20:09 +05:30
frappe-pr-bot
6be0e6bfca chore: update POT file 2025-01-24 16:04:10 +00:00
Jannat Patel
7bbdedf5f4 fix: margins beneath progress bar in course card 2025-01-23 18:34:15 +05:30
Jannat Patel
e942e6a2f5 Merge pull request #1267 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-23 10:34:41 +05:30
Jannat Patel
6162df7013 chore: Turkish translations 2025-01-22 16:48:09 +05:30
Jannat Patel
a28227ad75 Merge pull request #1265 from pateljannat/issues-70
fix: jobs page rendering issue for guest users
2025-01-22 12:54:27 +05:30
Frappe PR Bot
ed8baf3327 chore(release): Bumped to Version 2.21.0 2025-01-22 07:09:58 +00:00
Jannat Patel
1ac5de96f9 fix: jobs page rendering issue for guest users 2025-01-22 12:38:28 +05:30
Jannat Patel
15dd4c4350 Merge pull request #1261 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-22 10:53:00 +05:30
Jannat Patel
c986089e77 chore: Persian translations 2025-01-21 16:41:39 +05:30
Jannat Patel
17dc77f061 chore: Turkish translations 2025-01-21 16:41:38 +05:30
Jannat Patel
189f353de0 chore: Esperanto translations 2025-01-20 16:43:19 +05:30
Jannat Patel
845e7174f0 chore: Bosnian translations 2025-01-20 16:43:18 +05:30
Jannat Patel
8c6e4ad3ee chore: Persian translations 2025-01-20 16:43:17 +05:30
Jannat Patel
5dfddc890c chore: Chinese Simplified translations 2025-01-20 16:43:15 +05:30
Jannat Patel
1ebabc23d3 chore: Turkish translations 2025-01-20 16:43:14 +05:30
Jannat Patel
1bf8c1c763 chore: Swedish translations 2025-01-20 16:43:12 +05:30
Jannat Patel
c5a59b6370 chore: Russian translations 2025-01-20 16:43:11 +05:30
Jannat Patel
4a5a777478 chore: Polish translations 2025-01-20 16:43:09 +05:30
Jannat Patel
4fd7dcd5b2 chore: Hungarian translations 2025-01-20 16:43:08 +05:30
Jannat Patel
55920d9e3f chore: German translations 2025-01-20 16:43:07 +05:30
Jannat Patel
6d0c3c9cd8 chore: Arabic translations 2025-01-20 16:43:05 +05:30
Jannat Patel
7b20c3fe03 chore: Spanish translations 2025-01-20 16:43:04 +05:30
Jannat Patel
efbe35c836 chore: French translations 2025-01-20 16:43:02 +05:30
Jannat Patel
e591cd74ab Merge pull request #1260 from frappe/pot_develop_2025-01-17
chore: update POT file
2025-01-20 09:57:38 +05:30
Jannat Patel
669b9c73be Merge pull request #1257 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-20 09:57:26 +05:30
frappe-pr-bot
52e1dd6d33 chore: update POT file 2025-01-17 16:04:20 +00:00
Jannat Patel
828e195b81 Merge pull request #1259 from pateljannat/issues-69
perf: misc performance improvements
2025-01-17 17:57:28 +05:30
Jannat Patel
145342bb72 perf: misc performance improvements 2025-01-17 17:17:02 +05:30
Jannat Patel
58abfd004d Merge pull request #1256 from pateljannat/issues-68
fix: changed the naming for certificate and job opportunity
2025-01-17 14:30:56 +05:30
Jannat Patel
9dc8322270 fix: don't check assignment submission status if doc is new 2025-01-17 14:24:14 +05:30
Jannat Patel
4f0a6a7d57 chore: removed print statement 2025-01-17 14:18:07 +05:30
Jannat Patel
2fb8ae00b9 chore: Chinese Simplified translations 2025-01-17 14:11:26 +05:30
Jannat Patel
63da1e384d fix: changed the naming for certificate and job opportunity 2025-01-17 13:00:35 +05:30
Jannat Patel
34685ebdb2 Merge pull request #1255 from pateljannat/batch-url
refactor: changed batch naming to be a slug of the title
2025-01-17 10:54:31 +05:30
Jannat Patel
215ae941e1 Merge pull request #1254 from pateljannat/jobs-page-responsive
fix: improved jobs page ui
2025-01-17 10:36:48 +05:30
Jannat Patel
9d1211e872 fix: changed batch naming to be a slug of the title 2025-01-17 10:35:26 +05:30
Jannat Patel
cd4f2b1039 fix: clarified the posting date 2025-01-17 10:21:49 +05:30
Jannat Patel
9881b7b498 fix: improved jobs page ui 2025-01-17 10:15:58 +05:30
Jannat Patel
28a687f6bf Merge pull request #1252 from pateljannat/refactor-certified-participants-page
refactor: improved ui and performance for certified participants page
2025-01-16 17:01:28 +05:30
Jannat Patel
bd43ed0e88 fix: responsive design for certified participants page 2025-01-16 16:49:03 +05:30
Jannat Patel
17b59ce4e5 refactor: improved ui and performance for certified participants page 2025-01-16 16:39:48 +05:30
Jannat Patel
7acc1864c8 Merge pull request #1251 from pateljannat/issues-67
fix: misc issues
2025-01-16 13:07:23 +05:30
Jannat Patel
5a6fdfcbc3 fix: simplfied logic to filter current day batches 2025-01-16 12:57:13 +05:30
Jannat Patel
23d465d4a1 fix: batch enrolled filter logic 2025-01-16 12:52:17 +05:30
Jannat Patel
27ae014fcb fix: course is no longer mandatory to generate a certificate 2025-01-16 12:35:13 +05:30
Jannat Patel
b4c7338b76 fix: batch listing for current day batches 2025-01-16 11:43:56 +05:30
Jannat Patel
0d1464c5e9 Merge pull request #1249 from pateljannat/batches-responsive
fix: batch list responsive cards
2025-01-15 16:30:03 +05:30
Jannat Patel
f4421d362c fix: batch list responsive cards 2025-01-15 16:15:04 +05:30
Jannat Patel
5c8378f2d4 fix: changed sorting order of batch list 2025-01-15 12:31:23 +05:30
Jannat Patel
8401e86acb feat: batch tabs for moderators 2025-01-15 11:17:07 +05:30
Frappe PR Bot
e16101813c chore(release): Bumped to Version 2.20.0 2025-01-15 05:39:34 +00:00
Jannat Patel
bbd3ac6451 Merge pull request #1246 from pateljannat/batch-refactor
refactor: improved performance and ui batch list
2025-01-15 10:57:11 +05:30
Jannat Patel
c6a26e5260 fix: amount rounding issue 2025-01-14 18:45:57 +05:30
Jannat Patel
a87fda6b84 Merge pull request #1245 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-14 17:48:38 +05:30
Jannat Patel
b42c635cdb refactor: improved performance and ui batch list 2025-01-14 17:41:46 +05:30
Jannat Patel
a9c6b71e19 chore: Persian translations 2025-01-14 12:05:13 +05:30
Jannat Patel
282441e0e7 chore: Swedish translations 2025-01-14 12:05:10 +05:30
Jannat Patel
6020d5f5c2 Merge pull request #1244 from pateljannat/issues-65
fix: removed delivery parameter from batch feedback
2025-01-14 11:59:53 +05:30
Jannat Patel
9a395cbda0 Merge pull request #1243 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-14 11:29:40 +05:30
Jannat Patel
61e41180dd fix: removed delivery parameter from batch feedback 2025-01-14 11:29:13 +05:30
Jannat Patel
26bde996ac chore: Esperanto translations 2025-01-13 12:01:25 +05:30
Jannat Patel
6f78ac06c2 chore: Bosnian translations 2025-01-13 12:01:24 +05:30
Jannat Patel
8e498f4fbe chore: Persian translations 2025-01-13 12:01:22 +05:30
Jannat Patel
8105e606c9 chore: Chinese Simplified translations 2025-01-13 12:01:21 +05:30
Jannat Patel
7df6e5fe64 chore: Turkish translations 2025-01-13 12:01:19 +05:30
Jannat Patel
909c9b446b chore: Swedish translations 2025-01-13 12:01:18 +05:30
Jannat Patel
29639d59c3 chore: Russian translations 2025-01-13 12:01:16 +05:30
Jannat Patel
a13dac6dd4 chore: Polish translations 2025-01-13 12:01:15 +05:30
Jannat Patel
31257e588f chore: Hungarian translations 2025-01-13 12:01:13 +05:30
Jannat Patel
52ab419040 chore: German translations 2025-01-13 12:01:12 +05:30
Jannat Patel
7dbc35977f chore: Arabic translations 2025-01-13 12:01:10 +05:30
Jannat Patel
ce9aafadd9 chore: Spanish translations 2025-01-13 12:01:08 +05:30
Jannat Patel
13da79488f chore: French translations 2025-01-13 12:01:07 +05:30
Jannat Patel
2c999e2037 Merge pull request #1242 from frappe/pot_develop_2025-01-10
chore: update POT file
2025-01-13 11:47:52 +05:30
Jannat Patel
c096c176e3 Merge pull request #1241 from pateljannat/batch-feedback
feat: batch feedback
2025-01-13 11:47:00 +05:30
Jannat Patel
8fe0b62bb3 feat: batch feedback for moderators 2025-01-13 11:31:18 +05:30
frappe-pr-bot
e3b53efd2c chore: update POT file 2025-01-10 16:04:43 +00:00
Jannat Patel
2ecb93e925 feat: show submitted feedback as readonly 2025-01-10 19:05:59 +05:30
Jannat Patel
5d14d6f1aa chore: merged conflicts 2025-01-10 11:03:44 +05:30
Jannat Patel
4869bba7bb Merge pull request #1239 from pateljannat/issues-64
fix: made course list responsive for bigger screen sizes
2025-01-09 18:53:00 +05:30
Jannat Patel
ecc12d783a fix: list and table formatting in lesson 2025-01-09 17:07:57 +05:30
Jannat Patel
54b7f811f7 fix: made course list responsive for bigger screen sizes 2025-01-09 12:24:21 +05:30
Frappe PR Bot
bb6e97992b chore(release): Bumped to Version 2.19.0 2025-01-08 14:21:07 +00:00
Jannat Patel
64fac451f3 Merge pull request #1236 from FahidLatheef/fix/days_diff_function_name
fix: fixed typo in spelling in frappe.utils.date_diff import
2025-01-08 12:43:10 +05:30
Jannat Patel
e45b33a809 feat: batch feedback 2025-01-08 11:22:07 +05:30
Jannat Patel
eb6b72515e Merge pull request #1235 from FahidLatheef/fix/assignment-popup-on-edit-quiz
fix: fix issue where assignment form is popped up on add quiz button in Lesson Edit form
2025-01-08 10:45:42 +05:30
Fahid Latheef A
0550d3aea3 fix: fixed typo in spelling in frappe.utils.date_diff import 2025-01-07 21:07:23 +05:30
Fahid Latheef A
f6577acbff refactor: fixed linting issue 2025-01-07 20:41:54 +05:30
Fahid Latheef A
09c494f38a Added quiz type prop for AssessmentPlugin component 2025-01-07 20:29:07 +05:30
Fahid Latheef A
6c600d747e Added assignement type prop for AssessmentPlugin component 2025-01-07 20:27:39 +05:30
Jannat Patel
9dcfc347d9 Merge pull request #1234 from pateljannat/batch-dashboard-23
feat: student activities display in a heatmap
2025-01-07 19:31:20 +05:30
Jannat Patel
fb40b627fc feat: show student progress heatmap on moderators dashboard 2025-01-07 18:15:59 +05:30
Jannat Patel
c597f96375 Merge pull request #1233 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-07 10:27:39 +05:30
Jannat Patel
f1961ab614 chore: Esperanto translations 2025-01-07 09:39:40 +05:30
Jannat Patel
c2c7b7b250 chore: Bosnian translations 2025-01-07 09:39:38 +05:30
Jannat Patel
c20c272f8e chore: Persian translations 2025-01-07 09:39:37 +05:30
Jannat Patel
85e4115306 chore: Chinese Simplified translations 2025-01-07 09:39:36 +05:30
Jannat Patel
10c2bc589a chore: Turkish translations 2025-01-07 09:39:34 +05:30
Jannat Patel
a30244cb4a chore: Swedish translations 2025-01-07 09:39:33 +05:30
Jannat Patel
5691fcdca4 chore: Russian translations 2025-01-07 09:39:31 +05:30
Jannat Patel
f5848207e2 chore: Polish translations 2025-01-07 09:39:30 +05:30
Jannat Patel
ad224161d8 chore: Hungarian translations 2025-01-07 09:39:28 +05:30
Jannat Patel
5837a1ffab chore: German translations 2025-01-07 09:39:27 +05:30
Jannat Patel
1cfd7cdb98 chore: Arabic translations 2025-01-07 09:39:25 +05:30
Jannat Patel
56a4aa2a3f chore: Spanish translations 2025-01-07 09:39:24 +05:30
Jannat Patel
d91d2ded77 chore: French translations 2025-01-07 09:39:22 +05:30
Jannat Patel
6a48d44b14 Merge pull request #1232 from pateljannat/issues-63
fix: misc issues
2025-01-06 16:25:21 +05:30
Jannat Patel
31c5d423d0 fix: misc issues 2025-01-06 16:00:48 +05:30
Jannat Patel
79177b5f5b feat: students heatmap 2025-01-06 15:42:44 +05:30
Jannat Patel
74658b2054 Merge pull request #1231 from pateljannat/refactor-batch-list
refactor: fetch minimal information for batch cards
2025-01-06 12:44:28 +05:30
Jannat Patel
052fffccef refactor: badge page data 2025-01-06 12:36:44 +05:30
Jannat Patel
bd2b558154 refactor: fetch minimal information for batch cards 2025-01-06 12:05:29 +05:30
Jannat Patel
65ee6b62ea Merge pull request #1230 from pateljannat/issues-62
refactor: duration field in quiz should be in minutes
2025-01-06 11:24:13 +05:30
Jannat Patel
26266a22e8 fix: add description to indicate that duration should be in minutes 2025-01-06 11:02:46 +05:30
Jannat Patel
e52ca63075 refactor: duration field in quiz should be in minutes 2025-01-06 11:01:01 +05:30
Jannat Patel
4d8b2eb5b4 Merge pull request #1229 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-06 10:41:42 +05:30
Jannat Patel
2d81a1ce31 Merge pull request #1227 from frappe/pot_develop_2025-01-03
chore: update POT file
2025-01-06 10:41:30 +05:30
Jannat Patel
052a85fbc0 chore: Swedish translations 2025-01-06 09:43:51 +05:30
frappe-pr-bot
fa0e84c671 chore: update POT file 2025-01-03 16:04:23 +00:00
Jannat Patel
4759736571 Merge pull request #1226 from pateljannat/issues-61
fix: misc batch issues
2025-01-03 17:57:42 +05:30
Jannat Patel
f77686feaa fix: misc batch issues 2025-01-03 17:37:22 +05:30
Frappe PR Bot
34548b93f4 chore(release): Bumped to Version 2.18.0 2025-01-02 14:31:37 +00:00
Jannat Patel
f438d33f75 Merge pull request #1224 from pateljannat/issues-60
fix: quiz api issue
2025-01-02 20:00:36 +05:30
Jannat Patel
be1c0de4c6 fix: quiz api issue 2025-01-02 19:27:35 +05:30
Jannat Patel
ae5ea9a8aa Merge pull request #1223 from pateljannat/assignments-in-courses
feat: assignments in courses
2025-01-02 15:45:32 +05:30
Jannat Patel
eeb7fb1f78 fix: correct path for assignment plugin 2025-01-02 15:32:43 +05:30
Jannat Patel
3f32d5bb3b feat: notification to student on submission update 2025-01-02 15:22:32 +05:30
Jannat Patel
12019ca37d Merge pull request #1219 from frappe/l10n_develop2
chore: sync translations from crowdin
2025-01-02 15:20:15 +05:30
Jannat Patel
4d133b2f99 fix: assignment dirty state and comments view to student 2025-01-02 14:53:38 +05:30
Jannat Patel
e733226b0c chore: Persian translations 2025-01-01 09:00:19 +05:30
Jannat Patel
2ed583a0c3 fix: assignment submission ux improvements 2024-12-31 23:06:55 +05:30
Jannat Patel
048cee654e fix: mark lesson progress when quiz and assignment are submitted 2024-12-31 13:15:25 +05:30
Jannat Patel
1293294593 feat: assignment in lesson 2024-12-31 12:20:01 +05:30
Jannat Patel
a1947a3106 Merge pull request #1215 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-31 12:00:34 +05:30
Jannat Patel
eff6cd6bbe chore: Esperanto translations 2024-12-31 08:59:24 +05:30
Jannat Patel
d784ac5699 chore: Bosnian translations 2024-12-31 08:59:23 +05:30
Jannat Patel
9acad5157b chore: Persian translations 2024-12-31 08:59:21 +05:30
Jannat Patel
94459efa3f chore: Chinese Simplified translations 2024-12-31 08:59:20 +05:30
Jannat Patel
e88bc6a5ce chore: Turkish translations 2024-12-31 08:59:19 +05:30
Jannat Patel
55a7ab54e9 chore: Swedish translations 2024-12-31 08:59:17 +05:30
Jannat Patel
0c324c87cc chore: Russian translations 2024-12-31 08:59:16 +05:30
Jannat Patel
31e8befa11 chore: Polish translations 2024-12-31 08:59:14 +05:30
Jannat Patel
86ab7a6d97 chore: Hungarian translations 2024-12-31 08:59:13 +05:30
Jannat Patel
14bdfb2d98 chore: German translations 2024-12-31 08:59:11 +05:30
Jannat Patel
0036e585da chore: Arabic translations 2024-12-31 08:59:10 +05:30
Jannat Patel
cba2343fc0 chore: Spanish translations 2024-12-31 08:59:08 +05:30
Jannat Patel
864eebce2f chore: French translations 2024-12-31 08:59:07 +05:30
Jannat Patel
156d36fb5e chore: merged conflicts 2024-12-30 18:21:47 +05:30
Jannat Patel
068718aa8a Merge pull request #1214 from pateljannat/issues-59
fix: progress issue in batches
2024-12-30 18:08:09 +05:30
Jannat Patel
10219abfd6 fix: progress issue in batches 2024-12-30 17:51:14 +05:30
Jannat Patel
2ec231a3d0 Merge pull request #1213 from frappe/pot_develop_2024-12-27
chore: update POT file
2024-12-30 11:34:01 +05:30
frappe-pr-bot
78f29b3aff chore: update POT file 2024-12-27 16:04:15 +00:00
Jannat Patel
7f768e81f4 feat: assignment grading 2024-12-26 18:16:46 +05:30
Jannat Patel
aa1460eda1 Merge pull request #1211 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-26 14:57:32 +05:30
Jannat Patel
85f85063ac feat: assignment submission list 2024-12-26 11:28:32 +05:30
Jannat Patel
0a7ce3c5d8 chore: Esperanto translations 2024-12-25 07:47:58 +05:30
Jannat Patel
8468d0e3db chore: Bosnian translations 2024-12-25 07:47:56 +05:30
Jannat Patel
059ac27f0b chore: Persian translations 2024-12-25 07:47:55 +05:30
Jannat Patel
a96f8836b1 chore: Chinese Simplified translations 2024-12-25 07:47:54 +05:30
Jannat Patel
4018116136 chore: Turkish translations 2024-12-25 07:47:52 +05:30
Jannat Patel
aa083c8a40 chore: Swedish translations 2024-12-25 07:47:51 +05:30
Jannat Patel
8752243e9c chore: Russian translations 2024-12-25 07:47:50 +05:30
Jannat Patel
1d028e81c4 chore: Polish translations 2024-12-25 07:47:48 +05:30
Jannat Patel
2752d3e42c chore: Hungarian translations 2024-12-25 07:47:47 +05:30
Jannat Patel
aa074ef762 chore: German translations 2024-12-25 07:47:45 +05:30
Jannat Patel
bae75cd2f6 chore: Arabic translations 2024-12-25 07:47:44 +05:30
Jannat Patel
81a714b5a2 chore: Spanish translations 2024-12-25 07:47:41 +05:30
Jannat Patel
10cd44c22f chore: French translations 2024-12-25 07:47:40 +05:30
Jannat Patel
a44f59c362 feat: assignments list and form 2024-12-24 21:48:45 +05:30
Jannat Patel
8d372fcab4 Merge pull request #1204 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-24 10:52:10 +05:30
Jannat Patel
97d6c518b5 Merge pull request #1203 from frappe/pot_develop_2024-12-20
chore: update POT file
2024-12-24 10:52:00 +05:30
Jannat Patel
f331c48e1d Merge pull request #1201 from pateljannat/batch-dashboard-2
feat: batch student progress modal
2024-12-23 18:36:44 +05:30
Jannat Patel
9d0b10058d fix: show dashboard to evaluators too 2024-12-23 17:39:37 +05:30
Jannat Patel
4ccd3ba71e fix: legends 2024-12-23 17:19:48 +05:30
Jannat Patel
7a6f5a868c Merge branch 'develop' of https://github.com/frappe/lms into batch-dashboard-2 2024-12-23 12:49:32 +05:30
Jannat Patel
0fae11d031 docs: updated self hosting steps in README 2024-12-23 12:46:02 +05:30
Jannat Patel
8a9725c990 ci: updated the credentials for building docker image 2024-12-23 12:29:21 +05:30
Jannat Patel
d0189b0e3a ci: updated the credentials for building docker image 2024-12-23 12:28:31 +05:30
Jannat Patel
c6853cc95e Merge pull request #1208 from pateljannat/issues-58
ci: added back arch for building docker image
2024-12-23 12:14:36 +05:30
Jannat Patel
f28f37fb2c ci: added back arch for building docker image 2024-12-23 12:14:00 +05:30
Jannat Patel
7dbbe9dba4 Merge pull request #1206 from pateljannat/issues-57
fix: markdown embed and paste issue
2024-12-23 11:49:55 +05:30
Jannat Patel
b625d9b099 fix: markdown embed and paste issue 2024-12-23 11:33:09 +05:30
Jannat Patel
a85c81a4b4 chore: Bosnian translations 2024-12-23 07:45:35 +05:30
Jannat Patel
1677a4a32b chore: Persian translations 2024-12-23 07:45:33 +05:30
Jannat Patel
776d46f5a2 chore: Chinese Simplified translations 2024-12-23 07:45:32 +05:30
Jannat Patel
6384eeaa13 chore: Turkish translations 2024-12-23 07:45:30 +05:30
Jannat Patel
fdc0befcee chore: Russian translations 2024-12-23 07:45:27 +05:30
Jannat Patel
f2c28eb695 chore: Polish translations 2024-12-23 07:45:26 +05:30
Jannat Patel
4095916991 chore: Hungarian translations 2024-12-23 07:45:25 +05:30
Jannat Patel
551703364a chore: German translations 2024-12-23 07:45:23 +05:30
Jannat Patel
4a2fae023c chore: Arabic translations 2024-12-23 07:45:22 +05:30
Jannat Patel
fca206120e chore: Spanish translations 2024-12-23 07:45:21 +05:30
Jannat Patel
65b2199065 chore: French translations 2024-12-23 07:45:19 +05:30
Jannat Patel
9d03a52bf9 chore: Swedish translations 2024-12-21 07:21:24 +05:30
frappe-pr-bot
c8aa44dfcb chore: update POT file 2024-12-20 16:04:18 +00:00
Jannat Patel
7fcbe85ab9 Merge pull request #1202 from pateljannat/docker-production-image
ci: container image for production setup
2024-12-20 13:50:19 +05:30
Jannat Patel
de0dea7df8 ci: container image for production setup 2024-12-20 13:27:07 +05:30
Jannat Patel
43cf7d04b8 feat: batch dashboard for instructors 2024-12-20 13:12:40 +05:30
Jannat Patel
4d18580482 feat: batch student progress modal 2024-12-19 23:00:28 +05:30
Frappe PR Bot
b48e007ea8 chore(release): Bumped to Version 2.17.0 2024-12-18 14:51:51 +00:00
Jannat Patel
d5e8973866 Merge pull request #1196 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-18 14:18:51 +05:30
Jannat Patel
a8c530f98c chore: Esperanto translations 2024-12-18 06:07:10 +05:30
Jannat Patel
47769ccd62 Merge pull request #1195 from pateljannat/issues-56
feat: load more in quiz list
2024-12-17 18:33:39 +05:30
Jannat Patel
bfc1d9a0a8 feat: load more in quiz list 2024-12-17 17:48:49 +05:30
Jannat Patel
824484e608 Merge pull request #1194 from pateljannat/issues-55
fix: markdown parser link issue
2024-12-17 16:57:31 +05:30
Jannat Patel
d3f7baae4c fix: markdown parser link issue 2024-12-17 16:35:30 +05:30
Jannat Patel
8d961e9b71 Merge pull request #1193 from pateljannat/issues-54
feat: load more in quiz submissions
2024-12-17 12:48:53 +05:30
Jannat Patel
f22855920c Merge pull request #1192 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-17 12:24:18 +05:30
Jannat Patel
18728e3519 Merge pull request #1186 from frappe/pot_develop_2024-12-13
chore: update POT file
2024-12-17 12:24:06 +05:30
Jannat Patel
65dc2838d3 feat: load more in quiz submissions 2024-12-17 12:23:44 +05:30
Jannat Patel
be930ce076 chore: Persian translations 2024-12-17 05:37:38 +05:30
Jannat Patel
1ea47a008c Merge pull request #1191 from pateljannat/scormcontent-issue
fix: scormcontent package load issue
2024-12-16 19:25:32 +05:30
Jannat Patel
e0169cff79 fix: scormcontent package load issue 2024-12-16 19:12:15 +05:30
Jannat Patel
7c53ac10e2 Merge pull request #1189 from pateljannat/lesson-md-parser
feat: markdown parser for lessons
2024-12-16 18:29:45 +05:30
Jannat Patel
212e0de6e9 chore: resolved conflicts 2024-12-16 18:13:49 +05:30
Jannat Patel
8e74384b5a Merge branch 'develop' of https://github.com/frappe/lms into lesson-md-parser 2024-12-16 18:12:17 +05:30
Jannat Patel
86e7e68ce1 chore: removed unused packages 2024-12-16 18:12:13 +05:30
Jannat Patel
a77999dbb6 Merge pull request #1190 from pateljannat/quiz-marks-issue
fix: delete quiz and submission before deleting course
2024-12-16 18:10:23 +05:30
Jannat Patel
3288fb0f06 chore: replace mariadb-client-10.6 with mariadb-client for ui tests 2024-12-16 17:56:57 +05:30
Jannat Patel
a81b384f90 fix: mariadb dependency installation 2024-12-16 17:30:00 +05:30
Jannat Patel
75c11d3fcc fix: course category was not reflecting on course form 2024-12-16 17:21:12 +05:30
Jannat Patel
51a6cc035c fix: delete quiz and submission before deleting course 2024-12-16 17:14:30 +05:30
Jannat Patel
ae8008d05c chore: bumped up mariadb image version 2024-12-16 17:00:55 +05:30
Jannat Patel
7f44177986 feat: markdown parser for links and lists 2024-12-16 16:41:55 +05:30
Jannat Patel
d88aaedf3f Merge branch 'develop' of https://github.com/frappe/lms into lesson-md-parser 2024-12-16 16:40:32 +05:30
frappe-pr-bot
802d4ccb0b chore: update POT file 2024-12-13 16:04:40 +00:00
Jannat Patel
76a84c7f5d Merge pull request #1183 from pateljannat/batch-dashboard
feat: show student course and assessment progress on batch page
2024-12-13 12:11:59 +05:30
Jannat Patel
40aefba203 fix: styling of batch list headers 2024-12-13 12:03:00 +05:30
Jannat Patel
6cdfb822b4 fix: batch time issue 2024-12-13 11:45:54 +05:30
Jannat Patel
fdacab66f7 feat: show student course and assessment progress on batch page 2024-12-13 10:44:56 +05:30
Jannat Patel
5cc12e71df Merge pull request #1182 from pateljannat/fix-readme-2
docs: updated readme header, footer and screenshots
2024-12-12 16:33:24 +05:30
Jannat Patel
f5e5fa2f36 docs: fixed screenshot captions 2024-12-12 16:18:54 +05:30
Jannat Patel
6022b83b8c docs: removed extra space under screenshots 2024-12-12 16:06:30 +05:30
Jannat Patel
a01b1657cc docs: added captions to README screenshots 2024-12-12 16:05:39 +05:30
Jannat Patel
6b785bd0e6 docs: updated readme header, footer and screenshots 2024-12-12 15:59:57 +05:30
Jannat Patel
0beffc3083 Merge pull request #1181 from pateljannat/fix-readme
fix: readme
2024-12-11 12:49:37 +05:30
Jannat Patel
d345d09b13 fix: readme 2024-12-11 12:49:11 +05:30
Frappe PR Bot
ec75b8cb8f chore(release): Bumped to Version 2.16.0 2024-12-11 06:39:56 +00:00
Jannat Patel
503068b0d2 Merge pull request #1177 from pateljannat/readme-2
docs: updated README
2024-12-11 12:08:24 +05:30
Jannat Patel
60dc9682b4 docs: updated screenshots section in readme 2024-12-11 12:02:29 +05:30
Jannat Patel
38e1eb8fc7 feat: markdown parser for lessons 2024-12-11 11:57:35 +05:30
Jannat Patel
6490bb9258 docs: changed youtube link in README 2024-12-10 11:26:20 +05:30
Jannat Patel
bdac91c48c fix: README screenshots 2024-12-10 11:24:17 +05:30
Jannat Patel
c95366281b Merge pull request #1176 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-10 10:58:43 +05:30
Jannat Patel
484a31ab7e docs: updated README 2024-12-10 10:10:03 +05:30
Jannat Patel
dc9546955a chore: Esperanto translations 2024-12-10 05:01:13 +05:30
Jannat Patel
07b6e851cd chore: Bosnian translations 2024-12-10 05:01:12 +05:30
Jannat Patel
c3a98db6ae chore: Persian translations 2024-12-10 05:01:10 +05:30
Jannat Patel
0bb50a9742 chore: Chinese Simplified translations 2024-12-10 05:01:09 +05:30
Jannat Patel
76f96bfcf8 chore: Turkish translations 2024-12-10 05:01:07 +05:30
Jannat Patel
a2458281fc chore: Swedish translations 2024-12-10 05:01:06 +05:30
Jannat Patel
8467bdf19b chore: Russian translations 2024-12-10 05:01:05 +05:30
Jannat Patel
7c28067922 chore: Polish translations 2024-12-10 05:01:04 +05:30
Jannat Patel
a955db05a0 chore: Hungarian translations 2024-12-10 05:01:02 +05:30
Jannat Patel
a5ab893f05 chore: German translations 2024-12-10 05:01:01 +05:30
Jannat Patel
6afc94704a chore: Arabic translations 2024-12-10 05:01:00 +05:30
Jannat Patel
bd79e746ed chore: Spanish translations 2024-12-10 05:00:58 +05:30
Jannat Patel
fb58ab08cb chore: French translations 2024-12-10 05:00:57 +05:30
Jannat Patel
7868925ba2 Merge pull request #1168 from KerollesFathy/fix-show-role-for-members
fix: show role for members
2024-12-09 18:37:46 +05:30
Jannat Patel
85f69af38f Merge pull request #1172 from frappe/pot_develop_2024-12-06
chore: update POT file
2024-12-09 18:37:00 +05:30
Jannat Patel
63c9068306 Merge pull request #1173 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-09 18:36:47 +05:30
Jannat Patel
1fea3fc52d chore: Swedish translations 2024-12-09 04:21:40 +05:30
Jannat Patel
1e26e28515 chore: French translations 2024-12-09 04:21:34 +05:30
frappe-pr-bot
8edddaa502 chore: update POT file 2024-12-06 16:04:35 +00:00
KerollesFathy
5a68a85317 fix: show role only when user not a Student 2024-12-06 16:19:19 +02:00
Jannat Patel
655fde109f Merge pull request #1171 from pateljannat/scorm-check-if-file
fix: check if its file before fetching
2024-12-06 16:13:09 +05:30
Jannat Patel
463a1d8c7c fix: check if its file before fetching 2024-12-06 15:14:03 +05:30
Jannat Patel
726ae8ac06 Merge pull request #1170 from pateljannat/scorm-page-renderer
fix: handle html files during scorm page render
2024-12-06 14:01:42 +05:30
Jannat Patel
6f73be9a0b fix: handle html files during scorm page render 2024-12-06 13:20:14 +05:30
Jannat Patel
c1fdddbac3 Merge pull request #1166 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-06 10:55:31 +05:30
Jannat Patel
e0127d0824 Merge pull request #1167 from pateljannat/scorm-cloud
refactor: scorm package render
2024-12-06 10:55:08 +05:30
KerollesFathy
9a07882e8e fix: show role for members 2024-12-05 23:55:03 +02:00
Jannat Patel
2416777df2 refactor: scorm package render 2024-12-05 23:17:49 +05:30
Jannat Patel
d811014b86 chore: Swedish translations 2024-12-05 03:43:25 +05:30
Jannat Patel
3134ef6392 Merge pull request #1165 from pateljannat/batch-bulk-certificate
feat: generate bulk certificates for batch students
2024-12-04 17:16:05 +05:30
Jannat Patel
6c3bb3480e feat: generate bulk certificates for batch students 2024-12-04 17:02:03 +05:30
Frappe PR Bot
0b7ff1dff3 chore(release): Bumped to Version 2.15.0 2024-12-04 08:52:51 +00:00
Jannat Patel
9ac4efe9dc Merge pull request #1162 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-03 10:24:05 +05:30
Jannat Patel
e278e1ed35 chore: Esperanto translations 2024-12-03 03:41:08 +05:30
Jannat Patel
9db203d74f chore: Bosnian translations 2024-12-03 03:41:06 +05:30
Jannat Patel
c6366835d2 chore: Persian translations 2024-12-03 03:41:05 +05:30
Jannat Patel
5e8ad81ff3 chore: Chinese Simplified translations 2024-12-03 03:41:04 +05:30
Jannat Patel
ac24a353b0 chore: Turkish translations 2024-12-03 03:41:02 +05:30
Jannat Patel
8a3c681a6f chore: Swedish translations 2024-12-03 03:41:00 +05:30
Jannat Patel
2da946236d chore: Russian translations 2024-12-03 03:40:59 +05:30
Jannat Patel
d4641c9135 chore: Polish translations 2024-12-03 03:40:57 +05:30
Jannat Patel
cf710d7be5 chore: Hungarian translations 2024-12-03 03:40:55 +05:30
Jannat Patel
e56b8928f7 chore: German translations 2024-12-03 03:40:54 +05:30
Jannat Patel
66121e6cce chore: Arabic translations 2024-12-03 03:40:53 +05:30
Jannat Patel
cd824631bb chore: Spanish translations 2024-12-03 03:40:51 +05:30
Jannat Patel
115b72f2f0 chore: French translations 2024-12-03 03:40:50 +05:30
Jannat Patel
8d17b35160 Merge pull request #1158 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-12-02 10:07:09 +05:30
Jannat Patel
4c21ce2caa Merge pull request #1157 from frappe/pot_develop_2024-11-29
chore: update POT file
2024-12-02 10:06:56 +05:30
Jannat Patel
0057467acf Merge pull request #1159 from pateljannat/issues-53
fix: check standard in patch when deleting web forms
2024-12-02 10:06:43 +05:30
Jannat Patel
7048b22df0 fix: check standard in patch when deleting web forms 2024-12-01 12:32:44 +05:30
Jannat Patel
ddc3352b4b chore: Swedish translations 2024-12-01 02:22:10 +05:30
Jannat Patel
060a2808de chore: Turkish translations 2024-11-30 01:49:24 +05:30
frappe-pr-bot
d8f8a8e559 chore: update POT file 2024-11-29 16:04:32 +00:00
Jannat Patel
c471d39ba8 Merge pull request #1156 from pateljannat/program-saving-issue
fix: misc issues
2024-11-29 16:59:49 +05:30
Jannat Patel
55ec813f82 chore: removed unused file 2024-11-29 16:48:30 +05:30
Jannat Patel
727f7b032c fix: check for payments app before importing gateway controller 2024-11-29 16:41:00 +05:30
Jannat Patel
d1b613c0bb chore: removed unused file 2024-11-29 16:21:16 +05:30
Jannat Patel
c3af65e535 chore: removed unused imports 2024-11-29 16:07:48 +05:30
Jannat Patel
d688d5cdd9 fix: program title rename and program overlay 2024-11-29 15:53:50 +05:30
Jannat Patel
97543a43eb fix: misc quiz submission issues 2024-11-28 22:32:23 +05:30
Jannat Patel
0e6df83961 fix: patched quiz submission data 2024-11-27 22:47:45 +05:30
Jannat Patel
6329d9c917 Merge pull request #1108 from iamejaaz/required-indicator-job
feat: add required indicator in jobs and quiz
2024-11-27 22:26:08 +05:30
Frappe PR Bot
015e228304 chore(release): Bumped to Version 2.14.0 2024-11-27 16:55:28 +00:00
Jannat Patel
a9f40d16f0 Merge pull request #1109 from FahidLatheef/develop
feat: Add table component to LMS Lesson
2024-11-27 15:46:37 +05:30
Jannat Patel
b8da14a32e Merge pull request #1154 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-27 15:46:01 +05:30
Jannat Patel
a64b0f734a fix: misc issues 2024-11-27 15:45:26 +05:30
Jannat Patel
34ba2fb361 chore: Persian translations 2024-11-27 00:57:55 +05:30
Jannat Patel
98ccb15796 chore: Swedish translations 2024-11-27 00:57:54 +05:30
Jannat Patel
6c06f7d19b Merge pull request #1152 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-26 17:29:54 +05:30
Jannat Patel
86b129a25f chore: Esperanto translations 2024-11-26 00:59:16 +05:30
Jannat Patel
6e8d4cd8e8 chore: Bosnian translations 2024-11-26 00:59:15 +05:30
Jannat Patel
1b4622bdb2 chore: Persian translations 2024-11-26 00:59:13 +05:30
Jannat Patel
58d51579e3 chore: Chinese Simplified translations 2024-11-26 00:59:12 +05:30
Jannat Patel
06706ea41b chore: Turkish translations 2024-11-26 00:59:10 +05:30
Jannat Patel
d634a0f784 chore: Swedish translations 2024-11-26 00:59:09 +05:30
Jannat Patel
a92159b811 chore: Russian translations 2024-11-26 00:59:08 +05:30
Jannat Patel
7e1e37393c chore: Polish translations 2024-11-26 00:59:06 +05:30
Jannat Patel
d2f9a2cea4 chore: Hungarian translations 2024-11-26 00:59:05 +05:30
Jannat Patel
5111d83eee chore: German translations 2024-11-26 00:59:04 +05:30
Jannat Patel
0dc77343c4 chore: Arabic translations 2024-11-26 00:59:02 +05:30
Jannat Patel
cec5913632 chore: Spanish translations 2024-11-26 00:59:01 +05:30
Jannat Patel
75d43a1563 chore: French translations 2024-11-26 00:58:59 +05:30
Frappe PR Bot
1ecdbd9e06 chore(release): Bumped to Version 2.13.0 2024-11-25 09:21:10 +00:00
Jannat Patel
a90e3d611c Merge pull request #1150 from pateljannat/roles-desk-access-issue
fix: desk access and course amount validation issue
2024-11-25 14:49:28 +05:30
Jannat Patel
d49d638253 fix: amount validation for course 2024-11-25 14:36:32 +05:30
Jannat Patel
83338a56c0 fix: disable desk_access for lms roles 2024-11-25 14:26:11 +05:30
Jannat Patel
562020de70 Merge pull request #1149 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-25 11:00:48 +05:30
Jannat Patel
044907edeb Merge pull request #1148 from frappe/pot_develop_2024-11-22
chore: update POT file
2024-11-25 11:00:32 +05:30
Jannat Patel
cfa1aa87fc Merge pull request #1115 from yarin-zhang/develop
Add Chinese locale
2024-11-25 11:00:17 +05:30
Jannat Patel
0ac32ee474 chore: Swedish translations 2024-11-25 00:49:11 +05:30
Jannat Patel
de0675f850 chore: Persian translations 2024-11-23 23:46:59 +05:30
frappe-pr-bot
1c529790f2 chore: update POT file 2024-11-22 16:05:29 +00:00
Jannat Patel
40bcc4d572 Merge pull request #1147 from pateljannat/onboarding-steps
feat: onboarding steps
2024-11-22 16:47:12 +05:30
Jannat Patel
58f109e79c feat: onboarding steps 2024-11-22 16:28:28 +05:30
沨沄极客
cb324f6269 Merge branch 'develop' into develop 2024-11-22 15:29:15 +08:00
Jannat Patel
7cafaf5cbc Merge pull request #1145 from pateljannat/learning-paths
feat: learning paths
2024-11-22 11:12:42 +05:30
Jannat Patel
a394952630 Merge pull request #1146 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-22 11:07:41 +05:30
Jannat Patel
68e87f20aa feat: added progress column in program members list 2024-11-22 11:07:23 +05:30
Jannat Patel
64ed0b3e94 feat: program restrictions 2024-11-21 17:10:24 +05:30
Jannat Patel
fcaaee958d chore: Persian translations 2024-11-20 23:08:25 +05:30
Jannat Patel
29e356ff86 Merge pull request #1144 from pateljannat/issues-52
fix: changed SCORM input from checkbox to switch with better description
2024-11-20 20:20:41 +05:30
Jannat Patel
460edc7bc7 fix: changed SCORM input from checkbox to switch with better description 2024-11-20 19:52:28 +05:30
Jannat Patel
582c7af12d feat: reorder courses and students view for programs 2024-11-20 19:32:49 +05:30
Frappe PR Bot
af533a7a2c chore(release): Bumped to Version 2.12.0 2024-11-20 06:10:26 +00:00
Jannat Patel
acbede157f Merge pull request #1142 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-20 11:39:35 +05:30
Ejaaz Khan
8e1db293db refactor: change possibility to require only one option 2024-11-19 23:52:46 +05:30
Jannat Patel
f63a627ff2 chore: Chinese Simplified translations 2024-11-19 23:01:33 +05:30
Jannat Patel
b1a0556c12 Merge pull request #1137 from iamejaaz/notification-sidebar-ui
fix: show notification count at the top in collapsed
2024-11-19 21:56:14 +05:30
Jannat Patel
0097ede6ed Merge pull request #1135 from iamejaaz/add-keyboard-shortcut
feat: add keyboard shortcut to save lesson
2024-11-19 21:54:37 +05:30
Jannat Patel
b72774e54d Merge pull request #1141 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-19 21:52:38 +05:30
Ejaaz Khan
08261c804f refactor: mark two options as required in choices 2024-11-18 23:27:54 +05:30
Jannat Patel
3027a9e523 chore: Esperanto translations 2024-11-18 23:02:04 +05:30
Jannat Patel
c3995952b3 chore: Bosnian translations 2024-11-18 23:02:02 +05:30
Jannat Patel
ff1642382c chore: Persian translations 2024-11-18 23:02:01 +05:30
Jannat Patel
cfe35e40da chore: Chinese Simplified translations 2024-11-18 23:01:59 +05:30
Jannat Patel
c3238a9f91 chore: Turkish translations 2024-11-18 23:01:58 +05:30
Jannat Patel
58f08bf065 chore: Swedish translations 2024-11-18 23:01:56 +05:30
Jannat Patel
d3ac6ea337 chore: Russian translations 2024-11-18 23:01:55 +05:30
Jannat Patel
6649b7955f chore: Polish translations 2024-11-18 23:01:53 +05:30
Jannat Patel
15a53d33e0 chore: Hungarian translations 2024-11-18 23:01:52 +05:30
Jannat Patel
57f09542a2 chore: German translations 2024-11-18 23:01:50 +05:30
Jannat Patel
fa384b391d chore: Arabic translations 2024-11-18 23:01:49 +05:30
Jannat Patel
12b138c39f chore: Spanish translations 2024-11-18 23:01:47 +05:30
Jannat Patel
420a5f39eb chore: French translations 2024-11-18 23:01:46 +05:30
Jannat Patel
12c2666bd1 Merge pull request #1139 from pateljannat/issues-51
fix: validate amount and currency for paid courses and batches
2024-11-18 16:51:08 +05:30
Jannat Patel
1ecbc2e3f9 fix: validate amount and currency for paid courses and batches 2024-11-18 16:37:09 +05:30
Jannat Patel
e1a78382c3 feat: learning paths 2024-11-18 16:15:27 +05:30
Jannat Patel
dcf5c72cad Merge pull request #1136 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-18 11:27:56 +05:30
Jannat Patel
2ebf6be609 Merge pull request #1111 from iamejaaz/same-day-live-class
feat: allow same date live class creation
2024-11-18 11:27:39 +05:30
Jannat Patel
4ce7019ce6 Merge pull request #1134 from frappe/pot_develop_2024-11-15
chore: update POT file
2024-11-18 11:26:43 +05:30
Jannat Patel
3faf814162 Merge pull request #1133 from pateljannat/issues-50
fix: misc issues
2024-11-18 11:23:25 +05:30
Jannat Patel
52bd9825d8 fix: choice questions validations 2024-11-18 11:16:34 +05:30
Ejaaz Khan
b6028e741c fix: show notification count at the top in collapsed 2024-11-17 19:19:31 +05:30
沨沄极客
4ee1693434 Merge branch 'develop' into develop 2024-11-17 17:37:33 +08:00
Jannat Patel
cbc7892b25 chore: Persian translations 2024-11-16 22:45:19 +05:30
Ejaaz Khan
a4fa2ef0b3 feat: add keyboard shortcut to save lesson 2024-11-16 10:36:58 +05:30
frappe-pr-bot
96de90cb5f chore: update POT file 2024-11-15 16:04:37 +00:00
Jannat Patel
dfb22c81c3 Merge pull request #1113 from iamejaaz/search-functionality-in-jobs
feat: search functionality in jobs
2024-11-15 20:39:52 +05:30
Jannat Patel
6a70ed18d8 fix: misc issues 2024-11-15 20:36:15 +05:30
Jannat Patel
629c237349 Merge pull request #1132 from pateljannat/SCORM-2
feat: SCORM
2024-11-15 20:18:59 +05:30
Jannat Patel
cf014bca3c feat: record lesson progress 2024-11-15 19:14:34 +05:30
Jannat Patel
9323d8e17d Merge pull request #1131 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-14 14:29:36 +05:30
yarin-zhang
1ba63a2175 Update Chinese locale 2024-11-14 16:58:04 +08:00
沨沄极客
b5551fd8ba Merge branch 'develop' into develop 2024-11-14 16:56:30 +08:00
yarin-zhang
fac0038af8 Update Chinese locale 2024-11-14 16:52:52 +08:00
yarin-zhang
ee6685e324 Update Chinese locale 2024-11-14 16:38:54 +08:00
yarin-zhang
0fb18f995c Update Chinese locale 2024-11-14 16:19:14 +08:00
Ejaaz Khan
61e13aa7cd refactor: add transalation and use camel case 2024-11-13 23:26:13 +05:30
Jannat Patel
acb8c6c500 chore: Turkish translations 2024-11-13 21:24:13 +05:30
Fahid Latheef A
af838121d9 Merge branch 'frappe:develop' into develop 2024-11-13 13:50:58 +05:30
Jannat Patel
f504841a5c Merge pull request #1119 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-13 11:45:06 +05:30
Frappe PR Bot
fb3d8e4f7d chore(release): Bumped to Version 2.11.0 2024-11-13 06:14:53 +00:00
Ejaaz Khan
be49ba6d04 refactor: add translate in all error messages 2024-11-13 00:37:15 +05:30
Jannat Patel
24ffed11fb chore: Turkish translations 2024-11-12 21:18:40 +05:30
Jannat Patel
73754bd104 chore: merged conflicts 2024-11-12 12:13:39 +05:30
Jannat Patel
0c6029cbe8 Merge pull request #1118 from pateljannat/issues-49
fix: misc issues
2024-11-12 12:12:24 +05:30
Jannat Patel
a643e9ae83 Merge pull request #1102 from iamejaaz/make-tab-sticky
feat: add required attribute and make tab sticky in batches
2024-11-12 12:03:47 +05:30
Jannat Patel
08ac3948c3 Merge pull request #1112 from iamejaaz/bio-rich-text
feat: rich text editor in bio
2024-11-12 11:57:10 +05:30
Jannat Patel
78d289b9c0 Merge pull request #1117 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-12 11:56:40 +05:30
Jannat Patel
3473bdb527 fix: misc issues 2024-11-12 11:51:02 +05:30
Jannat Patel
a7f8835222 chore: Esperanto translations 2024-11-11 20:53:46 +05:30
Jannat Patel
d6441955fc chore: Bosnian translations 2024-11-11 20:53:45 +05:30
Jannat Patel
67d265e864 chore: Persian translations 2024-11-11 20:53:43 +05:30
Jannat Patel
17031f1df0 chore: Chinese Simplified translations 2024-11-11 20:53:42 +05:30
Jannat Patel
234a24baa2 chore: Turkish translations 2024-11-11 20:53:40 +05:30
Jannat Patel
9a58f4688b chore: Swedish translations 2024-11-11 20:53:39 +05:30
Jannat Patel
87c1c928ba chore: Russian translations 2024-11-11 20:53:37 +05:30
Jannat Patel
493b8297ea chore: Polish translations 2024-11-11 20:53:36 +05:30
Jannat Patel
4d16602190 chore: Hungarian translations 2024-11-11 20:53:35 +05:30
Jannat Patel
89222b23c3 chore: German translations 2024-11-11 20:53:33 +05:30
Jannat Patel
89a181c7d5 chore: Arabic translations 2024-11-11 20:53:32 +05:30
Jannat Patel
c0aecf30c1 chore: Spanish translations 2024-11-11 20:53:30 +05:30
Jannat Patel
fc8ef21802 chore: French translations 2024-11-11 20:53:29 +05:30
Jannat Patel
2e1aac4931 feat: SCORM 2024-11-11 18:25:56 +05:30
Fahid Latheef A
93b3eda05c refactor: removed trailing semicolon 2024-11-11 11:46:02 +05:30
Fahid Latheef A
740584d883 Merge branch 'frappe:develop' into develop 2024-11-11 11:45:08 +05:30
Jannat Patel
c45da4313e Merge pull request #1106 from frappe/pot_develop_2024-11-08
chore: update POT file
2024-11-11 09:52:20 +05:30
Jannat Patel
3a1a843747 Merge pull request #1110 from iamejaaz/error-on-branding-api
fix: 500 error on get_branding api call
2024-11-11 09:52:03 +05:30
yarin-zhang
5e6160149f Update Revision Date 2024-11-11 11:13:26 +08:00
yarin-zhang
be66c563a8 Add Chinese locale 2024-11-11 10:30:34 +08:00
Ejaaz Khan
92c380c74b feat: search functionality in jobs 2024-11-10 21:12:08 +05:30
Ejaaz Khan
c51e7b0037 feat: rich text editor in bio 2024-11-10 19:49:10 +05:30
Ejaaz Khan
e25f161980 feat: allow same date live class creation 2024-11-10 17:48:26 +05:30
Ejaaz Khan
000d9dbcef fix: 500 error on get_branding api call 2024-11-10 15:40:51 +05:30
Fahid Latheef Alungal
822603128d Merge remote-tracking branch 'origin/develop' into develop 2024-11-10 02:13:21 +05:30
Fahid Latheef Alungal
9dbe8fbb1f feat: tables in lms lessons 2024-11-10 02:09:48 +05:30
Ejaaz Khan
26f1e228a9 feat: add required indicator in jobs 2024-11-09 00:58:03 +05:30
Ejaaz Khan
0dcfd7e482 feat: add a required indicator to subject field 2024-11-09 00:18:10 +05:30
Ejaaz Khan
e933012a34 Merge branch 'develop' into make-tab-sticky 2024-11-09 00:08:23 +05:30
frappe-pr-bot
71db3ae6da chore: update POT file 2024-11-08 16:04:38 +00:00
Jannat Patel
c5f091fae8 Merge pull request #1105 from pateljannat/issues-48
fix: show only courses with evaluator for batch evaluation
2024-11-08 15:04:42 +05:30
Jannat Patel
4e61d569ac fix: ignore user type for instructor field in course and batch form 2024-11-08 14:57:11 +05:30
Jannat Patel
2d5c76e106 fix: show only courses with evaluator for batch evaluation 2024-11-08 14:52:10 +05:30
Ejaaz Khan
2e0abad61c feat: add required and make tab sticky in batches 2024-11-07 10:55:10 +05:30
Jannat Patel
3ea52a4e41 Merge pull request #1101 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-07 09:55:40 +05:30
Jannat Patel
c05e253b8d chore: Spanish translations 2024-11-06 20:25:41 +05:30
Jannat Patel
08b2063e45 Merge pull request #1100 from pateljannat/issues-47
fix: misc issues
2024-11-06 20:00:22 +05:30
Jannat Patel
4a8c8185c2 fix: condition to recalculate percentage 2024-11-06 19:46:35 +05:30
Jannat Patel
74ed7b3160 style: fixed formatting 2024-11-06 19:25:17 +05:30
Jannat Patel
38e6e4345f fix: misc issues 2024-11-06 19:22:20 +05:30
Jannat Patel
8004982e2e Merge pull request #1098 from FahidLatheef/develop
fix: removed unnecessary condition which resets show_answers to False
2024-11-06 15:30:24 +05:30
Jannat Patel
e6a532a870 Merge pull request #1096 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-06 15:18:53 +05:30
Jannat Patel
f90465210e Merge pull request #1092 from 0xflotus/patch-1
chore: added some german translations
2024-11-06 15:12:18 +05:30
Frappe PR Bot
4b3a71e424 chore(release): Bumped to Version 2.10.0 2024-11-06 05:17:44 +00:00
Jannat Patel
5499e7294d Merge pull request #1095 from pateljannat/issues-46
fix: misc issues
2024-11-06 10:34:17 +05:30
Fahid Latheef Alungal
619262aa97 fix: removed unnecessary condition which resets show_answers to False 2024-11-06 03:20:30 +05:30
Jannat Patel
693d2942aa chore: Esperanto translations 2024-11-05 20:04:12 +05:30
Jannat Patel
b4cf62920c chore: Bosnian translations 2024-11-05 20:04:10 +05:30
Jannat Patel
03636d6930 chore: Persian translations 2024-11-05 20:04:08 +05:30
Jannat Patel
7c1e1c86c7 chore: Chinese Simplified translations 2024-11-05 20:04:07 +05:30
Jannat Patel
8a5eceaf05 chore: Turkish translations 2024-11-05 20:04:06 +05:30
Jannat Patel
720425d1fb chore: Swedish translations 2024-11-05 20:04:04 +05:30
Jannat Patel
1f105b9ae5 chore: Russian translations 2024-11-05 20:04:02 +05:30
Jannat Patel
d43442be5c chore: Polish translations 2024-11-05 20:04:00 +05:30
Jannat Patel
3360b114b4 chore: Hungarian translations 2024-11-05 20:03:59 +05:30
Jannat Patel
94835b4117 chore: German translations 2024-11-05 20:03:57 +05:30
Jannat Patel
e6ed0b21e5 chore: Arabic translations 2024-11-05 20:03:56 +05:30
Jannat Patel
37db021682 chore: Spanish translations 2024-11-05 20:03:54 +05:30
Jannat Patel
6014a5ccce chore: French translations 2024-11-05 20:03:53 +05:30
0xflotus
c07207b564 Merge branch 'develop' into patch-1 2024-11-05 15:18:12 +01:00
Jannat Patel
fe1f78f8aa Merge pull request #1093 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-11-05 16:13:22 +05:30
Jannat Patel
1709c6b658 Merge pull request #1094 from frappe/pot_develop_2024-11-01
chore: update POT file
2024-11-05 16:13:05 +05:30
Jannat Patel
d3583a2cfb fix: set event in live class 2024-11-04 12:01:58 +05:30
Jannat Patel
634035fbc0 fix: misc issues 2024-11-04 09:54:53 +05:30
Jannat Patel
3c5b18411b chore: Swedish translations 2024-11-03 20:08:50 +05:30
frappe-pr-bot
82bb45a9ef chore: update POT file 2024-11-01 16:04:24 +00:00
Jannat Patel
373f3df196 chore: Turkish translations 2024-11-01 19:00:24 +05:30
Jannat Patel
6021f15bac chore: Turkish translations 2024-10-31 18:59:42 +05:30
0xflotus
da71fb2c23 chore: added some german translations 2024-10-31 11:21:42 +01:00
Jannat Patel
8f6f35d7c1 Merge pull request #1090 from iamejaaz/add-required-attribute
feat: add required indicator on the course add page
2024-10-31 11:48:06 +05:30
Jannat Patel
7aa5f4d20b Merge pull request #1086 from 0xflotus/patch-1
fix: small bug in course_progress_summary.py
2024-10-31 11:39:08 +05:30
Jannat Patel
64b54b05a6 Merge pull request #1085 from pateljannat/new-onboarding
feat: onboarding
2024-10-31 11:35:45 +05:30
Jannat Patel
22b1f22df4 fix: empty state conditions 2024-10-31 11:16:39 +05:30
Jannat Patel
ae4e5539d7 fix: removed chapter description when fetching outline 2024-10-31 09:51:50 +05:30
Ejaaz Khan
dbd96329b5 style: format code with precommit 2024-10-31 00:22:28 +05:30
Ejaaz Khan
c118ec7c4a feat: add required indicator on the course add page 2024-10-30 23:59:26 +05:30
0xflotus
7aab449502 fix: changed ranges 2024-10-30 18:47:36 +01:00
Jannat Patel
cf166b3a57 Merge pull request #1089 from 0xflotus/patch-2
chore: add some german translations
2024-10-30 23:12:33 +05:30
Jannat Patel
da5910d40d test: changed labels as per new onboarding 2024-10-30 23:11:47 +05:30
Jannat Patel
8640ecf9be refactor: course list data 2024-10-30 22:12:59 +05:30
0xflotus
c4faceff30 chore: add some german translations 2024-10-30 14:55:25 +01:00
0xflotus
01bd017bda fix: fixed labels 2024-10-29 19:33:22 +01:00
0xflotus
d76357981b fix: small bug in course_progress_summary.py
This is a small logical fix.

Otherwise if `row.progress == 10 or row.progress == 40 or row.progress == 70` wouldn't have an effect.
2024-10-29 19:28:14 +01:00
Jannat Patel
19b759e9fb feat: onboarding 2024-10-29 23:00:38 +05:30
Jannat Patel
df3bca6405 Merge pull request #1081 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-10-28 09:34:34 +05:30
Jannat Patel
5cde79b5eb chore: Persian translations 2024-10-27 17:10:17 +05:30
Jannat Patel
9b35cdbddc chore: Bosnian translations 2024-10-26 16:54:33 +05:30
Jannat Patel
70ec22004a chore: Persian translations 2024-10-26 16:54:32 +05:30
Jannat Patel
95ed77421a chore: Chinese Simplified translations 2024-10-26 16:54:31 +05:30
Jannat Patel
d64ec9817c chore: Turkish translations 2024-10-26 16:54:29 +05:30
Jannat Patel
ce01b7634f chore: Swedish translations 2024-10-26 16:54:28 +05:30
Jannat Patel
e0819f83bc chore: Russian translations 2024-10-26 16:54:27 +05:30
Jannat Patel
f87d28c2f5 chore: Polish translations 2024-10-26 16:54:25 +05:30
Jannat Patel
544b59744b chore: Hungarian translations 2024-10-26 16:54:24 +05:30
Jannat Patel
467dfb831d chore: German translations 2024-10-26 16:54:23 +05:30
Jannat Patel
4c4b4eaf55 chore: Arabic translations 2024-10-26 16:54:21 +05:30
Jannat Patel
227e5d00e5 chore: Spanish translations 2024-10-26 16:54:20 +05:30
Jannat Patel
73e9e384c8 chore: French translations 2024-10-26 16:54:18 +05:30
Jannat Patel
5bebdcba68 Merge pull request #1080 from frappe/l10n_develop2
chore: sync translations from crowdin
2024-10-25 16:48:48 +05:30
Jannat Patel
1c2e52ae4b chore: Esperanto translations 2024-10-25 16:35:56 +05:30
Jannat Patel
9377e89561 chore: Bosnian translations 2024-10-25 16:35:54 +05:30
Jannat Patel
4cae05ecbe chore: Persian translations 2024-10-25 16:35:53 +05:30
Jannat Patel
909dcfd51e chore: Chinese Simplified translations 2024-10-25 16:35:51 +05:30
Jannat Patel
2bd96a1f2a chore: Turkish translations 2024-10-25 16:35:49 +05:30
Jannat Patel
aca41080ee chore: Swedish translations 2024-10-25 16:35:48 +05:30
Jannat Patel
1c351696a9 chore: Russian translations 2024-10-25 16:35:46 +05:30
Jannat Patel
51a8958aa6 chore: Polish translations 2024-10-25 16:35:45 +05:30
Jannat Patel
777b8aed02 chore: Hungarian translations 2024-10-25 16:35:43 +05:30
Jannat Patel
3672b90075 chore: German translations 2024-10-25 16:35:42 +05:30
Jannat Patel
92c7e613db chore: Arabic translations 2024-10-25 16:35:40 +05:30
Jannat Patel
5c58b85a00 chore: Spanish translations 2024-10-25 16:35:39 +05:30
Jannat Patel
8af82daa37 chore: French translations 2024-10-25 16:35:36 +05:30
Jannat Patel
224bb18d3e Merge pull request #1077 from pateljannat/issues-45
fix: show live class start button only to moderators and evaluators
2024-10-23 12:53:42 +05:30
Jannat Patel
aab7bdcc20 fix: show live class start button only to moderators and evaluators 2024-10-23 11:02:16 +05:30
Jannat Patel
c5ca428d98 Merge pull request #1076 from pateljannat/issues-44
fix: misc issues
2024-10-23 10:55:42 +05:30
Frappe PR Bot
af0cc7126b chore(release): Bumped to Version 2.9.0 2024-10-23 05:09:14 +00:00
Jannat Patel
a085050d27 build: removed frappe-ui package 2024-10-23 10:36:26 +05:30
Jannat Patel
2442f35f56 fix: added is_instructor to jinja 2024-10-23 10:35:26 +05:30
Jannat Patel
ed79ea536b Merge pull request #1072 from frappe/pot_develop_2024-10-18
chore: update POT file
2024-10-18 23:06:49 +05:30
frappe-pr-bot
b3d0aecd14 chore: update POT file 2024-10-18 16:04:26 +00:00
Jannat Patel
5f43e67c0b Merge pull request #1068 from pateljannat/payment-issues
fix: batch enrollment after payment completion
2024-10-17 10:39:46 +05:30
Jannat Patel
49a765a9a6 style: fix spacing 2024-10-17 10:31:56 +05:30
Jannat Patel
4d82bc86e8 style: fix spacing 2024-10-17 10:30:06 +05:30
Jannat Patel
8fe02b83b8 fix: batch enrollment after payment completion 2024-10-17 09:27:24 +05:30
Jannat Patel
9c9075606b Merge pull request #1059 from frappe/pot_develop_2024-10-11
chore: update POT file
2024-10-15 19:38:24 +05:30
Jannat Patel
53285a0d19 fix: misc issues 2024-10-14 19:17:32 +05:30
Jannat Patel
9cdeaebb47 Merge pull request #1062 from pateljannat/quiz-timer
feat: timer in quiz
2024-10-14 16:11:55 +05:30
Jannat Patel
a9cb52c68b fix: hide timer instructions if duration is not set 2024-10-14 15:49:27 +05:30
Jannat Patel
f33e950e83 feat: timer in quiz 2024-10-14 14:31:26 +05:30
Jannat Patel
9c9b5963fe Merge pull request #1060 from pateljannat/issues-43
fix: redirect to login before enrollment
2024-10-11 22:33:52 +05:30
Jannat Patel
1597054cc9 fix: redirect to login before enrollment 2024-10-11 22:18:18 +05:30
frappe-pr-bot
deba6aa845 chore: update POT file 2024-10-11 16:04:13 +00:00
Jannat Patel
2d8ba3b84e Merge pull request #1058 from pateljannat/issues-42
fix: batch self enrollment
2024-10-11 19:22:50 +05:30
Jannat Patel
e56b28abad chore: removed unnecessary lines 2024-10-11 19:17:56 +05:30
Jannat Patel
eb350c5a20 fix: batch self enrollment 2024-10-11 19:16:40 +05:30
Jannat Patel
961d5ec77b Merge pull request #1057 from pateljannat/settings-minor-changes
fix: misc ux issues
2024-10-11 16:18:19 +05:30
Jannat Patel
fa566514aa fix: image fetch for settings 2024-10-11 15:32:41 +05:30
Jannat Patel
6e97449bf7 fix: misc ux issues 2024-10-11 13:39:30 +05:30
Jannat Patel
016dafb3c3 Merge pull request #1056 from pateljannat/issues-41
fix: misc issues
2024-10-10 16:43:59 +05:30
Jannat Patel
675bcc8956 test: replaced FrappeTestCase with UnitTestCase 2024-10-10 16:20:53 +05:30
Jannat Patel
aba4c034fc fix: misc issues 2024-10-10 14:48:59 +05:30
Jannat Patel
c76d8c582f Merge pull request #1052 from pateljannat/issues-40
fix: misc quiz issues
2024-10-09 19:17:01 +05:30
Jannat Patel
f1cb0e6f3c fix: usd conversion 2024-10-09 19:07:25 +05:30
Jannat Patel
d296687456 fix: misc quiz issues 2024-10-09 16:03:56 +05:30
Jannat Patel
5b68001c94 Merge pull request #1049 from pateljannat/issues-39
fix: create order for razorpay
2024-10-09 11:59:57 +05:30
Frappe PR Bot
736d79b8c9 chore(release): Bumped to Version 2.8.0 2024-10-09 06:04:56 +00:00
Jannat Patel
98c0bd5f3e Merge pull request #1042 from frappe/pot_develop_2024-10-04
chore: update POT file
2024-10-09 11:34:01 +05:30
Jannat Patel
8b1d9bb5a9 fix: create order for razorpay 2024-10-09 11:31:31 +05:30
Jannat Patel
289a0f9122 Merge pull request #1046 from pateljannat/issues-38
fix: quiz columns
2024-10-08 16:27:04 +05:30
Jannat Patel
3cd08c80c8 fix: reduced with of marks column 2024-10-08 16:09:21 +05:30
Jannat Patel
3d82c36250 fix: quiz columns 2024-10-08 16:03:37 +05:30
Jannat Patel
9b9af0215a Merge pull request #1045 from pateljannat/issues-37
fix: using google docs viewer to render pdf
2024-10-08 12:37:19 +05:30
Jannat Patel
2e4cf02737 fix: using google docs viewer to render pdf 2024-10-08 12:00:51 +05:30
Jannat Patel
438e9e1c47 Merge pull request #1044 from pateljannat/open-ended-questions
feat: open ended questions
2024-10-08 10:37:44 +05:30
Jannat Patel
36ded70eef fix: only allow instructor and moderator on submission page 2024-10-08 10:21:45 +05:30
Jannat Patel
ba78a15a1f fix: ui test button label 2024-10-08 10:14:04 +05:30
Jannat Patel
93061194bb fix: error toast when saving marks 2024-10-08 10:13:07 +05:30
Jannat Patel
6d41e4e552 feat: open ended questions 2024-10-07 21:18:42 +05:30
frappe-pr-bot
3b06968d0a chore: update POT file 2024-10-04 16:04:32 +00:00
Frappe PR Bot
fc81f1aa26 chore(release): Bumped to Version 2.7.0 2024-10-02 06:53:07 +00:00
Jannat Patel
59d8848125 Merge pull request #1035 from pateljannat/payments
feat: payments app integration
2024-10-02 12:22:00 +05:30
Jannat Patel
a067695f71 fix: removed help article from course lesson 2024-10-01 15:43:45 +05:30
Jannat Patel
be870e8145 fix: payment gateway fields 2024-10-01 15:17:17 +05:30
Jannat Patel
8a17dca351 fix: minor ui changes 2024-10-01 10:43:37 +05:30
Jannat Patel
1c9f636ad1 Merge pull request #1032 from frappe/pot_develop_2024-09-27
chore: update POT file
2024-10-01 09:42:57 +05:30
Jannat Patel
008cc66cdd chore: refactor payment settings 2024-09-30 18:30:53 +05:30
Jannat Patel
b6bf9c0032 Merge branch 'develop' of https://github.com/frappe/lms into payments 2024-09-30 10:16:52 +05:30
Jannat Patel
d295898674 Merge pull request #1033 from pateljannat/issues-35
fix: misc UI fixes
2024-09-27 22:15:43 +05:30
frappe-pr-bot
4fdca4691a chore: update POT file 2024-09-27 16:04:07 +00:00
Jannat Patel
7c055af496 fix: telemetry capture issue 2024-09-27 21:32:46 +05:30
Jannat Patel
60a3da283e refactor: billing page ui 2024-09-27 14:14:03 +05:30
Jannat Patel
576258ec6e fix: pass options to setting fields 2024-09-27 07:05:16 +05:30
Jannat Patel
01120fbc48 chore: resolved conflicts 2024-09-27 06:24:12 +05:30
Jannat Patel
ad07f883b5 fix: misc UI fixes 2024-09-27 06:19:38 +05:30
Jannat Patel
bb9b179e05 Merge pull request #1031 from pateljannat/brand-settings
feat:  brand settings
2024-09-26 14:01:19 +05:30
Jannat Patel
11a9bff57d fix: dirty form for branding section 2024-09-26 12:58:00 +05:30
Jannat Patel
e18f0c9dad feat: brand settings 2024-09-26 12:09:58 +05:30
Jannat Patel
41ad3d00de Merge pull request #1030 from pateljannat/fix-evaluation-issue
fix: evaluation error message issue
2024-09-25 11:29:42 +05:30
Frappe PR Bot
b74c1670ca chore(release): Bumped to Version 2.6.0 2024-09-25 05:47:45 +00:00
Jannat Patel
33c76e842f fix: evaluation error message issue 2024-09-25 11:10:26 +05:30
Jannat Patel
35a7cce283 feat: payment gateway settings 2024-09-25 10:50:53 +05:30
Jannat Patel
e0f569c382 feat: payment flow with payments app 2024-09-24 18:14:34 +05:30
Jannat Patel
d8ab88be28 Merge branch 'develop' of https://github.com/frappe/lms into payments 2024-09-24 14:14:49 +05:30
Jannat Patel
04552bdef6 Merge pull request #1025 from pateljannat/categories-in-courses
feat: course categories
2024-09-24 12:55:41 +05:30
Jannat Patel
ad5bf89b35 test: enter instructor value 2024-09-24 12:32:07 +05:30
Jannat Patel
88b38dfd83 test: category test in course form in UI 2024-09-24 12:22:34 +05:30
Jannat Patel
75e9ca395f chore: removed unnecessary custom fields 2024-09-24 10:59:27 +05:30
Jannat Patel
6fb206cc4e feat: updating category from settings 2024-09-24 10:33:23 +05:30
Jannat Patel
62cb198492 Merge branch 'develop' of https://github.com/frappe/lms into categories-in-courses 2024-09-23 19:23:49 +05:30
Jannat Patel
9609329f01 Merge pull request #1028 from pateljannat/fix-signup-customisations
fix: signup conditions
2024-09-23 19:12:29 +05:30
Jannat Patel
c93808af94 fix: signup conditions 2024-09-23 18:41:35 +05:30
Jannat Patel
58866260ec Merge branch 'develop' of https://github.com/frappe/lms into categories-in-courses 2024-09-23 18:39:19 +05:30
Jannat Patel
e6157ff411 Merge pull request #1027 from pateljannat/refactor-signup-customisations
refactor: signup customisations
2024-09-23 18:23:04 +05:30
Jannat Patel
8cca8920ee chore: removed unnecessary file 2024-09-23 18:07:08 +05:30
Jannat Patel
ab039dbd46 refactor: signup customisations 2024-09-23 18:04:36 +05:30
Jannat Patel
9853ab3fd9 Merge pull request #1024 from frappe/pot_develop_2024-09-20
chore: update POT file
2024-09-23 16:11:57 +05:30
Jannat Patel
dc2bf9f13e feat: category settings 2024-09-23 16:11:17 +05:30
Jannat Patel
7c90ca4040 feat: category in settings 2024-09-20 22:15:59 +05:30
frappe-pr-bot
75a90e1f39 chore: update POT file 2024-09-20 16:04:14 +00:00
Jannat Patel
bc4b17cc3d Merge pull request #1022 from pateljannat/evaluator_name_issue
fix: evaluator name issue
2024-09-19 15:18:05 +05:30
Jannat Patel
8c454a333e fix: evaluator name issue 2024-09-19 14:19:55 +05:30
Jannat Patel
cef4b70182 feat: payment through payments app 2024-09-19 12:46:56 +05:30
Jannat Patel
3cda563583 fix: padding of settings modal 2024-09-18 14:46:29 +05:30
Jannat Patel
545326a02a Merge pull request #1021 from pateljannat/fix-help-video-url
fix: url for lesson help videos
2024-09-18 14:42:33 +05:30
Jannat Patel
14ce5d7e23 fix: url for lesson help videos 2024-09-18 11:49:38 +05:30
Frappe PR Bot
b6422d1046 chore(release): Bumped to Version 2.5.0 2024-09-18 04:46:24 +00:00
Jannat Patel
7196bbe221 Merge pull request #1019 from pateljannat/issues-34
fix: misc issues
2024-09-18 09:03:33 +05:30
Jannat Patel
bed16c3726 fix: condition to show course addition button 2024-09-18 08:56:35 +05:30
Jannat Patel
d18ca232e3 fix: misc issues 2024-09-18 08:43:16 +05:30
Jannat Patel
d1200d0fa9 fix: profile page empty bio error 2024-09-17 11:48:49 +05:30
Jannat Patel
d1c88b306f Merge pull request #1018 from pateljannat/batch-quiz
feat: quiz page
2024-09-17 10:42:34 +05:30
Jannat Patel
7f2723f9cb Merge pull request #1014 from pateljannat/batch-welcome-email-fix
fix: batch confirmation email trigger
2024-09-17 10:30:00 +05:30
Jannat Patel
8df4bef71a feat: quiz page 2024-09-17 10:25:59 +05:30
Jannat Patel
aa87622606 Merge pull request #1017 from pateljannat/refactor-lesson-editor
refactor: adding quiz and uploading content to a lesson
2024-09-16 19:19:42 +05:30
Jannat Patel
b91339fe28 fix: removed unnecessary files 2024-09-16 18:50:06 +05:30
Jannat Patel
17d4973ab8 test: fixed course creation 2024-09-16 18:41:25 +05:30
Jannat Patel
3c12548420 Merge pull request #1016 from frappe/pot_develop_2024-09-13
chore: update POT file
2024-09-16 16:50:16 +05:30
Jannat Patel
20c10f1645 feat: help guide videos 2024-09-16 16:49:17 +05:30
Jannat Patel
a7843e0e3a refactor: uploading content in lesson 2024-09-16 10:33:16 +05:30
frappe-pr-bot
169ea4385f chore: update POT file 2024-09-13 16:04:09 +00:00
Jannat Patel
9549f3a3ed Merge pull request #1015 from pateljannat/course-completion-funnel
chore: analytics for course completion
2024-09-13 11:37:22 +05:30
Jannat Patel
ba66c2549f chore: renamed lesson_progress to course_progress for analytics 2024-09-13 11:21:59 +05:30
Jannat Patel
76c3e630cc chore: analytics for course completion 2024-09-13 11:18:17 +05:30
Jannat Patel
7a0b952638 style: trigger condition 2024-09-13 09:57:41 +05:30
Jannat Patel
5966a3edad fix: batch confirmation email trigger 2024-09-13 09:57:06 +05:30
Jannat Patel
d44c7cd9fc Merge pull request #1010 from pateljannat/evaluation-calendar
feat: Evaluation and Certification from Learning Portal
2024-09-12 16:48:51 +05:30
Jannat Patel
46553987ac fix: certification tab title 2024-09-12 16:22:43 +05:30
Jannat Patel
45725f1f6e chore: bumped up frappe-ui 2024-09-12 14:31:55 +05:30
Jannat Patel
58369ba65e fix: evaluator info and other styles 2024-09-11 19:51:14 +05:30
Jannat Patel
5ce67dda2e Merge pull request #1002 from prachi8848/cusrsor
feat: added a cusrsor
2024-09-11 15:05:48 +05:30
Jannat Patel
237ff8db07 Merge pull request #1008 from frappe/pot_develop_2024-09-06
chore: update POT file
2024-09-10 21:02:55 +05:30
Jannat Patel
7da608ed44 feat: certification details and form 2024-09-10 21:00:49 +05:30
Jannat Patel
60f2e86b42 feat: evaluation feedback record 2024-09-09 20:05:08 +05:30
frappe-pr-bot
b5e67a25d2 chore: update POT file 2024-09-06 16:03:59 +00:00
Jannat Patel
9d2ef4929c Merge pull request #1007 from pateljannat/fix-notification
fix: certificate request creation email
2024-09-06 10:49:52 +05:30
Jannat Patel
050084e552 style: fix formatting 2024-09-06 10:40:25 +05:30
Jannat Patel
86e9739218 fix: certificate request creation email 2024-09-06 10:19:25 +05:30
Jannat Patel
bd94890da7 Merge pull request #1005 from pateljannat/minor-ui-fix
fix: member-list ui
2024-09-05 20:36:41 +05:30
Jannat Patel
965f6adb90 style: fixed formatting 2024-09-05 20:31:22 +05:30
Jannat Patel
4979569cf3 fix: member-list ui 2024-09-05 19:59:44 +05:30
Frappe PR Bot
5c21a0532a chore(release): Bumped to Version 2.4.0 2024-09-04 05:00:25 +00:00
sonali8848
a2025c0571 feat: added a cusrsor 2024-09-02 09:41:22 +00:00
Jannat Patel
e07aae3fb0 Merge pull request #997 from pateljannat/issues-33
fix: slides rendering issue
2024-08-29 19:26:08 +05:30
Jannat Patel
65d628ffc0 fix: slides rendering issue 2024-08-29 11:10:43 +05:30
Jannat Patel
bf290bbf0a Merge pull request #994 from akhilnarang/fix-user-creation
fix(overrides): call parent's `after_insert()` as well
2024-08-27 14:56:11 +05:30
Akhil Narang
3c9059025b fix(overrides): call parent's after_insert() as well
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2024-08-27 14:08:35 +05:30
Jannat Patel
4b0413720b Merge pull request #993 from pateljannat/quiz-submission-issue
fix: quiz submission report issue
2024-08-27 11:58:14 +05:30
Jannat Patel
f8b4ff4bd3 fix: quiz submission report issue 2024-08-27 10:46:06 +05:30
Jannat Patel
3b8ff171f4 Merge pull request #989 from frappe/pot_develop_2024-08-23
chore: update POT file
2024-08-26 14:45:59 +05:30
frappe-pr-bot
dec270a10b chore: update POT file 2024-08-23 16:04:00 +00:00
Jannat Patel
152a339c4e Merge pull request #986 from pateljannat/app-switcher
feat: App switcher
2024-08-23 12:40:16 +05:30
Jannat Patel
395fe700e0 fix: removed switch to desk 2024-08-23 12:22:11 +05:30
Jannat Patel
ec25e895dc feat: app switcher 2024-08-23 12:21:22 +05:30
Frappe PR Bot
e02e4c7ab4 chore(release): Bumped to Version 2.3.0 2024-08-21 05:20:24 +00:00
Jannat Patel
e69cc9af1a Merge pull request #980 from pateljannat/member-addition
feat: Add users from the portal
2024-08-19 14:11:59 +05:30
Jannat Patel
98b8464e1a fix: ui test 2024-08-19 13:07:48 +05:30
Jannat Patel
0170fcc111 Merge pull request #968 from frappe/pot_develop_2024-08-16
chore: update POT file
2024-08-19 13:04:21 +05:30
Jannat Patel
0be5439e81 fix: tests 2024-08-19 12:31:46 +05:30
Jannat Patel
63f857b8fc fix: linters 2024-08-19 12:12:51 +05:30
Jannat Patel
a3b8ed8f91 fix: documented the api 2024-08-19 12:03:32 +05:30
Jannat Patel
cdd46667f3 feat: add new member 2024-08-19 11:47:17 +05:30
frappe-pr-bot
2f8acea988 chore: update POT file 2024-08-16 16:04:13 +00:00
Jannat Patel
75f0e5b9f1 feat: search member 2024-08-16 20:59:51 +05:30
Jannat Patel
ce51129e84 feat: member list 2024-08-16 11:26:11 +05:30
Jannat Patel
86aa8b0a2a Merge pull request #967 from pateljannat/issues-32
fix: settings ui
2024-08-14 12:47:31 +05:30
Jannat Patel
aeae62a45c chore: linters 2024-08-14 12:35:56 +05:30
Jannat Patel
6b12df44a0 fix: settings ui 2024-08-14 12:12:13 +05:30
Frappe PR Bot
a710183bc7 chore(release): Bumped to Version 2.2.0 2024-08-14 05:57:31 +00:00
Jannat Patel
669316ba14 Merge pull request #965 from pateljannat/make-release
ci: automated release PR
2024-08-14 11:08:26 +05:30
Jannat Patel
6c18f9a02f ci: automated release PR 2024-08-14 10:44:11 +05:30
Jannat Patel
363edb9a50 Merge pull request #964 from pateljannat/settings
feat: Settings
2024-08-13 19:14:07 +05:30
Jannat Patel
afbf64170a fix: removed old settings 2024-08-13 19:03:17 +05:30
Jannat Patel
14f36d0c64 chore: removed unnecessary file 2024-08-13 18:59:39 +05:30
Jannat Patel
ceecab395b feat: settings 2024-08-13 18:53:27 +05:30
Jannat Patel
b8eb9fd717 Merge branch 'develop' of https://github.com/frappe/lms into settings 2024-08-13 09:42:17 +05:30
Jannat Patel
230a52f06b Merge pull request #963 from pateljannat/issues-31
fix: misc issues
2024-08-13 09:16:12 +05:30
Jannat Patel
3e82608d5f chore: fixed linters 2024-08-12 20:13:57 +05:30
Jannat Patel
cf2c2345c3 fix: discussions text 2024-08-12 20:10:10 +05:30
Jannat Patel
05ebe4b787 fix: lesson structure issue 2024-08-12 20:09:56 +05:30
Frappe PR Bot
a744a43d14 chore(release): Bumped to Version 2.1.0 2024-08-12 12:32:42 +00:00
Jannat Patel
5abdbfec1f Merge pull request #962 from pateljannat/posthog
chore: product analytics
2024-08-12 18:01:45 +05:30
Jannat Patel
0335b3b4d0 chore: fixed linters 2024-08-12 17:38:59 +05:30
Jannat Patel
703fafd6c3 chore: analytics 2024-08-12 17:13:31 +05:30
Jannat Patel
b956c4e383 Merge branch 'develop' of https://github.com/frappe/lms into posthog 2024-08-12 14:17:04 +05:30
Jannat Patel
d0d1fb2c8c Merge pull request #944 from pateljannat/quiz-creation
Quiz creation
2024-08-12 14:13:23 +05:30
Jannat Patel
d18a6f6e73 chore: removed workspaces from package.json 2024-08-12 13:13:21 +05:30
Jannat Patel
2994144718 feat: quiz creation from lesson form 2024-08-12 12:47:17 +05:30
Jannat Patel
62ab853605 feat: quiz creation from lesson form 2024-08-12 12:46:38 +05:30
Jannat Patel
7f7986d77a chore: fixed linters 2024-08-12 10:04:42 +05:30
Jannat Patel
61f01cc51b chore: resolved conflicts 2024-08-12 10:02:22 +05:30
Jannat Patel
86af8c6301 Merge pull request #960 from mohsinalimat/patch-1
fix: lms setting to lms settings
2024-08-09 22:21:35 +05:30
Jannat Patel
f1b0fcfbfc Merge pull request #961 from frappe/pot_develop_2024-08-09
chore: update POT file
2024-08-09 21:50:21 +05:30
frappe-pr-bot
ab5ce39645 chore: update POT file 2024-08-09 16:04:06 +00:00
Jannat Patel
685e09ce4b feat: question update 2024-08-09 20:38:14 +05:30
MohsinAli
8ed4f775e5 fix: lms setting to lms settings 2024-08-09 13:58:50 +05:30
Jannat Patel
a3a3085b1f fix: update question title in quiz 2024-08-08 22:16:21 +05:30
Jannat Patel
ed97640107 feat: allow updating questions 2024-08-07 18:15:50 +05:30
Jannat Patel
a9e93a679b feat: posthog initialization 2024-08-07 11:31:58 +05:30
Jannat Patel
418c36c09f Merge pull request #957 from frappe/pot_develop_2024-08-06
chore: update POT file
2024-08-06 12:17:49 +05:30
frappe-pr-bot
935f7f1f7b chore: update POT file 2024-08-06 06:32:08 +00:00
Jannat Patel
9a0056b6ca Merge branch 'develop' of https://github.com/frappe/lms into develop 2024-08-06 11:50:23 +05:30
Jannat Patel
cd56da5d85 fix: changed upstream command for pot file generation 2024-08-06 11:47:37 +05:30
Jannat Patel
97d5d853fc Merge pull request #955 from pateljannat/issues-30
fix: lesson auto save
2024-08-06 11:11:50 +05:30
Jannat Patel
8adfe247b2 fix: lesson auto save 2024-08-05 18:14:35 +05:30
Jannat Patel
afe7df2989 fix: fetch question 2024-08-05 16:29:43 +05:30
Jannat Patel
cdb028c69c feat: settings 2024-08-05 15:12:45 +05:30
Jannat Patel
eed330662b Merge pull request #953 from pateljannat/issues-29
fix: course cards home page rendering
2024-08-05 14:20:36 +05:30
Jannat Patel
26db10bbe0 fix: course cards home page rendering 2024-08-05 14:04:08 +05:30
Jannat Patel
14230bd588 Merge pull request #951 from pateljannat/issues-28
fix: spacing and widths
2024-08-05 11:32:12 +05:30
Jannat Patel
699c821edd fix: spacing and widths 2024-08-05 11:12:34 +05:30
Jannat Patel
27ca13ece6 feat: add questions to quiz 2024-08-02 20:20:43 +05:30
Jannat Patel
6820dfc820 fix: make question attachments public 2024-08-01 13:02:20 +05:30
Jannat Patel
471e7d9229 fix: fetch question details 2024-08-01 13:00:37 +05:30
Jannat Patel
e0855a2c1b fix: quiz question population issue 2024-07-31 22:30:29 +05:30
Jannat Patel
6a0b37a4d4 chore: changed release branch to develop 2024-07-31 12:43:04 +05:30
Jannat Patel
f7fd6916e2 chore: release notes action 2024-07-31 12:15:24 +05:30
Jannat Patel
30e61f4b7c Merge pull request #947 from pateljannat/semantic-release
chore: semantic release action
2024-07-31 11:45:42 +05:30
Jannat Patel
48b37d58d8 chore: semantic release action 2024-07-31 11:10:47 +05:30
Jannat Patel
b8c3bdc0b4 feat: open modal to edit question 2024-07-31 11:07:46 +05:30
Jannat Patel
e96f18df7c Merge pull request #946 from pateljannat/issues-27
fix: quiz shuffle issue
2024-07-30 18:04:26 +05:30
Jannat Patel
7d15527831 fix: quiz shuffle issue 2024-07-30 16:58:09 +05:30
Jannat Patel
794c0e760b Merge pull request #945 from pateljannat/issues-26
fix: eval request issues
2024-07-30 15:26:46 +05:30
Jannat Patel
e46a60d00a chore: linters 2024-07-30 15:05:24 +05:30
Jannat Patel
819aac70fd fix: linters 2024-07-30 14:54:21 +05:30
Jannat Patel
ed7db2d7c5 fix: eval request issues 2024-07-30 14:17:17 +05:30
Jannat Patel
a450c846a6 feat: questions table 2024-07-29 19:44:04 +05:30
Jannat Patel
fa774b0db2 feat: quiz creation 2024-07-19 20:05:28 +05:30
Jannat Patel
98a56f9117 Merge pull request #936 from pateljannat/image-pasting
fix: batch filters on desk
2024-07-19 12:19:34 +05:30
Jannat Patel
cbc4b8c59d chore: removed unused plugin 2024-07-19 12:07:35 +05:30
Jannat Patel
69d266e018 feat: image pasting 2024-07-19 11:55:36 +05:30
Jannat Patel
4bc3ac1665 fix: batch filters on desk 2024-07-18 21:29:40 +05:30
Jannat Patel
e0de9d70de Merge pull request #933 from pateljannat/issues-25
fix: misc issues
2024-07-17 11:40:35 +05:30
Jannat Patel
493bab8163 fix: multiline tags 2024-07-17 11:29:14 +05:30
Jannat Patel
25a2d82e82 fix: misc issues 2024-07-16 16:11:24 +05:30
Jannat Patel
0183677494 Merge pull request #932 from pateljannat/batch-categories
feat: batch categories filter
2024-07-15 14:45:57 +05:30
Jannat Patel
7ae9244896 feat: batch categories filter 2024-07-15 13:45:38 +05:30
Jannat Patel
15330cb41d Merge pull request #928 from pateljannat/completion-certificate
feat: completion certificate
2024-07-12 20:36:06 +05:30
Jannat Patel
166996d77a chore: removed unnecessary lines 2024-07-12 20:17:42 +05:30
Jannat Patel
4943e0e902 chore: fixed linters 2024-07-12 19:58:52 +05:30
Jannat Patel
1db6a8bfda chore: fixed linters 2024-07-12 19:56:01 +05:30
Jannat Patel
57f43b256a feat: enable certification from course form 2024-07-12 19:46:45 +05:30
Jannat Patel
23b2e8d682 feat: generate certificate from course page 2024-07-12 15:56:50 +05:30
Jannat Patel
6e1d62340f feat: completion certificate 2024-07-11 18:12:15 +05:30
Jannat Patel
63d613a88e chore: fixed linters 2024-07-10 22:58:22 +05:30
Jannat Patel
70a4d16a8a chore: merge conflict 2024-07-10 22:40:40 +05:30
Jannat Patel
9960507318 Merge pull request #924 from pateljannat/reorder-lessons
feat: reorder lessons
2024-07-10 22:00:54 +05:30
Jannat Patel
a84b225247 chore: fixed linters 2024-07-10 21:53:49 +05:30
Jannat Patel
a1f938eaaf chore: removed unnecessary lines 2024-07-10 21:51:00 +05:30
Jannat Patel
f7027e9cfd fix: success message after lesson moved 2024-07-10 21:38:21 +05:30
Jannat Patel
8164526763 fix: misc issues 2024-07-10 16:13:28 +05:30
Jannat Patel
2ecc07ee58 feat: reorder lessons 2024-07-09 22:45:45 +05:30
Jannat Patel
8edfe041c3 Merge pull request #922 from pateljannat/delete-lesson
feat: delete lessons
2024-07-08 19:53:19 +05:30
Jannat Patel
e3e54b0188 feat: delete lessons 2024-07-08 18:15:22 +05:30
Jannat Patel
602d457212 Merge pull request #921 from pateljannat/course-cache-issue
fix: course cache issue
2024-07-08 12:38:02 +05:30
Jannat Patel
8bd4a5448b fix: achievements title issue 2024-07-08 11:18:59 +05:30
Jannat Patel
2257c09228 fix: course cache issue 2024-07-05 19:24:49 +05:30
Jannat Patel
dac8a3ecf2 fix: translations upstream 2024-07-05 16:03:36 +05:30
Jannat Patel
288f85b2f3 fix: indian state validation 2024-07-04 17:35:44 +05:30
Jannat Patel
d5d9e5e6e8 chore: changed translation cron 2024-07-04 17:32:10 +05:30
Jannat Patel
e194f2efea Merge pull request #919 from pateljannat/quiz-instructions
fix: instructions for user input questions
2024-07-04 10:25:00 +05:30
Jannat Patel
686839adc1 fix: instructions for user input questions 2024-07-03 22:41:39 +05:30
Jannat Patel
0c52b5a8ec fix: badge share url 2024-07-02 16:17:28 +05:30
Jannat Patel
f80a139c93 Merge pull request #913 from pateljannat/translations
feat: translations via gettext
2024-07-02 14:54:01 +05:30
Jannat Patel
eeadd6910e fix: changed cron to wednesday 2024-07-02 14:43:08 +05:30
Jannat Patel
eed16d9604 feat: translations via gettext 2024-07-01 11:15:12 +05:30
Jannat Patel
3745db6da4 Merge pull request #905 from pateljannat/search-course
feat: search courses
2024-06-28 19:05:34 +05:30
Jannat Patel
4ef694a2ed fix: search cache issue 2024-06-28 18:51:47 +05:30
Jannat Patel
279bb89ca9 feat: search courses 2024-06-28 15:58:35 +05:30
Jannat Patel
0bc5714392 Merge pull request #902 from pateljannat/quiz-limit
feat: limit questions in quiz
2024-06-28 12:48:10 +05:30
Jannat Patel
764f358708 feat: limit questions in quiz 2024-06-28 12:21:07 +05:30
Jannat Patel
bf43fd5079 Merge pull request #901 from pateljannat/issues-24
fix: lesson editor menu position
2024-06-27 21:58:39 +05:30
Jannat Patel
6adc62c72a fix: lesson editor menu position 2024-06-27 21:50:02 +05:30
Jannat Patel
2cf894df59 Merge pull request #900 from pateljannat/correct-workspace-links
fix: corrected workspace links
2024-06-27 21:29:08 +05:30
Jannat Patel
72053dbf56 fix: corrected workspace links 2024-06-27 21:20:14 +05:30
Jannat Patel
0cd50ff1b6 Merge pull request #898 from pateljannat/google-drive
feat: more embed sources for lesson components
2024-06-27 14:28:48 +05:30
Jannat Patel
d3f443014c feat: more embed sources for lesson components 2024-06-27 12:30:48 +05:30
Jannat Patel
ecd56609a0 Merge pull request #895 from pateljannat/issues-23
fix: minor UI issues
2024-06-26 15:01:06 +05:30
Jannat Patel
1af10b7f96 chore: removed unused imports 2024-06-26 14:29:29 +05:30
Jannat Patel
55170361c1 fix: minor UI issues 2024-06-26 14:25:16 +05:30
Jannat Patel
daa42f146d Merge pull request #894 from pateljannat/issues-22
fix: batch ui
2024-06-26 13:52:30 +05:30
Jannat Patel
67ebd30836 fix: batch ui 2024-06-26 13:10:20 +05:30
Jannat Patel
ac282cebfb Merge pull request #878 from MuhammadKazimSadiq/recent-courses-web-template
Recent courses web template
2024-06-26 11:13:38 +05:30
Jannat Patel
4aea074041 Merge pull request #888 from pateljannat/batch-instructors
feat: instructors in courses and batches
2024-06-26 10:42:01 +05:30
Jannat Patel
888ea5a911 test: type instructor 2024-06-26 10:32:42 +05:30
Jannat Patel
f02b9c09e6 chore: fixed merge conflicts 2024-06-26 09:34:09 +05:30
Jannat Patel
5e91553190 test: instructor when creating course 2024-06-26 09:33:03 +05:30
Md Hussain Nagaria
326c77cdb9 fix: clip progress bar width to 100% (#892)
* fix: course progress bar should not go beyond 100% width

* refactor: progress bar component should include outer body div
2024-06-26 00:29:55 +05:30
Muhammad Kazim
e10af413b2 Merge branch 'develop' into recent-courses-web-template 2024-06-25 19:44:08 +03:30
Md Hussain Nagaria
d4a15ade98 fix: seats left condition (#889) 2024-06-25 21:28:32 +05:30
Jannat Patel
b18a3cb5e1 test: instructor for courses 2024-06-25 19:56:50 +05:30
Jannat Patel
96028c9f42 feat: instructors in courses and batches 2024-06-25 18:43:28 +05:30
Jannat Patel
8625ac048a Merge pull request #877 from nikkothari22/fix-seats-badge
fix: show "Seats Left" instead of "Seat Left" if more than 1 seat is available
2024-06-24 14:35:11 +05:30
Jannat Patel
30934f9eba Merge pull request #884 from pateljannat/issues-21
fix: job page layout
2024-06-24 14:31:22 +05:30
Jannat Patel
8349f47cbe Merge branch 'develop' into fix-seats-badge 2024-06-24 14:30:24 +05:30
Muhammad Kazim
9d3d93443f fix linting issues with pre-commit 2024-06-22 10:46:06 +00:00
Muhammad Kazim
4b6d1c296c Merge branch 'frappe:develop' into recent-courses-web-template 2024-06-22 13:28:51 +03:30
Jannat Patel
0a3a48759f fix: deleted fixture json 2024-06-21 19:23:18 +05:30
Jannat Patel
407bea4ab9 fix: removed badge fixture 2024-06-21 19:17:23 +05:30
Jannat Patel
3ba34f36eb fix: removed meta from eval web form as its not needed 2024-06-21 19:03:22 +05:30
Jannat Patel
8d1c03d4c1 chore: removed unused imports 2024-06-21 18:52:12 +05:30
Jannat Patel
ed739b25e2 fix: job page layout 2024-06-21 18:41:10 +05:30
Nikhil Kothari
807c9b2225 fix: use single span instead of multiple badges 2024-06-21 17:17:36 +05:30
Jannat Patel
7d3dc8df90 Merge pull request #883 from pateljannat/batch-timezone
feat: timezone in batches
2024-06-21 14:23:59 +05:30
Jannat Patel
aafb8948d2 chore: resolved conflicts 2024-06-21 14:05:03 +05:30
Jannat Patel
4f2dd7654c fix: notification template for timezone 2024-06-21 13:17:54 +05:30
Jannat Patel
9c2bebb3d9 feat: timezone in batches 2024-06-21 13:08:58 +05:30
Jannat Patel
e93e82b56c Merge pull request #882 from pateljannat/video-player
feat: video and audio player
2024-06-21 11:44:08 +05:30
Jannat Patel
f783b981e5 feat: added support to embed aparat 2024-06-21 11:38:30 +05:30
Jannat Patel
b5a904354a test: fix lesson content 2024-06-21 11:24:28 +05:30
Jannat Patel
ed7c30057c test: increase wait time when lesson is opened 2024-06-21 10:36:26 +05:30
Jannat Patel
05e8513ad1 feat: video player 2024-06-20 16:46:50 +05:30
Muhammad Kazim
775f8db31e Merge branch 'frappe:develop' into recent-courses-web-template 2024-06-17 00:57:16 +03:30
Muhammad Kazim
4b6d3fe968 web template for recently published courses 2024-06-16 21:26:16 +00:00
Nikhil Kothari
e397295b5e fix: use else-if 2024-06-14 16:30:33 +05:30
Nikhil Kothari
1d16c46003 fix: show "30 seats left" instead of "seat left" in batches 2024-06-14 16:29:58 +05:30
Jannat Patel
3ba8805413 Merge branch 'develop' of https://github.com/frappe/lms into video-player 2024-06-14 10:28:22 +05:30
Jannat Patel
63f4dc0caa Merge pull request #876 from pateljannat/issues-20
fix: misc issues
2024-06-14 10:22:16 +05:30
Jannat Patel
965bdd7890 fix: hide discussions is lesson has quiz 2024-06-14 09:48:22 +05:30
Jannat Patel
a99c41a07b fix: misc changes 2024-06-13 15:34:57 +05:30
Jannat Patel
81feee887c Merge pull request #870 from pateljannat/issues-19
fix: better validation message on course creation
2024-06-12 12:11:47 +05:30
Jannat Patel
77433ebb7c fix: better validation message on course creation 2024-06-12 11:44:14 +05:30
Jannat Patel
d5614322c5 Merge pull request #869 from pateljannat/issues-18
fix: event meeting generation
2024-06-12 10:54:16 +05:30
Jannat Patel
479ff037c6 fix: convert eval string to dict 2024-06-12 10:42:47 +05:30
Jannat Patel
8a74f495e7 fix: event meeting generation 2024-06-12 10:32:57 +05:30
Jannat Patel
231f2cbc14 feat: video player 2024-06-12 10:27:33 +05:30
Jannat Patel
1f466482f8 Merge pull request #867 from pateljannat/issues-17
fix: perf issues
2024-06-07 11:52:41 +05:30
Jannat Patel
103ecef9f4 fix: misc issues 2024-06-07 11:37:46 +05:30
Jannat Patel
2744002390 Merge pull request #866 from pateljannat/issues-16
fix: misc issues
2024-06-06 22:04:47 +05:30
Jannat Patel
fd26d2bcd1 fix: misc issues 2024-06-06 21:57:24 +05:30
Md Hussain Nagaria
a55da8149a fix: forward resource submit promise (#861) 2024-06-06 18:23:14 +05:30
Jannat Patel
631f69bd75 Merge pull request #860 from pateljannat/issues-15
fix: sold out batch issue
2024-06-06 13:07:13 +05:30
Jannat Patel
621556263b fix: sold out batch issue 2024-06-06 13:00:08 +05:30
Jannat Patel
6fdd1a5f09 fix: job application count 2024-06-05 15:58:08 +05:30
Jannat Patel
a2b3bc8c1f Merge pull request #856 from pateljannat/jobs-applied
feat: job application count
2024-06-05 13:56:57 +05:30
Jannat Patel
d932baf896 feat: job application count 2024-06-05 10:53:31 +05:30
Jannat Patel
a9b469d3bf Merge pull request #849 from pateljannat/sidebar-edit
feat: configure sidebar items
2024-06-04 09:43:35 +05:30
Jannat Patel
e2bd9401a6 fix: removed unused imports 2024-06-04 09:22:16 +05:30
Jannat Patel
c6ada95b9d feat: edit and delete sidebar item 2024-06-03 20:28:25 +05:30
Jannat Patel
330a2f632a feat: edit and delete sidebar item 2024-06-03 20:27:38 +05:30
Jannat Patel
bf6a7a85a7 feat: web pages for sidebar 2024-05-31 21:26:11 +05:30
Jannat Patel
e609153f4f Merge branch 'develop' of https://github.com/frappe/lms into sidebar-edit 2024-05-30 12:31:50 +05:30
Jannat Patel
bedb1dc8d3 Merge pull request #852 from pateljannat/issues-14
fix: evaluation related issues
2024-05-30 12:24:32 +05:30
Jannat Patel
7f2821f639 fix: evaluation related issues 2024-05-30 12:16:01 +05:30
Jannat Patel
844f4b5e8d feat: new web page table 2024-05-30 11:01:30 +05:30
Jannat Patel
1e69ff7de8 feat: configure sidebar items 2024-05-29 17:16:09 +05:30
Jannat Patel
e6d58721f0 Merge pull request #846 from pateljannat/share-badge
feat: share badge on linkedin
2024-05-28 12:37:51 +05:30
Jannat Patel
7c077ace95 feat: share badge on social media 2024-05-28 12:05:16 +05:30
Jannat Patel
d03dd3d20d Merge branch 'develop' of https://github.com/frappe/lms into share-badge 2024-05-27 17:36:31 +05:30
Jannat Patel
a780668aac Merge pull request #841 from pateljannat/featured-courses
feat: featured courses
2024-05-27 15:51:31 +05:30
Jannat Patel
c0998ca8b3 feat: share badge on linkedin 2024-05-27 15:31:53 +05:30
Jannat Patel
b7dd488886 feat: featured courses 2024-05-27 15:30:15 +05:30
Jannat Patel
cb9125632a Merge pull request #837 from pateljannat/issues-13
fix: minor issues
2024-05-24 17:08:03 +05:30
Jannat Patel
9a776dabed fix: minor issues 2024-05-24 17:00:14 +05:30
Jannat Patel
180c8941a4 Merge pull request #787 from Bowrna/patch-2
Update README.md
2024-05-24 15:34:38 +05:30
Jannat Patel
f6b83d3518 Merge branch 'develop' into patch-2 2024-05-24 15:25:53 +05:30
Jannat Patel
97712dbdc0 Merge pull request #711 from ph4ni/main
Added batch start and end date validation
2024-05-24 15:19:58 +05:30
Jannat Patel
febf38a47a Merge pull request #739 from ahmadRagheb/patch-3
Update edit.html
2024-05-24 15:18:54 +05:30
Jannat Patel
753ae01efc Merge pull request #836 from pateljannat/notifications
feat: notifications
2024-05-24 15:13:39 +05:30
Jannat Patel
cef638e37a chore: removed unnecessary code 2024-05-24 15:08:18 +05:30
Jannat Patel
850069d380 feat: batch notifications 2024-05-24 13:08:02 +05:30
Jannat Patel
a748e2c2db feat: notification on mentions 2024-05-23 21:25:22 +05:30
Jannat Patel
f38aebbc9c feat: notifications 2024-05-22 20:40:02 +05:30
Jannat Patel
8e1b871f87 Merge pull request #824 from pateljannat/issues-12
fix: edit permission and other issues
2024-05-17 18:31:09 +05:30
Jannat Patel
76ea4fc1ae fix: edit permission and other issues 2024-05-17 18:03:04 +05:30
Jannat Patel
36c7c10d94 Merge pull request #821 from pateljannat/issues-11
fix: batch related issues
2024-05-16 13:15:24 +05:30
Jannat Patel
5148fcf25b fix: batch related issues 2024-05-16 12:53:14 +05:30
Jannat Patel
d00d152fdc Merge pull request #816 from pateljannat/ui-tests
test: course creation flow
2024-05-16 11:46:29 +05:30
Jannat Patel
7123736707 chore: removed unnecessary files 2024-05-16 10:56:42 +05:30
Jannat Patel
0ad685c262 text: removed user check 2024-05-15 18:10:12 +05:30
Jannat Patel
f2bef08568 ci: revert linter changes 2024-05-15 18:06:35 +05:30
Jannat Patel
7651eb5f97 test: fix discussions and asset testing 2024-05-15 17:56:11 +05:30
Jannat Patel
a0fc1b0a9e test: course creation flow 2024-05-15 14:55:54 +05:30
Jannat Patel
a62fd757d4 test: course creation flow 2024-05-15 14:55:28 +05:30
Jannat Patel
0094809273 Merge pull request #795 from pateljannat/badges
feat: badges
2024-05-14 19:46:29 +05:30
Jannat Patel
2ea5858716 fix: reverted unnecesary custom fields 2024-05-14 15:14:41 +05:30
Jannat Patel
753e62b441 feat: auto assign badges 2024-05-14 14:53:34 +05:30
Jannat Patel
68a1d1e436 fix: progress update 2024-05-13 16:50:52 +05:30
Jannat Patel
0d89f51d78 chore: merge conflicts 2024-05-13 11:16:13 +05:30
Jannat Patel
9670dfa916 Merge pull request #810 from pateljannat/issues-10
fix: mobile and lesson issues
2024-05-13 11:14:00 +05:30
Jannat Patel
2a19fbc3d2 fix: linter github action 2024-05-13 10:39:03 +05:30
Jannat Patel
e98d7d29f7 fix: removed permission check for linters 2024-05-13 10:31:09 +05:30
Jannat Patel
3c5918d485 fix: added branches to linters github action 2024-05-13 10:23:33 +05:30
Jannat Patel
65e9d164f5 fix: linter action 2024-05-13 10:22:11 +05:30
Jannat Patel
9d0b120cde fix: removed unnecessary commits 2024-05-10 19:04:13 +05:30
Jannat Patel
10ed37ec67 fix: mobile and lesson issues 2024-05-10 18:41:39 +05:30
Jannat Patel
528ab8f796 Merge pull request #808 from pateljannat/issues-9
fix: course issues
2024-05-09 16:45:43 +05:30
Jannat Patel
30973eb78d fix: course issues 2024-05-09 16:35:04 +05:30
Jannat Patel
2be7645c0c fix: course issues 2024-05-09 16:34:54 +05:30
Jannat Patel
0075c44918 fix: achievements position 2024-05-09 12:25:48 +05:30
Jannat Patel
4a321440d9 Merge pull request #803 from pateljannat/issues-8
fix: certified participants page mobile layout
2024-05-08 11:15:38 +05:30
Jannat Patel
b4cc0c6807 fix: certified participants page mobile layout 2024-05-07 19:03:27 +05:30
Jannat Patel
98c748359a Merge pull request #802 from pateljannat/issues-7
fix: misc issues
2024-05-06 16:44:28 +05:30
Jannat Patel
5c51e01c78 fix: linter 2024-05-06 16:24:57 +05:30
Jannat Patel
650f81c22b fix: misc issues 2024-05-06 16:20:47 +05:30
Jannat Patel
3478f278ff fix: progress 2024-05-06 14:24:19 +05:30
Jannat Patel
d53123cf07 Merge pull request #792 from dj12djdjs/fix-existing-role
fix: check if role exists before renaming
2024-05-03 16:01:19 +05:30
Jannat Patel
cf5a088f5e fix: disable self learning 2024-05-03 11:38:41 +05:30
Jannat Patel
7d937eb024 Merge pull request #794 from arunmathaisk/develop
feat: CertifiedParticipants.vue page is now searchable
2024-05-03 10:56:18 +05:30
Arun Mathai SK
4edaad53a1 chore : change to Lucide icon, lint issues 2024-05-02 15:07:08 +00:00
Jannat Patel
8a2991c4fb fix: multiple badges 2024-05-02 19:43:32 +05:30
Arun Mathai SK
0c9fdc6534 feat: CertifiedParticipants.vue page is now searchable 2024-05-02 13:00:46 +00:00
Devin Slauenwhite
889bc2b1c7 fix: check if role exists before renaming 2024-04-30 20:27:29 -04:00
Jannat Patel
7355be2a8b feat: badges 2024-04-30 19:25:07 +05:30
Jannat Patel
0f64da69c0 Merge pull request #791 from pateljannat/issues-5
fix: misc fixes
2024-04-30 11:12:55 +05:30
Jannat Patel
d9ad642a31 fix: misc fixes 2024-04-30 10:52:35 +05:30
Md Hussain Nagaria
180140c13f fix: attempts should be reloaded when quiz data changes (#790) 2024-04-29 20:03:11 +05:30
Jannat Patel
e7d7cffbc5 fix: unavailability validations 2024-04-29 13:39:58 +05:30
Jannat Patel
29ccbddea8 Merge pull request #788 from pateljannat/issues-4
fix: seo link redirections and guest certificate
2024-04-26 16:31:53 +05:30
Jannat Patel
944020ca6e fix: seo link redirections and guest certificate 2024-04-26 16:20:09 +05:30
Bowrna
4bc07100f5 Update README.md
After the docker is up, we may need to log in to the app for first time. Those credentials were hidden inside the file and keeping it in README.md may be useful for new contributors like me. Also the docker-compose yaml, comes bundled with frappe bench therefore the following guidelines on installing the frappe bench may be irrelevant.
2024-04-26 14:26:52 +05:30
Jannat Patel
7dec8f019f Merge pull request #783 from pateljannat/lesson-issues-3
fix: misc lesson issues
2024-04-26 10:32:21 +05:30
Jannat Patel
1a2cb0fc3c fix: misc lesson issues 2024-04-25 16:41:56 +05:30
Jannat Patel
5dc3b62b94 Merge pull request #782 from pateljannat/quiz-shuffle
feat: quiz shuffle
2024-04-25 12:37:03 +05:30
Jannat Patel
4a4c8b4e7a fix: explanation issue 2024-04-25 12:27:00 +05:30
Jannat Patel
c3390b9005 feat: quiz shuffle 2024-04-24 12:51:01 +05:30
Jannat Patel
804fc8e391 fix: quiz question rendering 2024-04-24 12:31:11 +05:30
Jannat Patel
5b5d779f25 fix: certified participants query 2024-04-24 11:27:50 +05:30
Jannat Patel
3fcf037db2 Merge pull request #781 from pateljannat/certified-users
feat: certified participants
2024-04-23 17:58:50 +05:30
Jannat Patel
324ede5523 fix: converted sql to qb 2024-04-23 17:52:21 +05:30
Jannat Patel
e6e8718bb4 feat: certified participants 2024-04-23 17:29:16 +05:30
Jannat Patel
93e42fbd86 fix: zoom settings 2024-04-22 21:10:19 +05:30
Jannat Patel
8a6adae89c fix: lesson content rendering 2024-04-22 20:51:09 +05:30
Jannat Patel
e3ad0baeb7 fix: batch details meta 2024-04-22 17:41:42 +05:30
Jannat Patel
953eb74235 fix: lesson duplicate video rendering 2024-04-22 17:18:53 +05:30
Jannat Patel
b3c76e311c fix: unavailability validations 2024-04-22 16:56:07 +05:30
Jannat Patel
f41eb30f3c Merge branch 'develop' of https://github.com/frappe/lms into develop 2024-04-22 16:50:18 +05:30
Jannat Patel
dbe236f75e fix: edit course when no tags added 2024-04-22 16:50:10 +05:30
Jannat Patel
7d4a9eaf45 Merge pull request #779 from pateljannat/lesson-issue-1
fix: misc lesson fixes
2024-04-22 15:06:34 +05:30
Jannat Patel
4f7c3f14df fix: batch lists 2024-04-22 14:38:46 +05:30
Jannat Patel
f15fdcc42e feat: code editor 2024-04-19 14:59:40 +05:30
Jannat Patel
44b36599c3 fix: profile routes 2024-04-18 20:27:15 +05:30
Jannat Patel
86713db75e fix: misc lesson fixes 2024-04-17 16:46:20 +05:30
Jannat Patel
d2491b81c0 Merge pull request #778 from pateljannat/new-bill-job
feat: new tab and other misc fixes
2024-04-17 10:43:42 +05:30
Jannat Patel
b98f6369ae feat: new tab and other misc fixes 2024-04-17 10:36:48 +05:30
Md Hussain Nagaria
a2a210d82b Merge pull request #777 from frappe/fix-batch-date-range
fix: batch date range
2024-04-16 22:04:00 +05:30
Hussain Nagaria
5b120ad248 refactor: take format as optional argument 2024-04-16 22:02:56 +05:30
Hussain Nagaria
4ec57349f8 refactor: extract out component for date range 2024-04-16 21:39:19 +05:30
Hussain Nagaria
f48f437075 fix: handle same start and end dates case for batch
* also minor refactor
2024-04-16 21:24:53 +05:30
Jannat Patel
255990b022 Merge pull request #774 from pateljannat/profile
feat: profile page
2024-04-16 17:37:37 +05:30
Jannat Patel
ac44c59e50 fix: unavailability validaions 2024-04-16 17:28:45 +05:30
Jannat Patel
9252920a79 feat: google calendar integration 2024-04-16 16:56:18 +05:30
Jannat Patel
719e471678 feat: evaluator unavailability 2024-04-16 11:08:30 +05:30
Jannat Patel
39bc141133 Merge branch 'develop' of https://github.com/frappe/lms into profile 2024-04-15 13:55:35 +05:30
Jannat Patel
78698cfcbe Merge pull request #773 from pateljannat/youtube-issues
fix: lesson youtube video issue
2024-04-15 13:33:03 +05:30
Jannat Patel
64c02f14a9 fix: removed quiz_id from the lesson content 2024-04-15 13:29:50 +05:30
Jannat Patel
2f68fc0d6e fix: quiz rerender issue 2024-04-15 13:27:38 +05:30
Jannat Patel
16570469e6 fix: lesson youtube video issue 2024-04-15 12:35:27 +05:30
Jannat Patel
f2c14d09d4 feat: profile settings for roles 2024-04-15 12:10:11 +05:30
Jannat Patel
7e81b9d45d Merge branch 'develop' of https://github.com/frappe/lms into profile 2024-04-15 10:06:58 +05:30
Md Hussain Nagaria
a62b754d28 fix: empty the container before editorjs init (#771) 2024-04-12 13:52:43 +05:30
Jannat Patel
93859d6635 Merge pull request #769 from pateljannat/fixes-lesson
fix: check site conf before sending email
2024-04-10 21:23:15 +05:30
Jannat Patel
20fab8dbd3 fix: check site conf before sending email 2024-04-10 19:38:30 +05:30
Jannat Patel
e56c8cc5f8 feat: profile page 2024-04-10 11:53:28 +05:30
Jannat Patel
13d0621881 feat: profile page 2024-04-10 11:53:00 +05:30
Md Hussain Nagaria
13536aac51 fix: primary page title (#767) 2024-04-09 15:33:10 +05:30
Jannat Patel
ccb8721674 fix: evaluation modal 2024-04-06 11:19:49 +05:30
Jannat Patel
fbe1423edd fix: meta for batches 2024-04-06 11:17:25 +05:30
Jannat Patel
d2713d7824 Merge pull request #763 from pateljannat/slots-message
fix: no slots message
2024-04-06 11:03:26 +05:30
Jannat Patel
f24a15b4f8 fix: no slots message 2024-04-06 10:55:50 +05:30
Jannat Patel
bf74868bd4 Merge pull request #762 from pateljannat/assignments
feat: assignments in batches
2024-04-05 22:51:39 +05:30
Jannat Patel
6d75b8a3a2 feat: assignments in batches 2024-04-05 21:51:18 +05:30
Jannat Patel
055f917c61 Merge pull request #761 from pateljannat/rewrite-fixes
fix: mobile layout and certification link
2024-04-05 08:59:38 +05:30
Jannat Patel
d892a28069 fix: mobile layout and certification link 2024-04-05 08:56:18 +05:30
Jannat Patel
838bc1fac2 Merge pull request #760 from pateljannat/fix-templates
fix: web templates
2024-04-04 15:41:14 +05:30
Jannat Patel
a98d36513b fix: web templates 2024-04-04 15:01:22 +05:30
Jannat Patel
2cfa6771ac fix: lesson page issue 2024-04-04 11:24:44 +05:30
Jannat Patel
4960c47377 Merge pull request #758 from pateljannat/branding
fix: branding, course, lesson and certificate creation
2024-04-04 10:31:13 +05:30
Jannat Patel
a46306720b fix: branding, course, lesson and certificate creation 2024-04-03 22:42:59 +05:30
Jannat Patel
efcdba3a29 Merge pull request #713 from pateljannat/lms-frappe-ui
feat: LMS rewrite in Frappe UI
2024-04-03 12:22:03 +05:30
Jannat Patel
e7263d0566 style: removed print statement 2024-04-03 12:14:51 +05:30
Jannat Patel
5de7f5e283 fix: progress 2024-04-03 12:11:34 +05:30
Jannat Patel
c7bdf68bc6 bump: frappe-ui 2024-04-02 14:07:52 +05:30
Jannat Patel
998ff51c58 chore: removed print statements 2024-04-01 22:34:59 +05:30
Jannat Patel
4eb9d84d8b chore: fixed semgrep 2024-04-01 22:29:24 +05:30
Jannat Patel
5f000d8017 style: linters for vue files 2024-04-01 22:01:55 +05:30
Jannat Patel
0cf9ad5228 chore: resolved conflicts 2024-04-01 21:54:01 +05:30
Jannat Patel
71a526e7aa fix: dummy text to make content words greater than 250 2024-04-01 18:38:31 +05:30
Jannat Patel
c5d9adb7fd fix: added paragraph for description and a link for seo 2024-04-01 17:47:34 +05:30
Jannat Patel
05fdf163a9 fix: certificate website link 2024-04-01 17:27:12 +05:30
Jannat Patel
de0a983033 fix: replaced h2 with h1 for flash text 2024-03-29 22:44:17 +05:30
Jannat Patel
44ee9b644f fix: flash text for seo 2024-03-29 22:29:24 +05:30
Jannat Patel
bd116c3e7b feat: meta for batches 2024-03-29 14:48:46 +05:30
Jannat Patel
02e8a97f85 chore: post install scripts 2024-03-28 17:20:39 +05:30
Jannat Patel
3525e4c90b feat: meta tags 2024-03-28 16:20:53 +05:30
Jannat Patel
e6d3819092 feat: mobile responsive 2024-03-28 11:30:59 +05:30
Jannat Patel
f15862cef4 fix: router 2024-03-19 12:51:11 +05:30
Jannat Patel
86748b301d feat: page titles 2024-03-19 12:04:58 +05:30
Jannat Patel
cc07dd849c feat: job creation 2024-03-18 16:55:36 +05:30
Jannat Patel
63bcbb6506 feat: batch creation 2024-03-15 21:54:02 +05:30
Jannat Patel
83a1b03bb7 feat: quiz plugin in lesson 2024-03-11 09:38:27 +05:30
Jannat Patel
2126b4f657 fix: lesson editing 2024-03-07 10:06:32 +05:30
Jannat Patel
0ce7c74778 feat: lesson creation 2024-03-05 23:07:58 +05:30
Jannat Patel
b9f6a23412 chore: build files 2024-03-04 22:12:21 +05:30
Jannat Patel
9ae96bd1fa feat: chapter creation 2024-03-04 22:10:51 +05:30
Jannat Patel
e863abe37c fix: structure of ourline creation 2024-03-01 13:50:00 +05:30
Jannat Patel
80e9984db0 feat: course creation resources 2024-03-01 10:57:31 +05:30
Jannat Patel
8f504a8043 fix: course creation form validations 2024-02-28 23:42:17 +05:30
Jannat Patel
60a917e60c feat: course creation page structure 2024-02-27 20:41:02 +05:30
Jannat Patel
5317aa8fb5 feat: job application 2024-02-21 12:08:05 +05:30
Jannat Patel
36c4e2f4dc feat: job application modal 2024-02-19 16:54:07 +05:30
Md Hussain Nagaria
8e7c1da7af Merge branch 'main' into main 2024-02-12 04:46:28 +03:00
ahmadRagheb
4f1f7c3fc0 Update edit.html
fix typo
2024-02-08 00:46:54 +02:00
Jannat Patel
084eeba2ed Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-02-07 12:25:37 +05:30
Jannat Patel
6401497422 feat: job details 2024-02-07 10:57:05 +05:30
Jannat Patel
684601f31b Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-02-07 10:55:50 +05:30
Jannat Patel
d7d222842b feat: statistics graphs 2024-02-06 22:39:08 +05:30
Jannat Patel
f59f6c617a fix: cleanup ui 2024-02-05 17:36:55 +05:30
Jannat Patel
af48ccfb57 fix: cleanup ui 2024-02-05 17:35:46 +05:30
Jannat Patel
4b9d3bd996 fix: minor ui 2024-02-01 15:03:50 +05:30
Jannat Patel
53eb95612c fix: review button 2024-02-01 10:48:05 +05:30
Jannat Patel
8f317d2f44 fix: ui issues 2024-01-25 15:24:52 +05:30
Jannat Patel
f4e581f6cb fix: multicurrency on course cards 2024-01-23 17:03:15 +05:30
Jannat Patel
9671c4d63f feat: batch billing 2024-01-23 15:33:31 +05:30
Jannat Patel
b07940951c feat: billing page 2024-01-19 22:48:38 +05:30
Jannat Patel
1f18ef4362 feat: discussions in batches 2024-01-19 17:44:47 +05:30
Jannat Patel
bf57a19e2c Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2024-01-18 14:44:20 +05:30
Jannat Patel
0845a6e2a3 feat: statistics page numbers 2024-01-17 10:35:34 +05:30
Jannat Patel
041bae16e0 feat: discussions new topic 2024-01-16 20:49:07 +05:30
Jannat Patel
3313db844c feat: discussions edit and delete 2024-01-16 17:24:35 +05:30
Jannat Patel
3a5977a718 feat: discussions 2024-01-15 23:26:31 +05:30
Jannat Patel
bcee74ce77 feat: batch announcements 2024-01-12 21:48:42 +05:30
Jannat Patel
1a6a119f35 feat: students and assessment tab in dashboard 2024-01-10 21:36:02 +05:30
Jannat Patel
09ae61492f feat: upcoming evals 2024-01-08 16:17:50 +05:30
Jannat Patel
3a33f047f5 feat: batch details 2024-01-05 18:22:03 +05:30
Jannat Patel
10cdd712d2 feat: batch card price and seat count 2024-01-02 12:39:28 +05:30
Jannat Patel
21959eef7b feat: quiz submission history table 2024-01-02 11:00:12 +05:30
Jannat Patel
41c3522285 feat: quiz submission 2024-01-01 23:26:53 +05:30
Jannat Patel
7087fde686 feat: quiz base 2023-12-28 11:59:44 +05:30
Sai Phanindra
a6ae5e0675 Update lms_batch.py 2023-12-27 11:31:17 +05:30
Sai Phanindra
cbd5ae9969 Update lms_batch.py 2023-12-27 11:29:51 +05:30
Sai Phanindra
7389d080b6 Update lms_batch.py 2023-12-27 11:28:48 +05:30
Sai Phanindra
8defd664c5 Added batch start and end date validation 2023-12-24 00:06:56 +05:30
Jannat Patel
e1d61c9eb9 feat: review submission 2023-12-21 17:25:08 +05:30
Jannat Patel
afcb15148f chore: merged conflicts 2023-12-21 14:59:30 +05:30
Jannat Patel
5adb36deaf Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-21 14:05:59 +05:30
Jannat Patel
4065b1b8cc feat: review modal 2023-12-21 09:56:15 +05:30
Jannat Patel
eb3afbbad1 feat: rating component 2023-12-20 10:35:12 +05:30
Jannat Patel
fbe219a888 feat: lesson pagination 2023-12-18 19:17:44 +05:30
Jannat Patel
5928b8e5f9 feat: lesson pagination 2023-12-18 19:17:17 +05:30
Jannat Patel
372425bed2 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-18 11:31:35 +05:30
Jannat Patel
d2922fd361 feat: lesson page 2023-12-15 23:39:15 +05:30
Jannat Patel
e7b6001e5f fix: logout issue 2023-12-14 14:32:50 +05:30
Jannat Patel
4053984ca2 fix: courses cahce 2023-12-13 11:57:25 +05:30
Jannat Patel
a1e06bf316 fix: courses cahce 2023-12-13 11:57:18 +05:30
Jannat Patel
c50f2147fd feat: course details page design 2023-12-13 10:33:34 +05:30
Jannat Patel
d4671fb888 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-12-12 14:58:45 +05:30
Jannat Patel
77cda10419 feat: course details page 2023-12-12 10:19:52 +05:30
Jannat Patel
6de879cd2a fix: translations 2023-12-08 19:12:59 +05:30
Jannat Patel
25f24b98c6 feat: fetch translations 2023-12-08 15:04:41 +05:30
Jannat Patel
11079dae00 feat: translations 2023-12-07 11:38:12 +05:30
Jannat Patel
d00da31f84 feat: course list 2023-12-05 22:39:00 +05:30
Jannat Patel
644fb698d8 chore: fixed config 2023-11-30 16:03:06 +05:30
Jannat Patel
92edb3a1bf Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-30 12:15:39 +05:30
Jannat Patel
0e2feac81e fix: frappe-ui setup 2023-11-29 22:28:38 +05:30
Jannat Patel
63bcf15900 feat: course cards 2023-11-29 12:05:40 +05:30
Jannat Patel
25bcd10e93 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-28 11:20:52 +05:30
Jannat Patel
0a784766b4 Merge branch 'main' of https://github.com/frappe/lms into lms-frappe-ui 2023-11-09 16:16:08 +05:30
Jannat Patel
7678b89995 feat: setup frappe ui 2023-08-30 22:45:56 +05:30
526 changed files with 123899 additions and 13629 deletions

BIN
.github/batch.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
.github/certificate.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 KiB

View File

@@ -5,7 +5,7 @@ echo "Setting Up System Dependencies..."
sudo apt update
sudo apt remove mysql-server mysql-client
sudo apt install libcups2-dev redis-server mariadb-client-10.6
sudo apt-get install libcups2-dev redis-server mariadb-client
install_wkhtmltopdf() {
wget -q https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb

40
.github/helper/update_pot_file.sh vendored Normal file
View File

@@ -0,0 +1,40 @@
#!/bin/bash
set -e
cd ~ || exit
echo "Setting Up Bench..."
pip install frappe-bench
bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)" --frappe-branch "${BASE_BRANCH}"
cd ./frappe-bench || exit
echo "Get LMS..."
bench get-app --skip-assets lms "${GITHUB_WORKSPACE}"
echo "Generating POT file..."
bench generate-pot-file --app lms
cd ./apps/lms || exit
echo "Configuring git user..."
git config user.email "developers@erpnext.com"
git config user.name "frappe-pr-bot"
echo "Setting the correct git remote..."
# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
git remote set-url upstream https://github.com/frappe/lms.git
echo "Creating a new branch..."
isodate=$(date -u +"%Y-%m-%d")
branch_name="pot_${BASE_BRANCH}_${isodate}"
git checkout -b "${branch_name}"
echo "Commiting changes..."
git add lms/locale/main.pot
git commit -m "chore: update POT file"
gh auth setup-git
git push -u upstream "${branch_name}"
echo "Creating a PR..."
gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" -R frappe/lms

BIN
.github/hero.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
.github/lms-logo.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
.github/quiz.png vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

64
.github/workflows/build.yml vendored Normal file
View File

@@ -0,0 +1,64 @@
name: Build Container Image
on:
workflow_dispatch:
push:
branches:
- main
tags:
- "*"
jobs:
build:
name: Build
runs-on: ubuntu-latest
strategy:
matrix:
arch: [amd64, arm64]
permissions:
packages: write
steps:
- name: Checkout Entire Repository
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
platforms: linux/${{ matrix.arch }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set Branch
run: |
export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]'
echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV
echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV
- name: Set Image Tag
run: |
echo "IMAGE_TAG=stable" >> $GITHUB_ENV
- uses: actions/checkout@v4
with:
repository: frappe/frappe_docker
path: builds
- name: Build and push
uses: docker/build-push-action@v6
with:
push: true
context: builds
file: builds/images/layered/Containerfile
tags: >
ghcr.io/${{ github.repository }}:${{ github.ref_name }},
ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}
build-args: |
"FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
"APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"

34
.github/workflows/generate-pot-file.yml vendored Normal file
View File

@@ -0,0 +1,34 @@
name: Regenerate POT file (translatable strings)
on:
schedule:
- cron: "00 16 * * 5"
workflow_dispatch:
jobs:
regenerate-pot-file:
name: Release
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
branch: ["develop"]
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Run script to update POT file
run: |
bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
BASE_BRANCH: ${{ matrix.branch }}

View File

@@ -30,4 +30,4 @@ jobs:
run: pip install semgrep
- name: Run Semgrep rules
run: semgrep ci --config ./frappe-semgrep-rules/rules
run: semgrep ci --config ./frappe-semgrep-rules/rules

27
.github/workflows/make_release_pr.yml vendored Normal file
View File

@@ -0,0 +1,27 @@
name: Create weekly release
on:
schedule:
# 13:00 UTC -> 7pm IST on every Wednesday
- cron: '30 4 * * 3'
workflow_dispatch:
jobs:
release:
name: Release
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: octokit/request-action@v2.x
with:
route: POST /repos/{owner}/{repo}/pulls
owner: frappe
repo: lms
title: |-
"chore: merge 'develop' into 'main'"
body: "Automated weekly release"
base: main
head: develop
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

32
.github/workflows/on_release.yml vendored Normal file
View File

@@ -0,0 +1,32 @@
name: Generate Semantic Release
on:
workflow_dispatch:
push:
branches:
- main
jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout Entire Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
- name: Setup dependencies
run: |
npm install @semantic-release/git @semantic-release/exec --no-save
- name: Create Release
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GIT_AUTHOR_NAME: "Frappe PR Bot"
GIT_AUTHOR_EMAIL: "developers@frappe.io"
GIT_COMMITTER_NAME: "Frappe PR Bot"
GIT_COMMITTER_EMAIL: "developers@frappe.io"
run: npx semantic-release

39
.github/workflows/release_notes.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
# This action:
#
# 1. Generates release notes using github API.
# 2. Strips unnecessary info like chore/style etc from notes.
# 3. Updates release info.
name: 'Release Notes'
on:
workflow_dispatch:
inputs:
tag_name:
description: 'Tag of release like v2.0.0'
required: true
type: string
release:
types: [released]
permissions:
contents: read
jobs:
regen-notes:
name: 'Regenerate release notes'
runs-on: ubuntu-latest
steps:
- name: Update notes
run: |
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/generate-notes -f tag_name=$RELEASE_TAG \
| jq -r '.body' \
| sed -E '/^\* (chore|ci|test|docs|style)/d' \
| sed -E 's/by @mergify //'
)
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/tags/$RELEASE_TAG | jq -r '.id')
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/$RELEASE_ID -f body="$NEW_NOTES"
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

View File

@@ -24,7 +24,7 @@ jobs:
services:
mariadb:
image: mariadb:10.6
image: mariadb:10.8
env:
MARIADB_ROOT_PASSWORD: 123
ports:
@@ -99,6 +99,7 @@ jobs:
cd ~/frappe-bench/
bench --site lms.test execute frappe.utils.install.complete_setup_wizard
bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
bench --site lms.test set-password frappe@example.com admin
- name: cypress pre-requisites
run: |

5
.gitignore vendored
View File

@@ -9,4 +9,7 @@ __pycache__/
*.py[cod]
*$py.class
node_modules
package-lock.json
package-lock.json
lms/public/frontend
lms/www/lms.html
frappe-ui

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "frappe-ui"]
path = frappe-ui
url = https://github.com/frappe/frappe-ui

View File

@@ -32,7 +32,7 @@ repos:
rev: v2.7.1
hooks:
- id: prettier
types_or: [javascript]
types_or: [javascript, vue]
# Ignore any files that might contain jinja / bundles
exclude: |
(?x)^(

21
.releaserc Normal file
View File

@@ -0,0 +1,21 @@
{
"branches": ["develop"],
"plugins": [
"@semantic-release/commit-analyzer", {
"preset": "angular"
},
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" lms/__init__.py'
}
],
[
"@semantic-release/git", {
"assets": ["lms/__init__.py"],
"message": "chore(release): Bumped to Version ${nextRelease.version}"
}
],
"@semantic-release/github"
]
}

241
README.md
View File

@@ -1,109 +1,174 @@
<p align="center">
<a href="https://www.frappelms.com/">
<img src="https://frappe.io/files/lms.png" alt="Frappe LMS" width="50px" height="50px">
</a>
<p align="center">Easy to use, open source, learning management system.</p>
</p>
<div align="center" markdown="1">
<img src=".github/lms-logo.png" alt="Frappe Learning logo" width="80" height="80"/>
<h1>Frappe Learning</h1>
&nbsp;
**Easy to use, open source, Learning Management System**
<p align="center">
<a href="https://www.producthunt.com/posts/frappe-lms?utm_source=badge-top-post-topic-badge&utm_medium=badge&utm_souce=badge-frappe&#0045;lms" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-topic-badge.svg?post_id=396079&theme=dark&period=weekly&topic_id=204" alt="Frappe&#0032;LMS - Easy&#0032;to&#0032;use&#0044;&#0032;100&#0037;&#0032;open&#0032;source&#0032;learning&#0032;management&#0032;system | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
</p>
![Tests](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress)
<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/lms/signup">
<img src=".github/try-on-f-cloud.svg" height="40">
</a>
</div>
&nbsp;
<p align="center">
<a href="https://dashboard.cypress.io/projects/vandxn/runs">
<img alt="cypress" src="https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/vandxn/main&style=flat&logo=cypress">
</a>
<a href="https://github.com/frappe/lms/blob/main/LICENSE">
<img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
</a>
</p>
<div align="center">
<img src=".github/hero.png?v=5" alt="Hero Image" width="72%" />
</div>
<br />
<div align="center">
<a href="https://frappe.io/learning">Website</a>
-
<a href="https://docs.frappe.io/learning">Documentation</a>
</div>
<img width="1402" alt="Lesson" src="https://frappelms.com/files/banner.png">
## Frappe Learning
Frappe Learning is an easy-to-use learning system that helps you bring structure to your content.
### Motivation
In 2021, we were looking for a Learning Management System to launch [Mon.School](https://mon.school) for FOSS United. We checked out Moodle, but it didnt feel right. The forms were unnecessarily lengthy and the UI was confusing. It shouldn't be this hard to create a course right? So I started making a learning system for Mon.School which soon became a product in itself. The aim is to have a simple platform that anyone can use to launch a course of their own and make knowledge sharing easier.
### Key Features
- **Structured Learning**: Design a course with a 3-level hierarchy, where your courses have chapters and you can group your lessons within these chapters. This ensures that the context of the lesson is set by the chapter.
- **Live Classes**: Group learners into batches based on courses and duration. You can then create Zoom live class for these batches right from the app. Learners get to see the list of live classes they have to take as a part of this batch.
- **Quizzes and Assignments**: Create quizzes where questions can have single-choice, multiple-choice options, or can be open ended. Instructors can also add assignments which learners can submit as PDF's or Documents.
- **Getting Certified**: Once a learner has completed the course or batch, you can grant them a certificate. The app provides an inbuilt certificate template. You can use this or else create a template of your own and use that instead.
<details>
<summary>Show more screenshots</summary>
<img width="1520" alt="ss1" src="https://user-images.githubusercontent.com/31363128/210056046-584bc8aa-d28c-4514-b031-73817012837d.png">
<img width="830" alt="ss2" src="https://user-images.githubusercontent.com/31363128/210056097-36849182-6db0-43a2-8c62-5333cd2aedf4.png">
<img width="941" alt="ss3" src="https://user-images.githubusercontent.com/31363128/210056134-01a7c429-1ef4-434e-9d43-128dda35d7e5.png">
<summary>View Screenshots</summary>
![Batch](.github/batch.png)
<div align="center">
<sub>
Create batches to group your learners
</sub>
</div>
<br>
![Quiz](.github/quiz.png)
<div align="center">
<sub>
Evaluate their knowledge by quizzes
</sub>
</div>
<br>
![Cerficicate](.github/certificate.png)
<div align="center">
<sub>
Autenticate their work with certification
</sub>
</div>
</details>
Frappe LMS is an easy-to-use, open-source learning management system. You can use it to create and share online courses. The app has a clear UI that helps students focus only on what's important and assists in distraction-free learning.
You can create courses and lessons through simple forms. Lessons can be in the form of text, videos, quizzes or a combination of all these. You can keep your students engaged with quizzes to help revise and test the concepts learned. Course Instructors and Students can reach out to each other through the discussions section available for each lesson and get queries resolved.
### Under the Hood
## Features
- Create online courses. 📚
- Add detailed descriptions and preview videos to the course. 🎬
- Add videos, quizzes, and assignments to your lessons and make them interesting and interactive 📝
- Discussions section below each lesson where instructors and students can interact with each other. 💬
- Create batches to group your students based on courses and track their progress 🏛
- Statistics dashboard that provides all important numbers at a glimpse. 📈
- Job Board where users can post and look for jobs. 💼
- People directory with each person's profile page 👨‍👩‍👧‍👦
- Set cover image, profile photo, short bio, and other professional information. 🦹🏼‍♀️
- Simple layout that optimizes readability 🤓
- Delightful user experience in overall usage ✨
- [**Frappe Framework**](https://github.com/frappe/frappe): A full-stack web application framework.
## Tech Stack
- [**Frappe UI**](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface.
Frappe LMS is built on [Frappe Framework](https://frappeframework.com) which is a batteries-included python web framework.
These are some of the tools it's built on:
- [Python](https://www.python.org)
- [Redis](https://redis.io/)
- [MariaDB](https://mariadb.org/)
- [Socket.io](https://socket.io/)
## Local Setup
### Docker
You need Docker, docker-compose, and git setup on your machine. Refer to [Docker documentation](https://docs.docker.com/). After that, run the following commands:
```
git clone https://github.com/frappe/lms
cd apps/lms/docker
docker-compose up
```
Wait for some time until the setup script creates a site. After that, you can access `http://localhost:8000` in your browser and the app's login screen should show up.
### Frappe Bench
Currently, this app depends on the `develop` branch of [frappe](https://github.com/frappe/frappe).
1. Setup frappe-bench by following [this guide](https://frappeframework.com/docs/v14/user/en/installation)
1. In the frappe-bench directory, run `bench start` and keep it running. Open a new terminal session and cd into the `frappe-bench` directory.
1. Run the following commands:
```sh
bench new-site lms.test
bench get-app lms
bench --site lms.test install-app lms
bench --site lms.test add-to-hosts
1. Now, you can access the site at `http://lms.test:8000`
## Deployment
Frappe LMS is an app built on top of the Frappe Framework. So, you can follow any deployment guide for hosting a Frappe Framework-based site.
## Production Setup
### Managed Hosting
Frappe LMS can be deployed in a few clicks on [Frappe Cloud](https://frappecloud.com/marketplace/apps/lms).
### Self-hosting
If you want to self-host, you can follow official [Frappe Bench Installation](https://github.com/frappe/bench#installation) instructions.
You can try [Frappe Cloud](https://frappecloud.com), a simple, user-friendly and sophisticated [open-source](https://github.com/frappe/press) platform to host Frappe applications with peace of mind.
## Bugs and Feature Requests
If you find any bugs or have a feature idea for the app, feel free to report them here on [GitHub Issues](https://github.com/frappe/lms/issues). Make sure you share enough information (app screenshots, browser console screenshots, stack traces, etc) for project maintainers.
It takes care of installation, setup, upgrades, monitoring, maintenance and support of your Frappe deployments. It is a fully featured developer platform with an ability to manage and control multiple Frappe deployments.
## License
Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
<div>
<a href="https://frappecloud.com/lms/signup" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/try-on-fc-white.png">
<img src="https://frappe.io/files/try-on-fc-black.png" alt="Try on Frappe Cloud" height="28" />
</picture>
</a>
</div>
### Self Hosting
Follow these steps to set up Frappe Learning in production:
**Step 1**: Download the easy install script
```bash
wget https://frappe.io/easy-install.py
```
**Step 2**: Run the deployment command
```bash
python3 ./easy-install.py deploy \
--project=learning_prod_setup \
--email=your_email.example.com \
--image=ghcr.io/frappe/lms \
--version=stable \
--app=lms \
--sitename subdomain.domain.tld
```
Replace the following parameters with your values:
- `your_email.example.com`: Your email address
- `subdomain.domain.tld`: Your domain name where Learning will be hosted
The script will set up a production-ready instance of Frappe Learning with all the necessary configurations in about 5 minutes.
## Development Setup
### Docker
You need Docker, docker-compose and git setup on your machine. Refer [Docker documentation](https://docs.docker.com/). After that, follow below steps:
**Step 1**: Setup folder and download the required files
mkdir frappe-learning
cd frappe-learning
# Download the docker-compose file
wget -O docker-compose.yml https://raw.githubusercontent.com/frappe/lms/develop/docker/docker-compose.yml
# Download the setup script
wget -O init.sh https://raw.githubusercontent.com/frappe/lms/develop/docker/init.sh
**Step 2**: Run the container and daemonize it
docker compose up -d
**Step 3**: The site [http://lms.localhost:8000/lms](http://lms.localhost:8000/lms) should now be available. The default credentials are:
- Username: Administrator
- Password: admin
### Local
To setup the repository locally follow the steps mentioned below:
1. Install bench and setup a `frappe-bench` directory by following the [Installation Steps](https://frappeframework.com/docs/user/en/installation)
1. Start the server by running `bench start`
1. In a separate terminal window, create a new site by running `bench new-site learning.test`
1. Map your site to localhost with the command `bench --site learning.test add-to-hosts`
1. Get the Learning app. Run `bench get-app https://github.com/frappe/lms`
1. Run `bench --site learning.test install-app lms`.
1. Now open the URL `http://learning.test:8000/lms` in your browser, you should see the app running
## Learn and connect
- [Telegram Public Group](https://t.me/frappelms)
- [Discuss Forum](https://discuss.frappe.io/c/lms/70)
- [Documentation](https://docs.frappe.io/learning)
- [YouTube](https://www.youtube.com/channel/UCn3bV5kx77HsVwtnlCeEi_A)
<br>
<br>
<div align="center" style="padding-top: 0.75rem;">
<a href="https://frappe.io" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://frappe.io/files/Frappe-white.png">
<img src="https://frappe.io/files/Frappe-black.png" alt="Frappe Technologies" height="28"/>
</picture>
</a>
</div>

8
crowdin.yml Normal file
View File

@@ -0,0 +1,8 @@
files:
- source: /lms/locale/main.pot
translation: /lms/locale/%two_letters_code%.po
pull_request_title: "chore: sync translations from crowdin"
pull_request_labels:
- translation
commit_message: "chore: %language% translations"
append_commit_message: false

View File

@@ -13,6 +13,6 @@ module.exports = defineConfig({
openMode: 0,
},
e2e: {
baseUrl: "http://pyp:8000",
baseUrl: "http://lms1:8000",
},
});

View File

@@ -1,133 +1,159 @@
describe("Course Creation", () => {
it("creates a new course", () => {
cy.login();
cy.visit("/courses");
cy.wait(1000);
cy.visit("/lms/courses");
// Create a course
cy.get("a.btn").contains("Create a Course").click();
cy.wait(1000);
cy.url().should("include", "/courses/new-course/edit");
cy.get("#title").type("Test Course");
cy.get("#intro").type("Test Course Short Introduction");
cy.get("#description").type("Test Course Description");
cy.get("#video-link").type("-LPmw2Znl2c");
cy.get("#tags-input").type("Test");
cy.get("#published").check();
cy.get("header").children().last().children().last().click();
cy.wait(1000);
cy.url().should("include", "/courses/new/edit");
cy.get("label").contains("Title").type("Test Course");
cy.get("label")
.contains("Short Introduction")
.type("Test Course Short Introduction to test the UI");
cy.get("div[contenteditable=true").invoke(
"text",
"Test Course Description. I need a very big description to test the UI. This is a very big description. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
);
cy.fixture("profile.png", "base64").then((fileContent) => {
cy.get('input[type="file"]').attachFile({
fileContent,
fileName: "profile.png",
mimeType: "image/png",
encoding: "base64",
});
});
cy.get("label")
.contains("Preview Video")
.type("https://www.youtube.com/embed/-LPmw2Znl2c");
cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
cy.get("label")
.contains("Category")
.parent()
.within(() => {
cy.get("button").click();
});
cy.get("[id^=headlessui-combobox-option-")
.should("be.visible")
.first()
.click();
/* Instructor */
cy.get("label")
.contains("Instructors")
.parent()
.within(() => {
cy.get("input").click().type("frappe");
cy.get("input")
.invoke("attr", "aria-controls")
.as("instructor_list_id");
});
cy.get("@instructor_list_id").then((instructor_list_id) => {
cy.get(`[id^=${instructor_list_id}`)
.should("be.visible")
.within(() => {
cy.get("[id^=headlessui-combobox-option-").first().click();
});
});
cy.get("label").contains("Published").click();
cy.get("label").contains("Published On").type("2021-01-01");
cy.button("Save").click();
// Add Chapter
cy.wait(1000);
cy.link("Course Outline").click();
cy.button("Add Chapter").click();
cy.wait(1000);
cy.get(".edit-header .btn-add-chapter").click();
cy.wait(500);
cy.get("#chapter-title").type("Test Chapter");
cy.get("#chapter-description").type("Test Chapter Description");
cy.button("Save").click();
cy.get("[id^=headlessui-dialog-panel-")
.should("be.visible")
.within(() => {
cy.get("label").contains("Title").type("Test Chapter");
cy.button("Create").click();
});
// Add Lesson
cy.wait(1000);
cy.link("Add Lesson").click();
cy.button("Add Lesson").click();
cy.wait(1000);
cy.url().should("include", "/learn/1-1/edit");
cy.wait(1000);
cy.get("#lesson-title").type("Test Lesson");
// Content
cy.get(".collapse-section.collapsed:first").click();
cy.get("#lesson-content .ce-block")
.click()
.type(
"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now. {enter}"
);
cy.get("#lesson-content .ce-toolbar__plus").click();
cy.get('#lesson-content [data-item-name="youtube"]').click();
cy.get('input[data-fieldname="youtube"]').type("GoDtyItReto");
cy.button("Insert").click();
cy.wait(1000);
cy.get("label").contains("Title").type("Test Lesson");
cy.get("#content .ce-block").type(
"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
);
cy.button("Save").click();
// View Course
cy.wait(1000);
cy.visit("/courses");
cy.get(".course-card-title:first").contains("Test Course");
cy.get(".course-card:first").click();
cy.url().should("include", "/courses/test-course");
cy.get("#title").contains("Test Course");
cy.get(".preview-video").should(
cy.visit("/lms");
cy.wait(500);
cy.url().should("include", "/lms/courses");
cy.get(".grid a:first").within(() => {
cy.get("div").contains("Test Course");
cy.get("div").contains(
"Test Course Short Introduction to test the UI"
);
cy.get(".course-image")
.invoke("css", "background-image")
.should("include", "/files/profile");
});
cy.get(".grid a:first").click();
cy.url().should("include", "/lms/courses/test-course");
cy.get("div").contains("Test Course");
cy.get("div").contains("Test Course Short Introduction to test the UI");
cy.get("div").contains("Learning");
cy.get("div").contains("Frappe");
cy.get("div").contains("ERPNext");
cy.get("iframe").should(
"have.attr",
"src",
"https://www.youtube.com/embed/-LPmw2Znl2c"
);
cy.get("#intro").contains("Test Course Short Introduction");
// View Chapter
cy.get(".chapter-title-main:first").contains("Test Chapter");
cy.get(".chapter-description:first").contains(
"Test Chapter Description"
);
cy.get(".lesson-info:first").contains("Test Lesson");
cy.get(".lesson-info:first").click();
cy.get("div").contains("Test Chapter");
cy.get("[id^=headlessui-disclosure-panel-").within(() => {
cy.get("div").contains("Test Lesson").click();
});
cy.wait(3000);
// View Lesson
cy.wait(1000);
cy.url().should("include", "learn/1.1");
cy.get("#title").contains("Test Lesson");
cy.get(".lesson-video iframe").should(
"have.attr",
"src",
"https://www.youtube.com/embed/GoDtyItReto"
);
cy.get(".lesson-content-card").contains(
cy.url().should("include", "/learn/1-1");
cy.get("div").contains("Test Lesson");
cy.get("div").contains(
"This is an extremely big paragraph that is meant to test the UI. This is a very long paragraph. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
);
// Add Discussion
cy.get(".reply").click();
cy.button("New Question").click();
cy.wait(500);
cy.get(".discussion-modal").should("be.visible");
// Enter title
cy.get(".modal .topic-title")
.type("Discussion from tests")
.should("have.value", "Discussion from tests");
// Enter comment
cy.get(".modal .discussions-comment").type(
"This is a discussion from the cypress ui tests."
);
// Submit
cy.get(".modal .submit-discussion").click();
cy.wait(2000);
// Check if discussion is added to page and content is visible
cy.get(".sidebar-parent:first .discussion-topic-title").should(
"have.text",
"Discussion from tests"
);
cy.get(".sidebar-parent:first .discussion-topic-title").click();
cy.get(".discussion-on-page:visible").should("have.class", "show");
cy.get(
".discussion-on-page:visible .reply-card .reply-text .ql-editor p"
).should(
"have.text",
"This is a discussion from the cypress ui tests."
);
cy.get(".discussion-form:visible .discussions-comment").type(
"This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page."
);
cy.get(".discussion-form:visible .submit-discussion").click();
cy.wait(3000);
cy.get(".discussion-on-page:visible").should("have.class", "show");
cy.get(".discussion-on-page:visible")
.children(".reply-card")
.eq(1)
.find(".reply-text")
.should(
"have.text",
"This is a discussion from the cypress ui tests. This comment was entered through the commentbox on the page.\n"
cy.get("[id^=headlessui-dialog-panel-").within(() => {
cy.get("label").contains("Title").type("Test Discussion");
cy.get("div[contenteditable=true]").invoke(
"text",
"This is a test discussion. This will check if the UI is working properly."
);
cy.button("Post").click();
});
// View Discussion
cy.wait(500);
cy.get("div").contains("Test Discussion").click();
cy.get("div[contenteditable=true").invoke(
"text",
"This is a test comment. This will check if the UI is working properly."
);
cy.get("div").contains(
"This is a test comment. This will check if the UI is working properly."
);
});
});

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@@ -24,6 +24,8 @@
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
import "cypress-file-upload";
Cypress.Commands.add("login", (email, password) => {
if (!email) {
email = Cypress.config("testUser") || "Administrator";
@@ -53,3 +55,13 @@ Cypress.Commands.add("iconButton", (text) => {
Cypress.Commands.add("dialog", (selector) => {
return cy.get(`[role=dialog] ${selector}`);
});
Cypress.Commands.add("paste", { prevSubject: true }, (subject, text) => {
cy.wrap(subject).then(($element) => {
const element = $element[0];
element.focus();
element.textContent = text;
const event = new Event("paste", { bubbles: true });
element.dispatchEvent(event);
});
});

View File

@@ -2,7 +2,7 @@ version: "3.7"
name: lms
services:
mariadb:
image: mariadb:10.6
image: mariadb:10.8
command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci

View File

@@ -35,7 +35,6 @@ bench new-site lms.localhost \
bench --site lms.localhost install-app lms
bench --site lms.localhost set-config developer_mode 1
bench --site lms.localhost clear-cache
bench --site lms.localhost set-config mute_emails 1
bench use lms.localhost
bench start

5
frontend/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
node_modules
.DS_Store
dist
dist-ssr
*.local

View File

@@ -0,0 +1,4 @@
{
"semi": false,
"singleQuote": true
}

42
frontend/README.md Normal file
View File

@@ -0,0 +1,42 @@
# Frappe UI Starter
This template should help get you started developing custom frontend for Frappe
apps with Vue 3 and the Frappe UI package.
This boilerplate sets up Vue 3, Vue Router, TailwindCSS, and Frappe UI out of
the box.
## Usage
This template is meant to be cloned inside an existing Frappe App. Assuming your
apps name is `todo`. Clone this template in the root folder of your app using `degit`.
```
cd apps/todo
npx degit netchampfaris/frappe-ui-starter frontend
cd frontend
yarn
yarn dev
```
In a development environment, you need to put the below key-value pair in your `site_config.json` file:
```
"ignore_csrf": 1
```
This will prevent `CSRFToken` errors while using the vite dev server. In production environment, the `csrf_token` is attached to the `window` object in `index.html` for you.
The Vite dev server will start on the port `8080`. This can be changed from `vite.config.js`.
The development server is configured to proxy your frappe app (usually running on port `8000`). If you have a site named `todo.test`, open `http://todo.test:8080` in your browser. If you see a button named "Click to send 'ping' request", congratulations!
If you notice the browser URL is `/frontend`, this is the base URL where your frontend app will run in production.
To change this, open `src/router.js` and change the base URL passed to `createWebHistory`.
## Resources
- [Vue 3](https://v3.vuejs.org/guide/introduction.html)
- [Vue Router](https://next.router.vuejs.org/guide/)
- [Frappe UI](https://github.com/frappe/frappe-ui)
- [TailwindCSS](https://tailwindcss.com/docs/utility-first)
- [Vite](https://vitejs.dev/guide/)

50
frontend/index.html Normal file
View File

@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="{{ favicon or '/assets/lms/frontend/favicon.png' }}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Frappe Learning</title>
<meta name="title" content="{{ meta.title }}" />
<meta name="image" content="{{ meta.image }}" />
<meta name="description" content="{{ meta.description }}" />
<meta name="keywords" content="{{ meta.keywords }}" />
<meta property="og:title" content="{{ meta.title }}" />
<meta property="og:image" content="{{ meta.image }}" />
<meta property="og:description" content="{{ meta.description }}" />
<meta name="twitter:title" content="{{ meta.title }}" />
<meta name="twitter:image" content="{{ meta.image }}" />
<meta name="twitter:description" content="{{ meta.description }}" />
</head>
<body>
<div id="app">
<div id="seo-content">
<h1>{{ meta.title }}</h1>
<p>
{{ meta.description }}
</p>
<p>
The content here is just for seo purposes. The actual content will be loaded in a few seconds.
</p>
<p>
Seo checks if a page has more than 300 words. So, here are some more words to make it more than 300 words.
Page descriptions are the HTML meta tags that provide a brief summary of a web page.
Search engines use meta descriptions to help identify the page's topic - they don't use them to rank the page, but they do use them to determine whether or not to display the page in search results.
Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on.
They're also important because they can help improve your click-through rate (CTR) from search results.
A good meta description can entice people to click on your page instead of someone else's.
</p>
<a href="{{ meta.link }}">Know More</a>
</div>
</div>
<div id="modals"></div>
<div id="popovers"></div>
<script>
window.csrf_token = '{{ csrf_token }}'
window.setup_complete = '{{ setup_complete }}'
document.getElementById('seo-content').style.display = 'none';
</script>
<script type="module" src="/src/main.js"></script>
</body>
</html>

48
frontend/package.json Normal file
View File

@@ -0,0 +1,48 @@
{
"name": "frappe-ui-frontend",
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "vite",
"serve": "vite preview",
"build": "vite build --base=/assets/lms/frontend/ && yarn copy-html-entry",
"copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/lms.html"
},
"dependencies": {
"@editorjs/checklist": "^1.6.0",
"@editorjs/code": "^2.9.0",
"@editorjs/editorjs": "^2.29.0",
"@editorjs/embed": "^2.7.0",
"@editorjs/header": "^2.8.1",
"@editorjs/inline-code": "^1.5.0",
"@editorjs/nested-list": "^1.4.2",
"@editorjs/paragraph": "^2.11.3",
"@editorjs/simple-image": "^1.6.0",
"@editorjs/table": "^2.4.2",
"ace-builds": "^1.36.2",
"apexcharts": "^4.3.0",
"chart.js": "^4.4.1",
"codemirror-editor-vue3": "^2.8.0",
"dayjs": "^1.11.6",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.109",
"lucide-vue-next": "^0.383.0",
"markdown-it": "^14.0.0",
"pinia": "^2.0.33",
"socket.io-client": "^4.7.2",
"tailwindcss": "^3.3.3",
"typescript": "^5.7.2",
"vue": "^3.4.23",
"vue-chartjs": "^5.3.0",
"vue-draggable-next": "^2.2.1",
"vue-router": "^4.0.12",
"vue3-apexcharts": "^1.8.0",
"vuedraggable": "4.1.0"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.3",
"autoprefixer": "^10.4.2",
"postcss": "^8.4.5",
"vite": "^5.0.11"
}
}

View File

@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}

BIN
frontend/public/Quiz.mp4 Normal file

Binary file not shown.

BIN
frontend/public/Upload.mp4 Normal file

Binary file not shown.

BIN
frontend/public/Youtube.mp4 Normal file

Binary file not shown.

BIN
frontend/public/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

38
frontend/src/App.vue Normal file
View File

@@ -0,0 +1,38 @@
<template>
<Layout>
<router-view />
</Layout>
<Dialogs />
<Toasts />
</template>
<script setup>
import { Toasts } from 'frappe-ui'
import { Dialogs } from '@/utils/dialogs'
import { computed, onMounted, onUnmounted } from 'vue'
import { useScreenSize } from './utils/composables'
import DesktopLayout from './components/DesktopLayout.vue'
import MobileLayout from './components/MobileLayout.vue'
import { stopSession } from '@/telemetry'
import { init as initTelemetry } from '@/telemetry'
import { usersStore } from '@/stores/user'
const screenSize = useScreenSize()
let { userResource } = usersStore()
const Layout = computed(() => {
if (screenSize.width < 640) {
return MobileLayout
} else {
return DesktopLayout
}
})
onMounted(async () => {
if (!userResource.data) return
await initTelemetry()
})
onUnmounted(() => {
stopSession()
})
</script>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,152 @@
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 100;
font-display: swap;
src: url("Inter-Thin.woff2?v=3.12") format("woff2"),
url("Inter-Thin.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 100;
font-display: swap;
src: url("Inter-ThinItalic.woff2?v=3.12") format("woff2"),
url("Inter-ThinItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLight.woff2?v=3.12") format("woff2"),
url("Inter-ExtraLight.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 200;
font-display: swap;
src: url("Inter-ExtraLightItalic.woff2?v=3.12") format("woff2"),
url("Inter-ExtraLightItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 300;
font-display: swap;
src: url("Inter-Light.woff2?v=3.12") format("woff2"),
url("Inter-Light.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 300;
font-display: swap;
src: url("Inter-LightItalic.woff2?v=3.12") format("woff2"),
url("Inter-LightItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url("Inter-Regular.woff2?v=3.12") format("woff2"),
url("Inter-Regular.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 400;
font-display: swap;
src: url("Inter-Italic.woff2?v=3.12") format("woff2"),
url("Inter-Italic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 500;
font-display: swap;
src: url("Inter-Medium.woff2?v=3.12") format("woff2"),
url("Inter-Medium.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 500;
font-display: swap;
src: url("Inter-MediumItalic.woff2?v=3.12") format("woff2"),
url("Inter-MediumItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBold.woff2?v=3.12") format("woff2"),
url("Inter-SemiBold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 600;
font-display: swap;
src: url("Inter-SemiBoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-SemiBoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url("Inter-Bold.woff2?v=3.12") format("woff2"),
url("Inter-Bold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 700;
font-display: swap;
src: url("Inter-BoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-BoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBold.woff2?v=3.12") format("woff2"),
url("Inter-ExtraBold.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 800;
font-display: swap;
src: url("Inter-ExtraBoldItalic.woff2?v=3.12") format("woff2"),
url("Inter-ExtraBoldItalic.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: normal;
font-weight: 900;
font-display: swap;
src: url("Inter-Black.woff2?v=3.12") format("woff2"),
url("Inter-Black.woff?v=3.12") format("woff");
}
@font-face {
font-family: 'Inter';
font-style: italic;
font-weight: 900;
font-display: swap;
src: url("Inter-BlackItalic.woff2?v=3.12") format("woff2"),
url("Inter-BlackItalic.woff?v=3.12") format("woff");
}

View File

@@ -0,0 +1,53 @@
<template>
<div v-if="communications.data?.length">
<div v-for="comm in communications.data">
<div class="mb-8">
<div class="flex items-center justify-between mb-2">
<div class="flex items-center">
<Avatar :label="comm.sender_full_name" size="lg" />
<div class="ml-2 text-ink-gray-7">
{{ comm.sender_full_name }}
</div>
</div>
<div class="text-sm">
{{ timeAgo(comm.communication_date) }}
</div>
</div>
<div
class="prose prose-sm bg-surface-menu-bar !min-w-full px-4 py-2 rounded-md"
v-html="comm.content"
></div>
</div>
</div>
</div>
<div v-else class="text-sm italic text-ink-gray-5">
{{ __('No announcements') }}
</div>
</template>
<script setup>
import { createResource, Avatar } from 'frappe-ui'
import { timeAgo } from '@/utils'
const props = defineProps({
batch: {
type: String,
required: true,
},
})
const communications = createResource({
url: 'lms.lms.api.get_announcements',
makeParams(value) {
return {
batch: props.batch,
}
},
auto: true,
cache: ['announcement', props.batch],
})
</script>
<style>
.prose-sm p {
margin: 0 0 0.5rem;
}
</style>

View File

@@ -0,0 +1,290 @@
<template>
<div
class="flex h-full flex-col justify-between transition-all duration-300 ease-in-out border-r bg-surface-menu-bar"
:class="sidebarStore.isSidebarCollapsed ? 'w-14' : 'w-56'"
>
<div
class="flex flex-col overflow-hidden"
:class="sidebarStore.isSidebarCollapsed ? 'items-center' : ''"
>
<UserDropdown :isCollapsed="sidebarStore.isSidebarCollapsed" />
<div class="flex flex-col" v-if="sidebarSettings.data">
<SidebarLink
v-for="link in sidebarLinks"
:link="link"
:isCollapsed="sidebarStore.isSidebarCollapsed"
class="mx-2 my-0.5"
/>
</div>
<div
v-if="sidebarSettings.data?.web_pages?.length || isModerator"
class="mt-4"
>
<div
class="flex items-center justify-between pr-2 cursor-pointer"
:class="sidebarStore.isSidebarCollapsed ? 'pl-3' : 'pl-4'"
@click="toggleWebPages"
>
<div
v-if="!sidebarStore.isSidebarCollapsed"
class="flex items-center text-sm text-ink-gray-5 my-1"
>
<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
<ChevronRight
class="h-4 w-4 stroke-1.5 text-ink-gray-9 transition-all duration-300 ease-in-out"
:class="{ 'rotate-90': !sidebarStore.isWebpagesCollapsed }"
/>
</span>
<span class="ml-2">
{{ __('More') }}
</span>
</div>
<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
<template #icon>
<Plus class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
</template>
</Button>
</div>
<div
v-if="sidebarSettings.data?.web_pages?.length"
class="flex flex-col transition-all duration-300 ease-in-out"
:class="!sidebarStore.isWebpagesCollapsed ? 'block' : 'hidden'"
>
<SidebarLink
v-for="link in sidebarSettings.data.web_pages"
:link="link"
:isCollapsed="sidebarStore.isSidebarCollapsed"
class="mx-2 my-0.5"
:showControls="isModerator ? true : false"
@openModal="openPageModal"
@deletePage="deletePage"
/>
</div>
</div>
</div>
<div>
<TrialBanner
v-if="
userResource.data?.user_type == 'System User' &&
userResource.data?.is_fc_site
"
:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
/>
<SidebarLink
:link="{
label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
}"
:isCollapsed="sidebarStore.isSidebarCollapsed"
@click="toggleSidebar()"
class="m-2"
>
<template #icon>
<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
<CollapseSidebar
class="h-4.5 w-4.5 text-ink-gray-7 duration-300 ease-in-out"
:class="{
'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
}"
/>
</span>
</template>
</SidebarLink>
</div>
</div>
<PageModal
v-model="showPageModal"
v-model:reloadSidebar="sidebarSettings"
:page="pageToEdit"
/>
</template>
<script setup>
import UserDropdown from '@/components/UserDropdown.vue'
import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
import SidebarLink from '@/components/SidebarLink.vue'
import { useStorage } from '@vueuse/core'
import { ref, onMounted, inject, watch } from 'vue'
import { getSidebarLinks } from '../utils'
import { usersStore } from '@/stores/user'
import { sessionStore } from '@/stores/session'
import { useSidebar } from '@/stores/sidebar'
import { useSettings } from '@/stores/settings'
import { ChevronRight, Plus } from 'lucide-vue-next'
import { Button, createResource, TrialBanner } from 'frappe-ui'
import PageModal from '@/components/Modals/PageModal.vue'
const { user, sidebarSettings } = sessionStore()
const { userResource } = usersStore()
let sidebarStore = useSidebar()
const socket = inject('$socket')
const unreadCount = ref(0)
const sidebarLinks = ref(getSidebarLinks())
const showPageModal = ref(false)
const isModerator = ref(false)
const isInstructor = ref(false)
const pageToEdit = ref(null)
const settingsStore = useSettings()
onMounted(() => {
socket.on('publish_lms_notifications', (data) => {
unreadNotifications.reload()
})
addNotifications()
sidebarSettings.reload(
{},
{
onSuccess(data) {
Object.keys(data).forEach((key) => {
if (!parseInt(data[key])) {
sidebarLinks.value = sidebarLinks.value.filter(
(link) => link.label.toLowerCase().split(' ').join('_') !== key
)
}
})
},
}
)
})
const unreadNotifications = createResource({
cache: 'Unread Notifications Count',
url: 'frappe.client.get_count',
makeParams(values) {
return {
doctype: 'Notification Log',
filters: {
for_user: user,
read: 0,
},
}
},
onSuccess(data) {
unreadCount.value = data
sidebarLinks.value = sidebarLinks.value.map((link) => {
if (link.label === 'Notifications') {
link.count = data
}
return link
})
},
auto: user ? true : false,
})
const addNotifications = () => {
if (user) {
sidebarLinks.value.push({
label: 'Notifications',
icon: 'Bell',
to: 'Notifications',
activeFor: ['Notifications'],
count: unreadCount.value,
})
}
}
const addQuizzes = () => {
if (isInstructor.value || isModerator.value) {
sidebarLinks.value.push({
label: 'Quizzes',
icon: 'CircleHelp',
to: 'Quizzes',
activeFor: ['Quizzes', 'QuizForm'],
})
}
}
const addAssignments = () => {
if (isInstructor.value || isModerator.value) {
sidebarLinks.value.push({
label: 'Assignments',
icon: 'Pencil',
to: 'Assignments',
activeFor: ['Assignments', 'AssignmentForm'],
})
}
}
const addPrograms = () => {
let activeFor = ['Programs', 'ProgramForm']
let index = 1
let canAddProgram = false
if (
!isInstructor.value &&
!isModerator.value &&
settingsStore.learningPaths.data
) {
sidebarLinks.value = sidebarLinks.value.filter(
(link) => link.label !== 'Courses'
)
activeFor.push('CourseDetail')
activeFor.push('Lesson')
index = 0
canAddProgram = true
} else if (isInstructor.value || isModerator.value) {
canAddProgram = true
}
if (canAddProgram) {
sidebarLinks.value.splice(index, 0, {
label: 'Programs',
icon: 'Route',
to: 'Programs',
activeFor: activeFor,
})
}
}
const openPageModal = (link) => {
showPageModal.value = true
pageToEdit.value = link
}
const deletePage = (link) => {
createResource({
url: 'lms.lms.api.delete_sidebar_item',
makeParams(values) {
return {
webpage: link.web_page,
}
},
}).submit(
{},
{
onSuccess() {
sidebarSettings.reload()
},
}
)
}
const getSidebarFromStorage = () => {
return useStorage('sidebar_is_collapsed', false)
}
watch(userResource, () => {
if (userResource.data) {
isModerator.value = userResource.data.is_moderator
isInstructor.value = userResource.data.is_instructor
addPrograms()
addQuizzes()
addAssignments()
}
})
const toggleSidebar = () => {
sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
localStorage.setItem(
'isSidebarCollapsed',
JSON.stringify(sidebarStore.isSidebarCollapsed)
)
}
const toggleWebPages = () => {
sidebarStore.isWebpagesCollapsed = !sidebarStore.isWebpagesCollapsed
localStorage.setItem(
'isWebpagesCollapsed',
JSON.stringify(sidebarStore.isWebpagesCollapsed)
)
}
</script>

View File

@@ -0,0 +1,67 @@
<template>
<Popover placement="right-start" class="flex w-full">
<template #target="{ togglePopover }">
<button
:class="[
'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-8 hover:bg-surface-gray-2',
]"
@click.prevent="togglePopover()"
>
<div class="flex gap-2">
<LayoutGrid class="size-4 stroke-1.5" />
<span class="whitespace-nowrap">
{{ __('Apps') }}
</span>
</div>
<ChevronRight class="h-4 w-4 stroke-1.5" />
</button>
</template>
<template #body>
<div
class="grid grid-cols-3 justify-between mx-3 p-2 rounded-lg border border-gray-100 bg-surface-white shadow-xl"
>
<div v-for="app in apps.data" key="name">
<a
:href="app.route"
class="flex flex-col gap-1.5 rounded justify-center items-center py-2 px-3 hover:bg-surface-gray-2"
>
<img class="size-8" :src="app.logo" />
<div class="text-sm text-ink-gray-7" @click="app.onClick">
{{ app.title }}
</div>
</a>
</div>
</div>
</template>
</Popover>
</template>
<script setup>
import { Popover, createResource } from 'frappe-ui'
import { LayoutGrid, ChevronRight } from 'lucide-vue-next'
const apps = createResource({
url: 'frappe.apps.get_apps',
cache: 'apps',
auto: true,
transform: (data) => {
let _apps = [
{
name: 'frappe',
logo: '/assets/lms/images/desk.png',
title: __('Desk'),
route: '/app',
},
]
data.map((app) => {
if (app.name === 'lms') return
_apps.push({
name: app.name,
logo: app.logo,
title: __(app.title),
route: app.route,
})
})
return _apps
},
})
</script>

View File

@@ -0,0 +1,75 @@
<template>
<Dialog
v-model="show"
:options="{
size: 'xl',
}"
>
<template #body>
<div class="p-5 space-y-4">
<div v-if="type == 'quiz'" class="text-lg font-semibold">
{{ __('Add a quiz to your lesson') }}
</div>
<div v-else class="text-lg font-semibold">
{{ __('Add an assignment to your lesson') }}
</div>
<div>
<Link
v-if="type == 'quiz'"
v-model="quiz"
doctype="LMS Quiz"
:label="__('Select a quiz')"
:onCreate="(value, close) => redirectToForm()"
/>
<Link
v-else
v-model="assignment"
doctype="LMS Assignment"
:label="__('Select an assignment')"
:onCreate="(value, close) => redirectToForm()"
/>
</div>
<div class="flex justify-end space-x-2">
<Button variant="solid" @click="addAssessment()">
{{ __('Save') }}
</Button>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, Button } from 'frappe-ui'
import { onMounted, ref, nextTick } from 'vue'
import Link from '@/components/Controls/Link.vue'
const show = ref(false)
const quiz = ref(null)
const assignment = ref(null)
const props = defineProps({
type: {
type: String,
required: true,
},
onAddition: {
type: Function,
required: true,
},
})
onMounted(async () => {
await nextTick()
show.value = true
})
const addAssessment = () => {
props.onAddition(props.type == 'quiz' ? quiz.value : assignment.value)
show.value = false
}
const redirectToForm = () => {
if (props.type == 'quiz') window.open('/lms/quizzes/new', '_blank')
else window.open('/lms/assignments/new', '_blank')
}
</script>

View File

@@ -0,0 +1,222 @@
<template>
<div>
<div class="flex items-center justify-between mb-4">
<div class="text-lg font-semibold text-ink-gray-9">
{{ __('Assessments') }}
</div>
<Button v-if="canSeeAddButton()" @click="showModal = true">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
{{ __('Add') }}
</Button>
</div>
<div v-if="assessments.data?.length" class="text-sm">
<ListView
:columns="getAssessmentColumns()"
:rows="assessments.data"
row-key="name"
:options="{
showTooltip: false,
getRowRoute: (row) => getRowRoute(row),
selectable: user.data?.is_student ? false : true,
}"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
>
<ListHeaderItem :item="item" v-for="item in getAssessmentColumns()">
<template #prefix="{ item }">
<component
v-if="item.icon"
:is="item.icon"
class="h-4 w-4 stroke-1.5 ml-4"
/>
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<ListRow :row="row" v-for="row in assessments.data">
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<div v-if="column.key == 'assessment_type'">
{{ row[column.key] == 'LMS Quiz' ? 'Quiz' : 'Assignment' }}
</div>
<div v-else-if="column.key == 'title'">
{{ row[column.key] }}
</div>
<div v-else-if="isNaN(row[column.key])">
<Badge :theme="getStatusTheme(row[column.key])">
{{ row[column.key] }}
</Badge>
</div>
<div v-else>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button
variant="ghost"
@click="removeAssessments(selections, unselectAll)"
>
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
</div>
<div v-else class="text-sm italic text-ink-gray-5">
{{ __('No Assessments') }}
</div>
</div>
<AssessmentModal
v-model="showModal"
v-model:assessments="assessments"
:batch="props.batch"
/>
</template>
<script setup>
import {
ListView,
ListRow,
ListRows,
ListHeader,
ListHeaderItem,
ListRowItem,
ListSelectBanner,
createResource,
Button,
Badge,
} from 'frappe-ui'
import { inject, ref } from 'vue'
import AssessmentModal from '@/components/Modals/AssessmentModal.vue'
import { Plus, Trash2 } from 'lucide-vue-next'
const user = inject('$user')
const showModal = ref(false)
const props = defineProps({
batch: {
type: String,
required: true,
},
rows: {
type: Array,
},
columns: {
type: Array,
},
options: {
type: Object,
default: () => ({
selectable: true,
totalCount: 0,
rowCount: 0,
}),
},
})
const assessments = createResource({
url: 'lms.lms.utils.get_assessments',
params: {
batch: props.batch,
},
auto: true,
})
const deleteAssessments = createResource({
url: 'lms.lms.api.delete_documents',
makeParams(values) {
return {
doctype: 'LMS Assessment',
documents: values.assessments,
}
},
})
const removeAssessments = (selections, unselectAll) => {
deleteAssessments.submit(
{ assessments: Array.from(selections) },
{
onSuccess(data) {
assessments.reload()
unselectAll()
},
}
)
}
const getRowRoute = (row) => {
if (row.assessment_type == 'LMS Assignment') {
if (row.submission) {
return {
name: 'AssignmentSubmission',
params: {
assignmentID: row.assessment_name,
submissionName: row.submission.name,
},
}
} else {
return {
name: 'AssignmentSubmission',
params: {
assignmentID: row.assessment_name,
submissionName: 'new',
},
}
}
} else {
return {
name: 'QuizPage',
params: {
quizID: row.assessment_name,
},
}
}
}
const canSeeAddButton = () => {
return user.data?.is_moderator || user.data?.is_evaluator
}
const getAssessmentColumns = () => {
let columns = [
{
label: 'Assessment',
key: 'title',
width: '25rem',
},
{
label: 'Type',
key: 'assessment_type',
width: '15rem',
},
]
if (!user.data?.is_moderator) {
columns.push({
label: 'Status/Percentage',
key: 'status',
align: 'left',
width: '10rem',
})
}
return columns
}
const getStatusTheme = (status) => {
if (status === 'Pass') {
return 'green'
} else if (status === 'Not Graded') {
return 'orange'
} else {
return 'red'
}
}
</script>

View File

@@ -0,0 +1,468 @@
<template>
<div
v-if="assignment.data"
class="grid grid-cols-[65%,35%] h-full"
:class="{ 'border rounded-lg': !showTitle }"
>
<div class="border-r p-5 overflow-y-auto h-[calc(100vh-3.2rem)]">
<div v-if="showTitle" class="text-lg font-semibold mb-5 text-ink-gray-9">
<div v-if="submissionName === 'new'">
{{ __('Submission by') }} {{ user.data?.full_name }}
</div>
<div v-else>
{{ __('Submission by') }} {{ submissionResource.doc?.member_name }}
</div>
</div>
<div class="text-sm text-ink-gray-7 font-medium mb-2">
{{ __('Question') }}:
</div>
<div
v-html="assignment.data.question"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
></div>
</div>
<div class="flex flex-col">
<div class="p-5">
<div class="flex items-center justify-between mb-4">
<div class="font-semibold text-ink-gray-9">
{{ __('Submission') }}
</div>
<div class="flex items-center space-x-2">
<Badge v-if="isDirty" theme="orange">
{{ __('Not Saved') }}
</Badge>
<Badge
v-else-if="submissionResource.doc?.status"
:theme="statusTheme"
size="lg"
>
{{ submissionResource.doc?.status }}
</Badge>
<Button variant="solid" @click="submitAssignment()">
{{ __('Save') }}
</Button>
</div>
</div>
<div
v-if="
submissionName != 'new' &&
!['Pass', 'Fail'].includes(submissionResource.doc?.status) &&
submissionResource.doc?.owner == user.data?.name
"
class="bg-surface-blue-2 p-3 rounded-md leading-5 text-sm mb-4"
>
{{ __("You've successfully submitted the assignment.") }}
{{
__(
"Once the moderator grades your submission, you'll find the details here."
)
}}
{{ __('Feel free to make edits to your submission if needed.') }}
</div>
<div v-if="showUploader()">
<div class="text-xs text-ink-gray-5 mt-1 mb-2">
{{ __('Add your assignment as {0}').format(assignment.data.type) }}
</div>
<FileUploader
v-if="!submissionFile"
:fileTypes="getType()"
:validateFile="validateFile"
@success="(file) => saveSubmission(file)"
>
<template #default="{ uploading, progress, openFileSelector }">
<Button @click="openFileSelector" :loading="uploading">
{{
uploading
? __('Uploading {0}%').format(progress)
: __('Upload File')
}}
</Button>
</template>
</FileUploader>
<div v-else>
<div class="flex text-ink-gray-7">
<div class="border self-start rounded-md p-2 mr-2">
<FileText class="h-5 w-5 stroke-1.5" />
</div>
<a
:href="submissionFile.file_url"
target="_blank"
class="flex flex-col cursor-pointer !no-underline"
>
<span class="text-sm leading-5">
{{ submissionFile.file_name }}
</span>
<span class="text-sm text-ink-gray-5 mt-1">
{{ getFileSize(submissionFile.file_size) }}
</span>
</a>
<X
v-if="canModifyAssignment"
@click="removeSubmission()"
class="bg-surface-gray-3 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
/>
</div>
</div>
</div>
<div v-else-if="assignment.data.type == 'URL'">
<div class="text-xs text-ink-gray-5 mb-1">
{{ __('Enter a URL') }}
</div>
<FormControl
v-model="answer"
type="text"
:readonly="!canModifyAssignment"
/>
</div>
<div v-else>
<div class="text-sm mb-4">
{{ __('Write your answer here') }}
</div>
<TextEditor
:content="answer"
@change="(val) => (answer = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
<div
v-if="
user.data?.name == submissionResource.doc?.owner &&
submissionResource.doc?.comments
"
class="mt-8 p-3 bg-surface-blue-2 rounded-md"
>
<div class="text-sm text-ink-gray-5 font-medium mb-2">
{{ __('Comments by Evaluator') }}:
</div>
<div class="leading-5">
{{ submissionResource.doc.comments }}
</div>
</div>
<!-- Grading -->
<div v-if="canGradeSubmission" class="mt-8 space-y-4">
<div class="font-semibold mb-2 text-ink-gray-9">
{{ __('Grading') }}
</div>
<FormControl
v-if="submissionResource.doc"
v-model="submissionResource.doc.status"
:label="__('Grade')"
type="select"
:options="submissionStatusOptions"
/>
<div>
<div class="text-sm text-ink-gray-5 mb-1">
{{ __('Comments') }}
</div>
<TextEditor
:content="comments"
@change="
(val) => {
comments = val
isDirty = true
}
"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
/>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup>
import {
Badge,
Button,
call,
createResource,
createDocumentResource,
FileUploader,
FormControl,
TextEditor,
} from 'frappe-ui'
import { computed, inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
import { FileText, X } from 'lucide-vue-next'
import { showToast, getFileSize } from '@/utils'
import { useRouter } from 'vue-router'
const submissionFile = ref(null)
const answer = ref(null)
const comments = ref(null)
const router = useRouter()
const user = inject('$user')
const showTitle = router.currentRoute.value.name == 'AssignmentSubmission'
const isDirty = ref(false)
const props = defineProps({
assignmentID: {
type: String,
required: true,
},
submissionName: {
type: String,
default: 'new',
},
})
onMounted(() => {
window.addEventListener('keydown', keyboardShortcut)
})
const keyboardShortcut = (e) => {
if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
submitAssignment()
e.preventDefault()
}
}
onBeforeUnmount(() => {
window.removeEventListener('keydown', keyboardShortcut)
})
const assignment = createResource({
url: 'frappe.client.get',
params: {
doctype: 'LMS Assignment',
name: props.assignmentID,
},
auto: true,
onSuccess(data) {
if (props.submissionName != 'new') {
submissionResource.reload()
}
},
})
const newSubmission = createResource({
url: 'frappe.client.insert',
makeParams(values) {
let doc = {
doctype: 'LMS Assignment Submission',
assignment: props.assignmentID,
member: user.data?.name,
}
if (showUploader()) {
doc.assignment_attachment = submissionFile.value.file_url
} else {
doc.answer = answer.value
}
return {
doc: doc,
}
},
})
const imageResource = createResource({
url: 'lms.lms.api.get_file_info',
makeParams(values) {
return {
file_url: values.image,
}
},
auto: false,
onSuccess(data) {
submissionFile.value = data
},
})
const submissionResource = createDocumentResource({
doctype: 'LMS Assignment Submission',
name: props.submissionName,
onError(err) {
showToast(__('Error'), __(err.messages?.[0] || err), 'x')
},
auto: false,
cache: [user.data?.name, props.assignmentID],
})
watch(submissionResource, () => {
if (submissionResource.doc) {
if (submissionResource.doc.assignment_attachment) {
imageResource.reload({
image: submissionResource.doc.assignment_attachment,
})
}
if (submissionResource.doc.answer) {
answer.value = submissionResource.doc.answer
}
if (submissionResource.doc.comments) {
comments.value = submissionResource.doc.comments
}
if (submissionResource.isDirty) {
isDirty.value = true
} else if (showUploader() && !submissionFile.value) {
isDirty.value = true
} else if (!showUploader() && !answer.value) {
isDirty.value = true
} else {
isDirty.value = false
}
}
})
watch(submissionFile, () => {
if (props.submissionName == 'new' && submissionFile.value) {
isDirty.value = true
}
})
const submitAssignment = () => {
if (props.submissionName != 'new') {
let evaluator =
submissionResource.doc && submissionResource.doc.owner != user.data?.name
? user.data?.name
: null
submissionResource.setValue.submit(
{
...submissionResource.doc,
assignment_attachment: submissionFile.value?.file_url,
evaluator: evaluator,
comments: comments.value,
answer: answer.value,
},
{
onSuccess(data) {
showToast(__('Success'), __('Changes saved successfully'), 'check')
},
}
)
} else {
addNewSubmission()
}
}
const addNewSubmission = () => {
newSubmission.submit(
{},
{
onSuccess(data) {
showToast('Success', 'Assignment submitted successfully.', 'check')
if (router.currentRoute.value.name == 'AssignmentSubmission') {
router.push({
name: 'AssignmentSubmission',
params: {
assignmentID: props.assignmentID,
submissionName: data.name,
},
})
} else {
markLessonProgress()
router.go()
}
submissionResource.name = data.name
submissionResource.reload()
},
onError(err) {
showToast('Error', err.messages?.[0] || err, 'x')
},
}
)
}
const saveSubmission = (file) => {
isDirty.value = true
submissionFile.value = file
}
const markLessonProgress = () => {
if (router.currentRoute.value.name == 'Lesson') {
let courseName = router.currentRoute.value.params.courseName
let chapterNumber = router.currentRoute.value.params.chapterNumber
let lessonNumber = router.currentRoute.value.params.lessonNumber
call('lms.lms.api.mark_lesson_progress', {
course: courseName,
chapter_number: chapterNumber,
lesson_number: lessonNumber,
})
}
}
const getType = () => {
const type = assignment.data?.type
if (type == 'Image') {
return ['image/*']
} else if (type == 'Document') {
return [
'.doc',
'.docx',
'.xml',
'application/msword',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
]
} else if (type == 'PDF') {
return ['.pdf']
}
}
const validateFile = (file) => {
let type = assignment.data?.type
let extension = file.name.split('.').pop().toLowerCase()
if (type == 'Image' && !['jpg', 'jpeg', 'png'].includes(extension)) {
return 'Only image file is allowed.'
} else if (
type == 'Document' &&
!['doc', 'docx', 'xml'].includes(extension)
) {
return 'Only document file is allowed.'
} else if (type == 'PDF' && !['pdf'].includes(extension)) {
return 'Only PDF file is allowed.'
}
}
const removeSubmission = () => {
isDirty.value = true
submissionFile.value = null
}
const canGradeSubmission = computed(() => {
return (
(user.data?.is_moderator ||
user.data?.is_evaluator ||
user.data?.is_instructor) &&
props.submissionName != 'new' &&
router.currentRoute.value.name == 'AssignmentSubmission'
)
})
const canModifyAssignment = computed(() => {
return (
!submissionResource.doc ||
(submissionResource.doc?.owner == user.data?.name &&
submissionResource.doc?.status == 'Not Graded')
)
})
const submissionStatusOptions = computed(() => {
return [
{ label: 'Not Graded', value: 'Not Graded' },
{ label: 'Pass', value: 'Pass' },
{ label: 'Fail', value: 'Fail' },
]
})
const statusTheme = computed(() => {
if (!submissionResource.doc) {
return 'orange'
} else if (submissionResource.doc.status == 'Pass') {
return 'green'
} else if (submissionResource.doc.status == 'Not Graded') {
return 'blue'
} else {
return 'red'
}
})
const showUploader = () => {
return ['PDF', 'Image', 'Document'].includes(assignment.data?.type)
}
</script>

View File

@@ -0,0 +1,46 @@
<template>
<Assignment
v-if="user.data && submission.data"
:assignmentID="assignmentID"
:submissionName="submission.data?.name || 'new'"
/>
<div v-else class="border rounded-md text-center py-20">
<div>
{{ __('Please login to access the assignment.') }}
</div>
<Button @click="redirectToLogin()" class="mt-2">
<span>
{{ __('Login') }}
</span>
</Button>
</div>
</template>
<script setup>
import { inject, watch } from 'vue'
import { Button, createResource } from 'frappe-ui'
import Assignment from '@/components/Assignment.vue'
const user = inject('$user')
const props = defineProps({
assignmentID: {
type: String,
required: true,
},
})
const submission = createResource({
url: 'frappe.client.get_value',
makeParams(values) {
return {
doctype: 'LMS Assignment Submission',
fieldname: 'name',
filters: {
assignment: props.assignmentID,
member: user.data?.name,
},
}
},
auto: true,
})
</script>

View File

@@ -0,0 +1,134 @@
<template>
<div>
<!-- <audio width="100%" controls controlsList="nodownload" class="mb-4">
<source :src="encodeURI(file)" type="audio/mp3" />
</audio> -->
<audio @ended="handleAudioEnd" controlsList="nodownload" class="mb-4">
<source :src="encodeURI(file)" type="audio/mp3" />
</audio>
<div class="flex items-center space-x-2 shadow rounded-lg p-1 w-1/2">
<Button variant="ghost" @click="togglePlay">
<template #icon>
<Play v-if="!isPlaying" class="w-4 h-4 text-ink-gray-9" />
<Pause v-else class="w-4 h-4 text-ink-gray-9" />
</template>
</Button>
<input
type="range"
min="0"
:max="duration"
step="0.1"
v-model="currentTime"
@input="changeCurrentTime"
class="duration-slider w-full h-1"
/>
<span class="text-xs text-ink-gray-9 font-medium">
{{ formatTime(currentTime) }} / {{ formatTime(duration) }}
</span>
<Button variant="ghost" @click="toggleMute">
<template #icon>
<Volume2 v-if="!isMuted" class="w-4 h-4 text-ink-gray-9" />
<VolumeX v-else class="w-4 h-4 text-ink-gray-9" />
</template>
</Button>
</div>
</div>
</template>
<script setup>
import { ref, onMounted, watch } from 'vue'
import { Play, Pause, Volume2, VolumeX } from 'lucide-vue-next'
import { Button } from 'frappe-ui'
const isPlaying = ref(false)
const audio = ref(null)
let isMuted = ref(false)
let currentTime = ref(0)
let duration = ref(0)
const props = defineProps({
file: {
type: String,
required: true,
},
})
onMounted(() => {
setTimeout(() => {
audio.value = document.querySelector('audio')
audio.value.onloadedmetadata = () => {
duration.value = audio.value.duration
}
audio.value.ontimeupdate = () => {
currentTime.value = audio.value.currentTime
}
}, 0)
})
const togglePlay = () => {
if (audio.value.paused) {
audio.value.play()
isPlaying.value = true
} else {
audio.value.pause()
isPlaying.value = false
}
}
const toggleMute = () => {
audio.value.muted = !audio.value.muted
isMuted.value = audio.value.muted
}
const changeCurrentTime = () => {
audio.value.currentTime = currentTime.value
}
const handleAudioEnd = () => {
isPlaying.value = false
}
const formatTime = (time) => {
const minutes = Math.floor(time / 60)
const seconds = Math.floor(time % 60)
return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
}
watch(isPlaying, (newVal) => {
if (newVal) {
audio.value.play()
} else {
audio.value.pause()
}
})
</script>
<style>
.duration-slider {
flex: 1;
-webkit-appearance: none;
appearance: none;
background-color: theme('colors.gray.400');
cursor: pointer;
}
.duration-slider::-webkit-slider-thumb {
height: 10px;
width: 10px;
-webkit-appearance: none;
background-color: theme('colors.gray.900');
}
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type='range'] {
overflow: hidden;
width: 150px;
-webkit-appearance: none;
}
input[type='range']::-webkit-slider-thumb {
-webkit-appearance: none;
cursor: pointer;
box-shadow: -150px 0 0 150px theme('colors.gray.900');
}
}
</style>

View File

@@ -0,0 +1,111 @@
<template>
<div
class="flex flex-col border-2 hover:bg-surface-gray-2 rounded-md p-4 h-full"
style="min-height: 150px"
>
<div class="text-lg leading-5 font-semibold mb-2 text-ink-gray-9">
{{ batch.title }}
</div>
<div
v-if="batch.seat_count && batch.seats_left > 0"
class="text-xs bg-green-100 text-green-700 self-start px-2 py-0.5 rounded-md"
>
{{ batch.seats_left }}
<span v-if="batch.seats_left > 1">
{{ __('Seats Left') }}
</span>
<span v-else-if="batch.seats_left == 1">
{{ __('Seat Left') }}
</span>
</div>
<div
v-else-if="batch.seat_count && batch.seats_left <= 0"
class="text-xs bg-red-100 text-red-700 self-start px-2 py-0.5 rounded-md"
>
{{ __('Sold Out') }}
</div>
<div class="short-introduction text-sm text-ink-gray-7">
{{ batch.description }}
</div>
<div v-if="batch.amount" class="font-semibold text-ink-gray-9 mb-4">
{{ batch.price }}
</div>
<div class="flex flex-col space-y-2 mt-auto">
<DateRange
:startDate="batch.start_date"
:endDate="batch.end_date"
class="text-sm text-ink-gray-7"
/>
<div class="flex items-center text-sm text-ink-gray-7">
<Clock class="h-4 w-4 stroke-1.5 mr-2 text-ink-gray-7" />
<span>
{{ formatTime(batch.start_time) }} - {{ formatTime(batch.end_time) }}
</span>
</div>
<div
v-if="batch.timezone"
class="flex items-center text-sm text-ink-gray-7"
>
<Globe class="h-4 w-4 stroke-1.5 mr-2 text-ink-gray-5" />
<span>
{{ batch.timezone }}
</span>
</div>
</div>
<div
v-if="batch.instructors?.length"
class="flex avatar-group overlap mt-4"
>
<div
class="h-6 mr-1"
:class="{ 'avatar-group overlap': batch.instructors.length > 1 }"
>
<UserAvatar
v-for="instructor in batch.instructors"
:user="instructor"
/>
</div>
<CourseInstructors :instructors="batch.instructors" />
</div>
</div>
</template>
<script setup>
import { Badge } from 'frappe-ui'
import { formatTime } from '../utils'
import { Clock, BookOpen, Globe } from 'lucide-vue-next'
import DateRange from '@/components/Common/DateRange.vue'
import CourseInstructors from '@/components/CourseInstructors.vue'
import UserAvatar from '@/components/UserAvatar.vue'
const props = defineProps({
batch: {
type: Object,
default: null,
},
})
</script>
<style>
.short-introduction {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
width: 100%;
overflow: hidden;
margin: 0.25rem 0 1rem;
line-height: 1.5;
}
.avatar-group {
display: inline-flex;
align-items: center;
}
.avatar-group .avatar {
transition: margin 0.1s ease-in-out;
}
.avatar-group.overlap .avatar + .avatar {
margin-left: calc(-8px);
}
</style>

View File

@@ -0,0 +1,161 @@
<template>
<div>
<div class="flex items-center justify-between mb-4">
<div class="text-lg font-semibold text-ink-gray-9">
{{ __('Courses') }}
</div>
<Button v-if="canSeeAddButton()" @click="openCourseModal()">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
{{ __('Add') }}
</Button>
</div>
<div v-if="courses.data?.length">
<ListView
:columns="getCoursesColumns()"
:rows="courses.data"
row-key="batch_course"
:options="{
showTooltip: false,
selectable: user.data?.is_student ? false : true,
getRowRoute: (row) => ({
name: 'CourseDetail',
params: { courseName: row.name },
}),
}"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
>
<ListHeaderItem :item="item" v-for="item in getCoursesColumns()">
<template #prefix="{ item }">
<component
v-if="item.icon"
:is="item.icon"
class="h-4 w-4 stroke-1.5 ml-4"
/>
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<ListRow :row="row" v-for="row in courses.data">
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<div>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button
variant="ghost"
@click="removeCourses(selections, unselectAll)"
>
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
</div>
<BatchCourseModal
v-model="showCourseModal"
:batch="batch"
v-model:courses="courses"
/>
</div>
</template>
<script setup>
import { ref, inject } from 'vue'
import BatchCourseModal from '@/components/Modals/BatchCourseModal.vue'
import {
createResource,
Button,
ListHeader,
ListHeaderItem,
ListSelectBanner,
ListRow,
ListRows,
ListView,
ListRowItem,
} from 'frappe-ui'
import { Plus, Trash2 } from 'lucide-vue-next'
import { showToast } from '@/utils'
const showCourseModal = ref(false)
const user = inject('$user')
const props = defineProps({
batch: {
type: String,
required: true,
},
})
const courses = createResource({
url: 'lms.lms.utils.get_batch_courses',
params: {
batch: props.batch,
},
cache: ['batchCourses', props.batchName],
auto: true,
})
const openCourseModal = () => {
showCourseModal.value = true
}
const getCoursesColumns = () => {
return [
{
label: 'Title',
key: 'title',
width: 2,
},
{
label: 'Lessons',
key: 'lessons',
align: 'right',
},
{
label: 'Enrollments',
align: 'right',
key: 'enrollments',
},
]
}
const deleteCourses = createResource({
url: 'lms.lms.api.delete_documents',
makeParams(values) {
return {
doctype: 'Batch Course',
documents: values.courses,
}
},
})
const removeCourses = (selections, unselectAll) => {
deleteCourses.submit(
{
courses: Array.from(selections),
},
{
onSuccess(data) {
courses.reload()
showToast(__('Success'), __('Courses deleted successfully'), 'check')
unselectAll()
},
}
)
}
const canSeeAddButton = () => {
return user.data?.is_moderator || user.data?.is_evaluator
}
</script>

View File

@@ -0,0 +1,27 @@
<template>
<div class="space-y-10">
<UpcomingEvaluations
:batch="batch.data.name"
:endDate="batch.data.evaluation_end_date"
:courses="batch.data.courses"
/>
<Assessments :batch="batch.data.name" />
<StudentHeatmap />
</div>
</template>
<script setup>
import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
import Assessments from '@/components/Assessments.vue'
import StudentHeatmap from '@/components/StudentHeatmap.vue'
const props = defineProps({
batch: {
type: Object,
default: null,
},
isStudent: {
type: Boolean,
default: false,
},
})
</script>

View File

@@ -0,0 +1,245 @@
<template>
<div v-if="user.data?.is_student">
<div
v-if="feedbackList.data?.length"
class="bg-surface-blue-2 text-blue-700 p-2 rounded-md mb-5"
>
{{ __('Thank you for providing your feedback!') }}
</div>
<div v-else class="flex justify-between items-center mb-5">
<div class="text-lg font-semibold">
{{ __('Help Us Improve') }}
</div>
<Button @click="submitFeedback()">
{{ __('Submit') }}
</Button>
</div>
<div class="space-y-8">
<div class="flex items-center justify-between">
<Rating
v-for="key in ratingKeys"
v-model="feedback[key]"
:label="__(convertToTitleCase(key))"
:readonly="readOnly"
/>
</div>
<FormControl
v-model="feedback.feedback"
type="textarea"
:label="__('Feedback')"
:rows="7"
:readonly="readOnly"
/>
</div>
</div>
<div v-else-if="feedbackList.data?.length">
<div class="text-lg font-semibold mb-5">
{{ __('Average of Feedback Received') }}
</div>
<div class="flex items-center justify-between mb-10">
<Rating
v-for="key in ratingKeys"
v-model="average[key]"
:label="__(convertToTitleCase(key))"
:readonly="true"
/>
</div>
<div class="text-lg font-semibold mb-5">
{{ __('All Feedback') }}
</div>
<ListView
:columns="feedbackColumns"
:rows="feedbackList.data"
row-key="name"
:options="{
showTooltip: false,
rowHeight: 'h-16',
selectable: false,
}"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
></ListHeader>
<ListRows>
<ListRow
:row="row"
v-for="row in feedbackList.data"
class="group cursor-pointer feedback-list"
>
<template #default="{ column, item }">
<ListRowItem
:item="row[column.key]"
:align="column.align"
class="text-sm"
>
<template #prefix>
<div v-if="column.key == 'member_name'">
<Avatar
class="flex"
:image="row['member_image']"
:label="item"
size="sm"
/>
</div>
</template>
<div v-if="ratingKeys.includes(column.key)">
<Rating v-model="row[column.key]" :readonly="true" />
</div>
<div v-else class="leading-5">
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
</ListView>
</div>
<div v-else class="text-sm italic text-center text-ink-gray-7 mt-5">
{{ __('No feedback received yet.') }}
</div>
</template>
<script setup>
import { computed, inject, onMounted, reactive, ref, watch } from 'vue'
import { convertToTitleCase } from '@/utils'
import {
Avatar,
Button,
createListResource,
FormControl,
ListView,
ListHeader,
ListHeaderItem,
ListRows,
ListRow,
ListRowItem,
Rating,
} from 'frappe-ui'
const user = inject('$user')
const ratingKeys = ['content', 'instructors', 'value']
const readOnly = ref(false)
const average = reactive({})
const feedback = reactive({})
const props = defineProps({
batch: {
type: String,
required: true,
},
})
onMounted(() => {
let filters = {
batch: props.batch,
}
if (user.data?.is_student) {
filters['member'] = user.data?.name
}
feedbackList.update({
filters: filters,
})
feedbackList.reload()
})
const feedbackList = createListResource({
doctype: 'LMS Batch Feedback',
filters: {
batch: props.batch,
},
fields: [
'content',
'instructors',
'value',
'feedback',
'name',
'member',
'member_name',
'member_image',
],
cache: ['feedbackList', props.batch, user.data?.name],
})
watch(
() => feedbackList.data,
() => {
if (feedbackList.data.length) {
let data = feedbackList.data
readOnly.value = true
ratingKeys.forEach((key) => {
average[key] = 0
})
data.forEach((row) => {
Object.keys(row).forEach((key) => {
if (ratingKeys.includes(key)) row[key] = row[key] * 5
feedback[key] = row[key]
})
ratingKeys.forEach((key) => {
average[key] += row[key]
})
})
Object.keys(average).forEach((key) => {
average[key] = average[key] / data.length
})
}
}
)
const submitFeedback = () => {
ratingKeys.forEach((key) => {
feedback[key] = feedback[key] / 5
})
feedbackList.insert.submit(
{
member: user.data?.name,
batch: props.batch,
...feedback,
},
{
onSuccess: () => {
feedbackList.reload()
},
}
)
}
const feedbackColumns = computed(() => {
return [
{
label: 'Member',
key: 'member_name',
width: '10rem',
},
{
label: 'Feedback',
key: 'feedback',
width: '15rem',
},
{
label: 'Content',
key: 'content',
width: '9rem',
},
{
label: 'Instructors',
key: 'instructors',
width: '9rem',
},
{
label: 'Value',
key: 'value',
width: '9rem',
},
]
})
</script>
<style>
.feedback-list > button > div {
align-items: start;
padding: 0.15rem 0;
}
</style>

View File

@@ -0,0 +1,170 @@
<template>
<div v-if="batch.data" class="border-2 rounded-md p-5 lg:w-72">
<div
v-if="batch.data.seat_count && seats_left > 0"
class="text-xs bg-green-100 text-green-700 float-right px-2 py-0.5 rounded-md"
>
{{ seats_left }}
<span v-if="seats_left > 1">
{{ __('Seats Left') }}
</span>
<span v-else-if="seats_left == 1">
{{ __('Seat Left') }}
</span>
</div>
<div
v-else-if="batch.data.seat_count && seats_left <= 0"
class="text-xs bg-red-100 text-red-700 float-right px-2 py-0.5 rounded-md"
>
{{ __('Sold Out') }}
</div>
<div
v-if="batch.data.amount"
class="text-lg font-semibold mb-3 text-ink-gray-9"
>
{{ formatNumberIntoCurrency(batch.data.amount, batch.data.currency) }}
</div>
<div class="flex items-center mb-3 text-ink-gray-7">
<BookOpen class="h-4 w-4 stroke-1.5 mr-2" />
<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
</div>
<DateRange
:startDate="batch.data.start_date"
:endDate="batch.data.end_date"
class="mb-3"
/>
<div class="flex items-center mb-3 text-ink-gray-7">
<Clock class="h-4 w-4 stroke-1.5 mr-2" />
<span>
{{ formatTime(batch.data.start_time) }} -
{{ formatTime(batch.data.end_time) }}
</span>
</div>
<div v-if="batch.data.timezone" class="flex items-center text-ink-gray-7">
<Globe class="h-4 w-4 stroke-1.5 mr-2" />
<span>
{{ batch.data.timezone }}
</span>
</div>
<router-link
v-if="isModerator || isStudent"
:to="{
name: 'Batch',
params: {
batchName: batch.data.name,
},
}"
>
<Button variant="solid" class="w-full mt-4">
<span>
{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
</span>
</Button>
</router-link>
<router-link
:to="{
name: 'Billing',
params: {
type: 'batch',
name: batch.data.name,
},
}"
v-else-if="batch.data.paid_batch && batch.data.seats_left"
>
<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
<span>
{{ __('Register Now') }}
</span>
</Button>
</router-link>
<Button
variant="solid"
class="w-full mt-2"
v-else-if="batch.data.allow_self_enrollment && batch.data.seats_left"
@click="enrollInBatch()"
>
{{ __('Enroll Now') }}
</Button>
<router-link
v-if="isModerator"
:to="{
name: 'BatchForm',
params: {
batchName: batch.data.name,
},
}"
>
<Button class="w-full mt-2">
<span>
{{ __('Edit') }}
</span>
</Button>
</router-link>
</div>
</template>
<script setup>
import { inject, computed } from 'vue'
import { Badge, Button, createResource } from 'frappe-ui'
import { BookOpen, Clock, Globe } from 'lucide-vue-next'
import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
import DateRange from '@/components/Common/DateRange.vue'
import { useRouter } from 'vue-router'
const router = useRouter()
const user = inject('$user')
const props = defineProps({
batch: {
type: Object,
default: null,
},
})
const enroll = createResource({
url: 'lms.lms.utils.enroll_in_batch',
makeParams(values) {
return {
batch: props.batch.data.name,
}
},
})
const enrollInBatch = () => {
if (!user.data) {
window.location.href = `/login?redirect-to=/batches/details/${props.batch.data.name}`
}
enroll.submit(
{},
{
onSuccess(data) {
showToast(
__('Success'),
__('You have been enrolled in this batch'),
'check'
)
router.push({
name: 'Batch',
params: {
batchName: props.batch.data.name,
},
})
},
}
)
}
const seats_left = computed(() => {
if (props.batch.data?.seat_count) {
return props.batch.data?.seat_count - props.batch.data?.students?.length
}
return null
})
const isStudent = computed(() => {
return props.batch.data?.students?.includes(user.data?.name)
})
const isModerator = computed(() => {
return user.data?.is_moderator
})
</script>

View File

@@ -0,0 +1,445 @@
<template>
<div class="">
<div class="w-full flex items-center justify-between pb-4">
<div class="font-medium text-ink-gray-7">
{{ __('Statistics') }}
</div>
</div>
<div class="grid grid-cols-4 gap-5 mb-8">
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<User class="w-5 h-5 stroke-1.5" />
</div>
<div class="flex items-center space-x-2">
<span class="font-semibold">
{{ students.data?.length }}
</span>
<span class="">
{{ __('Students') }}
</span>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<GraduationCap class="w-5 h-5 stroke-1.5" />
</div>
<div class="flex items-center space-x-2">
<span class="font-semibold">
{{ certificationCount.data }}
</span>
<span class="">
{{ __('Certified') }}
</span>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<BookOpen class="w-5 h-5 stroke-1.5" />
</div>
<div class="flex items-center space-x-2">
<span class="font-semibold">
{{ batch.courses?.length }}
</span>
<span>
{{ __('Courses') }}
</span>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<ShieldCheck class="w-5 h-5 stroke-1.5" />
</div>
<div class="flex items-center space-x-2">
<span class="font-semibold">
{{ assessmentCount }}
</span>
<span>
{{ __('Assessments') }}
</span>
</div>
</div>
</div>
<div v-if="showProgressChart" class="mb-8">
<div class="text-ink-gray-7 font-medium">
{{ __('Progress') }}
</div>
<ApexChart
:options="chartOptions"
:series="chartData"
type="bar"
:height="chartData[0].data.length * 30 + 100"
/>
<div
class="flex items-center justify-center text-sm text-ink-gray-7 space-x-4"
>
<div class="flex items-center space-x-2">
<div
class="w-3 h-3 rounded-sm"
:style="{ 'background-color': theme.colors.green[600] }"
></div>
<div>
{{ __('Courses') }}
</div>
</div>
<div class="flex items-center space-x-2">
<div
class="w-3 h-3 rounded-sm"
:style="{ 'background-color': theme.colors.blue[600] }"
></div>
<div>
{{ __('Assessments') }}
</div>
</div>
</div>
</div>
</div>
<div>
<div class="flex items-center justify-between mb-4">
<div class="text-ink-gray-7 font-medium">
{{ __('Students') }}
</div>
<Button @click="openStudentModal()">
<template #prefix>
<Plus class="h-4 w-4" />
</template>
{{ __('Add') }}
</Button>
</div>
<div v-if="students.data?.length">
<ListView
:columns="getStudentColumns()"
:rows="students.data"
row-key="name"
:options="{
showTooltip: false,
}"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
>
<ListHeaderItem
:item="item"
v-for="item in getStudentColumns()"
:title="item.label"
>
<template #prefix="{ item }">
<FeatherIcon
v-if="item.icon"
:name="item.icon"
class="h-4 w-4 stroke-1.5"
/>
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<ListRow
:row="row"
v-for="row in students.data"
class="group cursor-pointer"
@click="openStudentProgressModal(row)"
>
<template #default="{ column, item }">
<ListRowItem
:item="row[column.key]"
:align="column.align"
class="text-sm"
>
<template #prefix>
<div v-if="column.key == 'full_name'">
<Avatar
class="flex items-center"
:image="row['user_image']"
:label="item"
size="sm"
/>
</div>
</template>
<div
v-if="column.key == 'progress'"
class="flex items-center space-x-4 w-full"
>
<ProgressBar :progress="row[column.key]" size="sm" />
<div class="text-xs">{{ row[column.key] }}%</div>
</div>
<div v-else>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button
variant="ghost"
@click="removeStudents(selections, unselectAll)"
>
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
</div>
<div v-else class="text-sm italic text-ink-gray-5">
{{ __('There are no students in this batch.') }}
</div>
</div>
<StudentModal
:batch="props.batch.name"
v-model="showStudentModal"
v-model:reloadStudents="students"
/>
<BatchStudentProgress
:student="selectedStudent"
v-model="showStudentProgressModal"
/>
</template>
<script setup>
import {
Avatar,
Button,
createResource,
FeatherIcon,
ListHeader,
ListHeaderItem,
ListSelectBanner,
ListRow,
ListRows,
ListView,
ListRowItem,
} from 'frappe-ui'
import {
BookOpen,
GraduationCap,
Plus,
ShieldCheck,
Trash2,
User,
} from 'lucide-vue-next'
import { ref, watch } from 'vue'
import StudentModal from '@/components/Modals/StudentModal.vue'
import { showToast } from '@/utils'
import ProgressBar from '@/components/ProgressBar.vue'
import BatchStudentProgress from '@/components/Modals/BatchStudentProgress.vue'
import ApexChart from 'vue3-apexcharts'
import { theme } from '@/utils/theme'
const showStudentModal = ref(false)
const showStudentProgressModal = ref(false)
const selectedStudent = ref(null)
const chartData = ref(null)
const chartOptions = ref(null)
const showProgressChart = ref(false)
const assessmentCount = ref(0)
const props = defineProps({
batch: {
type: Object,
default: null,
},
})
const students = createResource({
url: 'lms.lms.utils.get_batch_students',
cache: ['students', props.batch.name],
params: {
batch: props.batch?.name,
},
auto: true,
onSuccess(data) {
chartData.value = getChartData()
showProgressChart.value = data.length && true
},
})
const getStudentColumns = () => {
let columns = [
{
label: 'Full Name',
key: 'full_name',
width: '20rem',
icon: 'user',
},
{
label: 'Progress',
key: 'progress',
width: '15rem',
icon: 'activity',
},
{
label: 'Last Active',
key: 'last_active',
width: '10rem',
align: 'center',
icon: 'clock',
},
]
return columns
}
const openStudentModal = () => {
showStudentModal.value = true
}
const openStudentProgressModal = (row) => {
showStudentProgressModal.value = true
selectedStudent.value = row
}
const deleteStudents = createResource({
url: 'lms.lms.api.delete_documents',
makeParams(values) {
return {
doctype: 'LMS Batch Enrollment',
documents: values.students,
}
},
})
const removeStudents = (selections, unselectAll) => {
deleteStudents.submit(
{
students: Array.from(selections),
},
{
onSuccess(data) {
students.reload()
showToast(__('Success'), __('Students deleted successfully'), 'check')
unselectAll()
},
}
)
}
const getChartData = () => {
let categories = {}
if (!students.data?.length) return []
Object.keys(students.data[0].courses).forEach((course) => {
categories[course] = {
value: 0,
type: 'course',
label: course,
}
})
Object.keys(students.data?.[0].assessments).forEach((assessment) => {
categories[assessment] = {
value: 0,
type: 'assessment',
label: assessment,
}
})
students.data.forEach((student) => {
Object.keys(student.courses).forEach((course) => {
if (student.courses[course] === 100) {
categories[course].value += 1
}
})
Object.keys(student.assessments).forEach((assessment) => {
if (student.assessments[assessment].result === 'Pass') {
categories[assessment].value += 1
}
})
})
chartOptions.value = getChartOptions(categories)
return [
{
name: __('Completed by Students'),
data: Object.values(categories).map((item) => item.value),
},
]
}
const getChartOptions = (categories) => {
const courseColor = theme.colors.green[700]
const assessmentColor = theme.colors.blue[700]
const maxY =
students.data?.length % 5
? students.data?.length + (5 - (students.data?.length % 5))
: students.data?.length
return {
chart: {
type: 'bar',
toolbar: {
show: false,
},
},
plotOptions: {
bar: {
distributed: true,
borderRadius: 3,
borderRadiusApplication: 'end',
horizontal: true,
barHeight: '40%',
},
},
colors: Object.values(categories).map((item) =>
item.type === 'course' ? courseColor : assessmentColor
),
xaxis: {
categories: Object.values(categories).map((item) => item.label),
labels: {
style: {
fontSize: '10px',
},
rotate: 0,
formatter: function (value) {
return value.length > 30 ? `${value.substring(0, 30)}...` : value
},
},
},
yaxis: {
max: maxY,
min: 0,
stepSize: 10,
tickAmount: maxY / 5,
/* reversed: true */
},
}
}
watch(students, () => {
if (students.data?.length) {
assessmentCount.value = Object.keys(students.data?.[0].assessments).length
}
})
const certificationCount = createResource({
url: 'frappe.client.get_count',
params: {
doctype: 'LMS Certificate',
filters: {
batch_name: props.batch.name,
},
},
auto: true,
})
</script>
<style>
.apexcharts-legend {
display: none !important;
}
</style>

View File

@@ -0,0 +1,92 @@
<template>
<div class="flex flex-col justify-between min-h-0">
<div>
<div class="flex items-center justify-between">
<div class="font-semibold mb-1 text-ink-gray-9">
{{ __(label) }}
</div>
<Badge
v-if="isDirty"
:label="__('Not Saved')"
variant="subtle"
theme="orange"
/>
</div>
<div class="text-xs text-ink-gray-5">
{{ __(description) }}
</div>
</div>
<div class="overflow-y-auto">
<SettingFields :fields="fields" :data="data.data" />
<div class="flex flex-row-reverse mt-auto">
<Button variant="solid" :loading="saveSettings.loading" @click="update">
{{ __('Update') }}
</Button>
</div>
</div>
</div>
</template>
<script setup>
import { createResource, Button, Badge } from 'frappe-ui'
import SettingFields from '@/components/SettingFields.vue'
import { watch, ref } from 'vue'
const isDirty = ref(false)
const props = defineProps({
fields: {
type: Array,
required: true,
},
data: {
type: Object,
required: true,
},
label: {
type: String,
required: true,
},
description: {
type: String,
},
})
const saveSettings = createResource({
url: 'frappe.client.set_value',
makeParams(values) {
return {
doctype: 'Website Settings',
name: 'Website Settings',
fieldname: values.fields,
}
},
})
const update = () => {
let fieldsToSave = {}
let imageFields = ['favicon', 'banner_image', 'footer_logo']
props.fields.forEach((f) => {
if (imageFields.includes(f.name)) {
fieldsToSave[f.name] = f.value ? f.value.file_url : null
} else {
fieldsToSave[f.name] = f.value
}
})
saveSettings.submit(
{
fields: fieldsToSave,
},
{
onSuccess(data) {
isDirty.value = false
},
}
)
}
watch(props.data, (newData) => {
if (newData && !isDirty.value) {
isDirty.value = true
}
})
</script>

View File

@@ -0,0 +1,130 @@
<template>
<div class="flex flex-col min-h-0">
<div class="flex items-center justify-between">
<div class="text-xl font-semibold mb-5 text-ink-gray-9">
{{ label }}
</div>
<Button @click="() => showCategoryForm()">
<template #icon>
<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
<X v-else class="h-3 w-3 stroke-1.5" />
</template>
</Button>
</div>
<div
v-if="showForm"
class="flex items-center justify-between my-4 space-x-2"
>
<FormControl
ref="categoryInput"
v-model="category"
:placeholder="__('Category Name')"
class="flex-1"
/>
<Button @click="addCategory()" variant="subtle">
{{ __('Add') }}
</Button>
</div>
<div class="overflow-y-scroll">
<div class="text-base divide-y space-y-2">
<FormControl
:value="cat.category"
type="text"
v-for="cat in categories.data"
class=""
@change.stop="(e) => update(cat.name, e.target.value)"
/>
</div>
</div>
</div>
</template>
<script setup>
import {
Button,
FormControl,
createListResource,
createResource,
debounce,
} from 'frappe-ui'
import { Plus, X } from 'lucide-vue-next'
import { ref } from 'vue'
const showForm = ref(false)
const category = ref(null)
const categoryInput = ref(null)
const props = defineProps({
label: {
type: String,
required: true,
},
description: {
type: String,
default: '',
},
})
const categories = createListResource({
doctype: 'LMS Category',
fields: ['name', 'category'],
auto: true,
})
const newCategory = createResource({
url: 'frappe.client.insert',
makeParams(values) {
return {
doc: {
doctype: 'LMS Category',
category: category.value,
},
}
},
})
const addCategory = () => {
newCategory.submit(
{},
{
onSuccess(data) {
categories.reload()
category.value = null
},
}
)
}
const showCategoryForm = () => {
showForm.value = !showForm.value
setTimeout(() => {
categoryInput.value.$el.querySelector('input').focus()
}, 0)
}
const updateCategory = createResource({
url: 'frappe.client.rename_doc',
makeParams(values) {
return {
doctype: 'LMS Category',
old_name: values.name,
new_name: values.category,
}
},
})
const update = (name, value) => {
updateCategory.submit(
{
name: name,
category: value,
},
{
onSuccess() {
categories.reload()
},
}
)
}
</script>

View File

@@ -0,0 +1,22 @@
<template>
<div class="flex items-center text-ink-gray-7">
<Calendar class="h-4 w-4 stroke-1.5 mr-2" />
<span>
{{ getFormattedDateRange(props.startDate, props.endDate) }}
</span>
</div>
</template>
<script setup>
import { Calendar } from 'lucide-vue-next'
import { getFormattedDateRange } from '@/utils'
const props = defineProps({
startDate: {
type: String,
},
endDate: {
type: String,
},
})
</script>

View File

@@ -0,0 +1,290 @@
<template>
<Combobox v-model="selectedValue" nullable v-slot="{ open: isComboboxOpen }">
<Popover class="w-full" v-model:show="showOptions">
<template #target="{ open: openPopover, togglePopover }">
<slot name="target" v-bind="{ open: openPopover, togglePopover }">
<div class="w-full">
<button
class="flex w-full items-center justify-between focus:outline-none"
:class="inputClasses"
@click="() => togglePopover()"
>
<div class="flex items-center">
<slot name="prefix" />
<span
class="overflow-hidden text-ellipsis whitespace-nowrap text-base leading-5"
v-if="selectedValue"
>
{{ displayValue(selectedValue) }}
</span>
<span class="text-base leading-5 text-ink-gray-4" v-else>
{{ placeholder || '' }}
</span>
</div>
<ChevronDown class="h-4 w-4 stroke-1.5" />
</button>
</div>
</slot>
</template>
<template #body="{ isOpen }">
<div v-show="isOpen">
<div
class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
>
<div class="relative px-1.5 pt-0.5">
<ComboboxInput
ref="search"
class="form-input w-full"
type="text"
@change="
(e) => {
query = e.target.value
}
"
:value="query"
autocomplete="off"
placeholder="Search"
/>
<button
class="absolute right-1.5 inline-flex h-7 w-7 items-center justify-center"
@click="selectedValue = null"
>
<X class="h-4 w-4 stroke-1.5" />
</button>
</div>
<ComboboxOptions
class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
static
>
<div
class="mt-1.5"
v-for="group in groups"
:key="group.key"
v-show="group.items.length > 0"
>
<div
v-if="group.group && !group.hideLabel"
class="px-2.5 py-1.5 text-sm font-medium text-ink-gray-4"
>
{{ group.group }}
</div>
<ComboboxOption
as="template"
v-for="option in group.items"
:key="option.value"
:value="option"
v-slot="{ active, selected }"
>
<li
:class="[
'flex items-center rounded px-2.5 py-2 text-base',
{ 'bg-surface-gray-2': active },
]"
>
<slot
name="item-prefix"
v-bind="{ active, selected, option }"
/>
<slot
name="item-label"
v-bind="{ active, selected, option }"
>
<div class="flex flex-col space-y-1">
<div>
{{ option.label }}
</div>
<div
v-if="option.description"
class="text-xs text-ink-gray-7"
v-html="option.description"
></div>
</div>
</slot>
</li>
</ComboboxOption>
</div>
<li
v-if="groups.length == 0"
class="mt-1.5 rounded-md px-2.5 py-1.5 text-base text-ink-gray-5"
>
No results found
</li>
</ComboboxOptions>
<div v-if="slots.footer" class="border-t p-1.5 pb-0.5">
<slot
name="footer"
v-bind="{ value: search?.el._value, close }"
></slot>
</div>
</div>
</div>
</template>
</Popover>
</Combobox>
</template>
<script setup>
import {
Combobox,
ComboboxInput,
ComboboxOptions,
ComboboxOption,
} from '@headlessui/vue'
import { Popover, Button } from 'frappe-ui'
import { ChevronDown, X } from 'lucide-vue-next'
import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
const props = defineProps({
modelValue: {
type: String,
default: '',
},
options: {
type: Array,
default: () => [],
},
size: {
type: String,
default: 'md',
},
variant: {
type: String,
default: 'subtle',
},
placeholder: {
type: String,
default: '',
},
disabled: {
type: Boolean,
default: false,
},
filterable: {
type: Boolean,
default: true,
},
})
const emit = defineEmits(['update:modelValue', 'update:query', 'change'])
const query = ref('')
const showOptions = ref(false)
const search = ref(null)
const attrs = useAttrs()
const slots = useSlots()
const valuePropPassed = computed(() => 'value' in attrs)
const selectedValue = computed({
get() {
return valuePropPassed.value ? attrs.value : props.modelValue
},
set(val) {
query.value = ''
if (val) {
showOptions.value = false
}
emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
},
})
function close() {
showOptions.value = false
}
const groups = computed(() => {
if (!props.options || props.options.length == 0) return []
let groups = props.options[0]?.group
? props.options
: [{ group: '', items: props.options }]
return groups
.map((group, i) => {
return {
key: i,
group: group.group,
hideLabel: group.hideLabel || false,
items: props.filterable ? filterOptions(group.items) : group.items,
}
})
.filter((group) => group.items.length > 0)
})
function filterOptions(options) {
if (!query.value) {
return options
}
return options.filter((option) => {
let searchTexts = [option.label, option.value]
return searchTexts.some((text) =>
(text || '').toString().toLowerCase().includes(query.value.toLowerCase())
)
})
}
function displayValue(option) {
if (typeof option === 'string') {
let allOptions = groups.value.flatMap((group) => group.items)
let selectedOption = allOptions.find((o) => o.value === option)
return selectedOption?.label || option
}
return option?.label
}
watch(query, (q) => {
emit('update:query', q)
})
watch(showOptions, (val) => {
if (val) {
nextTick(() => {
search.value.el.focus()
})
}
})
const textColor = computed(() => {
return props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
})
const inputClasses = computed(() => {
let sizeClasses = {
sm: 'text-base rounded h-7',
md: 'text-base rounded h-8',
lg: 'text-lg rounded-md h-10',
xl: 'text-xl rounded-md h-10',
}[props.size]
let paddingClasses = {
sm: 'py-1.5 px-2',
md: 'py-1.5 px-2.5',
lg: 'py-1.5 px-3',
xl: 'py-1.5 px-3',
}[props.size]
let variant = props.disabled ? 'disabled' : props.variant
let variantClasses = {
subtle:
'border border-gray-100 bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
outline:
'border border-outline-gray-2 bg-surface-white placeholder-ink-gray-4 hover:border-outline-gray-3 hover:shadow-sm focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
disabled: [
'border bg-surface-menu-bar placeholder-ink-gray-3',
props.variant === 'outline'
? 'border-outline-gray-2'
: 'border-transparent',
],
}[variant]
return [
sizeClasses,
paddingClasses,
variantClasses,
textColor.value,
'transition-colors w-full',
]
})
defineExpose({ query })
</script>

View File

@@ -0,0 +1,177 @@
<template>
<div
class="editor flex flex-col gap-1"
:style="{
height: height,
}"
>
<span class="text-xs text-ink-gray-7" v-if="label">
{{ label }}
</span>
<div
ref="editor"
class="h-auto flex-1 overflow-hidden overscroll-none !rounded border border-outline-gray-2 bg-surface-gray-2 dark:bg-gray-900"
/>
<span
class="mt-1 text-xs text-ink-gray-5"
v-show="description"
v-html="description"
></span>
<Button
v-if="showSaveButton"
@click="emit('save', aceEditor?.getValue())"
class="mt-3"
>
{{ __('Save') }}
</Button>
</div>
</template>
<script setup lang="ts">
import ace from 'ace-builds'
import 'ace-builds/src-min-noconflict/ext-searchbox'
import 'ace-builds/src-min-noconflict/theme-chrome'
import 'ace-builds/src-min-noconflict/theme-twilight'
import { PropType, onMounted, ref, watch } from 'vue'
import { Button } from 'frappe-ui'
const isDark = ref(false)
const props = defineProps({
modelValue: {
type: [Object, String, Array],
},
type: {
type: String as PropType<'JSON' | 'HTML' | 'Python' | 'JavaScript' | 'CSS'>,
default: 'JSON',
},
label: {
type: String,
default: '',
},
readonly: {
type: Boolean,
default: false,
},
height: {
type: String,
default: '250px',
},
showLineNumbers: {
type: Boolean,
default: false,
},
autofocus: {
type: Boolean,
default: true,
},
showSaveButton: {
type: Boolean,
default: false,
},
description: {
type: String,
default: '',
},
})
const emit = defineEmits(['save', 'update:modelValue'])
const editor = ref<HTMLElement | null>(null)
let aceEditor = null as ace.Ace.Editor | null
onMounted(() => {
isDark.value = localStorage.getItem('theme') === 'dark'
setupEditor()
})
const setupEditor = () => {
aceEditor = ace.edit(editor.value as HTMLElement)
resetEditor(props.modelValue as string, true)
aceEditor.setReadOnly(props.readonly)
aceEditor.setOptions({
fontSize: '12px',
useWorker: false,
showGutter: props.showLineNumbers,
wrap: props.showLineNumbers,
})
if (props.type === 'CSS') {
import('ace-builds/src-noconflict/mode-css').then(() => {
aceEditor?.session.setMode('ace/mode/css')
})
} else if (props.type === 'JavaScript') {
import('ace-builds/src-noconflict/mode-javascript').then(() => {
aceEditor?.session.setMode('ace/mode/javascript')
})
} else if (props.type === 'Python') {
import('ace-builds/src-noconflict/mode-python').then(() => {
aceEditor?.session.setMode('ace/mode/python')
})
} else if (props.type === 'JSON') {
import('ace-builds/src-noconflict/mode-json').then(() => {
aceEditor?.session.setMode('ace/mode/json')
})
} else {
import('ace-builds/src-noconflict/mode-html').then(() => {
aceEditor?.session.setMode('ace/mode/html')
})
}
aceEditor.on('blur', () => {
try {
let value = aceEditor?.getValue() || ''
if (props.type === 'JSON') {
value = JSON.parse(value)
}
if (value === props.modelValue) return
if (!props.showSaveButton && !props.readonly) {
emit('update:modelValue', value)
}
} catch (e) {
// do nothing
}
})
}
const getModelValue = () => {
let value = props.modelValue || ''
try {
if (props.type === 'JSON' || typeof value === 'object') {
value = JSON.stringify(value, null, 2)
}
} catch (e) {
// do nothing
}
return value as string
}
function resetEditor(value: string, resetHistory = false) {
value = getModelValue()
aceEditor?.setValue(value)
aceEditor?.clearSelection()
console.log(isDark.value)
aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
props.autofocus && aceEditor?.focus()
if (resetHistory) {
aceEditor?.session.getUndoManager().reset()
}
}
watch(isDark, () => {
console.log(isDark.value)
aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
})
watch(
() => props.type,
() => {
setupEditor()
}
)
watch(
() => props.modelValue,
() => {
resetEditor(props.modelValue as string)
}
)
defineExpose({ resetEditor })
</script>

View File

@@ -0,0 +1,114 @@
<template>
<div class="space-y-1.5">
<label class="block text-xs text-ink-gray-5">
{{ label }}
</label>
<div class="w-full">
<Popover>
<template #target="{ togglePopover }">
<button
@click="openPopover(togglePopover)"
class="flex w-full items-center space-x-2 focus:outline-none bg-surface-gray-2 rounded h-7 py-1.5 px-2 hover:bg-surface-gray-3 focus:bg-surface-white border border-gray-100 hover:border-outline-gray-modals focus:border-outline-gray-4"
>
<component
v-if="selectedIcon"
class="w-4 h-4 text-ink-gray-7 stroke-1.5"
:is="icons[selectedIcon]"
/>
<component
v-else
class="w-4 h-4 text-ink-gray-7 stroke-1.5"
:is="icons.Folder"
/>
<span v-if="selectedIcon">
{{ selectedIcon }}
</span>
<span v-else class="text-ink-gray-5">
{{ __('Choose an icon') }}
</span>
</button>
</template>
<template #body-main="{ close, isOpen }" class="w-full">
<div class="p-3 max-h-56 overflow-auto w-full">
<FormControl
ref="search"
v-model="iconQuery"
:placeholder="__('Search for an icon')"
autocomplete="off"
/>
<div class="grid grid-cols-10 gap-4 mt-4">
<div v-for="(iconComponent, iconName) in filteredIcons">
<component
:is="iconComponent"
class="h-4 w-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
@click="setIcon(iconName, close)"
/>
</div>
</div>
</div>
</template>
</Popover>
</div>
</div>
</template>
<script setup>
import { FormControl, Popover } from 'frappe-ui'
import * as icons from 'lucide-vue-next'
import { ref, computed, onMounted, nextTick } from 'vue'
const iconQuery = ref('')
const selectedIcon = ref('')
const search = ref(null)
const emit = defineEmits(['update:modelValue', 'change'])
const iconArray = ref(
Object.keys(icons)
.sort(() => 0.5 - Math.random())
.slice(0, 100)
.reduce((result, key) => {
result[key] = icons[key]
return result
}, {})
)
const props = defineProps({
label: {
type: String,
default: 'Icon',
},
modelValue: {
type: String,
default: '',
},
})
onMounted(() => {
selectedIcon.value = props.modelValue
})
const setIcon = (icon, close) => {
emit('update:modelValue', icon)
selectedIcon.value = icon
iconQuery.value = ''
close()
}
const filteredIcons = computed(() => {
if (!iconQuery.value) {
return iconArray.value
}
return Object.keys(icons)
.filter((icon) =>
icon.toLowerCase().includes(iconQuery.value.toLowerCase())
)
.reduce((result, key) => {
result[key] = icons[key]
return result
}, {})
})
const openPopover = (togglePopover) => {
togglePopover()
}
</script>

View File

@@ -0,0 +1,169 @@
<template>
<div class="space-y-1.5">
<label class="block" :class="labelClasses" v-if="attrs.label">
{{ attrs.label }}
<span class="text-ink-red-3" v-if="attrs.required">*</span>
</label>
<Autocomplete
ref="autocomplete"
:options="options.data"
v-model="value"
:size="attrs.size || 'sm'"
:variant="attrs.variant"
:placeholder="attrs.placeholder"
:filterable="false"
>
<template #target="{ open, togglePopover }">
<slot name="target" v-bind="{ open, togglePopover }" />
</template>
<template #prefix>
<slot name="prefix" />
</template>
<template #item-prefix="{ active, selected, option }">
<slot name="item-prefix" v-bind="{ active, selected, option }" />
</template>
<template #item-label="{ active, selected, option }">
<slot name="item-label" v-bind="{ active, selected, option }" />
</template>
<template #footer="{ value, close }">
<div v-if="attrs.onCreate">
<Button
variant="ghost"
class="w-full !justify-start"
label="Create New"
@click="attrs.onCreate(value, close)"
>
<template #prefix>
<Plus class="h-4 w-4 stroke-1.5" />
</template>
</Button>
</div>
<div>
<Button
variant="ghost"
class="w-full !justify-start"
:label="__('Clear')"
@click="() => clearValue(close)"
>
<template #prefix>
<X class="h-4 w-4 stroke-1.5" />
</template>
</Button>
</div>
</template>
</Autocomplete>
<p v-if="description" class="text-sm text-ink-gray-5">{{ description }}</p>
</div>
</template>
<script setup>
import Autocomplete from '@/components/Controls/Autocomplete.vue'
import { watchDebounced } from '@vueuse/core'
import { createResource, Button } from 'frappe-ui'
import { Plus, X } from 'lucide-vue-next'
import { useAttrs, computed, ref } from 'vue'
const props = defineProps({
doctype: {
type: String,
required: true,
},
filters: {
type: Object,
default: () => ({}),
},
modelValue: {
type: String,
default: '',
},
description: {
type: String,
default: '',
},
})
const emit = defineEmits(['update:modelValue', 'change'])
const attrs = useAttrs()
const valuePropPassed = computed(() => 'value' in attrs)
const value = computed({
get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
set: (val) => {
return (
val?.value &&
emit(valuePropPassed.value ? 'change' : 'update:modelValue', val?.value)
)
},
})
const autocomplete = ref(null)
const text = ref('')
watchDebounced(
() => autocomplete.value?.query,
(val) => {
val = val || ''
if (text.value === val) return
text.value = val
reload(val)
},
{ debounce: 300, immediate: true }
)
watchDebounced(
() => props.doctype,
() => reload(''),
{ debounce: 300, immediate: true }
)
const options = createResource({
url: 'frappe.desk.search.search_link',
cache: [props.doctype, text.value],
method: 'POST',
auto: true,
params: {
txt: text.value,
doctype: props.doctype,
filters: props.filters,
},
transform: (data) => {
return data.map((option) => {
return {
label: option.label || option.value,
value: option.value,
description: option.description,
}
})
},
})
const reload = (val) => {
options.update({
params: {
txt: val,
doctype: props.doctype,
filters: props.filters,
},
})
options.reload()
}
const clearValue = (close) => {
emit(valuePropPassed.value ? 'change' : 'update:modelValue', '')
close()
}
const labelClasses = computed(() => {
return [
{
sm: 'text-xs',
md: 'text-base',
}[attrs.size || 'sm'],
'text-ink-gray-5',
]
})
</script>

Some files were not shown because too many files have changed in this diff Show More