Compare commits

..

617 Commits

Author SHA1 Message Date
Jannat Patel
f01e634445 docs: grammar correction in readme 2022-12-30 17:06:04 +05:30
Jannat Patel
1564de346d docs: improved readme 2022-12-30 12:56:41 +05:30
Jannat Patel
a5268af269 Merge pull request #459 from pateljannat/onboarding-fixes 2022-12-29 16:43:14 +05:30
Jannat Patel
565d9e093c fix: onboarding header 2022-12-29 16:29:03 +05:30
Jannat Patel
cb75606b05 Merge pull request #458 from pateljannat/lesson-issues 2022-12-29 14:39:23 +05:30
Jannat Patel
7c36294359 fix: removed unnecessary code 2022-12-29 11:32:31 +05:30
Jannat Patel
ad084389cc fix: minor issues 2022-12-29 11:31:52 +05:30
Jannat Patel
aa8c65a00a Merge pull request #454 from pateljannat/course-count 2022-12-28 15:29:06 +05:30
Jannat Patel
95ec31e238 fix: formatting 2022-12-28 15:10:01 +05:30
Jannat Patel
b5f3a0fa98 feat: course count in list view 2022-12-28 13:13:03 +05:30
Jannat Patel
36bf0d7fb9 fix: rectified condition for login redirection 2022-12-28 11:07:37 +05:30
Jannat Patel
1719887ac4 Merge pull request #453 from pateljannat/setup-wizard-check-on-login 2022-12-27 17:39:06 +05:30
Jannat Patel
7f149bf3b1 fix: login redirect condition 2022-12-27 17:06:41 +05:30
Jannat Patel
f592e6655f fix: docker setup 2022-12-27 16:36:40 +05:30
Jannat Patel
46399c7b13 revert: docker setup 2022-12-27 15:44:12 +05:30
Jannat Patel
0ec66f0f2d fix: docker setup 2022-12-27 15:17:33 +05:30
Jannat Patel
96c8b64e26 Merge pull request #452 from pateljannat/search 2022-12-26 16:46:46 +05:30
Jannat Patel
bd0b7a8286 fix: removed unused code 2022-12-26 13:56:03 +05:30
Jannat Patel
263b3ec476 fix: formatting 2022-12-26 13:27:57 +05:30
Jannat Patel
46075130ab fix: search ux 2022-12-26 13:24:29 +05:30
Jannat Patel
0f314bc4e3 feat: new search ui 2022-12-22 15:47:03 +05:30
Jannat Patel
2b45e7d77c Merge pull request #450 from pateljannat/onboarding-signup 2022-12-21 12:04:49 +05:30
Jannat Patel
987c3e5fe2 Merge pull request #451 from mohsinalimat/main 2022-12-21 10:59:33 +05:30
Jannat Patel
1e1580d58a fix: patch format 2022-12-21 10:40:30 +05:30
Jannat Patel
da9667e1f7 feat: base template and patch for onboarding 2022-12-20 13:32:30 +05:30
Jannat Patel
9e42fdd786 feat: skip onboarding 2022-12-20 11:34:56 +05:30
Jannat Patel
de19abbc5e feat: onboarding ui 2022-12-19 23:25:53 +05:30
MohsinAli
5448a99177 fix: doc url 2022-12-17 17:01:00 +05:30
Jannat Patel
f93d7b0193 signup-and-onboarding 2022-12-16 16:44:55 +05:30
Jannat Patel
d3bda1b5d0 Merge pull request #449 from pateljannat/revert-navbar-settings 2022-12-15 10:35:16 +05:30
Jannat Patel
1c49e78b13 revert: navbar settings 2022-12-15 10:28:17 +05:30
Jannat Patel
9d373d4091 Merge pull request #446 from pateljannat/navbar-settings
Resolves https://github.com/frappe/lms/issues/442
2022-12-12 13:55:31 +05:30
Jannat Patel
26edfc7bb9 fix: remove after_install hook 2022-12-12 13:47:48 +05:30
Jannat Patel
b527c9b160 fix: format 2022-12-12 13:39:01 +05:30
Jannat Patel
0356b8e2d2 feat: pages to navbar settings 2022-12-12 13:31:11 +05:30
Jannat Patel
1bf093d1b9 Merge pull request #443 from pateljannat/course-redirection-issue 2022-12-12 11:37:33 +05:30
Jannat Patel
a78d127702 fix: formatting 2022-12-12 11:28:38 +05:30
Jannat Patel
028c0725c3 fix: hide start learning when no lesson in course 2022-12-12 11:17:51 +05:30
Jannat Patel
424d35bf42 fix: course outline style 2022-12-07 16:06:55 +05:30
Jannat Patel
1effdd8482 Merge pull request #441 from pateljannat/rename-instructor-to-course-creator 2022-12-02 23:46:31 +05:30
Jannat Patel
a780b7520f fix: rename instructor role to course creator 2022-12-01 15:22:18 +05:30
Jannat Patel
233bf36ef6 Merge pull request #440 from pateljannat/rename-skill 2022-12-01 15:03:01 +05:30
Jannat Patel
616a45ebc5 fix: linter 2022-12-01 13:13:01 +05:30
Jannat Patel
136f16c9cc fix: renamed skill doctype to user skill 2022-12-01 12:48:33 +05:30
Jannat Patel
609628b9cf fix: progress page style 2022-11-29 16:18:15 +05:30
Jannat Patel
1e0d2e0f2a Merge pull request #436 from pateljannat/optimisation 2022-11-28 14:44:12 +05:30
Jannat Patel
da7e52f85f perf: course card improvements 2022-11-28 12:40:07 +05:30
Jannat Patel
4640ce82f6 docs: updated readme 2022-11-28 10:26:37 +05:30
Jannat Patel
03ff9e0521 Merge pull request #434 from pateljannat/student-class-view 2022-11-28 10:13:41 +05:30
Jannat Patel
f566211d82 feat: students view for classes 2022-11-25 17:46:46 +05:30
Jannat Patel
66ddea2031 Merge pull request #433 from pateljannat/activity-details 2022-11-25 09:29:54 +05:30
Jannat Patel
8b5a9e1639 fix: removed unnecessary lines of code 2022-11-25 09:21:59 +05:30
Jannat Patel
9a183d2ef1 fix: removed quiz result view 2022-11-25 09:02:19 +05:30
Jannat Patel
807f77755e feat: activity details in class 2022-11-24 18:57:45 +05:30
Jannat Patel
c0a851e045 Merge pull request #432 from pateljannat/class-evaluations 2022-11-23 15:24:39 +05:30
Jannat Patel
96849afcba fix: formatting 2022-11-23 15:14:15 +05:30
Jannat Patel
91e71091ef fix: show evaluation in read only mode 2022-11-23 15:12:57 +05:30
Jannat Patel
f691ebd146 feat: class evaluation 2022-11-23 14:39:18 +05:30
Jannat Patel
f620c431a1 Merge pull request #431 from pateljannat/last-active 2022-11-23 09:52:36 +05:30
Jannat Patel
019743b245 fix: formating 2022-11-22 08:46:39 +05:30
Jannat Patel
1d8e3de136 feat: last active time of class students 2022-11-22 08:43:12 +05:30
Jannat Patel
0f46f6a1c1 Merge pull request #429 from pateljannat/classes 2022-11-21 14:08:29 +05:30
Jannat Patel
b5078c1f1f fix: removed unused file 2022-11-21 13:36:37 +05:30
Jannat Patel
88f9114dd6 ci: updated flake8 url 2022-11-21 12:33:26 +05:30
Jannat Patel
cfcc1b3162 fix: formatting 2022-11-21 12:27:52 +05:30
Jannat Patel
ed2fababff feat: assignment comments display 2022-11-21 12:08:17 +05:30
Jannat Patel
74210245cf feat: assignment submission and ui 2022-11-18 17:05:38 +05:30
Jannat Patel
a4ec058a81 feat: student progress 2022-11-16 18:43:10 +05:30
Jannat Patel
ae2c15fe8c feat: progress page 2022-11-15 18:56:45 +05:30
Jannat Patel
d9e44e0f91 fix: renamed instructor and moderator roles 2022-11-14 17:25:07 +05:30
Jannat Patel
3e1f29af48 feat: add and remove students and courses from class 2022-11-14 16:20:13 +05:30
Jannat Patel
7ac3f6d8ef Merge branch 'main' of https://github.com/frappe/lms into classes 2022-11-11 12:00:12 +05:30
Jannat Patel
e0f2b9c1ab Merge pull request #428 from pateljannat/lesson-chart 2022-11-11 10:54:52 +05:30
Jannat Patel
3785e7066e fix: formatting 2022-11-11 10:46:35 +05:30
Jannat Patel
157f6b45e9 feat: add pages to nav after install 2022-11-11 10:40:29 +05:30
Jannat Patel
c8dbc18179 feat: statistics page 2022-11-10 20:21:43 +05:30
Jannat Patel
1d5d86ef6c feat: claasses 2022-11-09 16:36:26 +05:30
Jannat Patel
f1746978b2 Merge pull request #427 from pateljannat/more-stats 2022-11-09 15:33:34 +05:30
Jannat Patel
e1f4dae832 fix: linting 2022-11-09 15:27:42 +05:30
Jannat Patel
94e7f6a1f4 feat: course and lesson completion count 2022-11-09 15:21:08 +05:30
Jannat Patel
d3ea923da7 fix: profile button visibility 2022-11-09 11:42:16 +05:30
Jannat Patel
dc27dd5d7e Merge pull request #425 from pateljannat/stats-format 2022-11-08 11:55:36 +05:30
Jannat Patel
26f76acdd2 fix: format stats 2022-11-08 11:29:46 +05:30
Jannat Patel
719a32e4a5 Merge pull request #424 from pateljannat/workspace-links 2022-11-07 18:59:59 +05:30
Jannat Patel
cdf004cdec fix: workspace links 2022-11-07 18:50:43 +05:30
Jannat Patel
9d5f495842 Merge pull request #422 from pateljannat/semgrep 2022-11-04 13:54:08 +05:30
Jannat Patel
8204fa8ee7 test: slugify issue 2022-11-04 13:48:12 +05:30
Jannat Patel
9f9dd25f91 fix: translations 2022-11-04 13:39:25 +05:30
Jannat Patel
bd929bfa3f fix: translations 2022-11-04 13:27:14 +05:30
Jannat Patel
5916695d30 ci: removed isort 2022-11-04 12:57:24 +05:30
Jannat Patel
cca42dca49 ci: flake8 issues 2022-11-04 12:43:15 +05:30
Jannat Patel
33065c0ed3 fix: pre commit in profile 2022-11-04 11:49:25 +05:30
Jannat Patel
603eddf878 fix: pre commit issues 2022-11-04 11:47:09 +05:30
Jannat Patel
cda26ab248 ci: test pre commit 2022-11-04 11:37:59 +05:30
Jannat Patel
e73d59d538 ci: pre commit yaml 2022-11-04 11:25:35 +05:30
Jannat Patel
893fac348d ci: pre commit config 2022-11-04 11:22:52 +05:30
Jannat Patel
642b28bad9 Merge pull request #421 from pateljannat/tabs-url 2022-11-04 11:17:23 +05:30
Jannat Patel
b9db14ad44 ci: semgrep 2022-11-04 11:14:37 +05:30
Jannat Patel
0c23ead398 fix: tab urls 2022-11-04 10:46:48 +05:30
Jannat Patel
e9009dcb9c fix: quiz button mayout 2022-11-03 15:23:16 +05:30
Jannat Patel
0d0e64f930 fix: no cache for quiz 2022-11-03 15:01:06 +05:30
Jannat Patel
b1bdf6516e fix: removed unused field 2022-11-03 14:21:06 +05:30
Jannat Patel
eca4f89d8b Merge pull request #419 from pateljannat/course-permission-messages 2022-11-03 11:27:46 +05:30
Jannat Patel
199cbcf33f fix: messages if access lacking 2022-11-03 11:20:58 +05:30
Jannat Patel
1f4c7fcb0f fix: course permission messages 2022-11-03 10:59:39 +05:30
Jannat Patel
59b8c781e3 fix: assignment issues 2022-11-01 14:39:30 +05:30
Jannat Patel
9133a3f50b fix: batch issue 2022-11-01 12:12:08 +05:30
Jannat Patel
b9f4ba6527 Merge pull request #417 from pateljannat/assignments-refactor 2022-10-31 17:22:36 +05:30
Jannat Patel
7b5fe82de9 fix: removed unused field and code 2022-10-31 17:17:46 +05:30
Jannat Patel
d74db85b82 fix: validations 2022-10-31 16:54:22 +05:30
Jannat Patel
915bbdf247 fix: batch context 2022-10-31 11:50:36 +05:30
Jannat Patel
b3412b42b7 refactor: assignments 2022-10-28 19:22:48 +05:30
Jannat Patel
c6b917fa83 Merge branch 'main' of https://github.com/frappe/lms 2022-10-27 17:40:31 +05:30
Jannat Patel
c286afa45f fix: stats graph for the current day 2022-10-27 17:40:27 +05:30
Jannat Patel
c74faa3340 Merge pull request #412 from pateljannat/user-onboarding 2022-10-27 13:38:32 +05:30
Jannat Patel
fa4e8a1ea6 Merge pull request #413 from pateljannat/stats-template 2022-10-27 11:33:49 +05:30
Jannat Patel
42c664a379 Merge pull request #416 from pateljannat/cohort-fixes 2022-10-27 11:31:38 +05:30
Jannat Patel
b84a955ee1 fix: cohorts 2022-10-27 11:23:44 +05:30
Jannat Patel
211ca3111f fix: stats template 2022-10-21 11:00:37 +05:30
Jannat Patel
935e2a976e fix: certifications section in workspace 2022-10-20 20:09:12 +05:30
Jannat Patel
5d38b4dfa0 feat: onboarding 2022-10-20 17:41:26 +05:30
Jannat Patel
cbf852828c Merge pull request #409 from pateljannat/reviews-cta 2022-10-19 17:52:49 +05:30
Jannat Patel
7d8b366a73 fix: reviews CTA 2022-10-19 17:29:05 +05:30
Jannat Patel
4ad457d568 chore: fix subscription limit for course members 2022-10-19 09:56:22 +05:30
Jannat Patel
2ab0cb2787 Merge pull request #406 from pateljannat/stats 2022-10-18 09:52:45 +05:30
Jannat Patel
4feab27c59 fix: show stats to guest users 2022-10-18 09:42:29 +05:30
Jannat Patel
3c1449c898 fix: import chart lib from website bundle 2022-10-17 19:47:11 +05:30
Jannat Patel
7d029c5305 fix: stats grid width 2022-10-17 11:26:47 +05:30
Jannat Patel
13274c01d7 fix: chart color 2022-10-17 10:56:06 +05:30
Jannat Patel
f37229c202 feat: statistics section 2022-10-14 20:33:27 +05:30
Jannat Patel
61f9ff6892 Merge pull request #405 from pateljannat/cohorts 2022-10-13 20:51:46 +05:30
Jannat Patel
3df08b99b3 fix: cohort translations 2022-10-13 17:28:22 +05:30
Jannat Patel
f9748cb723 fix: cohort issue 2022-10-13 17:12:13 +05:30
Jannat Patel
437f637be9 Merge pull request #404 from pateljannat/start-learning-issue 2022-10-13 13:19:39 +05:30
Jannat Patel
7d2b86c548 fix: dont show start learning from course page if disabled 2022-10-13 13:04:22 +05:30
Jannat Patel
c10ff68ee7 Merge pull request #383 from joebordes/i18n_es_001 2022-10-13 12:33:09 +05:30
Jannat Patel
b2a8dd13f6 Merge pull request #402 from pateljannat/dashboard-profile-merge 2022-10-12 15:55:21 +05:30
Jannat Patel
fb8ab132e9 fix: heading for course list page 2022-10-12 11:14:02 +05:30
Jannat Patel
7ce2e45719 Merge branch 'main' of https://github.com/frappe/lms into dashboard-profile-merge 2022-10-12 10:53:38 +05:30
Jannat Patel
c6d15d2605 Merge pull request #401 from pateljannat/ui-components 2022-10-12 10:53:12 +05:30
Jannat Patel
8d57ea4216 fix: better modal UI 2022-10-12 10:44:28 +05:30
Jannat Patel
fdf1bbd1e2 refactor: merged profile and dashboard page 2022-10-11 17:23:36 +05:30
Jannat Patel
662813b378 Merge pull request #400 from pateljannat/quiz-submission 2022-10-11 10:13:18 +05:30
Jannat Patel
8709ae7113 fix: quiz submission 2022-10-11 09:53:21 +05:30
Jannat Patel
ac22b71171 Merge pull request #397 from pateljannat/misc-fixes 2022-10-10 15:47:12 +05:30
Jannat Patel
328d1d6546 fix: label of login button in review section 2022-10-10 13:31:15 +05:30
Jannat Patel
11277d2ef3 fix: misc ux 2022-10-10 13:11:49 +05:30
Jannat Patel
54dc6102a6 Merge pull request #395 from pateljannat/delete-custom-fields-on-uninstall 2022-10-07 10:07:16 +05:30
Jannat Patel
c0c9b50a5f fix: delete custom fields after app in uninstalled 2022-10-06 18:08:27 +05:30
Jannat Patel
e780a6fc7c fix: get course directly from lesson for assignment folder 2022-10-04 19:23:51 +05:30
Jannat Patel
fd89b288e5 fix: username validation 2022-10-04 18:11:55 +05:30
joebordes
a05c3a5e94 i18n(ES) syntax and CSV format 2022-10-02 03:19:12 +02:00
Jannat Patel
43e91c9275 Merge pull request #382 from pateljannat/lms-statistics 2022-09-30 11:17:32 +05:30
Jannat Patel
26dd2935d7 fix: renamed dashboard stats to LMS Statistics 2022-09-30 10:51:51 +05:30
Jannat Patel
f653871e3a fix: duplicate function names 2022-09-29 18:30:45 +05:30
Jannat Patel
89b91a081c fix: course restriction condition 2022-09-29 18:02:50 +05:30
Jannat Patel
246b26079b perf: course cards get all memberships at once 2022-09-29 16:59:08 +05:30
Jannat Patel
41a9e422d5 fix: course list page performance 2022-09-29 13:19:09 +05:30
Jannat Patel
0704d7f4a4 Merge pull request #381 from pateljannat/dashboard-stats 2022-09-29 09:04:15 +05:30
Jannat Patel
1e66742d02 fix: batch creation error 2022-09-28 21:55:35 +05:30
Jannat Patel
d55f827d93 feat: dashboard stat 2022-09-28 18:34:14 +05:30
Jannat Patel
40c68d4d63 Merge pull request #380 from pateljannat/progress-refactor 2022-09-28 12:58:15 +05:30
Jannat Patel
5c58ddc800 fix: progress tracking 2022-09-28 12:42:15 +05:30
Jannat Patel
94171cbc0e Merge pull request #379 from pateljannat/notifications 2022-09-27 18:22:40 +05:30
Jannat Patel
cf8549bb28 fix: removed unused functions 2022-09-27 18:21:57 +05:30
Jannat Patel
a291d73828 feat: show notifications from logs 2022-09-27 18:13:46 +05:30
Jannat Patel
a6156ec863 feat: get notifications 2022-09-26 22:09:18 +05:30
Jannat Patel
be583cc86d fix: conflicts 2022-09-26 09:45:16 +05:30
Jannat Patel
00c55f5e82 Merge branch 'main' of https://github.com/frappe/lms 2022-09-23 07:12:16 +05:30
Jannat Patel
c9fd1f5252 fix: discussions component visibility conditions 2022-09-23 07:12:12 +05:30
Jannat Patel
992d1065ac Merge pull request #378 from pateljannat/subscription 2022-09-22 22:18:09 +05:30
Jannat Patel
247017d19a fix: changed essential plan to pro 2022-09-21 20:38:56 +05:30
Jannat Patel
b9fe05c27f feat: subscription add ons 2022-09-21 17:37:56 +05:30
Jannat Patel
b01a2cfd79 Merge pull request #377 from pateljannat/private-files 2022-09-20 15:39:07 +05:30
Jannat Patel
37f2e7eeda fix: check if path is present 2022-09-19 17:56:49 +05:30
Jannat Patel
4ba6ea9190 fix: removed unnecessary import 2022-09-19 10:34:49 +05:30
Jannat Patel
7c1c061681 fix: change private files to public for company logo, user image and course image 2022-09-16 19:06:53 +05:30
Jannat Patel
47e4175c9a Merge pull request #376 from pateljannat/ux-fix 2022-09-16 16:10:49 +05:30
Jannat Patel
023fd73b86 fix: removed unused classes 2022-09-16 16:05:33 +05:30
Jannat Patel
f7ba72217b fix: controls script loading 2022-09-16 11:37:11 +05:30
Jannat Patel
47b9b1dcd6 fix: show first chapter and question form by default 2022-09-15 22:52:17 +05:30
Jannat Patel
f3adbfef55 Merge pull request #375 from pateljannat/fixes 2022-09-14 20:42:54 +05:30
Jannat Patel
bc9225f8ed fix: course count on profile page 2022-09-14 20:07:58 +05:30
Jannat Patel
62ac0089c9 fix: misc ux 2022-09-14 17:10:38 +05:30
Jannat Patel
af059141f0 fix: profile ux 2022-09-13 17:48:54 +05:30
Jannat Patel
efe73a21d9 fix: profile ui 2022-09-13 17:13:25 +05:30
Jannat Patel
adad299724 Merge pull request #374 from pateljannat/certificate-on-profile 2022-09-13 13:11:38 +05:30
Jannat Patel
15b832eefb fix: styles 2022-09-13 13:03:21 +05:30
Jannat Patel
434b6fdc8f Merge pull request #373 from pateljannat/description-field 2022-09-13 12:49:40 +05:30
Jannat Patel
99c886a9cb fix: conflicts 2022-09-13 12:49:06 +05:30
Jannat Patel
7d18215bc9 feat: certificates section in profile 2022-09-13 12:47:01 +05:30
Jannat Patel
7d7f674d9e fix: empty states 2022-09-12 18:17:06 +05:30
Jannat Patel
46861486c9 fix: text editor for description field 2022-09-12 13:00:51 +05:30
Jannat Patel
d959cacd15 Merge pull request #372 from pateljannat/course-moderator 2022-09-12 12:35:44 +05:30
Jannat Patel
d8d0ce5b45 fix: empty state for review section 2022-09-12 12:15:30 +05:30
Jannat Patel
b94a4ef9d6 feat: role settings from profile 2022-09-12 12:06:36 +05:30
Jannat Patel
212ed8e428 feat: course settings from website 2022-09-09 18:16:02 +05:30
Jannat Patel
6d14bc2f54 fix: encode course image 2022-09-09 16:04:53 +05:30
Jannat Patel
9dc10c3756 feat: allow moderators to edit course 2022-09-09 15:37:35 +05:30
Jannat Patel
316e7be51e Merge branch 'main' of https://github.com/frappe/lms into course-moderator 2022-09-09 11:54:39 +05:30
Jannat Patel
14842a6d56 Merge pull request #371 from pateljannat/ui-fix 2022-09-06 13:12:33 +05:30
Jannat Patel
ce7f3ffca9 fix: no preview message 2022-09-06 11:38:40 +05:30
Jannat Patel
4c969420f3 feat: course moderator 2022-09-06 11:19:11 +05:30
Jannat Patel
36aca1e664 fix: ui for review, instructors and profile 2022-09-05 18:05:16 +05:30
Jannat Patel
3a08f57fb1 fix: context for dashboard 2022-09-05 14:53:13 +05:30
Jannat Patel
8f86a8aba6 chore: removed log 2022-09-05 14:46:40 +05:30
Jannat Patel
e84e02ff07 fix: profile, dashboard and tests 2022-09-05 13:32:51 +05:30
Jannat Patel
7ef625c598 chore: logging user 2022-09-05 11:35:21 +05:30
Jannat Patel
2819e55a61 fix: dashboard function parameters 2022-09-05 10:34:40 +05:30
Jannat Patel
25d9b08dd5 Merge pull request #370 from pateljannat/dashboard 2022-09-05 09:32:16 +05:30
Jannat Patel
6a760c3019 chore: removed logs 2022-09-05 09:25:00 +05:30
Jannat Patel
8088a464ad fix: dashboard creators section issue 2022-09-05 09:16:57 +05:30
Jannat Patel
e41c83a68c fix: spelling in readme 2022-09-02 17:58:52 +05:30
Jannat Patel
2d5b8430bd fix: images and links in readme 2022-09-02 17:55:00 +05:30
Jannat Patel
eabbe3e3ed fix: readme 2022-09-02 17:50:29 +05:30
Jannat Patel
c37cdbdc5f chore: added logs 2022-09-02 17:18:57 +05:30
Jannat Patel
8a0df559c3 Merge pull request #368 from pateljannat/video-and-quiz-field 2022-09-02 14:58:17 +05:30
Jannat Patel
dfc1c9c228 feat: seperate inputs for adding youtube video and quiz 2022-09-02 13:05:26 +05:30
Jannat Patel
ad20c1cbf1 fix: membership doctype structure 2022-09-01 17:12:32 +05:30
Jannat Patel
6f4677b36b fix: ui issues 2022-08-31 15:34:18 +05:30
Jannat Patel
b3a9274cd3 fix: minor UI 2022-08-30 12:50:26 +05:30
Jannat Patel
7a7bc3e0db fix: removed desk access from course instructor role 2022-08-29 09:21:45 +05:30
Jannat Patel
425bb54057 feat: notifications tab in dashboard 2022-08-29 09:19:06 +05:30
Jannat Patel
d82df84cf6 Merge pull request #357 from pateljannat/new-course-ui 2022-08-26 17:39:34 +05:30
Jannat Patel
7d697f068f fix: ux issues 2022-08-26 16:35:02 +05:30
Jannat Patel
4499b34b51 fix: minor issues 2022-08-24 18:20:19 +05:30
Jannat Patel
9c6cc8ecd4 fix: removed web forms of old course creation flow 2022-08-23 18:27:39 +05:30
Jannat Patel
668130d443 feat: access for course creation 2022-08-22 12:58:54 +05:30
Jannat Patel
5aba690318 feat: update quiz 2022-08-19 18:22:43 +05:30
Jannat Patel
7397bf389e feat: add a new quiz 2022-08-19 11:43:49 +05:30
Jannat Patel
e1b16e9ae3 feat: quiz-creation-ui 2022-08-18 19:52:27 +05:30
Jannat Patel
eb50f6fd8f feat: quiz listing 2022-08-16 17:08:43 +05:30
Jannat Patel
5d6dc16a19 fix: create course button and search bar width 2022-08-12 12:34:04 +05:30
Jannat Patel
64dc76d616 fix: text editor for lesson 2022-08-12 09:09:50 +05:30
Jannat Patel
301664ce93 fix: ui for course creation 2022-08-10 19:45:58 +05:30
Jannat Patel
a4534d8f3e feat: update lesson 2022-08-09 18:32:29 +05:30
Jannat Patel
f161173cb6 Merge pull request #358 from pateljannat/download-certificate-pdf 2022-08-08 16:47:46 +05:30
Jannat Patel
c58f5efcdd feat: export certificate 2022-08-08 16:40:40 +05:30
Jannat Patel
65edd2ce22 feat: new lesson redirect 2022-08-08 11:47:23 +05:30
Jannat Patel
0723f3091c fix: removed unnecessary code 2022-08-01 17:56:45 +05:30
Jannat Patel
a95204f02e feat: add and update a chapter 2022-08-01 17:53:57 +05:30
Jannat Patel
6dd12e111d feat: new course ui 2022-07-28 18:22:57 +05:30
Jannat Patel
6e741bd800 Merge pull request #354 from pateljannat/readme-update 2022-07-19 15:40:54 +05:30
Jannat Patel
d37e53bd8e chore: center align readme header 2022-07-19 15:15:04 +05:30
Jannat Patel
fd3585697b chore: readme update 2022-07-19 15:10:46 +05:30
Jannat Patel
e92e6ec1c6 fix: removed the blue arrow from the course cards template 2022-07-13 16:05:24 +05:30
Jannat Patel
f0c89cbbba Merge pull request #352 from pateljannat/delete-old-module-documents
fix: delete doctypes from old modules
2022-07-07 17:16:01 +05:30
Jannat Patel
d20f932316 fix: delete webforms of unused modules 2022-07-07 17:08:53 +05:30
Jannat Patel
e011ef469f fix: delete doctypes from old modules 2022-07-05 18:50:10 +05:30
Jannat Patel
384850b452 fix: don't load api file during app init 2022-07-04 16:36:22 +05:30
Jannat Patel
e467aba32f Merge pull request #350 from pateljannat/job-board-redesign 2022-07-01 18:08:43 +05:30
Jannat Patel
56c51b73b0 fix: job details redesign 2022-07-01 17:57:52 +05:30
Jannat Patel
1aa82dd03e Merge pull request #351 from frappe/ankush-patch-1 2022-07-01 16:27:43 +05:30
Ankush Menat
a3b7c67ef9 ci: use python 3.10 2022-07-01 16:01:53 +05:30
Jannat Patel
de0200f352 fix: job list ui 2022-06-30 17:45:48 +05:30
Jannat Patel
999c267dfe Merge pull request #348 from pateljannat/web-templates
fix: web template ui
2022-06-29 16:13:10 +05:30
Jannat Patel
c9a6c2948e fix: new design for testimonial cards 2022-06-29 16:05:18 +05:30
Jannat Patel
041157a85f fix: subtitle field for testimonial and course cards 2022-06-28 18:00:53 +05:30
Jannat Patel
cd009936e2 fix: save member info in quiz submission 2022-06-27 17:42:42 +05:30
Jannat Patel
f43dfd47d0 revert: markdown file changes 2022-06-24 19:11:18 +05:30
Jannat Patel
7082467352 fix: made bio field small text in profile edit form 2022-06-24 19:10:42 +05:30
Jannat Patel
f05d3581c1 Merge pull request #346 from pateljannat/user-name-hooks-fix
fix: renamed apps in hooks and rectified username validation conditions
2022-06-23 10:26:35 +05:30
Jannat Patel
02e560cb18 fix: renamed apps in hooks and rectified username validation conditions 2022-06-23 10:12:26 +05:30
Jannat Patel
b2d38ad9d6 Merge pull request #345 from pateljannat/minor-fix 2022-06-21 16:37:44 +05:30
Jannat Patel
2743f1adc9 fix: removed unnecessary space 2022-06-21 16:19:42 +05:30
Jannat Patel
5e875b6d71 refactor: member field in lms quiz submission 2022-06-20 17:44:14 +05:30
Jannat Patel
6ccb5e8dbf Merge pull request #344 from pateljannat/testimonials-redesign 2022-06-17 19:02:25 +05:30
Jannat Patel
ad42a3d41c fix: testimonials new design 2022-06-17 18:55:26 +05:30
Jannat Patel
b40e0068ab fix: show only published courses in dashboard 2022-06-15 09:48:29 +05:30
Jannat Patel
f8dbbc1d11 fix: quiz question style 2022-06-14 17:12:32 +05:30
Jannat Patel
951070757c fix: space between lock icon and lesson title 2022-06-13 17:57:28 +05:30
Jannat Patel
c2a93c6c02 fix: course card template icon and translation 2022-06-09 16:39:29 +05:30
Jannat Patel
9dc82963c4 Merge pull request #342 from pateljannat/quiz-style-fixes
fix: quiz ui
2022-06-08 10:06:35 +05:30
Jannat Patel
148fce42ba fix: quiz ui 2022-06-08 09:56:19 +05:30
Jannat Patel
92f1263314 fix: course card meta info 2022-06-07 13:12:07 +05:30
Jannat Patel
5fad44369c Merge pull request #339 from fproldan/translations 2022-06-07 11:37:24 +05:30
Jannat Patel
eb3d7c9615 Merge branch 'main' into translations 2022-06-07 11:28:42 +05:30
Jannat Patel
5437a98539 Merge pull request #341 from pateljannat/ux-fixes
fix: replaced some dialogs with alerts
2022-06-07 11:06:53 +05:30
Francisco Roldan
d9b26f31f8 trans: profile 2022-06-06 14:50:08 -03:00
Jannat Patel
9916ec132b fix: revert unnecessary changes 2022-06-06 20:53:22 +05:30
Jannat Patel
1f3806a7bd fix: replaced some dialogs with alerts 2022-06-06 11:15:06 +05:30
Jannat Patel
55a770f129 fix: certificate request notification template 2022-06-03 13:36:50 +05:30
Jannat Patel
d742d595b2 feat: notifications for certificate request 2022-06-03 12:01:58 +05:30
Jannat Patel
9f575902b0 fix: lms certificate existing request condition 2022-06-03 09:16:54 +05:30
Jannat Patel
6e49cf14fa fix: validation for certificate request 2022-06-02 19:28:40 +05:30
Jannat Patel
4d96abb786 Merge branch 'main' of https://github.com/frappe/lms 2022-05-27 11:44:45 +05:30
Jannat Patel
b6d9470a4e fix: removed meta info from certificate page 2022-05-27 11:44:41 +05:30
Francisco Roldan
6ef86dce8c fix: es 2022-05-26 09:52:04 -03:00
Francisco Roldan
5a33f4c707 fix: translations 2022-05-26 09:49:51 -03:00
Francisco Roldan
119c1cbb35 fix: translations 2022-05-26 09:48:35 -03:00
Francisco Roldan
2be2646d95 fix: translations 2022-05-26 09:45:56 -03:00
Francisco Roldan
0609174a14 fix: translations 2022-05-26 09:43:11 -03:00
Francisco Roldan
227ca0ed41 fix: translations 2022-05-26 09:34:02 -03:00
Francisco Roldan
cc90ccece2 feat: translations 2022-05-25 14:38:50 -03:00
Francisco Roldan
9ab92165c8 feat: translations 2022-05-25 14:24:54 -03:00
Jannat Patel
e1fc0d08b7 Merge pull request #337 from pateljannat/ui-fixes
fix: course banner spaces
2022-05-25 14:33:56 +05:30
Jannat Patel
21dad2d72e fix: eval slot display 2022-05-25 13:20:39 +05:30
Jannat Patel
87fe3e72a2 fix: course certificate price display 2022-05-24 16:51:55 +05:30
Jannat Patel
c92220f1e5 Merge branch 'main' of https://github.com/frappe/lms into ui-fixes 2022-05-24 11:05:20 +05:30
Jannat Patel
eabeb612b4 fix: adding missing closing div for job details 2022-05-23 17:14:46 +05:30
Jannat Patel
900e61291a Merge pull request #336 from pateljannat/format-amount 2022-05-19 17:17:10 +05:30
Jannat Patel
51d9f1943b fix: format certificate amount on course home page 2022-05-19 17:00:19 +05:30
Jannat Patel
282b07dffc fix: format amount on course cards 2022-05-19 16:49:53 +05:30
Jannat Patel
6521415ae0 fix: course overlay site 2022-05-19 15:59:41 +05:30
Jannat Patel
2819be4508 Merge branch 'main' of https://github.com/frappe/lms into ui-fixes 2022-05-18 11:13:26 +05:30
Jannat Patel
a60805a971 Merge pull request #335 from pateljannat/quiz-timer 2022-05-18 11:04:26 +05:30
Jannat Patel
af21d33165 fix: page reload condition 2022-05-18 10:47:49 +05:30
Jannat Patel
e465ad58ca fix: removed unnecessary tags 2022-05-17 17:47:27 +05:30
Jannat Patel
cd56fc6179 fix: banner style and page exit condition 2022-05-17 17:29:11 +05:30
Jannat Patel
1ef70dd4e4 fix: submit quiz if user leaves page 2022-05-17 17:12:54 +05:30
Jannat Patel
a460ea5194 fix: start banner style 2022-05-17 16:04:03 +05:30
Jannat Patel
5ebf7b7992 fix: start banner style 2022-05-17 15:31:05 +05:30
Jannat Patel
c9b50e7db6 feat: timer in quiz 2022-05-17 11:52:10 +05:30
Jannat Patel
b9993796a0 fix: certificate style and meta 2022-05-16 13:22:30 +05:30
Jannat Patel
4fb2241621 feat: see on website link for lms certificate 2022-05-13 19:47:36 +05:30
Jannat Patel
fa49dc08a3 fix: certificate footer style 2022-05-13 18:51:07 +05:30
Jannat Patel
3d939f18df fix: removed get certificate button from course page 2022-05-11 15:08:37 +05:30
Jannat Patel
0d38b9aab1 fix: course banner spaces 2022-05-11 15:07:26 +05:30
Jannat Patel
28207f45cd Merge pull request #332 from pateljannat/certificate-design 2022-05-11 14:39:25 +05:30
Jannat Patel
72a5e9eb05 fix: return 1.1 if current lesson not found 2022-05-09 15:05:50 +05:30
Jannat Patel
91dc99d8ef fix: certificate custom and style 2022-05-09 13:17:20 +05:30
Jannat Patel
305a34b26d fix: course card info condition 2022-05-06 09:45:42 +05:30
Jannat Patel
67349bbce6 fix: job list view card style 2022-05-06 08:39:34 +05:30
Jannat Patel
242ba89b95 fix: course card cleanup 2022-05-04 19:10:40 +05:30
Jannat Patel
295280f8cf Merge pull request #331 from pateljannat/cleanup
fix: UI Cleanup
2022-05-04 17:53:31 +05:30
Jannat Patel
eb0f4728c4 fix: course page style 2022-05-04 17:40:48 +05:30
Jannat Patel
8017715bc7 fix: ui cleanup 2022-05-04 16:54:16 +05:30
Jannat Patel
503c74c488 fix: show currency and certificate price in all course cards 2022-04-29 15:05:29 +05:30
Jannat Patel
32cdaa8baa Merge pull request #329 from pateljannat/max-eval-attempt 2022-04-28 16:37:21 +05:30
Jannat Patel
83176a0293 fix: renamed reapplication field to duration 2022-04-28 16:30:51 +05:30
Jannat Patel
5db3d14b17 test: evaluation eligibility 2022-04-28 14:10:10 +05:30
Jannat Patel
bc6ae25aa6 Merge branch 'main' of https://github.com/frappe/lms into max-eval-attempt 2022-04-27 17:34:10 +05:30
Jannat Patel
8e3900fab7 Merge branch 'main' of https://github.com/frappe/lms 2022-04-27 17:21:39 +05:30
Jannat Patel
51b3d59094 fix: certificate price on course card web template 2022-04-27 17:21:36 +05:30
Jannat Patel
3585645580 feat: conditions for evaluation eligibility 2022-04-27 17:20:30 +05:30
Jannat Patel
1e3c20d118 Merge branch 'main' of https://github.com/frappe/lms into max-eval-attempt 2022-04-27 10:48:46 +05:30
Jannat Patel
f83f13af59 Merge pull request #328 from pateljannat/course-outline-start-learning-issue
fix: no preview modal for upcoming courses.
2022-04-26 15:44:00 +05:30
Jannat Patel
54d0bc56a4 fix: indentation 2022-04-26 15:30:52 +05:30
Jannat Patel
c722673dbd fix: dont show notify button from outline if already opted 2022-04-26 15:27:35 +05:30
Jannat Patel
88d34a9daf fix: no preview modal for upcoming courses. 2022-04-26 15:14:31 +05:30
Jannat Patel
e91237ec05 feat: check no of attempts 2022-04-26 13:17:09 +05:30
Jannat Patel
430a2bc08d feat: max attempts fields 2022-04-25 18:48:31 +05:30
Jannat Patel
3bbe5d33d3 Merge pull request #327 from pateljannat/image-in-lesson-webform
feat: image markdown extension
2022-04-25 11:42:58 +05:30
Jannat Patel
674c6a1684 fix: web form description and redirection 2022-04-25 10:42:07 +05:30
Jannat Patel
f34519e3ff fix: upload image component in lesson web form 2022-04-22 12:22:25 +05:30
Jannat Patel
f047be816a fix: validate url for job opportunity 2022-04-21 11:56:24 +05:30
Jannat Patel
593c20d62b fix: login without user category 2022-04-21 08:42:18 +05:30
Jannat Patel
a4bfad6138 fix: class name change for testimonial author 2022-04-20 17:54:37 +05:30
Jannat Patel
89de3c5f7a fix: class name change for testimonial author 2022-04-20 17:48:44 +05:30
Jannat Patel
81fb664ad9 feat: image markdown extension 2022-04-20 17:45:40 +05:30
Jannat Patel
b65597b884 fix: replaced html5lib with lxml for lesson markdown 2022-04-20 11:26:54 +05:30
Jannat Patel
d5423947f3 Merge pull request #325 from pateljannat/designation-to-category 2022-04-20 10:36:48 +05:30
Jannat Patel
f80db23642 fix: changed designation to user category 2022-04-20 10:22:35 +05:30
Jannat Patel
935906e328 Merge pull request #324 from pateljannat/designation-during-signup
feat: Designation during signup
2022-04-19 16:39:34 +05:30
Jannat Patel
3ed7f68054 fix: data attribute for certificate price 2022-04-19 16:18:48 +05:30
Jannat Patel
c894b75f4b feat: designation during signup 2022-04-19 15:53:25 +05:30
Jannat Patel
ef43d6905f fix: take country from doctype at signup 2022-04-14 09:03:18 +05:30
Jannat Patel
ab7ebedcd5 fix: check evaluator schedule for certificate request 2022-04-13 17:53:46 +05:30
Jannat Patel
8ca19afd87 Merge pull request #323 from pateljannat/start-learning-fixes 2022-04-11 16:08:32 +05:30
Jannat Patel
70e1e550e3 fix: certificate request flow and other minor changes 2022-04-11 15:35:40 +05:30
Jannat Patel
cb0087c433 fix: no preview modal start learning button 2022-04-07 23:03:53 +05:30
Jannat Patel
d867f86c08 fix: replaced save with insert for certificate doctype rename patch 2022-04-07 22:46:40 +05:30
Jannat Patel
1891029eed fix: ignore mandatory for certificate doctype rename patch 2022-04-07 22:38:49 +05:30
Jannat Patel
157090a122 fix: reload doc in certificate doctype rename patch 2022-04-07 22:33:06 +05:30
Jannat Patel
0ddf2aad79 fix: removed certification student to member rename patch 2022-04-07 22:27:26 +05:30
Jannat Patel
4f47a5032c fix: removed post_model_sync from patches.txt 2022-04-07 22:13:19 +05:30
Jannat Patel
ae957ab642 fix: average rating precision 2022-04-07 21:58:49 +05:30
Jannat Patel
b69a7022b5 Merge pull request #319 from pateljannat/certification 2022-04-07 14:58:27 +05:30
Jannat Patel
c19bd88a8e fix: added post_model_sync in patches.txt 2022-04-07 14:42:05 +05:30
Jannat Patel
4967b70e7c fix: validate same slot addition twice 2022-04-07 14:32:02 +05:30
Jannat Patel
cdfad8cc67 feat: cerificate price 2022-04-07 12:57:42 +05:30
Jannat Patel
dcaccaca35 fix: certificate design 2022-04-05 21:13:21 +05:30
Jannat Patel
d954262184 fix: redirect to list when course does not exist 2022-04-04 12:46:35 +05:30
Jannat Patel
208720545e Merge branch 'main' of https://github.com/frappe/lms into certification 2022-04-01 18:59:35 +05:30
Jannat Patel
2cbadc6946 Merge pull request #311 from pateljannat/discussion-component-redesign 2022-04-01 18:58:59 +05:30
Jannat Patel
ebfa49ed8e chore: renamed lms certification to lms certificate 2022-04-01 18:56:57 +05:30
Jannat Patel
e70c3ef939 feat: request for certification 2022-04-01 17:30:17 +05:30
Jannat Patel
0523f701c2 fix: profile page fixes 2022-03-31 18:03:11 +05:30
Jannat Patel
c6b46295bc fix: date field 2022-03-31 17:54:31 +05:30
Jannat Patel
16ddfb2a20 feat: certification request 2022-03-30 22:52:38 +05:30
Jannat Patel
ca5ea6032c feat: certificate evaluation 2022-03-29 16:49:50 +05:30
Jannat Patel
b4eda0e7cd Merge pull request #318 from pateljannat/workspace-issue 2022-03-28 17:52:42 +05:30
Jannat Patel
9d2a9bbd9c fix: workspace published field filter 2022-03-28 17:40:55 +05:30
Jannat Patel
ef13c8fe8d fix: update patch date 2022-03-25 18:53:35 +05:30
Jannat Patel
aa6932f547 fix: reload doctype in patch 2022-03-25 18:53:07 +05:30
Jannat Patel
5d3c132e83 Merge pull request #317 from pateljannat/field-name-uniformity 2022-03-25 16:13:25 +05:30
Jannat Patel
56f4f6c977 fix: patch for published field 2022-03-25 15:56:43 +05:30
Jannat Patel
77df068fea fix: field cleanup 2022-03-24 18:59:58 +05:30
Jannat Patel
b9a1bf9f24 fix: conflicts 2022-03-24 09:56:54 +05:30
Jannat Patel
2b348916f4 Merge pull request #316 from pateljannat/rename-to-lms 2022-03-23 19:20:36 +05:30
Jannat Patel
70bc5ea2ec fix: conflicts 2022-03-23 19:13:30 +05:30
Jannat Patel
eff9e553a1 fix: course home card ui 2022-03-23 19:10:02 +05:30
Jannat Patel
e1bfca1883 fix: breadcrumb from lesson page 2022-03-23 15:20:57 +05:30
Jannat Patel
190dbab3d0 fix: ui issues 2022-03-23 15:18:32 +05:30
Jannat Patel
a1895b1f78 fix: removed unused modules from modules.txt 2022-03-21 14:14:24 +05:30
Jannat Patel
1091774003 Merge branch 'main' of https://github.com/frappe/school into rename-to-lms 2022-03-21 12:58:06 +05:30
Jannat Patel
ae29eb35fd fix: removed unused modules 2022-03-21 12:57:16 +05:30
Jannat Patel
5ca0a89789 fix: reload doctypes in patch 2022-03-21 10:16:09 +05:30
Jannat Patel
6c6e836f0d fix: reload doctypes in recent patches 2022-03-21 09:47:18 +05:30
Jannat Patel
c971d34d67 refactor: renamed app to lms 2022-03-19 17:30:00 +05:30
Jannat Patel
1b04615bff Merge pull request #313 from pateljannat/course-creation-through-ui 2022-03-19 14:19:25 +05:30
Jannat Patel
40eb8dec68 fix: branch shift for semantic 2022-03-19 12:57:10 +05:30
Jannat Patel
2556e98c26 fix: version change for semantic pull request 2022-03-19 12:33:56 +05:30
Jannat Patel
2204da25ed fix: semantic pull request workflow 2022-03-19 12:22:13 +05:30
Jannat Patel
ab1eb6de6b Merge pull request #315 from pateljannat/semantic-pull-request 2022-03-19 11:32:51 +05:30
Jannat Patel
16278a72e9 chore: semantic pull request check 2022-03-19 11:20:37 +05:30
Jannat Patel
573a1f22dc fix: button positions on course home 2022-03-19 10:09:32 +05:30
Jannat Patel
da370a7dd2 fix: better msg on web form save 2022-03-19 09:31:39 +05:30
Jannat Patel
6567660639 Merge pull request #314 from pateljannat/ui-cleanup 2022-03-17 15:23:51 +05:30
Jannat Patel
984054f00f fix: icon position on course card 2022-03-17 15:17:21 +05:30
Jannat Patel
9351edebe0 fix: jobs, quiz and community page cleanup 2022-03-17 14:23:06 +05:30
Jannat Patel
36465f0859 fix: icon background and space cleanup 2022-03-17 11:25:34 +05:30
Jannat Patel
ef5cf4bd96 fix: course home, course cards and course outline cleanup 2022-03-16 18:53:09 +05:30
Jannat Patel
27e1aec001 fix: dashboard links, web form redirects and patch for status 2022-03-15 16:51:39 +05:30
Jannat Patel
aa9ef65375 dashboard and patch for lesson 2022-03-14 19:07:02 +05:30
Jannat Patel
c8af6d3672 feat: course creation from portal setting 2022-03-11 11:15:13 +05:30
Jannat Patel
ffe5370264 Merge branch 'main' of https://github.com/frappe/school 2022-03-10 08:42:17 +05:30
Jannat Patel
ef0156c068 fix: removed batch from list and filter of membership 2022-03-10 08:42:13 +05:30
Jannat Patel
00883170f3 Merge pull request #312 from pateljannat/cookie-policy 2022-03-10 08:41:35 +05:30
Jannat Patel
fb72704a33 feat: cookie policy 2022-03-09 14:32:50 +05:30
Jannat Patel
8f9cd72975 feat: course creation from ui 2022-03-09 12:29:03 +05:30
Jannat Patel
913e87c4f5 Merge branch 'main' of https://github.com/frappe/school into course-creation-through-ui 2022-03-07 18:28:54 +05:30
Jannat Patel
3bdf6df70d fix: allow locked lessons o instructors through outline 2022-03-07 18:28:12 +05:30
Jannat Patel
5e973b21ae feat: course web form 2022-03-07 18:21:11 +05:30
Jannat Patel
23e2611725 feat: discussions redesign 2022-03-07 12:52:09 +05:30
Jannat Patel
f8784afd72 Merge pull request #310 from pateljannat/minor-fixes 2022-02-24 14:24:41 +05:30
Jannat Patel
46a73c8ef1 fix: classname 2022-02-24 12:56:39 +05:30
Jannat Patel
bcd80b616d fix: empty states redesign and misc changes 2022-02-24 12:40:13 +05:30
Jannat Patel
b5d870d885 fix: indentation and headline field 2022-02-23 17:39:04 +05:30
Jannat Patel
f9ac77606e Merge pull request #309 from pateljannat/privacy-policy-during-signup 2022-02-23 17:12:12 +05:30
Jannat Patel
ce554ed53f feat: privacy policy and other misc changes 2022-02-23 16:52:29 +05:30
Jannat Patel
27d48f85a9 Merge pull request #308 from pateljannat/css-cleanup 2022-02-23 16:33:46 +05:30
Jannat Patel
059ff14e6d fix: added missing style 2022-02-23 14:31:14 +05:30
Jannat Patel
8cfb3569fe fix: css cleanup and testimonials redesign 2022-02-23 13:14:22 +05:30
Jannat Patel
1ac3e9b364 Merge pull request #307 from pateljannat/community-page-redesign 2022-02-23 12:16:41 +05:30
Jannat Patel
22c6a3da4f feat: community page redesign 2022-02-23 11:37:05 +05:30
Jannat Patel
737405d449 Merge pull request #306 from pateljannat/profile-redesign 2022-02-23 09:57:27 +05:30
Jannat Patel
e805ae7757 feat: profile page redesign 2022-02-23 09:36:50 +05:30
Jannat Patel
d5cf0fee64 Merge branch 'main' of https://github.com/frappe/school into profile-redesign 2022-02-22 11:34:22 +05:30
Jannat Patel
48e2ae6e52 Merge pull request #305 from pateljannat/lesson-page-fixes 2022-02-22 11:30:16 +05:30
Jannat Patel
351e784733 fix: conflicts 2022-02-22 11:18:57 +05:30
Jannat Patel
6c64181bf4 fix: overlay position when related courses 2022-02-22 11:15:02 +05:30
Jannat Patel
d64e6a12a7 Merge pull request #304 from pateljannat/quiz-redesign 2022-02-21 18:45:19 +05:30
Jannat Patel
ccddc9a404 fix: margin before explanation 2022-02-21 18:03:27 +05:30
Jannat Patel
aee35aa66d fix: ui after question check 2022-02-21 16:30:10 +05:30
Jannat Patel
0cf953b3eb fix: markup lib 2022-02-21 16:01:07 +05:30
Jannat Patel
eb073ebe87 fix: quiz card layout 2022-02-21 15:23:23 +05:30
Jannat Patel
c3fac64280 fix: translations and sidebar 2022-02-21 14:55:20 +05:30
Jannat Patel
28ef8e7db7 feat: quiz redesign 2022-02-21 11:43:05 +05:30
Jannat Patel
e3eda95b35 Merge pull request #303 from pateljannat/course-page-redesign 2022-02-18 12:52:05 +05:30
Jannat Patel
894a68823f fix: button width 2022-02-18 12:44:42 +05:30
Jannat Patel
dc3843087e feat: course page redesign 2022-02-18 12:26:08 +05:30
Jannat Patel
aaae9fe8bc Merge pull request #302 from pateljannat/reviews-empty-state 2022-02-17 17:24:23 +05:30
Jannat Patel
3dc9fc52a7 style: reviews empty state 2022-02-17 17:17:26 +05:30
Jannat Patel
2d373ba509 fix: avg rating condition 2022-02-17 16:53:40 +05:30
Jannat Patel
f200e79dc8 style: banner 2022-02-17 16:51:21 +05:30
Jannat Patel
ae9518a006 Merge pull request #301 from pateljannat/course-list-page 2022-02-17 15:04:48 +05:30
Jannat Patel
96c24e8e5f test: certificate with expiry 2022-02-17 14:56:33 +05:30
Jannat Patel
cc0c1cc320 fix: removed console statements 2022-02-17 14:40:33 +05:30
Jannat Patel
9834c83126 revert: print statement 2022-02-17 13:43:11 +05:30
Jannat Patel
4b8cb5a4e4 fix: test data 2022-02-17 13:37:29 +05:30
Jannat Patel
7e2f473e22 fix: import statement 2022-02-17 13:05:47 +05:30
Jannat Patel
ee9f858933 test: certificate creation 2022-02-17 12:46:35 +05:30
Jannat Patel
69f322d34c fix: certification flow 2022-02-17 11:38:27 +05:30
Jannat Patel
91099188f2 Merge pull request #300 from pateljannat/course-home-redesign 2022-02-17 10:12:56 +05:30
Jannat Patel
1e7209bafa style: banner 2022-02-16 20:41:20 +05:30
Jannat Patel
a23a356bf6 style: course home 2022-02-16 19:12:25 +05:30
Jannat Patel
5218e134a9 Merge pull request #299 from pateljannat/jobs-redesign 2022-02-14 16:22:58 +05:30
Jannat Patel
55a87999e4 fix: date format 2022-02-14 16:14:53 +05:30
Jannat Patel
6cd7861b2c style: job card redesign 2022-02-14 13:46:02 +05:30
Jannat Patel
6dfaeddc0a Merge pull request #298 from pateljannat/ip-issue-fix 2022-02-11 15:06:51 +05:30
Jannat Patel
4846549a90 fix: ip issue 2022-02-11 12:56:11 +05:30
Jannat Patel
942837b4d9 fix: instructor patch 2022-02-11 10:33:06 +05:30
Jannat Patel
259b4aabcc Merge pull request #297 from pateljannat/redesign-school 2022-02-11 10:05:52 +05:30
Jannat Patel
6200b6a4b0 fix: suffix message for course card instructor 2022-02-10 12:59:31 +05:30
Jannat Patel
6ee1413996 fix: import 2022-02-10 10:32:23 +05:30
Jannat Patel
08fff1700f fix: tests and moved course functions to lms utils 2022-02-10 10:22:01 +05:30
Jannat Patel
fd5b7976e7 fix: get_doc references 2022-02-10 09:53:08 +05:30
Jannat Patel
e17637d27b fix: conflicts 2022-02-08 16:34:24 +05:30
Jannat Patel
57c69a7d6c fix: removing get_doc dependencies for lms course 2022-02-08 16:13:38 +05:30
Jannat Patel
bf3a496ea3 feat: multiple instructors on course card and course home 2022-02-07 13:41:28 +05:30
Jannat Patel
3e46db9c11 feat: multiple instructors 2022-02-07 12:01:07 +05:30
Jannat Patel
50c624e305 Merge pull request #295 from anandology/context-in-page-extensions 2022-02-07 11:33:49 +05:30
Anand Chitipothu
6d4e64059a feat: pass context to page extensions
Pass the context to page extensions to allow them to make decisions
based on the context. For example, an extension to load the course
specific scripts. This is currently not possible because the course
details are not availale to the page extensions. Made this possible by
passing the context to page extensions.
2022-01-25 07:32:13 +05:30
Jannat Patel
ec879b12b3 Merge pull request #291 from pateljannat/jobs-improvement 2022-01-11 19:55:18 +05:30
Jannat Patel
5ace8f5570 fix: email content 2022-01-11 19:41:59 +05:30
Jannat Patel
2fe5a6b248 Merge branch 'main' of https://github.com/frappe/school into jobs-improvement 2022-01-11 19:30:53 +05:30
Jannat Patel
19f5251736 fix: login button before job application 2022-01-11 19:27:12 +05:30
Jannat Patel
a87e3d66a6 fix: hide apply and report button from guest users 2022-01-11 17:50:14 +05:30
Jannat Patel
62acdde68f fix: email 2022-01-11 16:33:20 +05:30
Jannat Patel
e214573cd1 fix: job reporting 2022-01-11 15:10:31 +05:30
Jannat Patel
8fff1cd817 fix: jobs ui 2022-01-10 21:39:26 +05:30
Jannat Patel
20eb0c4d64 Merge pull request #290 from pateljannat/community-and-job-redesign 2022-01-10 17:00:02 +05:30
Jannat Patel
ff05292bdb fix: community cards 2022-01-10 16:45:06 +05:30
Jannat Patel
326bc88f19 Merge pull request #288 from pateljannat/community-page-fix 2022-01-07 11:10:09 +05:30
Jannat Patel
f0a7612369 fix: exclude disabled users 2022-01-06 21:29:04 +05:30
Jannat Patel
515be5de33 Merge pull request #287 from pateljannat/members-page 2022-01-06 17:19:25 +05:30
Jannat Patel
e1e7354d85 feat: search in community page 2022-01-06 17:10:07 +05:30
Jannat Patel
2ec6a06204 Merge branch 'main' of https://github.com/frappe/school into members-page 2022-01-03 16:36:23 +05:30
Jannat Patel
9150def93e Merge pull request #285 from pateljannat/profile-fixes 2022-01-03 10:21:05 +05:30
Jannat Patel
730f1a6c47 fix: conditions to hide contacts section 2022-01-03 09:55:34 +05:30
Jannat Patel
7c12d094c5 fix: logo dimensions 2022-01-03 09:40:30 +05:30
Jannat Patel
8aceaf0595 Merge pull request #282 from pateljannat/job-posting 2021-12-30 14:54:08 +05:30
Jannat Patel
5a1bdc156d fix: email on job creation 2021-12-30 13:08:52 +05:30
Jannat Patel
aa81426189 fix: show jobs with Open status 2021-12-30 11:51:27 +05:30
Jannat Patel
7a5d39cc94 fix: new module called job 2021-12-30 10:08:15 +05:30
Jannat Patel
b1b8f202c9 feat: job posting 2021-12-28 22:26:52 +05:30
Jannat Patel
fcfda68d88 Merge pull request #281 from pateljannat/rating-field 2021-12-27 15:19:43 +05:30
Jannat Patel
e966e4c7ed fix: rating field issue 2021-12-27 13:26:50 +05:30
Jannat Patel
42455c72f9 fix: revert unnecesary change 2021-12-27 12:37:49 +05:30
Jannat Patel
ef5f49016e fix: structure of course home page 2021-12-27 12:37:17 +05:30
Jannat Patel
6417dfb4a1 Merge pull request #279 from pateljannat/upload-in-lessons 2021-12-24 16:24:42 +05:30
Jannat Patel
40985da9ca fix: updating existing assignment 2021-12-23 20:30:31 +05:30
Jannat Patel
e07c26c17d Merge pull request #280 from frappe/make-contact-display-configurable 2021-12-23 20:23:05 +05:30
Jannat Patel
9f2cba49ee feat: hide primary contact from profile 2021-12-23 19:58:42 +05:30
Jannat Patel
6e3de21f6e fix: file type support 2021-12-23 17:58:39 +05:30
Jannat Patel
a6bdbd7cf1 feat: lesson assignment 2021-12-22 22:13:33 +05:30
Jannat Patel
b822428d52 Merge pull request #277 from pateljannat/custom-signup 2021-12-21 16:13:15 +05:30
Jannat Patel
03a7df1c98 fix: mandatory terms of use 2021-12-21 16:02:30 +05:30
Jannat Patel
08b7290070 fix: display internship in profile 2021-12-21 15:54:47 +05:30
Jannat Patel
6188c698e3 fix: checkbox for terms of use 2021-12-21 15:41:32 +05:30
Jannat Patel
7d9b60c16a fix: conflicts 2021-12-21 11:34:43 +05:30
Jannat Patel
df3c5060e9 Merge pull request #278 from pateljannat/profile-restrictions 2021-12-21 11:22:01 +05:30
Jannat Patel
ff702c9d14 fix: restrict profile and mark as complete 2021-12-21 11:11:39 +05:30
Jannat Patel
ea06fe8cf8 feat: hooks for profile mandatory fields 2021-12-20 14:18:22 +05:30
Jannat Patel
f8b0d9b180 feat: hooks for profile mandatory fields 2021-12-20 14:18:10 +05:30
Jannat Patel
d3a3e7066d fix: removed unnecessary imports 2021-12-20 11:28:55 +05:30
Jannat Patel
45e3964285 fix: renamed signup hook and moved default form to a template 2021-12-20 11:06:51 +05:30
Jannat Patel
4edf4936c1 fix: pass path in hooks instead of function 2021-12-20 10:04:50 +05:30
Jannat Patel
067be4973d fix: string translation 2021-12-20 09:42:31 +05:30
Jannat Patel
6a3442d058 fix: user and country data 2021-12-17 19:42:57 +05:30
Jannat Patel
0b83307f7d fix: custom signup form 2021-12-17 11:24:28 +05:30
Jannat Patel
f36042f537 Merge pull request #272 from anandology/cohorts-v1 2021-12-17 10:45:56 +05:30
Jannat Patel
668a5d6334 fix: labels and order 2021-12-16 15:20:08 +05:30
Anand Chitipothu
eb59713b65 fix: delete invalid links from Cohort doctype 2021-12-16 11:45:29 +05:30
Jannat Patel
fbc6187062 fix: profile settings 2021-12-16 10:06:58 +05:30
Anand Chitipothu
274ecaa222 fix: typo in exercise_submission.py
Corrected the use of save instead of insert.
2021-12-15 22:27:57 +05:30
Anand Chitipothu
051196179d fix: failing test in doctype Exercise 2021-12-15 11:42:52 +05:30
Anand Chitipothu
cddfc4550d Merge branch 'main' into cohorts-v1 2021-12-15 11:25:30 +05:30
Anand Chitipothu
465bc3b24a feat: allow the same custom page to be avaiable both for cohort and subgroup 2021-12-14 22:09:51 +05:30
Jannat Patel
38087f0b02 Merge pull request #275 from pateljannat/enhanced-profile 2021-12-14 18:09:15 +05:30
Jannat Patel
3237a539f7 fix: removed print statement 2021-12-14 18:04:41 +05:30
Jannat Patel
828d5764d0 fix: made user fields non mandatory 2021-12-14 17:21:08 +05:30
Jannat Patel
15fc3742d2 fix: ci install app command 2021-12-14 16:56:24 +05:30
Jannat Patel
8489b1d943 fix: text editor for bio and profile redirect changes 2021-12-14 16:46:06 +05:30
Jannat Patel
682188540c feat: new profile fields 2021-12-14 16:28:15 +05:30
Anand Chitipothu
8f740d70e0 fix: broken link to the course on join page 2021-12-13 21:30:19 +05:30
Anand Chitipothu
bc80c2200d feat: add anchor to exercise to allow linking to an exercise 2021-12-13 11:16:56 +05:30
Jannat Patel
fd524f627e fix: profile web form 2021-12-09 19:07:04 +05:30
Anand Chitipothu
59b3b68bde fix: fixed the issue of duplicate join requests
Someone was spamming mon.school by generating thousands of join
requests. Added to fix to avoid creating duplicate requests.
2021-12-09 18:21:29 +05:30
Anand Chitipothu
943c8eabbf feat: added custom pages at subgroup level 2021-12-09 01:17:03 +05:30
Anand Chitipothu
b83918c2aa feat: added Exercise Latest Submission doctype
Issue #274
2021-12-08 23:07:53 +05:30
Jannat Patel
5b4db8fd54 feat: child tables for profile sections 2021-12-07 16:58:55 +05:30
Anand Chitipothu
c8d7ac48ea fix: CohortSubgroup.has_student
Fixed the wrong query.

