From bb62f626fd2096887b9f21845047f85cf2a21e45 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 21 Oct 2021 12:53:36 +0530 Subject: [PATCH] feat: dashboard web templates --- .../web_template/courses_enrolled/__init__.py | 0 .../courses_enrolled/courses_enrolled.html | 28 +++ .../courses_enrolled/courses_enrolled.json | 16 ++ .../web_template/courses_mentored/__init__.py | 0 .../courses_mentored/courses_mentored.html | 11 + .../courses_mentored/courses_mentored.json | 16 ++ community/lms/widgets/CourseCard.html | 196 +++++++++--------- community/overrides/user.py | 3 +- community/public/css/style.css | 1 - community/www/profiles/profile.html | 5 +- 10 files changed, 174 insertions(+), 102 deletions(-) create mode 100644 community/lms/web_template/courses_enrolled/__init__.py create mode 100644 community/lms/web_template/courses_enrolled/courses_enrolled.html create mode 100644 community/lms/web_template/courses_enrolled/courses_enrolled.json create mode 100644 community/lms/web_template/courses_mentored/__init__.py create mode 100644 community/lms/web_template/courses_mentored/courses_mentored.html create mode 100644 community/lms/web_template/courses_mentored/courses_mentored.json diff --git a/community/lms/web_template/courses_enrolled/__init__.py b/community/lms/web_template/courses_enrolled/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/web_template/courses_enrolled/courses_enrolled.html b/community/lms/web_template/courses_enrolled/courses_enrolled.html new file mode 100644 index 00000000..c09babc1 --- /dev/null +++ b/community/lms/web_template/courses_enrolled/courses_enrolled.html @@ -0,0 +1,28 @@ +{% set member = frappe.get_doc("User", frappe.session.user) %} +
+ {% set enrolled = member.get_enrolled_courses().in_progress + member.get_enrolled_courses().completed %} + {% if enrolled | length %} +
+
+ {{ _("Courses Enrolled") }} +
+
+ {% for course in enrolled %} + {{ widgets.CourseCard(course=course) }} + {% endfor %} +
+
+ {% else %} +
+
+ No Enrolled Courses +
+ You have not enrolled in any course yet. +
+ + Explore Courses + +
+
+ {% endif %} +
diff --git a/community/lms/web_template/courses_enrolled/courses_enrolled.json b/community/lms/web_template/courses_enrolled/courses_enrolled.json new file mode 100644 index 00000000..8edc57b1 --- /dev/null +++ b/community/lms/web_template/courses_enrolled/courses_enrolled.json @@ -0,0 +1,16 @@ +{ + "__unsaved": 1, + "creation": "2021-10-21 11:29:50.424865", + "docstatus": 0, + "doctype": "Web Template", + "fields": [], + "idx": 0, + "modified": "2021-10-21 12:02:23.837501", + "modified_by": "Administrator", + "module": "LMS", + "name": "Courses Enrolled", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/lms/web_template/courses_mentored/__init__.py b/community/lms/web_template/courses_mentored/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/web_template/courses_mentored/courses_mentored.html b/community/lms/web_template/courses_mentored/courses_mentored.html new file mode 100644 index 00000000..c40697a8 --- /dev/null +++ b/community/lms/web_template/courses_mentored/courses_mentored.html @@ -0,0 +1,11 @@ +{% set member = frappe.get_doc("User", frappe.session.user) %} +
+ {% if member.get_mentored_courses() | length %} +
{{ _("Courses Mentored") }}
+
+ {% for course in member.get_mentored_courses() %} + {{ widgets.CourseCard(course=course) }} + {% endfor %} +
+ {% endif %} +
diff --git a/community/lms/web_template/courses_mentored/courses_mentored.json b/community/lms/web_template/courses_mentored/courses_mentored.json new file mode 100644 index 00000000..9903e1fc --- /dev/null +++ b/community/lms/web_template/courses_mentored/courses_mentored.json @@ -0,0 +1,16 @@ +{ + "__unsaved": 1, + "creation": "2021-10-21 11:32:57.411626", + "docstatus": 0, + "doctype": "Web Template", + "fields": [], + "idx": 0, + "modified": "2021-10-21 12:01:56.270656", + "modified_by": "Administrator", + "module": "LMS", + "name": "Courses Mentored", + "owner": "Administrator", + "standard": 1, + "template": "", + "type": "Section" +} \ No newline at end of file diff --git a/community/lms/widgets/CourseCard.html b/community/lms/widgets/CourseCard.html index 33783870..614c7f6e 100644 --- a/community/lms/widgets/CourseCard.html +++ b/community/lms/widgets/CourseCard.html @@ -2,115 +2,117 @@ {% set progress = frappe.utils.cint(membership.progress) %}
-
+
{% for tag in course.get_tags() %}
{{ tag }}
{% endfor %} {% if membership and not read_only %} - {% if progress < 100 %} -  
{{ frappe.utils.rounded(progress) }}% {{ _("Completed") }}
- {% else %} -
{{ _("Completed") }}
- {% endif %} - {% endif %} + {% if progress < 100 %}  
{{ frappe.utils.rounded(progress) }}% + {{ _("Completed") }}
- {% if not course.image %} -
{{ course.title[0] }}
+ {% else %} +
{{ _("Completed") + }}
+ {% endif %} {% endif %}
+ {% if not course.image %} +
{{ course.title[0] }}
+ {% endif %} +
-
-
- {% if course.get_chapters() | length %} - - {{ course.get_chapters() | length }} {{ _("Chapters") }} - - {% endif %} - {% if course.get_chapters() | length and course.get_upcoming_batches() | length %} - . - {% endif %} - {% if course.get_upcoming_batches() | length %} - - {{ course.get_upcoming_batches() | length }} {{ _("Open Batches") }} - - {% endif %} -
-
{{ course.title }}
-
- - {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }} - - - {{ course.get_instructor().full_name }} - - - - - {% if course.get_students() | length %} - - - {{ course.get_students() | length }} - {% endif %} - {% set avg_rating = course.get_average_rating() %} - {% if avg_rating %} - - - {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} +
+
+ {% if course.get_chapters() | length %} + + {{ course.get_chapters() | length }} {{ _("Chapters") }} + + {% endif %} + {% if course.get_chapters() | length and course.get_upcoming_batches() | length %} + . + {% endif %} + {% if course.get_upcoming_batches() | length %} + + {{ course.get_upcoming_batches() | length }} {{ _("Open Batches") }} + + {% endif %} +
+
{{ course.title }}
+
+ + {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }} + + + {{ course.get_instructor().full_name }} - {% endif %} + + + + {% if course.get_students() | length %} + + + {{ course.get_students() | length }} + {% endif %} + {% set avg_rating = course.get_average_rating() %} + {% if avg_rating %} + + + {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} -
- - {% if read_only %} - - {% else %} - - {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and - membership.current_lesson else '1.1' %} - {% set query_parameter = "?batch=" + membership.batch if membership and - membership.batch else "" %} - {% set certificate = course.is_certified() %} - - {% if certificate %} -
- _("Get Certificate") -
- - - {% elif course.enable_certification and progress == 100 %} - - - {% elif progress == 100 %} -
- {{ _("Course Completed") }} -
- - - {% elif course.upcoming %} -
- {{ _("Upcoming Course") }} -
- - - {% elif membership %} -
- {{ _("Continue Course") }} -
- - - {% else %} -
- {{ _("View Course") }} -
- - - {% endif %} - {% endif %} + {% endif %} +
+ + {% if read_only %} + + {% else %} + + {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and + membership.current_lesson else '1.1' %} + {% set query_parameter = "?batch=" + membership.batch if membership and + membership.batch else "" %} + {% set certificate = course.is_certified() %} + + {% if certificate %} +
+ _("Get Certificate") +
+ + + {% elif course.enable_certification and progress == 100 %} + + + {% elif progress == 100 %} +
+ {{ _("Course Completed") }} +
+ + + {% elif course.upcoming %} +
+ {{ _("Upcoming Course") }} +
+ + + {% elif membership %} +
+ {{ _("Continue Course") }} +
+ + + {% else %} +
+ {{ _("View Course") }} +
+ + + {% endif %} + {% endif %} +