diff --git a/lms/lms/doctype/lms_certification/__init__.py b/lms/lms/doctype/course_evaluator/__init__.py similarity index 100% rename from lms/lms/doctype/lms_certification/__init__.py rename to lms/lms/doctype/course_evaluator/__init__.py diff --git a/lms/lms/doctype/course_evaluator/course_evaluator.js b/lms/lms/doctype/course_evaluator/course_evaluator.js new file mode 100644 index 00000000..dd14d6e0 --- /dev/null +++ b/lms/lms/doctype/course_evaluator/course_evaluator.js @@ -0,0 +1,14 @@ +// Copyright (c) 2022, Frappe and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Course Evaluator', { + onload: (frm) => { + frm.set_query('evaluator', function(doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + } +}); diff --git a/lms/lms/doctype/course_evaluator/course_evaluator.json b/lms/lms/doctype/course_evaluator/course_evaluator.json new file mode 100644 index 00000000..07cbcb20 --- /dev/null +++ b/lms/lms/doctype/course_evaluator/course_evaluator.json @@ -0,0 +1,53 @@ +{ + "actions": [], + "allow_rename": 1, + "autoname": "field:evaluator", + "creation": "2022-03-29 10:51:47.667284", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "evaluator", + "schedule" + ], + "fields": [ + { + "fieldname": "evaluator", + "fieldtype": "Link", + "label": "Evaluator", + "options": "User", + "unique": 1 + }, + { + "fieldname": "schedule", + "fieldtype": "Table", + "label": "Schedule", + "options": "Evaluator Schedule" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2022-04-01 15:14:03.300260", + "modified_by": "Administrator", + "module": "LMS", + "name": "Course Evaluator", + "naming_rule": "By fieldname", + "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": [] +} \ No newline at end of file diff --git a/lms/lms/doctype/course_evaluator/course_evaluator.py b/lms/lms/doctype/course_evaluator/course_evaluator.py new file mode 100644 index 00000000..282881e4 --- /dev/null +++ b/lms/lms/doctype/course_evaluator/course_evaluator.py @@ -0,0 +1,38 @@ +# Copyright (c) 2022, Frappe and contributors +# For license information, please see license.txt + +import frappe +from frappe import _ +from frappe.model.document import Document + +class CourseEvaluator(Document): + + def validate(self): + self.validate_time_slots() + + def validate_time_slots(self): + for schedule in self.schedule: + if schedule.start_time >= schedule.end_time: + frappe.throw(_("Start Time cannot be greater than End Time")) + + self.validate_overlaps(schedule) + + def validate_overlaps(self, schedule): + same_day_slots = list(filter(lambda x: x.day == schedule.day and x.name != schedule.name , self.schedule)) + overlap = False + + for slot in same_day_slots: + if schedule.start_time <= slot.start_time < schedule.end_time: + overlap = True + if schedule.start_time < slot.end_time <= schedule.end_time: + overlap = True + if slot.start_time < schedule.start_time and schedule.end_time < slot.end_time: + overlap = True + + if overlap: + frappe.throw(_("Slot Times are overlapping for some schedules.")) + +@frappe.whitelist() +def get_schedule(course): + evaluator = frappe.db.get_value("LMS Course", course, "evaluator") + return frappe.get_all("Evaluator Schedule", filters={"parent": evaluator}, fields=["day", "start_time", "end_time"]) diff --git a/lms/lms/doctype/course_evaluator/test_course_evaluator.py b/lms/lms/doctype/course_evaluator/test_course_evaluator.py new file mode 100644 index 00000000..cde3cf75 --- /dev/null +++ b/lms/lms/doctype/course_evaluator/test_course_evaluator.py @@ -0,0 +1,9 @@ +# Copyright (c) 2022, Frappe and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestCourseEvaluator(FrappeTestCase): + pass diff --git a/lms/lms/doctype/evaluator_schedule/__init__.py b/lms/lms/doctype/evaluator_schedule/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lms/lms/doctype/evaluator_schedule/evaluator_schedule.json b/lms/lms/doctype/evaluator_schedule/evaluator_schedule.json new file mode 100644 index 00000000..9821c145 --- /dev/null +++ b/lms/lms/doctype/evaluator_schedule/evaluator_schedule.json @@ -0,0 +1,50 @@ +{ + "actions": [], + "autoname": "autoincrement", + "creation": "2022-03-29 11:09:47.726629", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "day", + "start_time", + "end_time" + ], + "fields": [ + { + "fieldname": "day", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Day", + "options": "Sunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday", + "reqd": 1 + }, + { + "fieldname": "start_time", + "fieldtype": "Time", + "in_list_view": 1, + "label": "Start Time", + "reqd": 1 + }, + { + "fieldname": "end_time", + "fieldtype": "Time", + "in_list_view": 1, + "label": "End Time", + "reqd": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2022-03-29 12:58:22.229033", + "modified_by": "Administrator", + "module": "LMS", + "name": "Evaluator Schedule", + "naming_rule": "Autoincrement", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC", + "states": [] +} \ No newline at end of file diff --git a/lms/lms/doctype/evaluator_schedule/evaluator_schedule.py b/lms/lms/doctype/evaluator_schedule/evaluator_schedule.py new file mode 100644 index 00000000..894126db --- /dev/null +++ b/lms/lms/doctype/evaluator_schedule/evaluator_schedule.py @@ -0,0 +1,8 @@ +# Copyright (c) 2022, Frappe and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class EvaluatorSchedule(Document): + pass diff --git a/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json index 07061b24..7a8123f0 100644 --- a/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json +++ b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json @@ -115,7 +115,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2022-03-09 15:17:15.386067", + "modified": "2022-03-29 09:47:05.007133", "modified_by": "Administrator", "module": "LMS", "name": "LMS Batch Membership", @@ -135,7 +135,9 @@ } ], "quick_entry": 1, + "show_title_field_in_link": 1, "sort_field": "modified", "sort_order": "DESC", - "states": [] + "states": [], + "title_field": "member" } \ No newline at end of file diff --git a/lms/lms/doctype/lms_certificate/__init__.py b/lms/lms/doctype/lms_certificate/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lms/lms/doctype/lms_certificate/lms_certificate.js b/lms/lms/doctype/lms_certificate/lms_certificate.js new file mode 100644 index 00000000..6a341a63 --- /dev/null +++ b/lms/lms/doctype/lms_certificate/lms_certificate.js @@ -0,0 +1,14 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('LMS Certificate', { + onload: function (frm) { + frm.set_query("member", function (doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + } +}); diff --git a/lms/lms/doctype/lms_certification/lms_certification.json b/lms/lms/doctype/lms_certificate/lms_certificate.json similarity index 70% rename from lms/lms/doctype/lms_certification/lms_certification.json rename to lms/lms/doctype/lms_certificate/lms_certificate.json index fc6e58fa..91ec1085 100644 --- a/lms/lms/doctype/lms_certification/lms_certification.json +++ b/lms/lms/doctype/lms_certificate/lms_certificate.json @@ -5,25 +5,19 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "student", - "issue_date", - "column_break_3", "course", + "member", + "member_name", + "column_break_3", + "issue_date", "expiry_date" ], "fields": [ - { - "fieldname": "student", - "fieldtype": "Link", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Student", - "options": "User" - }, { "fieldname": "issue_date", "fieldtype": "Date", - "label": "Issue Date" + "label": "Issue Date", + "reqd": 1 }, { "fieldname": "column_break_3", @@ -35,20 +29,37 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Course", - "options": "LMS Course" + "options": "LMS Course", + "reqd": 1 }, { "fieldname": "expiry_date", "fieldtype": "Date", "label": "Expiry Date" + }, + { + "fieldname": "member", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Member", + "options": "User", + "reqd": 1 + }, + { + "fetch_from": "member.full_name", + "fieldname": "member_name", + "fieldtype": "Data", + "label": "Member Name", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-08-16 15:47:19.494055", + "modified": "2022-04-06 11:49:36.077370", "modified_by": "Administrator", "module": "LMS", - "name": "LMS Certification", + "name": "LMS Certificate", "owner": "Administrator", "permissions": [ { @@ -66,5 +77,7 @@ ], "sort_field": "modified", "sort_order": "DESC", + "states": [], + "title_field": "member_name", "track_changes": 1 } \ No newline at end of file diff --git a/lms/lms/doctype/lms_certification/lms_certification.py b/lms/lms/doctype/lms_certificate/lms_certificate.py similarity index 79% rename from lms/lms/doctype/lms_certification/lms_certification.py rename to lms/lms/doctype/lms_certificate/lms_certificate.py index 1c5d9f51..0a6e9b19 100644 --- a/lms/lms/doctype/lms_certification/lms_certification.py +++ b/lms/lms/doctype/lms_certificate/lms_certificate.py @@ -8,16 +8,16 @@ from frappe import _ from frappe.utils.pdf import get_pdf from lms.lms.utils import is_certified -class LMSCertification(Document): +class LMSCertificate(Document): def validate(self): - certificates = frappe.get_all("LMS Certification", { - "student": self.student, + certificates = frappe.get_all("LMS Certificate", { + "member": self.member, "course": self.course, "expiry_date": [">", nowdate()] }) if len(certificates): - full_name = frappe.db.get_value("User", self.student, "full_name") + full_name = frappe.db.get_value("User", self.member, "full_name") course_name = frappe.db.get_value("LMS Course", self.course, "title") frappe.throw(_("There is already a valid certificate for user {0} for the course {1}").format(full_name, course_name)) @@ -35,8 +35,8 @@ def create_certificate(course): expiry_date = add_years(nowdate(), expires_after_yrs) certificate = frappe.get_doc({ - "doctype": "LMS Certification", - "student": frappe.session.user, + "doctype": "LMS Certificate", + "member": frappe.session.user, "course": course, "issue_date": nowdate(), "expiry_date": expiry_date diff --git a/lms/lms/doctype/lms_certification/test_lms_certification.py b/lms/lms/doctype/lms_certificate/test_lms_certificate.py similarity index 71% rename from lms/lms/doctype/lms_certification/test_lms_certification.py rename to lms/lms/doctype/lms_certificate/test_lms_certificate.py index 7a757f01..b527f357 100644 --- a/lms/lms/doctype/lms_certification/test_lms_certification.py +++ b/lms/lms/doctype/lms_certificate/test_lms_certificate.py @@ -4,19 +4,19 @@ import frappe import unittest from lms.lms.doctype.lms_course.test_lms_course import new_course -from lms.lms.doctype.lms_certification.lms_certification import create_certificate +from lms.lms.doctype.lms_certificate.lms_certificate import create_certificate from frappe.utils import nowdate, add_years, cint -class TestLMSCertification(unittest.TestCase): +class TestLMSCertificate(unittest.TestCase): def test_certificate_creation(self): course = new_course("Test Certificate", 1, 2) certificate = create_certificate(course.name) - self.assertEqual(certificate.student, "Administrator") + self.assertEqual(certificate.member, "Administrator") self.assertEqual(certificate.course, course.name) self.assertEqual(certificate.issue_date, nowdate()) self.assertEqual(certificate.expiry_date, add_years(nowdate(), cint(course.expiry))) - frappe.db.delete("LMS Certification", certificate.name) + frappe.db.delete("LMS Certificate", certificate.name) frappe.db.delete("LMS Course", course.name) diff --git a/lms/lms/doctype/lms_certificate_evaluation/__init__.py b/lms/lms/doctype/lms_certificate_evaluation/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js new file mode 100644 index 00000000..b10da907 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.js @@ -0,0 +1,32 @@ +// Copyright (c) 2022, Frappe and contributors +// For license information, please see license.txt + +frappe.ui.form.on('LMS Certificate Evaluation', { + refresh: function(frm) { + frm.add_custom_button(__("Create LMS Certificate"), () => { + frappe.model.open_mapped_doc({ + method: "lms.lms.doctype.lms_certificate_evaluation.lms_certificate_evaluation.create_lms_certificate", + frm: frm + }); + }); + }, + + onload: function(frm) { + frm.set_query("course", function(doc) { + return { + filters: { + "enable_certification": true, + "grant_certificate_after": "Evaluation" + } + }; + }); + + frm.set_query('member', function(doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + } +}); diff --git a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json new file mode 100644 index 00000000..e2413f9e --- /dev/null +++ b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json @@ -0,0 +1,105 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2022-03-29 09:32:16.769951", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "course", + "member", + "member_name", + "date", + "start_time", + "end_time", + "column_break_5", + "rating", + "summary" + ], + "fields": [ + { + "fieldname": "course", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Course", + "options": "LMS Course", + "reqd": 1 + }, + { + "fieldname": "member", + "fieldtype": "Link", + "in_standard_filter": 1, + "label": "Member", + "options": "User", + "reqd": 1 + }, + { + "fieldname": "column_break_5", + "fieldtype": "Column Break" + }, + { + "fieldname": "rating", + "fieldtype": "Rating", + "in_list_view": 1, + "label": "Rating", + "reqd": 1 + }, + { + "fieldname": "summary", + "fieldtype": "Text", + "label": "Summary" + }, + { + "fieldname": "date", + "fieldtype": "Date", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Date", + "reqd": 1 + }, + { + "fieldname": "start_time", + "fieldtype": "Time", + "label": "Start Time", + "reqd": 1 + }, + { + "fieldname": "end_time", + "fieldtype": "Time", + "label": "End Time" + }, + { + "fetch_from": "member.full_name", + "fieldname": "member_name", + "fieldtype": "Data", + "label": "Member Name", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2022-04-06 11:44:17.051279", + "modified_by": "Administrator", + "module": "LMS", + "name": "LMS Certificate Evaluation", + "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": [], + "title_field": "member_name" +} \ No newline at end of file diff --git a/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.py b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.py new file mode 100644 index 00000000..5cb730f6 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.py @@ -0,0 +1,18 @@ +# Copyright (c) 2022, Frappe and contributors +# For license information, please see license.txt + +import frappe +from frappe.model.document import Document +from frappe.model.mapper import get_mapped_doc + +class LMSCertificateEvaluation(Document): + pass + +@frappe.whitelist() +def create_lms_certificate(source_name, target_doc=None): + doc = get_mapped_doc("LMS Certificate Evaluation", source_name, { + "LMS Certificate Evaluation": { + "doctype": "LMS Certificate" + } + }, target_doc) + return doc diff --git a/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py b/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py new file mode 100644 index 00000000..06e6996e --- /dev/null +++ b/lms/lms/doctype/lms_certificate_evaluation/test_lms_certificate_evaluation.py @@ -0,0 +1,9 @@ +# Copyright (c) 2022, Frappe and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestLMSCertificateEvaluation(FrappeTestCase): + pass diff --git a/lms/lms/doctype/lms_certificate_request/__init__.py b/lms/lms/doctype/lms_certificate_request/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js new file mode 100644 index 00000000..24d6ef31 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.js @@ -0,0 +1,23 @@ +// Copyright (c) 2022, Frappe and contributors +// For license information, please see license.txt + +frappe.ui.form.on('LMS Certificate Request', { + refresh: function(frm) { + frm.add_custom_button(__("Create LMS Certificate Evaluation"), () => { + frappe.model.open_mapped_doc({ + method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_lms_certificate_evaluation", + frm: frm + }); + }); + }, + + onload: function(frm) { + frm.set_query('member', function(doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + } +}); diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json new file mode 100644 index 00000000..cbe66fb9 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.json @@ -0,0 +1,110 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2022-03-29 10:43:50.889723", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "course", + "member", + "member_name", + "evaluator", + "column_break_4", + "date", + "day", + "start_time", + "end_time" + ], + "fields": [ + { + "fieldname": "course", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Course", + "options": "LMS Course", + "reqd": 1 + }, + { + "fieldname": "member", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Member", + "options": "User", + "reqd": 1 + }, + { + "fetch_from": "course.evaluator", + "fieldname": "evaluator", + "fieldtype": "Link", + "label": "Evaluator", + "options": "Course Evaluator", + "read_only": 1 + }, + { + "fieldname": "date", + "fieldtype": "Date", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Date", + "reqd": 1 + }, + { + "fieldname": "day", + "fieldtype": "Select", + "label": "Day", + "options": "Sunday\nMonday\nTuesday\nWednesday\nThursday\nFriday\nSaturday" + }, + { + "fieldname": "start_time", + "fieldtype": "Time", + "in_list_view": 1, + "label": "Start Time", + "reqd": 1 + }, + { + "fieldname": "end_time", + "fieldtype": "Time", + "in_list_view": 1, + "label": "End Time", + "reqd": 1 + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fetch_from": "member.full_name", + "fieldname": "member_name", + "fieldtype": "Data", + "label": "Member Name", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2022-04-06 11:33:33.711545", + "modified_by": "Administrator", + "module": "LMS", + "name": "LMS Certificate Request", + "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": [], + "title_field": "member_name" +} \ No newline at end of file diff --git a/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py new file mode 100644 index 00000000..3d674cf3 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_request/lms_certificate_request.py @@ -0,0 +1,40 @@ +# Copyright (c) 2022, Frappe and contributors +# For license information, please see license.txt + +import frappe +from frappe.model.document import Document +from frappe.model.mapper import get_mapped_doc + +class LMSCertificateRequest(Document): + pass + +@frappe.whitelist() +def create_certificate_request(course, date, day, start_time, end_time): + is_member = frappe.db.exists({ + "doctype": "LMS Batch Membership", + "course": course, + "member": frappe.session.user + }) + + if not is_member: + return + + frappe.get_doc({ + "doctype": "LMS Certificate Request", + "course": course, + "member": frappe.session.user, + "date": date, + "day": day, + "start_time": start_time, + "end_time": end_time + }).save(ignore_permissions=True) + + +@frappe.whitelist() +def create_lms_certificate_evaluation(source_name, target_doc=None): + doc = get_mapped_doc("LMS Certificate Request", source_name, { + "LMS Certificate Request": { + "doctype": "LMS Certificate Evaluation" + } + }, target_doc) + return doc diff --git a/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py b/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py new file mode 100644 index 00000000..87149242 --- /dev/null +++ b/lms/lms/doctype/lms_certificate_request/test_lms_certificate_request.py @@ -0,0 +1,9 @@ +# Copyright (c) 2022, Frappe and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestLMSCertificateRequest(FrappeTestCase): + pass diff --git a/lms/lms/doctype/lms_certification/lms_certification.js b/lms/lms/doctype/lms_certification/lms_certification.js deleted file mode 100644 index 7a264e1e..00000000 --- a/lms/lms/doctype/lms_certification/lms_certification.js +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2021, FOSS United and contributors -// For license information, please see license.txt - -frappe.ui.form.on('LMS Certification', { - onload: function (frm) { - frm.set_query("student", function (doc) { - return { - filters: { - "ignore_user_type": 1, - } - }; - }); - } -}); diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json index f07718eb..76cfcb11 100644 --- a/lms/lms/doctype/lms_course/lms_course.json +++ b/lms/lms/doctype/lms_course/lms_course.json @@ -34,7 +34,14 @@ "related_courses", "certification_section", "enable_certification", - "expiry" + "expiry", + "column_break_22", + "grant_certificate_after", + "evaluator", + "pricing_section", + "paid_certificate", + "currency", + "price_certificate" ], "fields": [ { @@ -129,9 +136,8 @@ "default": "0", "depends_on": "enable_certification", "fieldname": "expiry", - "fieldtype": "Select", - "label": "Certification Expires After Years", - "options": "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10" + "fieldtype": "Int", + "label": "Certification Expires After (Years)" }, { "fieldname": "related_courses", @@ -161,6 +167,50 @@ { "fieldname": "column_break_12", "fieldtype": "Column Break" + }, + { + "default": "0", + "depends_on": "enable_certification", + "fieldname": "paid_certificate", + "fieldtype": "Check", + "label": "Paid Certificate" + }, + { + "fieldname": "column_break_22", + "fieldtype": "Column Break" + }, + { + "depends_on": "enable_certification", + "fieldname": "grant_certificate_after", + "fieldtype": "Select", + "label": "Grant Certificate After", + "options": "Completion\nEvaluation" + }, + { + "depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"", + "fieldname": "evaluator", + "fieldtype": "Link", + "label": "Evaluator", + "options": "Course Evaluator" + }, + { + "depends_on": "eval: doc.grant_certificate_after == \"Evaluation\"", + "fieldname": "pricing_section", + "fieldtype": "Section Break", + "label": "Pricing" + }, + { + "depends_on": "paid_certificate", + "fieldname": "price_certificate", + "fieldtype": "Currency", + "label": "Certificate Price" + }, + { + "depends_on": "paid_certificate", + "fieldname": "currency", + "fieldtype": "Link", + "label": "Currency", + "options": "Currency" } ], "is_published_field": "published", @@ -186,7 +236,7 @@ "link_fieldname": "course" } ], - "modified": "2022-03-24 13:09:37.228855", + "modified": "2022-04-07 12:27:05.353788", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", @@ -220,9 +270,10 @@ } ], "search_fields": "title", + "show_title_field_in_link": 1, "sort_field": "creation", "sort_order": "DESC", "states": [], "title_field": "title", "track_changes": 1 -} +} \ No newline at end of file diff --git a/lms/lms/utils.py b/lms/lms/utils.py index c90d652e..dab2518a 100644 --- a/lms/lms/utils.py +++ b/lms/lms/utils.py @@ -170,9 +170,9 @@ def get_sorted_reviews(course): return rating_percent def is_certified(course): - certificate = frappe.get_all("LMS Certification", + certificate = frappe.get_all("LMS Certificate", { - "student": frappe.session.user, + "member": frappe.session.user, "course": course }) if len(certificate): diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html index 28d7ee8f..01b1cdf8 100644 --- a/lms/lms/widgets/CourseCard.html +++ b/lms/lms/widgets/CourseCard.html @@ -60,12 +60,18 @@
- {{ progress }} Complete + {{ progress }} {{ _("Complete") }}
-
{{ progress }}% Completed
+
{{ progress }}% {{ _("Completed") }}
{% endif %} + {% if course.paid_certificate %} +
+ {{ _("Certificate Price: ") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }} +
+ {% endif %} +
{% set instructors = get_instructors(course.name) %} diff --git a/lms/patches.txt b/lms/patches.txt index 571f435d..7e92309e 100644 --- a/lms/patches.txt +++ b/lms/patches.txt @@ -26,3 +26,7 @@ school.patches.v0_0.set_course_in_lesson #21-03-2022 school.patches.v0_0.set_status_in_course #21-03-2022 lms.patches.v0_0.change_published_field_data #25-03-2022 execute:frappe.delete_doc("Workspace", "School", ignore_missing=True, force=True) + +[post_model_sync] +lms.patches.v0_0.certification_member_field_data #04-04-2022 +lms.patches.v0_0.move_certification_to_certificate diff --git a/lms/patches/v0_0/certification_member_field_data.py b/lms/patches/v0_0/certification_member_field_data.py new file mode 100644 index 00000000..c1015703 --- /dev/null +++ b/lms/patches/v0_0/certification_member_field_data.py @@ -0,0 +1,7 @@ +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "lms_certification") + certificates = frappe.get_all("LMS Certification", fields=["name", "student"]) + for certificate in certificates: + frappe.db.set_value("LMS Certification", certificate.name, "member", certificate.student) diff --git a/lms/patches/v0_0/move_certification_to_certificate.py b/lms/patches/v0_0/move_certification_to_certificate.py new file mode 100644 index 00000000..5c386a8d --- /dev/null +++ b/lms/patches/v0_0/move_certification_to_certificate.py @@ -0,0 +1,12 @@ +import frappe + +def execute(): + old = frappe.get_all("LMS Certification", fields=["name", "course", "student", "issue_date", "expiry_date"]) + for data in old: + frappe.get_doc({ + "doctype": "LMS Certificate", + "course": data.course, + "member": data.member or data.student, + "issue_date": data.issue_date, + "expiry_date": data.expiry_date + }).save(ignore_permissions=True) diff --git a/lms/public/css/style.css b/lms/public/css/style.css index f56cd446..1d953fee 100644 --- a/lms/public/css/style.css +++ b/lms/public/css/style.css @@ -122,6 +122,7 @@ input[type=checkbox] { display: flex; flex-direction: column; flex: 1 1 auto; + color: var(--text-color); } .course-card-title { @@ -813,16 +814,6 @@ input[type=checkbox] { .progress-percent { margin: 0.5rem 0; font-size: var(--text-base); - font-weight: 500; -} - -.progress-percentage { - width: 100%; - font-size: 12px; - line-height: 165%; - letter-spacing: 0.02em; - color: #000000; - text-align: center; } pre { @@ -856,67 +847,76 @@ pre { .certificate-content { padding: 2.5rem 3rem; + background-color: #FFFFFF; } .certificate-footer { - margin-top: 4.5rem; - display: flex; + display: flex; + justify-content: space-between; + width: 30%; + margin: 5rem auto 0; } -.certificate-footer-item { - margin-right: 3.5rem; +.certificate-price { + font-weight: bold; + margin-bottom: 0.5rem; } .certificate-ribbon { background-color: var(--primary-color); - margin-left: auto; - margin-right: 2.5rem; - width: 4.5rem; + padding: 0.5rem; + border-radius: var(--border-radius-md); } .certificate-heading { - font-size: 3rem; + font-size: 1.5rem; font-weight: 500; - color: var(--gray-800); + color: var(--text-color); } .certificate-para { margin-bottom: 4rem; } +.certificate-card { + background: #FFFFFF; + border-radius: var(--border-radius-md); + position: relative; + box-shadow: var(--shadow-sm); + padding: 1rem; + text-align: center; + margin: 0 6rem; +} + +.certificate-footer-item { + color: var(--text-color); + font-weight: 500; +} + .certificate-logo { - height: 20px; + height: 1.5rem; +} + +@media (max-width: 1050px) { + .certificate-footer { + width: 50%; + } } @media (max-width: 768px) { - .certificate-heading { - font-size: 2rem; - } + .certificate-card { + margin: 0; + } } @media (max-width: 550px) { - .certificate-footer { - flex-direction: column; - } + .certificate-content { + padding: 1rem; + } - .certificate-footer-item { - margin-bottom: 1rem; - } -} - -@media (max-width: 500px) { - .certificate-heading { - font-size: 1.5rem; - } - - .certificate-content { - padding: 2.5rem 2rem; - } - - .certificate-ribbon { - margin-right: 1rem; - width: 1.5rem; - } + .certificate-footer { + width: 100%; + } } .profile-card { @@ -940,7 +940,7 @@ pre { .empty-state-heading { font-size: var(--text-xl); - color: var(--gray-900); + color: var(--text-color); font-weight: 600; } @@ -953,7 +953,7 @@ pre { background-image: url(/assets/frappe/icons/timeless/search.svg); border: none; border-radius: var(--border-radius-md); - font-size: var(--text-base); + font-size: var(--text-sm); padding: 0.625rem 0.75rem; height: 36px; background-repeat: no-repeat; @@ -978,11 +978,11 @@ pre { .testimonial-author { font-weight: 500; font-size: var(--text-lg); - color: var(--gray-900); + color: var(--text-color); } .testimonial-review { - color: var(--gray-900); + color: var(--text-color); margin-bottom: 2rem; } @@ -1208,7 +1208,8 @@ pre { .course-overlay-content { padding: 1.25rem; font-size: var(--text-base); - color: var(--gray-900); + color: var(--text-color); + text-align: center; } .breadcrumb-destination { diff --git a/lms/templates/certificate.html b/lms/templates/certificate.html index ac9bbc7e..b16ff782 100644 --- a/lms/templates/certificate.html +++ b/lms/templates/certificate.html @@ -1,49 +1,50 @@ -
-
- -
- Completion Certificate +
+
+
+ +
+ {{ _("This certifies that") }} +
+
{{ member.full_name }}
+
{{ _("has successfully completed the course on") }}
+
{{ course.title }}
+ +
+ {% if certificate.issue_date %} +
+
+ {{ frappe.utils.format_date(certificate.issue_date, "medium") }} +
+
+ {{ _("Issue date") }} +
+
+ {% endif %} + + {% if certificate.expiry_date %} +
+
+ {{ frappe.utils.format_date(certificate.expiry_date, "medium") }} +
+
+ {{ _("Expiry date") }} +
+
+ {% endif %} + + {% if instructor.full_name %} +
+
+ {{ instructor.full_name }} +
+
+ {{ _("Instructor") }} +
+
+ {% endif %} + +
+
-
{{ course.title }}
-
Awarded To
-
{{ student.full_name }}
  - -