Issue #271
2021-12-07 15:37:46 +05:30
Anand Chitipothu
3cd4e64957 feat: allow cohort admins to add mentors
Issue #271
2021-12-05 02:10:58 +05:30
Anand Chitipothu
2f994628c3 fix: show students/mentors on subgroup page alphabetically
Issue #271
2021-12-05 01:33:33 +05:30
Anand Chitipothu
f68fc02e57 style: improved the ux of approve/reject flow
Issue #271
2021-12-05 01:29:48 +05:30
Anand Chitipothu
0637b9c8f8 fix: allow admins to manage join requests
Issue #271
2021-12-05 01:29:24 +05:30
Anand Chitipothu
7001ddc96f feat: made all the cohort pages public
There is some info on the page that is only accessible to mentors and
admins and not shown to other users.
2021-12-05 01:04:46 +05:30
Anand Chitipothu
fe31a64175 style: updated the styles of subgroup links on cohort page 2021-12-05 00:22:27 +05:30
Anand Chitipothu
cd0cc2b501 feat: added support to get subgroups in sorted order
Issue #271
2021-12-05 00:13:05 +05:30
Anand Chitipothu
ebcb3c5466 fix: fixed the issue with rendering custom cohort page
Issue #271
2021-12-05 00:01:42 +05:30
Anand Chitipothu
a1d0f3948a feat: added support for custom web pages for cohorts
This allows adding custom web pages to each cohort by defining a web
template and attaching it to the cohort.

