dashboard and patch for lesson

2022-03-14 19:07:02 +05:30
parent c8af6d3672 ffe5370264
commit aa9ef65375
34 changed files with 389 additions and 218 deletions
--- a/school/lms/doctype/course_chapter/course_chapter.json
+++ b/school/lms/doctype/course_chapter/course_chapter.json
@@ -59,7 +59,7 @@
   "link_fieldname": "chapter"
  }
 ],
- "modified": "2022-03-08 15:21:10.389729",
+ "modified": "2022-03-14 17:57:00.707416",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "Course Chapter",
@@ -93,6 +93,7 @@
  }
 ],
 "search_fields": "title",
+ "show_title_field_in_link": 1,
 "sort_field": "modified",
 "sort_order": "DESC",
 "states": [],
--- a/school/lms/doctype/course_lesson/course_lesson.json
+++ b/school/lms/doctype/course_lesson/course_lesson.json
@@ -9,6 +9,7 @@
 "engine": "InnoDB",
 "field_order": [
  "chapter",
+  "course",
  "include_in_preview",
  "column_break_4",
  "title",
@@ -69,11 +70,20 @@
  {
   "fieldname": "help",
   "fieldtype": "HTML"
+  },
+  {
+   "fetch_from": "chapter.course",
+   "fieldname": "course",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Course",
+   "options": "LMS Course",
+   "read_only": 1
  }
 ],
 "index_web_pages_for_search": 1,
 "links": [],
- "modified": "2022-03-08 17:56:50.504143",
+ "modified": "2022-03-14 18:56:31.969801",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "Course Lesson",
--- a/school/lms/doctype/lms_batch_membership/lms_batch_membership.json
+++ b/school/lms/doctype/lms_batch_membership/lms_batch_membership.json
@@ -1,6 +1,6 @@
 {
 "actions": [],
- "creation": "2021-03-18 19:52:10.673835",
+ "creation": "2022-02-07 12:01:40.929633",
 "doctype": "DocType",
 "editable_grid": 1,
 "engine": "InnoDB",
@@ -24,8 +24,6 @@
  {
   "fieldname": "batch",
   "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
   "label": "Batch",
   "options": "LMS Batch"
  },
@@ -117,7 +115,7 @@
 ],
 "index_web_pages_for_search": 1,
 "links": [],
- "modified": "2021-12-16 14:49:25.964853",
+ "modified": "2022-03-09 15:17:15.386067",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "LMS Batch Membership",
@@ -138,5 +136,6 @@
 ],
 "quick_entry": 1,
 "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "states": []
 }
--- a/school/lms/doctype/lms_course/lms_course.json
+++ b/school/lms/doctype/lms_course/lms_course.json
@@ -20,13 +20,14 @@
  "column_break_3",
  "instructors",
  "tags",
+  "status",
  "section_break_7",
  "is_published",
-  "column_break_9",
+  "column_break_10",
  "upcoming",
-  "column_break_11",
+  "column_break_12",
  "disable_self_learning",
-  "section_break_5",
+  "section_break_18",
  "short_introduction",
  "description",
  "chapters",
@@ -42,7 +43,8 @@
   "in_list_view": 1,
   "label": "Title",
   "reqd": 1,
-   "unique": 1
+   "unique": 1,
+   "width": "200"
  },
  {
   "fieldname": "description",
@@ -65,10 +67,6 @@
   "fieldtype": "Data",
   "label": "Video Embed Link"
  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
  {
   "fieldname": "short_introduction",
   "fieldtype": "Small Text",
@@ -108,6 +106,7 @@
   "fieldtype": "Table MultiSelect",
   "in_standard_filter": 1,
   "label": "Instructors",
+   "max_height": "50px",
   "options": "Course Instructor"
  },
  {
@@ -115,14 +114,6 @@
   "fieldtype": "Section Break",
   "label": "Course Settings"
  },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break"
-  },
  {
   "fieldname": "certification_section",
   "fieldtype": "Section Break",
@@ -147,6 +138,27 @@
   "fieldtype": "Table",
   "label": "Related Courses",
   "options": "Related Courses"
+  },
+  {
+   "default": "In Progress",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "label": "Status",
+   "options": "In Progress\nReady for Review\nApproved",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_18",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break"
  }
 ],
 "is_published_field": "is_published",
@@ -172,7 +184,7 @@
   "link_fieldname": "course"
  }
 ],