- {% if certificate.issue_date %} -
-
- {{ frappe.utils.format_date(certificate.issue_date, "medium") }} -
-
- Issue date -
-
- {% endif %} - - {% if certificate.expiry_date %} -
-
- {{ frappe.utils.format_date(certificate.expiry_date, "medium") }} -
-
- Expiry date -
-
- {% endif %} - - {% if instructor.full_name %} -
-
- {{ instructor.full_name }} -
-
- Instructor -
-
- {% endif %} - -
-
-
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js index 4bde13fb..21521e2f 100644 --- a/lms/www/batch/learn.js +++ b/lms/www/batch/learn.js @@ -244,7 +244,7 @@ const create_certificate = (e) => { e.preventDefault(); course = $(".title").attr("data-course"); frappe.call({ - method: "lms.lms.doctype.lms_certification.lms_certification.create_certificate", + method: "lms.lms.doctype.lms_certificate.lms_certificate.create_certificate", args: { "course": course }, diff --git a/lms/www/courses/certificate.html b/lms/www/courses/certificate.html index 0013bb96..dbc3cc06 100644 --- a/lms/www/courses/certificate.html +++ b/lms/www/courses/certificate.html @@ -1,24 +1,21 @@ {% extends "templates/base.html" %} -{% from "www/macros/common_macro.html" import MentorsSection %} - -{% block title %} {{ student.full_name }} - {{ course.title }} {% endblock %} +{% block title %} {{ member.full_name }} - {{ course.title }} {% endblock %} {% block content %}
-
- All Courses - - {{ course.title }} -
- - {% if certificate.student == frappe.session.user %} -
-
Export
-
+ {% if certificate.member == frappe.session.user %} +
{{ _("Export") }}
{% endif %} + +
+ {{ _("All Courses") }} + + {{ course.title }} +
+ {% include "lms/templates/certificate.html" %}
diff --git a/lms/www/courses/certificate.py b/lms/www/courses/certificate.py index aae2ba10..fc2fa0be 100644 --- a/lms/www/courses/certificate.py +++ b/lms/www/courses/certificate.py @@ -9,8 +9,8 @@ def get_context(context): except KeyError: redirect_to_course_list() - context.certificate = frappe.db.get_value("LMS Certification", certificate_name, - ["name", "student", "issue_date", "expiry_date", "course"], as_dict=True) + context.certificate = frappe.db.get_value("LMS Certificate", certificate_name, + ["name", "member", "issue_date", "expiry_date", "course"], as_dict=True) if context.certificate.course != course_name: redirect_to_course_list() @@ -21,7 +21,7 @@ def get_context(context): context.instructor = frappe.db.get_value("User", context.course.instructor, ["full_name", "username"], as_dict=True) - context.student = frappe.db.get_value("User", context.certificate.student, + context.member = frappe.db.get_value("User", context.certificate.member, ["full_name"], as_dict=True) context.logo = frappe.db.get_single_value("Website Settings", "banner_image") diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html index 96cda3f9..418156d2 100644 --- a/lms/www/courses/course.html +++ b/lms/www/courses/course.html @@ -105,6 +105,12 @@ {{ _("You have opted to be notified for this course. You will receive an email when the course becomes available.") }}
+ {% if certificate_request %} +

{{ _("Evaluation On: ") }} + {{ _("{0} at {1}").format(frappe.utils.format_date(certificate_request.date, "medium"), + frappe.utils.format_time(certificate_request.start_time, "short")) }}

+ {% endif %} + {% if course.status == "Under Review" %}
{{ _("Your course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }} @@ -125,7 +131,7 @@
{% endif %} -
+
@@ -145,6 +151,12 @@ {% endif %}
+ {% if course.paid_certificate %} +
+ {{ _("Certificate Price:") }} {{ frappe.utils.fmt_money(course.price_certificate, 2, course.currency) }} +
+ {% endif %} + {% set lesson_index = get_lesson_index(membership.current_lesson) if membership and membership.current_lesson else '1.1' %} @@ -155,7 +167,7 @@
- {% elif is_instructor(course.name) and not course.published and course.status != "Under Review" %} + {% elif is_instructor(course.name) and not course.published and course.status == "Under Review" %}
{{ _("Submit for Review") }} @@ -167,12 +179,6 @@ {{ _("Checkout Course") }} - {% elif membership %} - - {{ _("Continue Learning") }} - - {% elif course.upcoming and not is_user_interested %}
@@ -185,22 +191,73 @@ style="color: inherit;"> {{ _("Manage the course") }} + + {% elif membership %} + + {{ _("Continue Learning") }} + {% endif %} {% set certificate = is_certified(course.name) %} {% set progress = frappe.utils.cint(membership.progress) %} + {% if membership and course.enable_certification %} {% if certificate %} {{ _("Get Certificate") }} - {% elif course.enable_certification and progress == 100 %} + {% elif course.grant_certificate_after == "Evaluation" and not certificate_request %} + + {{ _("Apply for Certificate") }} + + {% elif progress == 100 %}
{{ _("Get Certificate") }}
{% endif %} + {% endif %}
+
+ {% endmacro %} diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js index bf8921b8..bed20644 100644 --- a/lms/www/courses/course.js +++ b/lms/www/courses/course.js @@ -1,50 +1,62 @@ frappe.ready(() => { - hide_wrapped_mentor_cards(); + hide_wrapped_mentor_cards(); - $("#cancel-request").click((e) => { - cancel_mentor_request(e); - }); + $("#cancel-request").click((e) => { + cancel_mentor_request(e); + }); - $(".join-batch").click((e) => { - join_course(e) - }); + $(".join-batch").click((e) => { + join_course(e) + }); - $(".view-all-mentors").click((e) => { - view_all_mentors(e); - }); + $(".view-all-mentors").click((e) => { + view_all_mentors(e); + }); - $(".review-link").click((e) => { - show_review_dialog(e); - }); + $(".review-link").click((e) => { + show_review_dialog(e); + }); - $(".icon-rating").click((e) => { - highlight_rating(e); - }); + $(".icon-rating").click((e) => { + highlight_rating(e); + }); - $("#submit-review").click((e) => { - submit_review(e); - }) + $("#submit-review").click((e) => { + submit_review(e); + }) - $("#notify-me").click((e) => { - notify_user(e); - }) + $("#notify-me").click((e) => { + notify_user(e); + }) - $("#certification").click((e) => { - create_certificate(e); - }); + $("#certification").click((e) => { + create_certificate(e); + }); - $("#submit-for-review").click((e) => { - submit_for_review(e); - }); + $("#submit-for-review").click((e) => { + submit_for_review(e); + }); - $(document).scroll(function() { - let timer; - clearTimeout(timer); - timer = setTimeout(() => { handle_overlay_display.apply(this, arguments); }, 500); - }); + $("#apply-certificate").click((e) => { + apply_cetificate(e); + }); -}) + $("#slot-date").on("change", (e) => { + display_slots(e); + }); + + $(document).on("click", ".slot", (e) => { + submit_slot(e); + }); + + $(document).scroll(function() { + let timer; + clearTimeout(timer); + timer = setTimeout(() => { handle_overlay_display.apply(this, arguments); }, 500); + }); + +}); var hide_wrapped_mentor_cards = () => { var offset_top_prev; @@ -185,7 +197,7 @@ const create_certificate = (e) => { e.preventDefault(); course = $(e.currentTarget).attr("data-course"); frappe.call({ - method: "lms.lms.doctype.lms_certification.lms_certification.create_certificate", + method: "lms.lms.doctype.lms_certificate.lms_certificate.create_certificate", args: { "course": course }, @@ -236,4 +248,63 @@ const submit_for_review = (e) => { } } }) -} +}; + +const apply_cetificate = (e) => { + frappe.call({ + method: "lms.lms.doctype.course_evaluator.course_evaluator.get_schedule", + args: { + "course": $(e.currentTarget).data("course") + }, + callback: (data) => { + let options = ""; + data.message.forEach((obj) => { + options += ``; + }); + e.preventDefault(); + $("#slot-modal .slots").html(options); + $("#slot-modal").modal("show"); + } + }) +}; + +const submit_slot = (e) => { + e.preventDefault(); + const slot = $(e.currentTarget); + frappe.call({ + method: "lms.lms.doctype.lms_certificate_request.lms_certificate_request.create_certificate_request", + args: { + "course": slot.data("course"), + "date": $("#slot-date").val(), + "day": slot.data("day"), + "start_time": slot.data("start"), + "end_time": slot.data("end") + }, + callback: (data) => { + $("#slot-modal").modal("hide"); + frappe.msgprint(__("Your slot has been booked. Prepare well for the evaluations.")); + setTimeout(() => { + window.location.reload(); + }, 2000); + } + }); +}; + +const display_slots = (e) => { + const weekday = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]; + const day = weekday[new Date($(e.currentTarget).val()).getDay()] + + $(".slot").addClass("hide"); + $(".slot-label").addClass("hide"); + + if ($(`[data-day='${day}']`).length) { + $(".slot-label").removeClass("hide"); + $(`[data-day='${day}']`).removeClass("hide"); + $("#no-slots-message").addClass("hide"); + } else { + $("#no-slots-message").removeClass("hide"); + } +}; diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py index 4e1d923e..8bb55ffb 100644 --- a/lms/www/courses/course.py +++ b/lms/www/courses/course.py @@ -12,8 +12,8 @@ def get_context(context): raise frappe.Redirect course = frappe.db.get_value("LMS Course", course_name, - ["name", "title", "image", "short_introduction", "description", "published", "upcoming", - "disable_self_learning", "video_link", "enable_certification", "status"], + ["name", "title", "image", "short_introduction", "description", "published", "upcoming", "disable_self_learning", "status", + "video_link", "enable_certification", "grant_certificate_after", "paid_certificate", "price_certificate", "currency"], as_dict=True) if course is None: @@ -30,10 +30,19 @@ def get_context(context): membership = get_membership(course.name, frappe.session.user) context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" context.membership = membership - if context.course.upcoming: - context.is_user_interested = get_user_interest(context.course.name) context.restriction = check_profile_restriction() context.show_start_learing_cta = show_start_learing_cta(course, membership, context.restriction) + context.certificate_request = frappe.db.get_value("LMS Certificate Request", + { + "course": course.name, + "member": frappe.session.user + }, + ["date", "start_time", "end_time"], + as_dict=True) + + if context.course.upcoming: + context.is_user_interested = get_user_interest(context.course.name) + context.metatags = { "title": course.title, "image": course.image, diff --git a/lms/www/courses/index.py b/lms/www/courses/index.py index 3c6c7c96..f35b3cc7 100644 --- a/lms/www/courses/index.py +++ b/lms/www/courses/index.py @@ -15,7 +15,8 @@ def get_context(context): def get_courses(): courses = frappe.get_all("LMS Course", filters={"published": True}, - fields=["name", "upcoming", "title", "image", "enable_certification"]) + fields=["name", "upcoming", "title", "image", "enable_certification", + "paid_certificate", "price_certificate", "currency"]) live_courses, upcoming_courses = [], [] for course in courses: diff --git a/lms/www/utils.py b/lms/www/utils.py index 3e99530c..81228e4e 100644 --- a/lms/www/utils.py +++ b/lms/www/utils.py @@ -9,7 +9,7 @@ def get_common_context(context): batch_name = None course = frappe.db.get_value("LMS Course", - frappe.form_dict["course"], ["name", "title", "video_link"], as_dict=True) + frappe.form_dict["course"], ["name", "title", "video_link", "enable_certification"], as_dict=True) if not course: context.template = "www/404.html" return