Issue #271
2021-12-04 23:47:29 +05:30
Anand Chitipothu
22f5508bea style: improved the display of users and mentors in a subgroup
Using MemberCard insted of Avatar macro.

Issue #271
2021-12-04 23:14:37 +05:30
Anand Chitipothu
63c4f708c3 feat: improved the subgroup page load time
Using `get_cached_doc` instead of `get_doc` for loading students and
mentors.

Issue #271
2021-12-04 23:03:58 +05:30
Anand Chitipothu
52fd891370 fix: show the recent join requests on the top
Issue #271
2021-12-04 22:52:56 +05:30
Anand Chitipothu
fb447a30e4 feat: added undo of rejected join requests
Also improved the dispaly of timestamp, showing the diff now.

Issue #271
2021-12-04 22:47:23 +05:30
Anand Chitipothu
e0c73e26ee fix: increased the page_length when querying for students of a subgroup. 2021-12-04 17:19:49 +05:30
Anand Chitipothu
d5da5bd8aa feat: allow all mentors to see the cohort status
Issue #271
2021-12-04 07:25:15 +05:30
Anand Chitipothu
d84302682e fix: permission issue on cohort page
Using get_all instead of get_list to disable permission check.

Issue #271
2021-12-03 16:03:14 +05:30
Anand Chitipothu
c963e93b52 feat: allow students who have already joined the course to join the cohort
Issue #271
2021-12-03 00:28:13 +05:30
Anand Chitipothu
c96e3ee2f9 feat: show counts on cohort listing and view pages
Issue #271
2021-12-02 10:36:17 +05:30
Jannat Patel
a78019ccbc fix: mark as complete label 2021-12-01 18:59:29 +05:30
Anand Chitipothu
e014c94446 fix: mentor counts on cohort page
The group by clause was missing in the query.