- "modified": "2022-03-08 15:20:58.501082",
+ "modified": "2022-03-14 17:56:46.514391",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "LMS Course",
--- a/school/lms/doctype/lms_course/lms_course.py
+++ b/school/lms/doctype/lms_course/lms_course.py
@@ -12,6 +12,24 @@ from school.lms.utils import get_chapters

 class LMSCourse(Document):

+    def validate(self):
+        self.validate_instructors()
+        self.validate_status()
+
+    def validate_instructors(self):
+        if self.is_new() and not self.instructors:
+            frappe.get_doc({
+                "doctype": "Course Instructor",
+                "instructor": self.owner,
+                "parent": self.name,
+                "parentfield": "instructors",
+                "parenttype": "LMS Course"
+            }).save(ignore_permissions=True)
+
+    def validate_status(self):
+        if self.is_published:
+            self.status = "Approved"
+
    def on_update(self):
        if not self.upcoming and self.has_value_changed("upcoming"):
            self.send_email_to_interested_users()
@@ -184,3 +202,11 @@ def search_course(text):
    }) """

    return courses
+
+@frappe.whitelist()
+def submit_for_review(course):
+    chapters = frappe.get_all("Chapter Reference", {"parent": course})
+    if not len(chapters):
+        return "No Chp"
+    frappe.db.set_value("LMS Course", course, "status", "Ready for Review")
+    return "OK"
--- a/school/lms/doctype/lms_course/test_lms_course.py
+++ b/school/lms/doctype/lms_course/test_lms_course.py
@@ -12,8 +12,6 @@ class TestLMSCourse(unittest.TestCase):
        frappe.db.sql('delete from `tabLMS Course Mentor Mapping`')
        frappe.db.sql('delete from `tabLMS Course`')

-
-
    def test_new_course(self):
        course = new_course("Test Course")
        assert course.title == "Test Course"
--- a/school/lms/doctype/lms_settings/lms_settings.json
+++ b/school/lms/doctype/lms_settings/lms_settings.json
@@ -14,9 +14,12 @@
  "signup_settings_section",
  "terms_of_use",
  "terms_page",
-  "column_break_12",
+  "column_break_9",
  "privacy_policy",
  "privacy_policy_page",
+  "column_break_12",
+  "cookie_policy",
+  "cookie_policy_page",
  "mentor_request_section",
  "mentor_request_creation",
  "mentor_request_status_update"
@@ -97,6 +100,7 @@
   "fieldname": "privacy_policy_page",
   "fieldtype": "Link",
   "label": "Privacy Policy Page",
+   "mandatory_depends_on": "privacy_policy",
   "options": "Web Page"
  },
  {
@@ -108,6 +112,24 @@
   "fieldname": "portal_course_creation",
   "fieldtype": "Check",
   "label": "Enable Course Creation from Portal"
+  },
+  {
+    "fieldname": "column_break_9",
+    "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "cookie_policy",
+   "fieldtype": "Check",
+   "label": "Show Cookie Policy on Signup"
+  },
+  {
+   "depends_on": "cookie_policy",
+   "fieldname": "cookie_policy_page",
+   "fieldtype": "Link",
+   "label": "Cookie Policy Page",
+   "mandatory_depends_on": "cookie_policy",
+   "options": "Web Page"
  }
 ],
 "index_web_pages_for_search": 1,
--- a/school/lms/doctype/lms_settings/lms_settings.py
+++ b/school/lms/doctype/lms_settings/lms_settings.py
@@ -5,9 +5,10 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe import _

 class LMSSettings(Document):
-	pass
+    pass

@frappe.whitelist()
 def check_profile_restriction():
--- a/school/lms/utils.py
+++ b/school/lms/utils.py
@@ -3,6 +3,7 @@ import frappe
 from frappe.utils import flt, cint, cstr
 from school.lms.md import markdown_to_html
 import string
+from frappe import _

 RE_SLUG_NOTALLOWED = re.compile("[^a-z0-9]+")

@@ -296,3 +297,43 @@ def is_instructor(course):

 def convert_number_to_character(number):
    return string.ascii_uppercase[number]
+
+def get_signup_optin_checks():
+
+    mapper = frappe._dict({
+        "terms_of_use": {
+            "page_name": "terms_page",
+            "title": _("Terms of Use")
+        },
+        "privacy_policy": {
+            "page_name": "privacy_policy_page",
+            "title": _("Privacy Policy")
+        },
+        "cookie_policy": {
+            "page_name": "cookie_policy_page",
+            "title": _("Cookie Policy")
+        }
+    })
+    checks = ["terms_of_use", "privacy_policy", "cookie_policy"]
+    links = []
+
+    for check in checks:
+        if frappe.db.get_single_value("LMS Settings", check):
+            page = frappe.db.get_single_value("LMS Settings", mapper[check].get("page_name"))
+            route = frappe.db.get_value("Web Page", page, "route")
+            links.append("<a href='/" + route + "'>" + mapper[check].get("title") + "</a>")
+
+    return (", ").join(links)
+
+def get_popular_courses():
+    courses = frappe.get_all("LMS Course", {"is_published": 1, "upcoming": 0})
+    course_membership = []
+
+    for course in courses:
+        course_membership.append({
+            "course": course.name,
+            "members": cint(frappe.db.count("LMS Batch Membership", {"course": course.name}))
+        })
+
+    course_membership = sorted(course_membership, key = lambda x: x.get("members"), reverse=True)
+    return course_membership[:3]
--- a/school/lms/web_form/chapter/chapter.js
+++ b/school/lms/web_form/chapter/chapter.js
@@ -1,3 +1,5 @@
 frappe.ready(function() {
-	// bind events here
-})
+	frappe.web_form.after_save = () => {
+        window.location.href = `/courses/${frappe.web_form.doc.course}`;
+    }
+});
--- a/school/lms/web_form/chapter/chapter.json
+++ b/school/lms/web_form/chapter/chapter.json
@@ -8,7 +8,7 @@
 "allow_print": 0,
 "amount": 0.0,
 "amount_based_on_field": 0,
- "apply_document_permissions": 0,
+ "apply_document_permissions": 1,
 "button_label": "Save",
 "creation": "2022-03-07 18:41:07.058806",
 "doc_type": "Course Chapter",
@@ -19,7 +19,7 @@
 "is_standard": 1,
 "login_required": 1,
 "max_attachment_size": 0,
- "modified": "2022-03-07 18:41:07.058806",
+ "modified": "2022-03-14 18:48:01.704325",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "chapter",
--- a/school/lms/web_form/course/course.js
+++ b/school/lms/web_form/course/course.js
@@ -1,7 +1,5 @@
 frappe.ready(function() {
-	frappe.web_form.after_save = () => {
-    setTimeout(() => {
-      window.location.href = `/courses/${frappe.web_form.doc.name}`;
-    })
-  }
+    frappe.web_form.after_save = () => {
+        window.location.href = `/dashboard#courses-created`;
+    }
 });
--- a/school/lms/web_form/course/course.json
+++ b/school/lms/web_form/course/course.json
@@ -20,7 +20,7 @@
 "is_standard": 1,
 "login_required": 1,
 "max_attachment_size": 0,
- "modified": "2022-03-09 10:10:30.069458",
+ "modified": "2022-03-11 12:32:22.512115",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "course",
@@ -121,7 +121,7 @@
  {
   "allow_read_on_all_link_options": 0,
   "fieldname": "description",
-   "fieldtype": "Data",
+   "fieldtype": "Text",
   "hidden": 0,
   "label": "Description",
   "max_length": 0,
--- a/school/lms/web_form/lesson/lesson.js
+++ b/school/lms/web_form/lesson/lesson.js
@@ -1,17 +1,5 @@
 frappe.ready(function() {
-	frappe.web_form.after_save = () => {
-    setTimeout(() => {
-
-      frappe.call({
-        method: "school.lms.doctype.course_lesson.course_lesson.get_lesson_info",
-        args: {
-          "lesson_name": frappe.web_form.doc.name
-        },
-        callback: (data) => {
-          window.location.href = data.message;
-        }
-      });
-
-    });
+    frappe.web_form.after_save = () => {
+        window.location.href = `/courses/`
  };
 });
--- a/school/lms/web_form/lesson/lesson.json
+++ b/school/lms/web_form/lesson/lesson.json
@@ -21,7 +21,7 @@
 "is_standard": 1,
 "login_required": 1,
 "max_attachment_size": 0,
- "modified": "2022-03-09 09:55:58.406164",
+ "modified": "2022-03-14 18:49:33.526455",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "lesson",
@@ -38,7 +38,7 @@
 "title": "Lesson",
 "web_form_fields": [
  {
-   "allow_read_on_all_link_options": 1,
+   "allow_read_on_all_link_options": 0,
   "fieldname": "chapter",
   "fieldtype": "Link",
   "hidden": 0,
@@ -78,7 +78,7 @@
  {
   "allow_read_on_all_link_options": 0,
   "fieldname": "body",
-   "fieldtype": "Data",
+   "fieldtype": "Text",
   "hidden": 0,
   "label": "Body",
   "max_length": 0,
--- a/school/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/school/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,35 +1,27 @@
-{% set member = frappe.get_doc("User", frappe.session.user) %}
-<div class="mt-10">
-  {% set enrolled = member.get_enrolled_courses().in_progress + member.get_enrolled_courses().completed %}
-  {% if enrolled | length %}
-  <div class="mt-8">
-    <div class="course-home-headings">
-      {{ _("Courses Enrolled") }}
-    </div>
-    <div class="cards-parent">
-      {% for course in enrolled %}
-      {{ widgets.CourseCard(course=course) }}
-      {% endfor %}
-    </div>
-  </div>
-  {% else %}
-  {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
-  <div class="empty-state">
-    <div class="empty-state-text">
-      <div class="text-center">
-        <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
-        <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
-      </div>
-      {% set recommended_courses = [course1, course2, course3] %}
-      <div class="cards-parent">
-      {% for recommended_course in recommended_courses %}
-      {% if recommended_course %}
-      {% set course_details = frappe.get_doc("LMS Course", recommended_course) %}
-      {{ widgets.CourseCard(course=course_details) }}
-      {% endif %}
-      {% endfor %}
-      </div>
-    </div>
-  </div>
-  {% endif %}
+{% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
+{% if enrolled | length %}
+<div class="cards-parent">
+  {% for course in enrolled %}
+  {{ widgets.CourseCard(course=course) }}
+  {% endfor %}
 </div>
+{% else %}
+{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
+<div class="empty-state">
+  <div class="empty-state-text">
+    <div class="text-center">
+      <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
+      <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+    </div>
+    {% set recommended_courses = get_popular_courses() %}
+    <div class="cards-parent">
+    {% for course in recommended_courses %}
+    {% if course %}
+    {% set course_details = frappe.get_doc("LMS Course", course.course) %}
+    {{ widgets.CourseCard(course=course_details) }}
+    {% endif %}
+    {% endfor %}
+    </div>
+  </div>
+</div>
+{% endif %}
--- a/school/lms/web_template/courses_enrolled/courses_enrolled.json
+++ b/school/lms/web_template/courses_enrolled/courses_enrolled.json
@@ -3,41 +3,9 @@
 "creation": "2021-10-21 11:29:50.424865",
 "docstatus": 0,
 "doctype": "Web Template",
- "fields": [
-  {
-   "__unsaved": 1,
-   "fieldname": "recommended_courses",
-   "fieldtype": "Section Break",
-   "label": "Recommended Courses for new users",
-   "reqd": 0
-  },
-  {
-   "__unsaved": 1,
-   "fieldname": "course1",
-   "fieldtype": "Link",
-   "label": "Course 1",
-   "options": "LMS Course",
-   "reqd": 1
-  },
-  {
-   "__unsaved": 1,
-   "fieldname": "course2",
-   "fieldtype": "Link",
-   "label": "Course 2",
-   "options": "LMS Course",
-   "reqd": 1
-  },
-  {
-   "__unsaved": 1,
-   "fieldname": "course3",
-   "fieldtype": "Link",
-   "label": "Course 3",
-   "options": "LMS Course",
-   "reqd": 1
-  }
- ],
+ "fields": [],
 "idx": 0,
- "modified": "2021-10-28 19:36:11.372396",
+ "modified": "2022-03-14 09:44:28.266320",
 "modified_by": "Administrator",
 "module": "LMS",
 "name": "Courses Enrolled",
--- a/school/lms/widgets/Reviews.html
+++ b/school/lms/widgets/Reviews.html
@@ -92,14 +92,16 @@
      <div class="course-meta">{{ _("Help us improve our course material.") }}</div>
    </div>
    <div>
-      {% if is_eligible_to_review(course.name, membership) %}
-      <span class="review-link button is-secondary">
-        {{ _("Write a review") }}
-      </span>
-      {% elif frappe.session.user == "Guest" %}
-      <a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
-      {% elif not membership %}
-      <div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
+      {% if not is_instructor(course.name) %}
+        {% if is_eligible_to_review(course.name, membership) %}
+        <span class="review-link button is-secondary">
+          {{ _("Write a review") }}
+        </span>
+        {% elif frappe.session.user == "Guest" %}
+        <a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
+        {% elif not membership %}
+        <div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
+        {% endif %}
      {% endif %}
    </div>
  </div>