diff --git a/lms/lms/doctype/lms_class/lms_class.py b/lms/lms/doctype/lms_class/lms_class.py index cd5d2586..fd8b6a9f 100644 --- a/lms/lms/doctype/lms_class/lms_class.py +++ b/lms/lms/doctype/lms_class/lms_class.py @@ -73,21 +73,8 @@ def remove_student(student, class_name): @frappe.whitelist() -def update_course(class_name, course, value): - if cint(value): - doc = frappe.get_doc( - { - "doctype": "Class Course", - "parent": class_name, - "course": course, - "parenttype": "LMS Class", - "parentfield": "courses", - } - ) - doc.save() - else: - frappe.db.delete("Class Course", {"parent": class_name, "course": course}) - return True +def remove_course(course, parent): + frappe.db.delete("Class Course", {"name": course, "parent": parent}) @frappe.whitelist() diff --git a/lms/public/css/style.css b/lms/public/css/style.css index 66dcaf1d..7fdba3ec 100644 --- a/lms/public/css/style.css +++ b/lms/public/css/style.css @@ -1989,8 +1989,8 @@ select { display: flex; flex-direction: column; border-radius: 0.75rem; - /* border: 1px solid var(--gray-200); */ - box-shadow: var(--shadow-sm); + border: 1px solid var(--gray-300); + /* box-shadow: var(--shadow-sm); */ padding: 0.5rem; height: 100%; position: relative; diff --git a/lms/www/classes/class.html b/lms/www/classes/class.html index 1df30575..1738e6d7 100644 --- a/lms/www/classes/class.html +++ b/lms/www/classes/class.html @@ -112,26 +112,51 @@ {% macro CoursesSection(class_info, class_courses, published_courses) %} -
- {% if published_courses | length %} - {% for course in published_courses %} - {% set checked = course.name in class_courses %} - - {% endfor %} - {% endif %} -
+
+
+ {% if is_moderator %} + + {% endif %} +
+ {{ _("Courses") }} +
+
+ +
+ {% for course in class_courses %} +
+
+ + + +
+
+ {{ course.title }} +
+
+ {% endfor %} +
+ +
+ {% endmacro %} {% macro StudentsSection(class_info, class_students) %}
- {% if is_moderator %} - {{ AddStudents() }} - {% endif %} + +
+
+ +
+
+ {{ _("Students") }} +
+
{% if class_students | length %} @@ -171,23 +196,13 @@
{% else %} -

{{ _("No Students are added to this class.") }}

+

{{ _("No Students are added to this class.") }}

{% endif %}
{% endmacro %} -{% macro AddStudents() %} -
-
- -
-{% endmacro %} - - {% macro LiveClassSection(class_info, live_classes) %}
{{ CreateLiveClass(class_info) }} @@ -304,3 +319,9 @@ {{ include_script('controls.bundle.js') }} {% endblock %} + +{% set classes = frappe.get_all("LMS Class", filters = { + "start_date": [">", frappe.utils.getdate()], + "title": ["like", "%ERPNext%"] + }, fields=["name", "title", "start_date", "end_date"]) +%} \ No newline at end of file diff --git a/lms/www/classes/class.js b/lms/www/classes/class.js index ac266856..54c8f487 100644 --- a/lms/www/classes/class.js +++ b/lms/www/classes/class.js @@ -1,24 +1,16 @@ frappe.ready(() => { - $("#submit-student").click((e) => { - submit_student(e); + $(".btn-add-student").click((e) => { + show_student_modal(e); }); $(".remove-student").click((e) => { remove_student(e); }); - $(".class-course").click((e) => { - update_course(e); - }); - if ($("#live-class-form").length) { make_live_class_form(); } - if ($(".add-students").length) { - make_add_students_section(); - } - $("#open-class-modal").click((e) => { e.preventDefault(); $("#live-class-modal").modal("show"); @@ -27,6 +19,14 @@ frappe.ready(() => { $("#create-live-class").click((e) => { create_live_class(e); }); + + $(".btn-add-course").click((e) => { + show_course_modal(e); + }); + + $(".btn-remove-course").click((e) => { + remove_course(e); + }); }); const submit_student = (e) => { @@ -77,17 +77,6 @@ const remove_student = (e) => { ); }; -const update_course = (e) => { - frappe.call({ - method: "lms.lms.doctype.lms_class.lms_class.update_course", - args: { - course: $(e.currentTarget).data("course"), - value: $(e.currentTarget).children("input").prop("checked") ? 1 : 0, - class_name: $(".class-details").data("class"), - }, - }); -}; - const create_live_class = (e) => { let class_name = $(".class-details").data("class"); frappe.call({ @@ -353,3 +342,110 @@ const make_add_students_section = () => { $(".add-students .form-section:last").removeClass("empty-section"); $(".add-students .frappe-control").removeClass("hide-control"); }; + +const show_course_modal = () => { + let course_modal = new frappe.ui.Dialog({ + title: "Add Course", + fields: [ + { + fieldtype: "Link", + options: "LMS Course", + label: __("Course"), + fieldname: "course", + reqd: 1, + }, + ], + primary_action_label: __("Add"), + primary_action(values) { + frappe.call({ + method: "frappe.client.insert", + args: { + doc: { + doctype: "Class Course", + course: values.course, + parenttype: "LMS Class", + parentfield: "courses", + parent: $(".class-details").data("class"), + }, + }, + callback(r) { + frappe.show_alert( + { + message: __("Course Added"), + indicator: "green", + }, + 3 + ); + window.location.reload(); + }, + }); + course_modal.hide(); + }, + }); + course_modal.show(); +}; + +const remove_course = (e) => { + frappe.call({ + method: "lms.lms.doctype.lms_class.lms_class.remove_course", + args: { + course: $(e.target).data("course"), + parent: $(".class-details").data("class"), + }, + callback(r) { + frappe.show_alert( + { + message: __("Course Removed"), + indicator: "green", + }, + 3 + ); + window.location.reload(); + }, + }); +}; + +const show_student_modal = () => { + let student_modal = new frappe.ui.Dialog({ + title: "Add Student", + fields: [ + { + fieldtype: "Link", + options: "User", + label: __("Student"), + fieldname: "student", + reqd: 1, + filters: { + ignore_user_type: 1, + }, + }, + ], + primary_action_label: __("Add"), + primary_action(values) { + frappe.call({ + method: "frappe.client.insert", + args: { + doc: { + doctype: "Class Student", + student: values.student, + parenttype: "LMS Class", + parentfield: "students", + parent: $(".class-details").data("class"), + }, + }, + callback(r) { + frappe.show_alert( + { + message: __("Student Added"), + indicator: "green", + }, + 3 + ); + window.location.reload(); + }, + }); + student_modal.hide(); + }, + }); + student_modal.show(); +}; diff --git a/lms/www/classes/class.py b/lms/www/classes/class.py index 09a98a9c..3f218d93 100644 --- a/lms/www/classes/class.py +++ b/lms/www/classes/class.py @@ -22,7 +22,7 @@ def get_context(context): ) context.class_courses = frappe.get_all( - "Class Course", {"parent": class_name}, pluck="course" + "Class Course", {"parent": class_name}, ["name", "course", "title"] ) class_students = frappe.get_all( diff --git a/lms/www/classes/index.html b/lms/www/classes/index.html index 69b62d2f..8ffe6c23 100644 --- a/lms/www/classes/index.html +++ b/lms/www/classes/index.html @@ -12,8 +12,8 @@ {% endif %}
{{ _("All Classes") }}
- {% if classes %} - {{ ClassCards(classes) }} + {% if past_classes | length or upcoming_classes | length %} + {{ ClassTabs(past_classes, upcoming_classes) }} {% else %}
@@ -27,15 +27,38 @@
{% endblock %} -{%- block script %} - {{ super() }} - {{ include_script('controls.bundle.js') }} - {% if is_moderator %} - - {% endif %} -{% endblock %} +{% macro ClassTabs(past_classes, upcoming_classes) %} +
+ + +
+ +
+
+ {{ ClassCards(upcoming_classes) }} +
+ +
+ {{ ClassCards(past_classes) }} +
+ +
+
+{% endmacro %} {% macro ClassCards(classes) %}
@@ -79,3 +102,13 @@ {% endfor %}
{% endmacro %} + +{%- block script %} + {{ super() }} + {{ include_script('controls.bundle.js') }} + {% if is_moderator %} + + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/lms/www/classes/index.py b/lms/www/classes/index.py index 90875fc0..c97d81b5 100644 --- a/lms/www/classes/index.py +++ b/lms/www/classes/index.py @@ -6,8 +6,15 @@ from lms.lms.utils import has_course_moderator_role def get_context(context): context.no_cache = 1 context.is_moderator = has_course_moderator_role() - context.classes = frappe.get_all( + classes = frappe.get_all( "LMS Class", - {"end_date": [">=", getdate()]}, - ["name", "title", "start_date", "end_date"], + fields=["name", "title", "start_date", "end_date"], ) + past_classes, upcoming_classes = [], [] + for class_ in classes: + if getdate(class_.end_date) < getdate(): + past_classes.append(class_) + else: + upcoming_classes.append(class_) + context.past_classes = past_classes + context.upcoming_classes = upcoming_classes