Issue #271
2021-12-01 12:19:03 +05:30
Anand Chitipothu
6c747ff8b4 feat: added get_url method to cohort doctypes
This is required to make it easier to include links in the email
notification to mentors.

Issue #271
2021-12-01 08:43:10 +05:30
Anand Chitipothu
ffd9e9d48e feat: Added support for approve/reject join requests to a cohort subgroup
Issue #271
2021-11-30 18:06:36 +05:30
Anand Chitipothu
3328359ba4 style: "manage the course" button
Issue #271
2021-11-30 18:06:27 +05:30
Jannat Patel
66f6c1fd46 Merge pull request #273 from pateljannat/testimonial-card-fix 2021-11-30 11:15:59 +05:30
Jannat Patel
aaa845a0f8 fix: testimonial cards height and shadows 2021-11-30 11:04:29 +05:30
Anand Chitipothu
f1157895db feat: added portal page to join a cohort
Issue #271
2021-11-30 08:29:24 +05:30
Anand Chitipothu
1277cfed64 feat: added cohort and subgroup pages
Issue #271
2021-11-30 07:46:48 +05:30
Anand Chitipothu
102fa9c0a8 feat: added a page to list cohorts of a course
- added a page /courses/<course>/manage that lists the active cohorts
- only accessible to mentors and staff
- also added a "manage the course" button on course page for mentors/staff

Issue #271
2021-11-29 17:33:45 +05:30
Anand Chitipothu
7cd57cadb2 feat: added doctypes for cohorts
Issue #271
2021-11-29 17:26:38 +05:30
Jannat Patel
2a56b7ade2 Merge pull request #270 from pateljannat/mark-as-complete 2021-11-29 16:29:21 +05:30
Jannat Patel
cf8be3ca21 style: discussons empty state and mark as complete message 2021-11-29 16:20:49 +05:30
Jannat Patel
715a1b5df5 fix: mark as complete behaviour 2021-11-29 16:02:59 +05:30
Jannat Patel
0a374a0e78 Merge pull request #269 from pateljannat/search-generic 2021-11-26 11:44:23 +05:30
Jannat Patel
36996a54a5 fix: search-settings 2021-11-26 11:34:10 +05:30
Jannat Patel
3f687e4c4a Merge pull request #265 from pateljannat/improve-notify-me-behaviour 2021-11-25 14:09:03 +05:30
Jannat Patel
315d373d2d fix: hide notify me button on callback 2021-11-25 13:06:12 +05:30
Jannat Patel
6ae346df44 fix: notify-me-ux 2021-11-23 22:28:07 +05:30
Jannat Patel
9582a27dc6 Merge pull request #264 from pateljannat/search-empty-state-improvements 2021-11-22 10:14:48 +05:30
Jannat Patel
6195d72c3c fix: indentation 2021-11-22 10:08:54 +05:30
Jannat Patel
3f0309c36a fix: search empty state improvements 2021-11-22 10:05:04 +05:30
Jannat Patel
08ea7401cc Merge pull request #263 from pateljannat/search-improvements 2021-11-19 19:44:55 +05:30
Jannat Patel
f3d7f09476 feat: search empty state 2021-11-19 19:12:19 +05:30
Jannat Patel
36150d5b09 fix: allow guests to search 2021-11-18 15:44:19 +05:30
Jannat Patel
e5deb2ddd7 Merge pull request #262 from pateljannat/testimonials 2021-11-18 15:25:33 +05:30
Jannat Patel
d60aa54903 fix: condition if testimonials are less than multiple of three 2021-11-18 15:12:41 +05:30
Jannat Patel
2627cee938 fix: increased margin above explore more link 2021-11-18 15:07:29 +05:30
Jannat Patel
e7f47a4485 fix: slider height 2021-11-18 10:09:11 +05:30
Jannat Patel
5bfe56c091 fix: slider 2021-11-17 20:34:10 +05:30
Jannat Patel
f08586ee12 feat: testimonials template 2021-11-16 19:32:05 +05:30
Jannat Patel
af17270c52 fix: back tracing result on search 2021-11-15 19:30:01 +05:30
Jannat Patel
06b4062003 Merge pull request #261 from pateljannat/search 2021-11-15 19:08:24 +05:30
Jannat Patel
6cba6972bc feat: search for courses 2021-11-15 19:00:23 +05:30
Jannat Patel
f7a23e629c fix: conflicts 2021-11-15 13:29:02 +05:30
Jannat Patel
e67b37be28 Merge pull request #260 from pateljannat/course-cards-cleanup 2021-11-12 19:35:52 +05:30
Jannat Patel
1fa7dfe41f fix: removed arrow interaction 2021-11-12 19:20:18 +05:30
Jannat Patel
e781071ebf Merge pull request #257 from pateljannat/empty-states 2021-11-12 18:48:12 +05:30
Jannat Patel
1697c5d5b5 feat: search bar on course list 2021-11-12 10:10:39 +05:30
Jannat Patel
091fefb601 fix: removed unused css variables 2021-11-11 09:48:11 +05:30
Jannat Patel
7939e6c619 style: course cards and templates 2021-11-10 17:08:46 +05:30
Jannat Patel
f8788dc32c fix: empty state logo and link style 2021-11-08 16:49:31 +05:30
Jannat Patel
4db51bff79 style: empty state for reviews 2021-11-04 22:03:26 +05:30
Jannat Patel
6f96da74c7 empty state for discussion 2021-11-02 18:27:52 +05:30
Jannat Patel
f1692763d3 Merge pull request #255 from pateljannat/fixes 2021-11-01 15:08:00 +05:30
772 changed files with 33110 additions and 19499 deletions

View File

@@ -9,7 +9,7 @@ root = true
end_of_line = lf end_of_line = lf
insert_final_newline = true insert_final_newline = true
charset = utf-8 charset = utf-8
indent_style = space indent_style = tab
trim_trailing_whitespace = true trim_trailing_whitespace = true
# Python # Python
@@ -26,4 +26,4 @@ indent_style = tab
# HTML, CSS, javascript, JSON and YAML # HTML, CSS, javascript, JSON and YAML
[*.{html,css,js,json,yml,yaml}] [*.{html,css,js,json,yml,yaml}]
indent_size = 2 indent_size = 4

37
.flake8 Normal file
View File

@@ -0,0 +1,37 @@
[flake8]
ignore =
E121,
E126,
E127,
E128,
E203,
E225,
E226,
E231,
E241,
E251,
E261,
E265,
E302,
E303,
E305,
E402,
E501,
E741,
W291,
W292,
W293,
W391,
W503,
W504,
F403,
B007,
B950,
W191,
E124, # closing bracket, irritating while writing QB code
E131, # continuation line unaligned for hanging indent
E123, # closing bracket does not match indentation of opening bracket's line
E101, # ensured by use of black
max-line-length = 200
exclude=.github/helper/semgrep_rules

74
.github/helper/flake8.conf vendored Normal file
View File

@@ -0,0 +1,74 @@
[flake8]
ignore =
B001,
B007,
B009,
B010,
B950,
E101,
E111,
E114,
E116,
E117,
E121,
E122,
E123,
E124,
E125,
E126,
E127,
E128,
E131,
E201,
E202,
E203,
E211,
E221,
E222,
E223,
E224,
E225,
E226,
E228,
E231,
E241,
E242,
E251,
E261,
E262,
E265,
E266,
E271,
E272,
E273,
E274,
E301,
E302,
E303,
E305,
E306,
E402,
E501,
E502,
E701,
E702,
E703,
E741,
F401,
F403,
F405,
W191,
W291,
W292,
W293,
W391,
W503,
W504,
E711,
E129,
F841,
E713,
E712,
max-line-length = 200

View File

@@ -32,7 +32,7 @@ jobs:
- name: setup python - name: setup python
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
python-version: '3.9' python-version: '3.10'
- name: setup node - name: setup node
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
@@ -57,15 +57,15 @@ jobs:
mkdir -p ~/bench-cache mkdir -p ~/bench-cache
(cd && tar czf ~/bench-cache/bench.tgz frappe-bench) (cd && tar czf ~/bench-cache/bench.tgz frappe-bench)
fi fi
- name: add school app to bench - name: add lms app to bench
working-directory: /home/runner/frappe-bench working-directory: /home/runner/frappe-bench
run: bench get-app school $GITHUB_WORKSPACE run: bench get-app lms $GITHUB_WORKSPACE
- name: create bench site - name: create bench site
working-directory: /home/runner/frappe-bench working-directory: /home/runner/frappe-bench
run: bench new-site --mariadb-root-password root --admin-password admin frappe.local run: bench new-site --mariadb-root-password root --admin-password admin frappe.local
- name: install school app - name: install lms app
working-directory: /home/runner/frappe-bench working-directory: /home/runner/frappe-bench
run: bench --verbose --site frappe.local install-app school run: bench --site frappe.local install-app lms
- name: setup requirements - name: setup requirements
working-directory: /home/runner/frappe-bench working-directory: /home/runner/frappe-bench
run: bench setup requirements --dev run: bench setup requirements --dev
@@ -77,5 +77,5 @@ jobs:
run: bench --site frappe.local build run: bench --site frappe.local build
- name: run tests - name: run tests
working-directory: /home/runner/frappe-bench working-directory: /home/runner/frappe-bench
run: bench --site frappe.local run-tests --app school run: bench --site frappe.local run-tests --app lms

33
.github/workflows/linters.yml vendored Normal file
View File

@@ -0,0 +1,33 @@
name: Linters
on:
pull_request:
workflow_dispatch:
push:
branches: [ main ]
jobs:
linters:
name: Semantic Commits
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Install and Run Pre-commit
uses: pre-commit/action@v2.0.3
- name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
- name: Download semgrep
run: pip install semgrep
- name: Run Semgrep rules
run: semgrep ci --config ./frappe-semgrep-rules/rules

19
.github/workflows/semantic.yml vendored Normal file
View File

@@ -0,0 +1,19 @@
name: Semantic Pull Request
on:
push:
branches: [ main ]
pull_request: {}
jobs:
# This workflow contains a single job called "build"
semantic:
name: Validate PR title
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: zeke/semantic-pull-requests@main

4
.gitignore vendored
View File

@@ -3,8 +3,8 @@
*.egg-info *.egg-info
*.swp *.swp
tags tags
school/docs/current lms/docs/current
school/public/dist lms/public/dist
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
*$py.class *$py.class

59
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,59 @@
exclude: 'node_modules|.git'
default_stages: [commit]
fail_fast: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
- id: trailing-whitespace
files: "frappe.*"
exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
- id: check-yaml
- id: no-commit-to-branch
args: ['--branch', 'main']
- id: check-merge-conflict
- id: check-ast
- id: check-json
- id: check-toml
- id: debug-statements
- repo: https://github.com/asottile/pyupgrade
rev: v2.34.0
hooks:
- id: pyupgrade
args: ['--py310-plus']
- repo: https://github.com/adityahase/black
rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
hooks:
- id: black
additional_dependencies: ['click==8.0.4']
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
hooks:
- id: prettier
types_or: [javascript]
# Ignore any files that might contain jinja / bundles
exclude: |
(?x)^(
lms/public/dist/.*|
.*node_modules.*|
.*boilerplate.*|
lms/www/website_script.js|
lms/templates/includes/.*|
lms/public/js/lib/.*
)$
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies: ['flake8-bugbear',]
args: ['--config', '.github/helper/flake8.conf']
ci:
autoupdate_schedule: weekly
skip: []
submodules: false

View File

@@ -1,5 +1,5 @@
1. Go to the apps/school directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/school repository on GitHub. 1. Go to the apps/lms directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/lms repository on GitHub.
1. Check out a working branch in git (e.g. git checkout -b my-new-branch). 1. Check out a working branch in git (e.g. git checkout -b my-new-branch).
1. Make your proposed changes to the source 1. Make your proposed changes to the source
1. Run your local version (e.g. bench start in your bench installation). Make sure that your changes work the way you want them to. 1. Run your local version (e.g. bench start in your bench installation). Make sure that your changes work the way you want them to.

View File

@@ -4,15 +4,15 @@ include *.json
include *.md include *.md
include *.py include *.py
include *.txt include *.txt
recursive-include school *.css recursive-include lms *.css
recursive-include school *.csv recursive-include lms *.csv
recursive-include school *.html recursive-include lms *.html
recursive-include school *.ico recursive-include lms *.ico
recursive-include school *.js recursive-include lms *.js
recursive-include school *.json recursive-include lms *.json
recursive-include school *.md recursive-include lms *.md
recursive-include school *.png recursive-include lms *.png
recursive-include school *.py recursive-include lms *.py
recursive-include school *.svg recursive-include lms *.svg
recursive-include school *.txt recursive-include lms *.txt
recursive-exclude school *.pyc recursive-exclude lms *.pyc

View File

@@ -1,25 +1,90 @@
## School <p align="center">
<a href="https://www.frappelms.com/">
<img src="https://www.frappelms.com/files/flms.svg" alt="Frappe LMS" width="100" height="100">
</a>
<p align="center">Easy to use, open source, learning management system.</p>
</p>
Create online courses without much hassle. <p align="center">
<a href="https://github.com/frappe/lms/blob/main/LICENSE">
<img alt="license" src="https://img.shields.io/badge/license-AGPLv3-blue">
</a>
</p>
![Course Home](/school/public/images/course-home.png) <img width="1402" alt="Lesson" src="https://frappelms.com/files/fs-banner71f330.png">
<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">
</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.
## Features ## 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 classes 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 ✨
1. Simple Backend Forms. ## Tech Stack
1. The UI is clean and minimal.
1. Lessons can be in the form of texts, videos, quizzes or a combination of all of these.
## Development Setup 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/)
1. [Through Docker](docker-installation.md) ## Local Setup
1. [Direct install through bench](bench-installation.md)
### 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 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://gameplan.test:8080`
### Contributing ## 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.
1. [Contribution Guidelines](Contribution.md) ### 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.
## 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.
## License ## License
Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)
[GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)

View File

@@ -2,9 +2,9 @@ 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. 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. Start the server by running bench start.
1. In a separate terminal window, create a new site by running bench new-site school.test. 1. In a separate terminal window, create a new site by running bench new-site lms.test.
1. Fork the school app 1. Fork the LMS app
1. Run bench get-app <url-of-your-form>. 1. Run bench get-app <url-of-your-form>.
1. Run bench --site school.test install-app school. 1. Run bench --site lms.test install-app lms.
1. Map your site to localhost with the command ```bench --site school.test add-to-hosts``` 1. Map your site to localhost with the command ```bench --site lms.test add-to-hosts```
1. Now open the URL http://school.test:8000/ in your browser, you should see the app running. 1. Now open the URL http://lms.test:8000/ in your browser, you should see the app running.

View File

@@ -1,25 +0,0 @@
version: "3"
services:
mariadb:
image: mariadb
volumes:
- mariadb-storage:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=root
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
bench:
image: anandology/frappe-bench:2021.10
volumes:
- .:/opt/frappe-bench/apps/school
environment:
- FRAPPE_APPS=school
- FRAPPE_ALLOW_TESTS=true
- FRAPPE_SITE_NAME=frappe.localhost
depends_on:
- mariadb
ports:
- 8000:8000
- 9000:9000
volumes:
mariadb-storage: {}

View File

@@ -1,9 +1,9 @@
**Step 1:** Clone the repo **Step 1:** Clone the repo
``` ```
$ git clone https://github.com/frappe/school.git $ git clone https://github.com/frappe/lms.git
$ cd school $ cd lms
``` ```
**Step 2:** Run docker-compose **Step 2:** Run docker-compose

32
docker/docker-compose.yml Normal file
View File

@@ -0,0 +1,32 @@
version: "3.7"
name: lms
services:
mariadb:
image: mariadb:10.6
command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci
- --skip-character-set-client-handshake
- --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
environment:
MYSQL_ROOT_PASSWORD: 123
volumes:
- mariadb-data:/var/lib/mysql
redis:
image: redis:alpine
frappe:
image: frappe/bench:latest
command: bash /workspace/init.sh
environment:
- SHELL=/bin/bash
working_dir: /home/frappe
volumes:
- .:/workspace
ports:
- 8000:8000
- 9000:9000
volumes:
mariadb-data:

39
docker/init.sh Normal file
View File

@@ -0,0 +1,39 @@
#!bin/bash
if [ -d "/home/frappe/frappe-bench/apps/frappe" ]; then
echo "Bench already exists, skipping init"
cd frappe-bench
bench start
else
echo "Creating new bench..."
fi
bench init --skip-redis-config-generation frappe-bench
cd frappe-bench
# Use containers instead of localhost
bench set-mariadb-host mariadb
bench set-redis-cache-host redis:6379
bench set-redis-queue-host redis:6379
bench set-redis-socketio-host redis:6379
# Remove redis, watch from Procfile
sed -i '/redis/d' ./Procfile
sed -i '/watch/d' ./Procfile
bench get-app lms
bench new-site lms.localhost \
--force \
--mariadb-root-password 123 \
--admin-password admin \
--no-mariadb-socket
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

1
lms/__init__.py Normal file
View File

@@ -0,0 +1 @@
__version__ = "0.0.1"

View File

@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from frappe import _ from frappe import _
def get_data(): def get_data():
return [ return [
{ {
@@ -9,6 +8,6 @@ def get_data():
"color": "grey", "color": "grey",
"icon": "octicon octicon-file-directory", "icon": "octicon octicon-file-directory",
"type": "module", "type": "module",
"label": _("Community") "label": _("Community"),
} }
] ]

View File

@@ -7,5 +7,6 @@ Configuration for docs
# headline = "App that does everything" # headline = "App that does everything"
# sub_heading = "Yes, you got that right the first time, everything" # sub_heading = "Yes, you got that right the first time, everything"
def get_context(context): def get_context(context):
context.brand_html = "Community" context.brand_html = "Community"

File diff suppressed because it is too large Load Diff

114
lms/fixtures/function.json Normal file
View File

@@ -0,0 +1,114 @@
[
{
"docstatus": 0,
"doctype": "Function",
"function": "Consulting",
"modified": "2021-12-14 15:16:26.189604",
"name": "Consulting"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Data & Analytics",
"modified": "2021-12-14 15:16:26.341051",
"name": "Data & Analytics"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Design & Creative",
"modified": "2021-12-14 15:16:26.343820",
"name": "Design & Creative"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Engineering (Non Software)",
"modified": "2021-12-14 15:16:26.346329",
"name": "Engineering (Non Software)"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Finance, Investment & Accounting",
"modified": "2021-12-14 15:16:26.351518",
"name": "Finance, Investment & Accounting"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Human Resource & Recruiting",
"modified": "2021-12-14 15:16:26.354310",
"name": "Human Resource & Recruiting"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Legal",
"modified": "2021-12-14 15:16:26.356844",
"name": "Legal"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Marketing, Advertising & PR",
"modified": "2021-12-14 15:16:26.359511",
"name": "Marketing, Advertising & PR"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Operations & Admin",
"modified": "2021-12-14 15:16:26.362571",
"name": "Operations & Admin"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Project Management",
"modified": "2021-12-14 15:16:26.365033",
"name": "Project Management"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Product",
"modified": "2021-12-14 15:16:26.367804",
"name": "Product"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Research, Training & Education",
"modified": "2021-12-14 15:16:26.370085",
"name": "Research, Training & Education"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Sales & Customer Service",
"modified": "2021-12-14 15:16:26.372635",
"name": "Sales & Customer Service"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Supply Chain, Logistics Strategy & Management",
"modified": "2021-12-14 15:16:26.375091",
"name": "Supply Chain, Logistics Strategy & Management"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Other",
"modified": "2021-12-14 15:16:26.377761",
"name": "Other"
},
{
"docstatus": 0,
"doctype": "Function",
"function": "Engineering (Software & IT)",
"modified": "2021-12-14 15:16:26.348864",
"name": "Engineering (Software & IT)"
}
]

170
lms/fixtures/industry.json Normal file
View File

@@ -0,0 +1,170 @@
[
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Accounting",
"modified": "2021-12-14 15:21:18.044741",
"name": "Accounting"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Ads, Marketing, PR & Events",
"modified": "2021-12-14 15:21:18.069794",
"name": "Ads, Marketing, PR & Events"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Agriculture, Fishing & Forestry",
"modified": "2021-12-14 15:21:18.074148",
"name": "Agriculture, Fishing & Forestry"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Architecture",
"modified": "2021-12-14 15:21:18.078250",
"name": "Architecture"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Aviation & Aerospace",
"modified": "2021-12-14 15:21:18.082127",
"name": "Aviation & Aerospace"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Banking, Financial Services & Insurance",
"modified": "2021-12-14 15:21:18.087499",
"name": "Banking, Financial Services & Insurance"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Biotech & Pharmaceuticals",
"modified": "2021-12-14 15:21:18.092094",
"name": "Biotech & Pharmaceuticals"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Construction & Real Estate",
"modified": "2021-12-14 15:21:18.095728",
"name": "Construction & Real Estate"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Consulting & Professional Services",
"modified": "2021-12-14 15:21:18.099171",
"name": "Consulting & Professional Services"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Energy & Utilities",
"modified": "2021-12-14 15:21:18.114022",
"name": "Energy & Utilities"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Food & Beverages",
"modified": "2021-12-14 15:21:18.124655",
"name": "Food & Beverages"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Health & Medical",
"modified": "2021-12-14 15:21:18.127914",
"name": "Health & Medical"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Hospitality & Tourism",
"modified": "2021-12-14 15:21:18.130783",
"name": "Hospitality & Tourism"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "IT / Ecommerce / Internet",
"modified": "2021-12-14 15:21:18.134069",
"name": "IT / Ecommerce / Internet"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Manufacturing & Production",
"modified": "2021-12-14 15:21:18.137362",
"name": "Manufacturing & Production"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Media & Entertainment",
"modified": "2021-12-14 15:21:18.140180",
"name": "Media & Entertainment"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Public Service & NGOs",
"modified": "2021-12-14 15:21:18.143125",
"name": "Public Service & NGOs"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Retail, Fashion & FMCG",
"modified": "2021-12-14 15:21:18.146020",
"name": "Retail, Fashion & FMCG"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Staffing & Recruiting",
"modified": "2021-12-14 15:21:18.149084",
"name": "Staffing & Recruiting"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Transportation & Logistics",
"modified": "2021-12-14 15:21:18.151952",
"name": "Transportation & Logistics"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Security & Law Enforcement",
"modified": "2021-12-14 15:21:18.154929",
"name": "Security & Law Enforcement"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Other",
"modified": "2021-12-14 15:21:18.157766",
"name": "Other"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Education & Training",
"modified": "2021-12-14 15:21:18.105864",
"name": "Education & Training"
},
{
"docstatus": 0,
"doctype": "Industry",
"industry": "Engineering",
"modified": "2021-12-14 15:21:18.119149",
"name": "Engineering"
}
]

292
lms/hooks.py Normal file
View File

@@ -0,0 +1,292 @@
from . import __version__ as app_version
app_name = "frappe_lms"
app_title = "Frappe LMS"
app_publisher = "Frappe"
app_description = "Frappe LMS App"
app_icon = "octicon octicon-file-directory"
app_color = "grey"
app_email = "school@frappe.io"
app_license = "AGPL"
# Includes in <head>
# ------------------
# include js, css files in header of desk.html
# app_include_css = "/assets/lms/css/lms.css"
# app_include_js = "/assets/lms/js/lms.js"
# include js, css files in header of web template
web_include_css = "lms.bundle.css"
# web_include_css = "/assets/lms/css/lms.css"
web_include_js = ["website.bundle.js"]
# include custom scss in every website theme (without file extension ".scss")
# website_theme_scss = "lms/public/scss/website"
# include js, css files in header of web form
# webform_include_js = {"doctype": "public/js/doctype.js"}
# webform_include_css = {"doctype": "public/css/doctype.css"}
# include js in page
# page_js = {"page" : "public/js/file.js"}
# include js in doctype views
# doctype_js = {"doctype" : "public/js/doctype.js"}
# doctype_list_js = {"doctype" : "public/js/doctype_list.js"}
# doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}
# doctype_calendar_js = {"doctype" : "public/js/doctype_calendar.js"}
# Home Pages
# ----------
# application home page (will override Website Settings)
# home_page = "login"
# website user home page (by Role)
# role_home_page = {
# "Role": "home_page"
# }
# Generators
# ----------
# automatically create page for each record of this doctype
# website_generators = ["Web Page"]
# Installation
# ------------
# before_install = "lms.install.before_install"
after_install = "lms.install.after_install"
after_sync = "lms.install.after_sync"
after_uninstall = "lms.install.after_uninstall"
setup_wizard_requires = "assets/lms/js/setup_wizard.js"
# Desk Notifications
# ------------------
# See frappe.core.notifications.get_notification_config
# notification_config = "lms.notifications.get_notification_config"
# Permissions
# -----------
# Permissions evaluated in scripted ways
# permission_query_conditions = {
# "Event": "frappe.desk.doctype.event.event.get_permission_query_conditions",
# }
#
# has_permission = {
# "Event": "frappe.desk.doctype.event.event.has_permission",
# }
# DocType Class
# ---------------
# Override standard doctype classes
override_doctype_class = {
"User": "lms.overrides.user.CustomUser",
"Web Template": "lms.overrides.web_template.CustomWebTemplate",
}
# Document Events
# ---------------
# Hook on document methods and events
doc_events = {
"Discussion Reply": {"after_insert": "lms.lms.utils.create_notification_log"},
"Course Lesson": {"on_update": "lms.lms.doctype.lms_quiz.lms_quiz.update_lesson_info"},
}
# Scheduled Tasks
# ---------------
# scheduler_events = {
# "daily": [
# "erpnext.stock.reorder_item.reorder_item"
# ]
# }
fixtures = ["Custom Field", "Function", "Industry"]
# Testing
# -------
# before_tests = "lms.install.before_tests"
# Overriding Methods
# ------------------------------
#
# override_whitelisted_methods = {
# "frappe.desk.doctype.event.event.get_events": "lms.event.get_events"
# }
#
# each overriding function accepts a `data` argument;
# generated from the base implementation of the doctype dashboard,
# along with any modifications made in other Frappe apps
# override_doctype_dashboards = {
# "Task": "lms.task.get_dashboard_data"
# }
# exempt linked doctypes from being automatically cancelled
#
# auto_cancel_exempted_doctypes = ["Auto Repeat"]
# Add all simple route rules here
website_route_rules = [
{"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
{"from_route": "/courses/<course>", "to_route": "courses/course"},
{"from_route": "/courses/<course>/<certificate>", "to_route": "courses/certificate"},
{"from_route": "/courses/<course>/learn", "to_route": "batch/learn"},
{
"from_route": "/courses/<course>/learn/<int:chapter>.<int:lesson>",
"to_route": "batch/learn",
},
{"from_route": "/quizzes", "to_route": "batch/quiz_list"},
{"from_route": "/quizzes/<quizname>", "to_route": "batch/quiz"},
{"from_route": "/classes/<classname>", "to_route": "classes/class"},
{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
{"from_route": "/courses/<course>/manage", "to_route": "cohorts"},
{"from_route": "/courses/<course>/cohorts/<cohort>", "to_route": "cohorts/cohort"},
{
"from_route": "/courses/<course>/cohorts/<cohort>/<page>",
"to_route": "cohorts/cohort",
},
{
"from_route": "/courses/<course>/subgroups/<cohort>/<subgroup>",
"to_route": "cohorts/subgroup",
},
{
"from_route": "/courses/<course>/subgroups/<cohort>/<subgroup>/<page>",
"to_route": "cohorts/subgroup",
},
{
"from_route": "/courses/<course>/join/<cohort>/<subgroup>/<invite_code>",
"to_route": "cohorts/join",
},
{"from_route": "/users", "to_route": "profiles/profile"},
{"from_route": "/jobs/<job>", "to_route": "jobs/job"},
{
"from_route": "/classes/<classname>/students/<username>",
"to_route": "/classes/progress",
},
{"from_route": "/assignments/<assignment>", "to_route": "assignments/assignment"},
]
website_redirects = [
{"source": "/update-profile", "target": "/edit-profile"},
{"source": "/dashboard", "target": "/courses"},
]
update_website_context = [
"lms.widgets.update_website_context",
]
jinja = {
"methods": [
"lms.page_renderers.get_profile_url",
"lms.overrides.user.get_enrolled_courses",
"lms.overrides.user.get_course_membership",
"lms.overrides.user.get_authored_courses",
"lms.overrides.user.get_palette",
"lms.lms.utils.get_membership",
"lms.lms.utils.get_lessons",
"lms.lms.utils.get_tags",
"lms.lms.utils.get_instructors",
"lms.lms.utils.get_students",
"lms.lms.utils.get_average_rating",
"lms.lms.utils.is_certified",
"lms.lms.utils.get_lesson_index",
"lms.lms.utils.get_lesson_url",
"lms.lms.utils.get_chapters",
"lms.lms.utils.get_slugified_chapter_title",
"lms.lms.utils.get_progress",
"lms.lms.utils.render_html",
"lms.lms.utils.is_mentor",
"lms.lms.utils.is_cohort_staff",
"lms.lms.utils.get_mentors",
"lms.lms.utils.get_reviews",
"lms.lms.utils.is_eligible_to_review",
"lms.lms.utils.get_initial_members",
"lms.lms.utils.get_sorted_reviews",
"lms.lms.utils.is_instructor",
"lms.lms.utils.convert_number_to_character",
"lms.lms.utils.get_signup_optin_checks",
"lms.lms.utils.get_popular_courses",
"lms.lms.utils.format_amount",
"lms.lms.utils.first_lesson_exists",
"lms.lms.utils.get_courses_under_review",
"lms.lms.utils.has_course_instructor_role",
"lms.lms.utils.has_course_moderator_role",
"lms.lms.utils.get_certificates",
"lms.lms.utils.format_number",
"lms.lms.utils.get_lesson_count",
"lms.lms.utils.get_all_memberships",
"lms.lms.utils.get_filtered_membership",
"lms.lms.utils.show_start_learing_cta",
"lms.lms.utils.can_create_courses",
],
"filters": [],
}
## Specify the additional tabs to be included in the user profile page.
## Each entry must be a subclass of lms.lms.plugins.ProfileTab
# profile_tabs = []
## Specify the extension to be used to control what scripts and stylesheets
## to be included in lesson pages. The specified value must be be a
## subclass of lms.plugins.PageExtension
# lms_lesson_page_extension = None
# lms_lesson_page_extensions = [
# "lms.plugins.LiveCodeExtension"
# ]
has_website_permission = {
"LMS Certificate Evaluation": "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.has_website_permission"
}
profile_mandatory_fields = [
"first_name",
"last_name",
"user_image",
"bio",
"linkedin",
"education",
"skill",
"preferred_functions",
"preferred_industries",
"dream_companies",
"attire",
"collaboration",
"role",
"location_preference",
"time",
"company_type",
]
## Markdown Macros for Lessons
lms_markdown_macro_renderers = {
"Exercise": "lms.plugins.exercise_renderer",
"Quiz": "lms.plugins.quiz_renderer",
"YouTubeVideo": "lms.plugins.youtube_video_renderer",
"Video": "lms.plugins.video_renderer",
"Assignment": "lms.plugins.assignment_renderer",
}
# page_renderer to manage profile pages
page_renderer = [
"lms.page_renderers.ProfileRedirectPage",
"lms.page_renderers.ProfilePage",
]
# set this to "/" to have profiles on the top-level
profile_url_prefix = "/users/"
signup_form_template = "lms.plugins.show_custom_signup"
on_login = "lms.overrides.user.on_login"
on_session_creation = "lms.overrides.user.on_session_creation"

129
lms/install.py Normal file
View File

@@ -0,0 +1,129 @@
import frappe
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
def after_install():
add_pages_to_nav()
def after_sync():
create_lms_roles()
set_default_home()
add_all_roles_to("Administrator")
def add_pages_to_nav():
pages = [
{"label": "Explore", "idx": 1},
{"label": "Courses", "url": "/courses", "parent": "Explore", "idx": 2},
{"label": "Classes", "url": "/classes", "parent": "Explore", "idx": 3},
{"label": "Statistics", "url": "/statistics", "parent": "Explore", "idx": 4},
{"label": "Jobs", "url": "/jobs", "parent": "Explore", "idx": 5},
{"label": "People", "url": "/community", "parent": "Explore", "idx": 6},
]
for page in pages:
filters = frappe._dict()
if page.get("url"):
filters["url"] = ["like", "%" + page.get("url") + "%"]
else:
filters["label"] = page.get("label")
if not frappe.db.exists("Top Bar Item", filters):
frappe.get_doc(
{
"doctype": "Top Bar Item",
"label": page.get("label"),
"url": page.get("url"),
"parent_label": page.get("parent"),
"idx": page.get("idx"),
"parent": "Website Settings",
"parenttype": "Website Settings",
"parentfield": "top_bar_items",
}
).save()
def after_uninstall():
delete_custom_fields()
def create_lms_roles():
create_course_creator_role()
create_moderator_role()
def set_default_home():
frappe.db.set_value("Portal Settings", None, "default_portal_home", "/courses")
def create_course_creator_role():
if not frappe.db.exists("Role", "Course Creator"):
role = frappe.get_doc(
{
"doctype": "Role",
"role_name": "Course Creator",
"home_page": "",
"desk_access": 0,
}
)
role.save(ignore_permissions=True)
def create_moderator_role():
if not frappe.db.exists("Role", "Moderator"):
role = frappe.get_doc(
{
"doctype": "Role",
"role_name": "Moderator",
"home_page": "",
"desk_access": 0,
}
)
role.save(ignore_permissions=True)
def delete_custom_fields():
fields = [
"user_category",
"headline",
"college",
"city",
"verify_terms",
"country",
"preferred_location",
"preferred_functions",
"preferred_industries",
"work_environment_column",
"time",
"role",
"carrer_preference_details",
"skill",
"certification_details",
"internship",
"branch",
"github",
"medium",
"linkedin",
"profession",
"looking_for_job",
"cover_image" "work_environment",
"dream_companies",
"career_preference_column",
"attire",
"collaboration",
"location_preference",
"company_type",
"skill_details",
"certification",
"education",
"work_experience",
"education_details",
"hide_private",
"work_experience_details",
"profile_complete",
]
for field in fields:
frappe.db.delete("Custom Field", {"fieldname": field})
frappe.db.commit()

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe and contributors // Copyright (c) 2021, Frappe and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Community Talk', { frappe.ui.form.on("Job Opportunity", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -0,0 +1,157 @@
{
"actions": [],
"allow_import": 1,
"allow_rename": 1,
"autoname": "format: JOB-{#####}",
"creation": "2022-02-07 12:01:41.074418",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"job_title",
"location",
"disabled",
"column_break_5",
"type",
"status",
"section_break_6",
"description",
"company_details_section",
"company_name",
"company_website",
"column_break_11",
"company_logo",
"application_link"
],
"fields": [
{
"fieldname": "job_title",
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Job Title",
"reqd": 1
},
{
"fieldname": "location",
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Location",
"reqd": 1
},
{
"fieldname": "column_break_5",
"fieldtype": "Column Break"
},
{
"default": "Full Time",
"fieldname": "type",
"fieldtype": "Select",
"label": "Type",
"options": "Full Time\nPart Time\nFreelance\nContract",
"reqd": 1
},
{
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Status",
"options": "Open\nClosed"
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break"
},
{
"fieldname": "description",
"fieldtype": "Text Editor",
"label": "Description",
"reqd": 1
},
{
"fieldname": "company_details_section",
"fieldtype": "Section Break",
"label": "Company Details"
},
{
"fieldname": "company_name",
"fieldtype": "Data",
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Company Name",
"reqd": 1
},
{
"fieldname": "company_website",
"fieldtype": "Data",
"label": "Company Website",
"reqd": 1
},
{
"fieldname": "column_break_11",
"fieldtype": "Column Break"
},
{
"fieldname": "company_logo",
"fieldtype": "Attach Image",
"label": "Company Logo",
"reqd": 1
},
{
"fieldname": "application_link",
"fieldtype": "Data",
"label": "Application Form Link",
"reqd": 1
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
"label": "Disabled"
}
],
"index_web_pages_for_search": 1,
"links": [],
"make_attachments_public": 1,
"modified": "2022-09-15 17:22:21.662675",
"modified_by": "Administrator",
"module": "Job",
"name": "Job Opportunity",
"naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"select": 1,
"share": 1,
"write": 1
},
{
"create": 1,
"email": 1,
"export": 1,
"if_owner": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "All",
"select": 1,
"share": 1,
"write": 1
}
],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"title_field": "job_title"
}

View File

@@ -0,0 +1,41 @@
# Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt
import frappe
from frappe import _
from frappe.model.document import Document
from frappe.utils import get_link_to_form
from frappe.utils.user import get_system_managers
from lms.lms.utils import validate_image
class JobOpportunity(Document):
def validate(self):
self.validate_urls()
self.company_logo = validate_image(self.company_logo)
def validate_urls(self):
frappe.utils.validate_url(self.company_website, True)
frappe.utils.validate_url(self.application_link, True)
@frappe.whitelist()
def report(job, reason):
system_managers = get_system_managers(only_name=True)
user = frappe.db.get_value("User", frappe.session.user, "full_name")
subject = _("User {0} has reported the job post {1}").format(user, job)
args = {
"job": job,
"job_url": get_link_to_form("Job Opportunity", job),
"user": user,
"reason": reason,
}
frappe.sendmail(
recipients=system_managers,
subject=subject,
header=[subject, "green"],
template="job_report",
args=args,
now=True,
)

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2021, Frappe and Contributors
# See license.txt
# import frappe
import unittest
class TestJobOpportunity(unittest.TestCase):
pass

View File

@@ -0,0 +1,7 @@
// Copyright (c) 2022, Frappe and contributors
// For license information, please see license.txt
frappe.ui.form.on("Job Settings", {
// refresh: function(frm) {
// }
});

View File

@@ -1,50 +1,48 @@
{ {
"actions": [], "actions": [],
"creation": "2021-08-11 10:51:47.234690", "allow_rename": 1,
"creation": "2022-02-07 12:01:41.422955",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"event", "allow_posting",
"user", "title",
"full_name" "subtitle"
], ],
"fields": [ "fields": [
{ {
"fieldname": "event", "default": "0",
"fieldtype": "Link", "fieldname": "allow_posting",
"label": "Event", "fieldtype": "Check",
"options": "Event Details" "label": "Allow Job Posting From Website"
}, },
{ {
"fieldname": "full_name", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1, "label": "Job Board Title"
"label": "Full Name",
"unique": 1
}, },
{ {
"fieldname": "user", "fieldname": "subtitle",
"fieldtype": "Data", "fieldtype": "Data",
"label": "User" "label": "Job Board Subtitle"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1,
"links": [], "links": [],
"modified": "2021-08-20 17:03:26.733195", "modified": "2022-02-11 15:56:38.958317",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Event Management", "module": "Job",
"name": "Host", "name": "Job Settings",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1,
"role": "System Manager", "role": "System Manager",
"share": 1, "share": 1,
"write": 1 "write": 1
@@ -52,6 +50,5 @@
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "user", "states": []
"track_changes": 1
} }

View File

@@ -1,8 +1,9 @@
# Copyright (c) 2021, FOSS United and contributors # Copyright (c) 2022, Frappe and contributors
# For license information, please see license.txt # For license information, please see license.txt
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class Host(Document):
class JobSettings(Document):
pass pass

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2022, Frappe and Contributors
# See license.txt
# import frappe
import unittest
class TestJobSettings(unittest.TestCase):
pass

View File

@@ -0,0 +1,28 @@
{
"attach_print": 0,
"channel": "Email",
"creation": "2021-12-30 12:29:56.533903",
"days_in_advance": 0,
"docstatus": 0,
"doctype": "Notification",
"document_type": "Job Opportunity",
"enabled": 1,
"event": "New",
"idx": 0,
"is_standard": 1,
"message": "Hey,\n\nA new Job Opportunity has been created. \n\n<p>Company Name: {{ doc.company_name}}</p>\n<p>Job Title: {{ doc.job_title}}</p>\n<p>Job Location: {{ doc.location}}</p><br>\n<p>Job Description: {{ doc.description}}</p><br>\n\n<p>Find all the posted jobs <a href=\"{{ frappe.utils.get_url() }}/app/job-opportunity\">here</a>.</p><br>\n",
"modified": "2021-12-30 12:54:13.382512",
"modified_by": "Administrator",
"module": "Job",
"name": "New job alert",
"owner": "Administrator",
"recipients": [
{
"receiver_by_role": "System Manager"
}
],
"send_system_notification": 0,
"send_to_all_assignees": 0,
"sender_email": "",
"subject": "New job added by {{ doc.company_name}}"
}

View File

@@ -0,0 +1,10 @@
Hey,
A new Job Opportunity has been created.
<p>Company Name: {{ doc.company_name}}</p>
<p>Job Title: {{ doc.job_title}}</p>
<p>Job Location: {{ doc.location}}</p><br>
<p>Job Description: {{ doc.description}}</p><br>
<p>Find all the posted jobs <a href="{{ frappe.utils.get_url() }}/app/job-opportunity">here</a>.</p><br>

View File

@@ -1,5 +1,6 @@
import frappe import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here
pass pass

View File

@@ -0,0 +1,7 @@
frappe.ready(function () {
frappe.web_form.after_save = () => {
setTimeout(() => {
window.location.href = `/jobs`;
});
};
});

View File

@@ -0,0 +1,151 @@
{
"accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 1,
"allow_incomplete": 0,
"allow_multiple": 1,
"allow_print": 0,
"amount": 0.0,
"amount_based_on_field": 0,
"apply_document_permissions": 1,
"button_label": "Save",
"creation": "2021-12-27 17:02:12.461145",
"custom_css": "[data-doctype=\"Web Form\"] {\n max-width: 720px;\n margin: 6rem auto;\n}",
"doc_type": "Job Opportunity",
"docstatus": 0,
"doctype": "Web Form",
"idx": 0,
"is_standard": 1,
"list_columns": [],
"login_required": 1,
"max_attachment_size": 0,
"modified": "2022-09-15 17:22:43.957184",
"modified_by": "Administrator",
"module": "Job",
"name": "job-opportunity",
"owner": "Administrator",
"payment_button_label": "Buy Now",
"published": 1,
"route": "job-opportunity",
"show_attachments": 0,
"show_list": 1,
"show_sidebar": 0,
"success_message": "",
"success_url": "/jobs",
"title": "Job Opportunity",
"web_form_fields": [
{
"allow_read_on_all_link_options": 0,
"fieldname": "job_title",
"fieldtype": "Data",
"hidden": 0,
"label": "Job Title",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "location",
"fieldtype": "Data",
"hidden": 0,
"label": "Location",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"default": "Full Time",
"fieldname": "type",
"fieldtype": "Select",
"hidden": 0,
"label": "Type",
"max_length": 0,
"max_value": 0,
"options": "Full Time\nPart Time\nFreelance\nContract",
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
"hidden": 0,
"label": "Status",
"max_length": 0,
"max_value": 0,
"options": "Open\nClosed",
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "company_name",
"fieldtype": "Data",
"hidden": 0,
"label": "Company Name",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "company_website",
"fieldtype": "Data",
"hidden": 0,
"label": "Company Website",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "company_logo",
"fieldtype": "Attach Image",
"hidden": 0,
"label": "Company Logo",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "application_link",
"fieldtype": "Data",
"hidden": 0,
"label": "Application Form Link",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
},
{
"allow_read_on_all_link_options": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
"label": "Description",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 1,
"show_in_filter": 0
}
]
}

View File

@@ -1,5 +1,6 @@
import frappe import frappe
def get_context(context): def get_context(context):
# do your magic here # do your magic here
pass pass

141
lms/lms/api.py Normal file
View File

@@ -0,0 +1,141 @@
"""API methods for the LMS.
"""
import frappe
@frappe.whitelist()
def autosave_section(section, code):
"""Saves the code edited in one of the sections."""
doc = frappe.get_doc(
doctype="Code Revision", section=section, code=code, author=frappe.session.user
)
doc.insert()
return {"name": doc.name}
@frappe.whitelist()
def submit_solution(exercise, code):
"""Submits a solution.
@exerecise: name of the exercise to submit
@code: solution to the exercise
"""
ex = frappe.get_doc("Exercise", exercise)
if not ex:
return
doc = ex.submit(code)
return {"name": doc.name, "creation": doc.creation}
@frappe.whitelist()
def save_current_lesson(course_name, lesson_name):
"""Saves the current lesson for a student/mentor."""
name = frappe.get_value(
doctype="LMS Batch Membership",
filters={"course": course_name, "member": frappe.session.user},
fieldname="name",
)
if not name:
return
doc = frappe.get_doc("LMS Batch Membership", name)
doc.current_lesson = lesson_name
doc.save(ignore_permissions=True)
return {"current_lesson": doc.current_lesson}
@frappe.whitelist()
def join_cohort(course, cohort, subgroup, invite_code):
"""Creates a Cohort Join Request for given user."""
course_doc = frappe.get_doc("LMS Course", course)
cohort_doc = course_doc and course_doc.get_cohort(cohort)
subgroup_doc = cohort_doc and cohort_doc.get_subgroup(subgroup)
if not subgroup_doc or subgroup_doc.invite_code != invite_code:
return {"ok": False, "error": "Invalid join link"}
data = {
"doctype": "Cohort Join Request",
"cohort": cohort_doc.name,
"subgroup": subgroup_doc.name,
"email": frappe.session.user,
"status": "Pending",
}
# Don't insert duplicate records
if frappe.db.exists(data):
return {"ok": True, "status": "record found"}
else:
doc = frappe.get_doc(data)
doc.insert(ignore_permissions=True)
return {"ok": True, "status": "record created"}
@frappe.whitelist()
def approve_cohort_join_request(join_request):
r = frappe.get_doc("Cohort Join Request", join_request)
sg = r and frappe.get_doc("Cohort Subgroup", r.subgroup)
if not sg or r.status not in ["Pending", "Accepted"]:
return {"ok": False, "error": "Invalid Join Request"}
if (
not sg.is_manager(frappe.session.user) and "System Manager" not in frappe.get_roles()
):
return {"ok": False, "error": "Permission Deined"}
r.status = "Accepted"
r.save(ignore_permissions=True)
return {"ok": True}
@frappe.whitelist()
def reject_cohort_join_request(join_request):
r = frappe.get_doc("Cohort Join Request", join_request)
sg = r and frappe.get_doc("Cohort Subgroup", r.subgroup)
if not sg or r.status not in ["Pending", "Rejected"]:
return {"ok": False, "error": "Invalid Join Request"}
if (
not sg.is_manager(frappe.session.user) and "System Manager" not in frappe.get_roles()
):
return {"ok": False, "error": "Permission Deined"}
r.status = "Rejected"
r.save(ignore_permissions=True)
return {"ok": True}
@frappe.whitelist()
def undo_reject_cohort_join_request(join_request):
r = frappe.get_doc("Cohort Join Request", join_request)
sg = r and frappe.get_doc("Cohort Subgroup", r.subgroup)
# keeping Pending as well to consider the case of duplicate requests
if not sg or r.status not in ["Pending", "Rejected"]:
return {"ok": False, "error": "Invalid Join Request"}
if (
not sg.is_manager(frappe.session.user) and "System Manager" not in frappe.get_roles()
):
return {"ok": False, "error": "Permission Deined"}
r.status = "Pending"
r.save(ignore_permissions=True)
return {"ok": True}
@frappe.whitelist()
def add_mentor_to_subgroup(subgroup, email):
try:
sg = frappe.get_doc("Cohort Subgroup", subgroup)
except frappe.DoesNotExistError:
return {"ok": False, "error": f"Invalid subgroup: {subgroup}"}
if (
not sg.get_cohort().is_admin(frappe.session.user)
and "System Manager" not in frappe.get_roles()
):
return {"ok": False, "error": "Permission Deined"}
try:
user = frappe.get_doc("User", email)
except frappe.DoesNotExistError:
return {"ok": False, "error": f"Invalid user: {email}"}
sg.add_mentor(email)
return {"ok": True}

View File

@@ -2,23 +2,26 @@
"based_on": "creation", "based_on": "creation",
"chart_name": "Course Enrollments", "chart_name": "Course Enrollments",
"chart_type": "Count", "chart_type": "Count",
"color": "#4463F0",
"creation": "2021-09-30 12:23:09.414853", "creation": "2021-09-30 12:23:09.414853",
"custom_options": "{\"type\": \"line\", \"axisOptions\": {\"xIsSeries\": 1}, \"lineOptions\": {\"regionFill\": 1}}",
"docstatus": 0, "docstatus": 0,
"doctype": "Dashboard Chart", "doctype": "Dashboard Chart",
"document_type": "LMS Batch Membership", "document_type": "LMS Batch Membership",
"dynamic_filters_json": "[]", "dynamic_filters_json": "[]",
"filters_json": "[]", "filters_json": "[]",
"group_by_type": "Count", "group_by_type": "Count",
"idx": 0, "idx": 1,
"is_public": 1, "is_public": 1,
"is_standard": 1, "is_standard": 1,
"last_synced_on": "2021-10-17 13:32:21.745498", "last_synced_on": "2022-10-20 10:46:56.859520",
"modified": "2021-10-21 17:31:06.997133", "modified": "2022-10-20 11:30:26.863008",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "Course Enrollments", "name": "Course Enrollments",
"number_of_groups": 0, "number_of_groups": 0,
"owner": "basawaraj@erpnext.com", "owner": "basawaraj@erpnext.com",
"roles": [],
"source": "", "source": "",
"time_interval": "Daily", "time_interval": "Daily",
"timeseries": 1, "timeseries": 1,

View File

@@ -0,0 +1,33 @@
{
"based_on": "creation",
"chart_name": "Lesson Completion",
"chart_type": "Count",
"color": "#4463F0",
"creation": "2022-11-09 16:52:19.021695",
"custom_options": "{\"type\": \"line\", \"axisOptions\": {\"xIsSeries\": 1}, \"lineOptions\": {\"regionFill\": 1}}",
"docstatus": 0,
"doctype": "Dashboard Chart",
"document_type": "LMS Course Progress",
"dynamic_filters_json": "[]",
"filters_json": "[]",
"group_by_type": "Count",
"idx": 0,
"is_public": 1,
"is_standard": 1,
"modified": "2022-11-09 16:52:52.241756",
"modified_by": "Administrator",
"module": "LMS",
"name": "Lesson Completion",
"number_of_groups": 0,
"owner": "Administrator",
"parent_document_type": "",
"roles": [],
"source": "",
"time_interval": "Daily",
"timeseries": 1,
"timespan": "Last Month",
"type": "Line",
"use_report_chart": 0,
"value_based_on": "",
"y_axis": []
}

View File

@@ -0,0 +1,33 @@
{
"based_on": "creation",
"chart_name": "New Signups",
"chart_type": "Count",
"color": "#4463F0",
"creation": "2021-09-28 18:57:50.047656",
"custom_options": "{\"type\": \"line\", \"axisOptions\": {\"xIsSeries\": 1}, \"lineOptions\": {\"regionFill\": 1}}",
"docstatus": 0,
"doctype": "Dashboard Chart",
"document_type": "User",
"dynamic_filters_json": "[]",
"filters_json": "[]",
"group_by_type": "Count",
"idx": 1,
"is_public": 1,
"is_standard": 1,
"last_synced_on": "2022-10-20 10:46:56.849265",
"modified": "2022-10-20 11:31:17.184897",
"modified_by": "Administrator",
"module": "LMS",
"name": "New Signups",
"number_of_groups": 0,
"owner": "basawaraj@erpnext.com",
"roles": [],
"source": "",
"time_interval": "Daily",
"timeseries": 1,
"timespan": "Last Quarter",
"type": "Line",
"use_report_chart": 0,
"value_based_on": "",
"y_axis": []
}

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe and contributors // Copyright (c) 2021, Frappe and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('TShirt Sizes', { frappe.ui.form.on("Certification", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -0,0 +1,74 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "hash",
"creation": "2021-12-07 12:20:37.143096",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"certification_name",
"organization",
"description",
"column_break_4",
"expire",
"issue_date",
"expiration_date"
],
"fields": [
{
"fieldname": "certification_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Certification Name",
"reqd": 1
},
{
"fieldname": "organization",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Organization",
"reqd": 1
},
{
"fieldname": "issue_date",
"fieldtype": "Date",
"in_list_view": 1,
"label": "Issue Date",
"reqd": 1
},
{
"fieldname": "description",
"fieldtype": "Small Text",
"label": "Description"
},
{
"depends_on": "eval: !doc.expire",
"fieldname": "expiration_date",
"fieldtype": "Data",
"label": "Expiration Date"
},
{
"default": "0",
"fieldname": "expire",
"fieldtype": "Check",
"label": "This certificate does no expire"
},
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-12-21 10:05:43.377876",
"modified_by": "Administrator",
"module": "LMS",
"name": "Certification",
"naming_rule": "Random",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
}

View File

@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors # Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class TShirtSizes(Document):
class Certification(Document):
pass pass

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2021, Frappe and Contributors
# See license.txt
# import frappe
import unittest
class TestCertification(unittest.TestCase):
pass

View File

@@ -1,5 +1,6 @@
{ {
"actions": [], "actions": [],
"autoname": "hash",
"creation": "2021-07-27 16:25:02.903245", "creation": "2021-07-27 16:25:02.903245",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
@@ -20,13 +21,15 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-09-30 10:35:30.014950", "modified": "2022-03-15 09:39:41.937565",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "Chapter Reference", "name": "Chapter Reference",
"naming_rule": "Random",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [],
"track_changes": 1 "track_changes": 1
} }

View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class ChapterReference(Document): class ChapterReference(Document):
pass pass

View File

@@ -0,0 +1,43 @@
{
"actions": [],
"autoname": "autoincrement",
"creation": "2022-11-09 16:23:26.454527",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"course",
"title"
],
"fields": [
{
"fieldname": "course",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Course",
"options": "LMS Course",
"reqd": 1
},
{
"fetch_from": "course.title",
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-11-11 15:51:45.560864",
"modified_by": "Administrator",
"module": "LMS",
"name": "Class Course",
"naming_rule": "Autoincrement",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}

View File

@@ -1,8 +1,9 @@
# Copyright (c) 2021, FOSS United and contributors # Copyright (c) 2022, Frappe and contributors
# For license information, please see license.txt # For license information, please see license.txt
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class Speaker(Document):
class ClassCourse(Document):
pass pass

View File

@@ -0,0 +1,7 @@
// Copyright (c) 2022, Frappe and contributors
// For license information, please see license.txt
frappe.ui.form.on("Class Student", {
// refresh: function(frm) {
// }
});

View File

@@ -0,0 +1,51 @@
{
"actions": [],
"allow_rename": 1,
"creation": "2022-11-09 16:20:44.602545",
"default_view": "List",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"student",
"student_name",
"username"
],
"fields": [
{
"fieldname": "student",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Student",
"options": "User",
"reqd": 1
},
{
"fetch_from": "student.full_name",
"fieldname": "student_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Student Name",
"read_only": 1
},
{
"fetch_from": "student.username",
"fieldname": "username",
"fieldtype": "Data",
"label": "Username",
"read_only": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-11-15 11:13:39.410578",
"modified_by": "Administrator",
"module": "LMS",
"name": "Class Student",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": []
}

View File

@@ -1,8 +1,9 @@
# Copyright (c) 2021, FOSS United and contributors # Copyright (c) 2022, Frappe and contributors
# For license information, please see license.txt # For license information, please see license.txt
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class Attendee(Document):
class ClassStudent(Document):
pass pass

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2022, Frappe and Contributors
# See license.txt
# import frappe
from frappe.tests.utils import FrappeTestCase
class TestClassStudent(FrappeTestCase):
pass

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors // Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Talk', { frappe.ui.form.on("Cohort", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -0,0 +1,133 @@
{
"actions": [],
"allow_rename": 1,
"autoname": "format:{course}/{slug}",
"creation": "2021-11-19 11:45:31.016097",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"course",
"title",
"slug",
"section_break_2",
"instructor",
"status",
"column_break_4",
"begin_date",
"end_date",
"duration",
"section_break_8",
"description",
"pages"
],
"fields": [
{
"fieldname": "description",
"fieldtype": "Markdown Editor",
"label": "Description"
},
{
"fieldname": "instructor",
"fieldtype": "Link",
"label": "Instructor",
"options": "User",
"reqd": 1
},
{
"fieldname": "status",
"fieldtype": "Select",
"label": "Status",
"options": "Upcoming\nLive\nCompleted\nCancelled",
"reqd": 1
},
{
"fieldname": "begin_date",
"fieldtype": "Date",
"label": "Begin Date"
},
{
"fieldname": "end_date",
"fieldtype": "Date",
"label": "End Date"
},
{
"fieldname": "duration",
"fieldtype": "Data",
"label": "Duration"
},
{
"fieldname": "slug",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Slug",
"reqd": 1,
"unique": 1
},
{
"fieldname": "column_break_4",
"fieldtype": "Column Break"
},
{
"fieldname": "section_break_8",
"fieldtype": "Section Break"
},
{
"fieldname": "section_break_2",
"fieldtype": "Section Break"
},
{
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title",
"reqd": 1
},
{
"fieldname": "course",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Course",
"options": "LMS Course",
"reqd": 1
},
{
"fieldname": "pages",
"fieldtype": "Table",
"label": "Pages",
"options": "Cohort Web Page"
}
],
"index_web_pages_for_search": 1,
"links": [
{
"group": "Links",
"link_doctype": "Cohort Subgroup",
"link_fieldname": "cohort"
}
],
"modified": "2022-10-13 15:46:32.322926",
"modified_by": "Administrator",
"module": "LMS",
"name": "Cohort",
"naming_rule": "Expression",
"owner": "Administrator",
"permissions": [
{
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}

View File

@@ -0,0 +1,79 @@
# Copyright (c) 2021, FOSS United and contributors
# For license information, please see license.txt
import frappe
from frappe.model.document import Document
class Cohort(Document):
def get_url(self):
return f"{frappe.utils.get_url()}/courses/{self.course}/cohorts/{self.slug}"
def get_subgroups(self, include_counts=False, sort_by=None):
names = frappe.get_all("Cohort Subgroup", filters={"cohort": self.name}, pluck="name")
subgroups = [frappe.get_cached_doc("Cohort Subgroup", name) for name in names]
subgroups = sorted(subgroups, key=lambda sg: sg.title)
if include_counts:
mentors = self._get_subgroup_counts("Cohort Mentor")
students = self._get_subgroup_counts("LMS Batch Membership")
join_requests = self._get_subgroup_counts("Cohort Join Request", status="Pending")
for s in subgroups:
s.num_mentors = mentors.get(s.name, 0)
s.num_students = students.get(s.name, 0)
s.num_join_requests = join_requests.get(s.name, 0)
if sort_by:
subgroups.sort(key=lambda sg: getattr(sg, sort_by), reverse=True)
return subgroups
def _get_subgroup_counts(self, doctype, **kw):
rows = frappe.get_all(
doctype,
filters={"cohort": self.name, **kw},
fields=["subgroup", "count(*) as count"],
group_by="subgroup",
)
return {row["subgroup"]: row["count"] for row in rows}
def _get_count(self, doctype, **kw):
filters = {"cohort": self.name, **kw}
return frappe.db.count(doctype, filters=filters)
def get_page_template(self, slug, scope=None):
p = self.get_page(slug, scope=scope)
return p and p.get_template_html()
def get_page(self, slug, scope=None):
for p in self.pages:
if p.slug == slug and scope in [p.scope, None]:
return p
def get_pages(self, scope=None):
return [p for p in self.pages if scope in [p.scope, None]]
def get_stats(self):
return {
"subgroups": self._get_count("Cohort Subgroup"),
"mentors": self._get_count("Cohort Mentor"),
"students": self._get_count("LMS Batch Membership"),
"join_requests": self._get_count("Cohort Join Request", status="Pending"),
}
def get_subgroup(self, slug):
q = dict(cohort=self.name, slug=slug)
name = frappe.db.get_value("Cohort Subgroup", q, "name")
return name and frappe.get_doc("Cohort Subgroup", name)
def get_mentor(self, email):
q = dict(cohort=self.name, email=email)
name = frappe.db.get_value("Cohort Mentor", q, "name")
return name and frappe.get_doc("Cohort Mentor", name)
def is_mentor(self, email):
q = {"doctype": "Cohort Mentor", "cohort": self.name, "email": email}
return frappe.db.exists(q)
def is_admin(self, email):
q = {"doctype": "Cohort Staff", "cohort": self.name, "email": email, "role": "Admin"}
return frappe.db.exists(q)

View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
import unittest import unittest
class TestTalk(unittest.TestCase):
class TestCohort(unittest.TestCase):
pass pass

View File

@@ -0,0 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt
frappe.ui.form.on("Cohort Join Request", {
// refresh: function(frm) {
// }
});

View File

@@ -1,51 +1,60 @@
{ {
"actions": [], "actions": [],
"creation": "2021-02-12 18:36:08.324156", "allow_rename": 1,
"creation": "2021-11-19 16:27:41.716509",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"project", "cohort",
"intro", "email",
"status", "column_break_3",
"project_owner" "subgroup",
"status"
], ],
"fields": [ "fields": [
{ {
"fieldname": "project", "fieldname": "cohort",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "label": "Cohort",
"label": "Project", "options": "Cohort",
"options": "Community Project",
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "intro", "fieldname": "subgroup",
"fieldtype": "Small Text", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Intro", "label": "Subgroup",
"options": "Cohort Subgroup",
"reqd": 1
},
{
"fieldname": "email",
"fieldtype": "Link",
"in_list_view": 1,
"label": "E-Mail",
"options": "User",
"reqd": 1 "reqd": 1
}, },
{ {
"default": "Pending", "default": "Pending",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1,
"label": "Status", "label": "Status",
"options": "Pending\nAccepted\nRejected" "options": "Pending\nAccepted\nRejected"
}, },
{ {
"fieldname": "project_owner", "fieldname": "column_break_3",
"fieldtype": "Data", "fieldtype": "Column Break"
"label": "Project Owner",
"options": "Email"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2021-03-04 19:44:09.832170", "modified": "2021-12-16 15:06:03.985221",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Hackathon", "module": "LMS",
"name": "Community Project Member", "name": "Cohort Join Request",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
@@ -59,18 +68,8 @@
"role": "System Manager", "role": "System Manager",
"share": 1, "share": 1,
"write": 1 "write": 1
},
{
"email": 1,
"export": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "Participant",
"share": 1
} }
], ],
"quick_entry": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1

View File

@@ -0,0 +1,52 @@
# Copyright (c) 2021, FOSS United and contributors
# For license information, please see license.txt
import frappe
from frappe.model.document import Document
class CohortJoinRequest(Document):
def on_update(self):
if self.status == "Accepted":
self.ensure_student()
def ensure_student(self):
# case 1 - user is already a member
q = {
"doctype": "LMS Batch Membership",
"cohort": self.cohort,
"subgroup": self.subgroup,
"member": self.email,
"member_type": "Student",
}
if frappe.db.exists(q):
return
# case 2 - user has signed up for this course, possibly not this cohort
cohort = frappe.get_doc("Cohort", self.cohort)
q = {
"doctype": "LMS Batch Membership",
"course": cohort.course,
"member": self.email,
"member_type": "Student",
}
name = frappe.db.exists(q)
if name:
doc = frappe.get_doc("LMS Batch Membership", name)
doc.cohort = self.cohort
doc.subgroup = self.subgroup
doc.save(ignore_permissions=True)
else:
# case 3 - user has not signed up for this course yet
data = {
"doctype": "LMS Batch Membership",
"course": cohort.course,
"cohort": self.cohort,
"subgroup": self.subgroup,
"member": self.email,
"member_type": "Student",
"role": "Member",
}
doc = frappe.get_doc(data)
doc.insert(ignore_permissions=True)

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2021, FOSS United and Contributors
# See license.txt
# import frappe
import unittest
class TestCohortJoinRequest(unittest.TestCase):
pass

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors // Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Host', { frappe.ui.form.on("Cohort Mentor", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -1,57 +1,57 @@
{ {
"actions": [], "actions": [],
"creation": "2021-02-15 11:04:02.748879", "allow_rename": 1,
"creation": "2021-11-19 15:31:47.129156",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"first_name", "cohort",
"last_name",
"email", "email",
"student", "subgroup",
"organization_college" "course"
], ],
"fields": [ "fields": [
{ {
"fieldname": "first_name", "fieldname": "cohort",
"fieldtype": "Data", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "First Name", "in_standard_filter": 1,
"reqd": 1 "label": "Cohort",
}, "options": "Cohort",
{
"fieldname": "last_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Last Name",
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "email", "fieldname": "email",
"fieldtype": "Data", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Email", "label": "E-mail",
"options": "Email", "options": "User",
"reqd": 1 "reqd": 1
}, },
{ {
"default": "0", "fieldname": "subgroup",
"fieldname": "student", "fieldtype": "Link",
"fieldtype": "Check", "in_list_view": 1,
"label": "Student" "label": "Primary Subgroup",
"options": "Cohort Subgroup",
"reqd": 1
}, },
{ {
"fieldname": "organization_college", "fetch_from": "cohort.course",
"fieldtype": "Data", "fieldname": "course",
"label": "Organization/College" "fieldtype": "Link",
"label": "Course",
"options": "LMS Course",
"read_only": 1
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2021-02-15 11:04:02.748879", "modified": "2021-11-29 16:32:33.235281",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Community", "module": "LMS",
"name": "Community Participant", "name": "Cohort Mentor",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
@@ -67,7 +67,6 @@
"write": 1 "write": 1
} }
], ],
"quick_entry": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1

View File

@@ -0,0 +1,13 @@
# Copyright (c) 2021, FOSS United and contributors
# For license information, please see license.txt
import frappe
from frappe.model.document import Document
class CohortMentor(Document):
def get_subgroup(self):
return frappe.get_doc("Cohort Subgroup", self.subgroup)
def get_user(self):
return frappe.get_doc("User", self.email)

View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
import unittest import unittest
class TestEventDetails(unittest.TestCase):
class TestCohortMentor(unittest.TestCase):
pass pass

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors // Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Exhibitor', { frappe.ui.form.on("Cohort Staff", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -1,55 +1,61 @@
{ {
"actions": [], "actions": [],
"creation": "2021-08-11 10:37:32.124651", "allow_rename": 1,
"creation": "2021-11-19 15:35:00.551949",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"event", "cohort",
"company", "course",
"column_break_8", "column_break_3",
"user", "email",
"full_name" "role"
], ],
"fields": [ "fields": [
{ {
"fieldname": "user", "fieldname": "cohort",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Cohort",
"options": "Cohort",
"reqd": 1
},
{
"fieldname": "email",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "User", "label": "User",
"options": "User" "options": "User",
"reqd": 1
}, },
{ {
"fetch_from": "user.full_name", "fieldname": "role",
"fieldname": "full_name", "fieldtype": "Select",
"fieldtype": "Data",
"in_list_view": 1, "in_list_view": 1,
"label": "Full Name", "label": "Role",
"options": "Admin\nManager\nStaff",
"reqd": 1
},
{
"fetch_from": "cohort.course",
"fieldname": "course",
"fieldtype": "Link",
"label": "Course",
"options": "LMS Course",
"read_only": 1 "read_only": 1
}, },
{ {
"fieldname": "company", "fieldname": "column_break_3",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Company"
},
{
"fieldname": "column_break_8",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "event",
"fieldtype": "Link",
"label": "Event",
"options": "Event Details"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2021-08-20 16:53:43.968260", "modified": "2021-12-16 15:16:04.042372",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Event Management", "module": "LMS",
"name": "Speaker", "name": "Cohort Staff",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
@@ -67,6 +73,5 @@
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "user",
"track_changes": 1 "track_changes": 1
} }

View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
from frappe.model.document import Document from frappe.model.document import Document
class EventDetails(Document):
class CohortStaff(Document):
pass pass

View File

@@ -4,5 +4,6 @@
# import frappe # import frappe
import unittest import unittest
class TestExhibitor(unittest.TestCase):
class TestCohortStaff(unittest.TestCase):
pass pass

View File

@@ -1,8 +1,7 @@
// Copyright (c) 2021, FOSS United and contributors // Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Event Details', { frappe.ui.form.on("Cohort Subgroup", {
// refresh: function(frm) { // refresh: function(frm) {
// } // }
}); });

View File

@@ -1,82 +1,87 @@
{ {
"actions": [], "actions": [],
"allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "format:{####} {title}", "autoname": "format:{title} ({cohort})",
"creation": "2021-05-03 06:21:12.995984", "creation": "2021-11-19 11:50:27.312434",
"doctype": "DocType", "doctype": "DocType",
"editable_grid": 1, "editable_grid": 1,
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"chapter", "cohort",
"include_in_preview", "slug",
"column_break_4",
"title", "title",
"index_label", "column_break_4",
"section_break_6", "invite_code",
"body", "course",
"help_section", "section_break_7",
"help" "description"
], ],
"fields": [ "fields": [
{ {
"fieldname": "chapter", "fieldname": "cohort",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Course Chapter", "in_preview": 1,
"options": "Course Chapter", "in_standard_filter": 1,
"label": "Cohort",
"options": "Cohort",
"reqd": 1 "reqd": 1
}, },
{ {
"default": "0", "fieldname": "title",
"fieldname": "include_in_preview", "fieldtype": "Data",
"fieldtype": "Check", "in_list_view": 1,
"label": "Include In Preview" "in_preview": 1,
"in_standard_filter": 1,
"label": "Title",
"reqd": 1
},
{
"fieldname": "description",
"fieldtype": "Markdown Editor",
"label": "Description"
},
{
"fieldname": "invite_code",
"fieldtype": "Data",
"label": "Invite Code",
"read_only": 1
},
{
"fieldname": "slug",
"fieldtype": "Data",
"label": "Slug",
"reqd": 1
},
{
"fetch_from": "cohort.course",
"fieldname": "course",
"fieldtype": "Link",
"label": "Course",
"options": "LMS Course",
"read_only": 1
}, },
{ {
"fieldname": "column_break_4", "fieldname": "column_break_4",
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{ {
"fieldname": "title", "fieldname": "section_break_7",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title",
"reqd": 1
},
{
"fieldname": "index_label",
"fieldtype": "Data",
"label": "Index Label",
"read_only": 1
},
{
"fieldname": "section_break_6",
"fieldtype": "Section Break" "fieldtype": "Section Break"
},
{
"fieldname": "body",
"fieldtype": "Markdown Editor",
"ignore_xss_filter": 1,
"label": "Body",
"reqd": 1
},
{
"fieldname": "help_section",
"fieldtype": "Section Break",
"label": "Help"
},
{
"fieldname": "help",
"fieldtype": "HTML"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [
"modified": "2021-10-11 15:07:38.134808", {
"group": "Links",
"link_doctype": "Cohort Join Request",
"link_fieldname": "subgroup"
}
],
"modified": "2021-12-16 15:12:42.504883",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "Course Lesson", "name": "Cohort Subgroup",
"naming_rule": "Expression", "naming_rule": "Expression",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
@@ -96,4 +101,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

View File

@@ -0,0 +1,88 @@
# Copyright (c) 2021, FOSS United and contributors
# For license information, please see license.txt
import frappe
from frappe.model.document import Document
from frappe.utils import random_string
class CohortSubgroup(Document):
def before_save(self):
if not self.invite_code:
self.invite_code = random_string(8)
def get_url(self):
cohort = frappe.get_doc("Cohort", self.cohort)
return (
f"{frappe.utils.get_url()}/courses/{self.course}/subgroups/{cohort.slug}/{self.slug}"
)
def get_invite_link(self):
cohort = frappe.get_doc("Cohort", self.cohort)
return f"{frappe.utils.get_url()}/courses/{self.course}/join/{cohort.slug}/{self.slug}/{self.invite_code}"
def has_student(self, email):
"""Check if given user is a student of this subgroup."""
q = {"doctype": "LMS Batch Membership", "subgroup": self.name, "member": email}
return frappe.db.exists(q)
def has_join_request(self, email):
"""Check if given user is a student of this subgroup."""
q = {"doctype": "Cohort Join Request", "subgroup": self.name, "email": email}
return frappe.db.exists(q)
def get_join_requests(self, status="Pending"):
q = {"subgroup": self.name, "status": status}
return frappe.get_all(
"Cohort Join Request", filters=q, fields=["*"], order_by="creation desc"
)
def get_mentors(self):
emails = frappe.get_all(
"Cohort Mentor", filters={"subgroup": self.name}, fields=["email"], pluck="email"
)
return self._get_users(emails)
def get_students(self):
emails = frappe.get_all(
"LMS Batch Membership",
filters={"subgroup": self.name},
fields=["member"],
pluck="member",
page_length=1000,
)
return self._get_users(emails)
def _get_users(self, emails):
users = [frappe.get_cached_doc("User", email) for email in emails]
return sorted(users, key=lambda user: user.full_name)
def is_mentor(self, email):
q = {"doctype": "Cohort Mentor", "subgroup": self.name, "email": email}
return frappe.db.exists(q)
def is_manager(self, email):
"""Returns True if the given user is a manager of this subgroup.
Mentors of the subgroup, admins of the Cohort are considered as managers.
"""
return self.is_mentor(email) or self.get_cohort().is_admin(email)
def get_cohort(self):
return frappe.get_doc("Cohort", self.cohort)
def add_mentor(self, email):
d = {
"doctype": "Cohort Mentor",
"subgroup": self.name,
"cohort": self.cohort,
"email": email,
}
if frappe.db.exists(d):
return
doc = frappe.get_doc(d)
doc.insert(ignore_permissions=True)
# def after_doctype_insert():
# frappe.db.add_unique("Cohort Subgroup", ("cohort", "slug"))

View File

@@ -0,0 +1,9 @@
# Copyright (c) 2021, FOSS United and Contributors
# See license.txt
# import frappe
import unittest
class TestCohortSubgroup(unittest.TestCase):
pass

View File

@@ -0,0 +1,64 @@
{
"actions": [],
"allow_rename": 1,
"creation": "2021-12-04 23:28:40.429867",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"slug",
"title",
"template",
"scope",
"required_role"
],
"fields": [
{
"fieldname": "title",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Title",
"reqd": 1
},
{
"fieldname": "template",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Template",
"options": "Web Template",
"reqd": 1
},
{
"default": "Cohort",
"fieldname": "scope",
"fieldtype": "Select",
"label": "Scope",
"options": "Cohort\nSubgroup"
},
{
"default": "Public",
"fieldname": "required_role",
"fieldtype": "Select",
"label": "Required Role",
"options": "Public\nStudent\nMentor\nAdmin"
},
{
"fieldname": "slug",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Slug",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-12-04 23:33:03.954128",
"modified_by": "Administrator",
"module": "LMS",
"name": "Cohort Web Page",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
}

View File

@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2021, Frappe and contributors # Copyright (c) 2021, Frappe and contributors
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals import frappe
# import frappe
from frappe.model.document import Document from frappe.model.document import Document
class CommunityEventVolunteer(Document):
pass class CohortWebPage(Document):
def get_template_html(self):
return frappe.get_doc("Web Template", self.template).template

View File

@@ -1,13 +1,13 @@
// Copyright (c) 2021, FOSS United and contributors // Copyright (c) 2021, FOSS United and contributors
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('LMS Course Mentor Mapping', { frappe.ui.form.on("Course Chapter", {
onload: function(frm) { onload: function (frm) {
frm.set_query('mentor', function(doc) { frm.set_query("lesson", "lessons", function () {
return { return {
filters: { filters: {
"ignore_user_type": 1, chapter: frm.doc.name,
} },
}; };
}); });
}, },

View File

@@ -59,7 +59,7 @@
"link_fieldname": "chapter" "link_fieldname": "chapter"
} }
], ],
"modified": "2021-09-29 15:33:44.611229", "modified": "2022-03-14 17:57:00.707416",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "LMS", "module": "LMS",
"name": "Course Chapter", "name": "Course Chapter",
@@ -77,11 +77,26 @@
"role": "System Manager", "role": "System Manager",
"share": 1, "share": 1,
"write": 1 "write": 1
},
{
"create": 1,
"email": 1,
"export": 1,
"if_owner": 1,
"print": 1,
"read": 1,
"report": 1,
"role": "All",
"select": 1,
"share": 1,
"write": 1
} }
], ],
"search_fields": "title", "search_fields": "title",
"show_title_field_in_link": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [],
"title_field": "title", "title_field": "title",
"track_changes": 1 "track_changes": 1
} }

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