From 9bc5408a44b095e73f68a8cbc4806667a1e4c7c2 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 28 Jun 2021 12:52:10 +0530 Subject: [PATCH 01/16] feat: course card redesign --- .../lms/doctype/lms_course/lms_course.json | 21 +- .../lms/doctype/lms_course/lms_course.py | 3 + .../lms/doctype/lms_course_review/__init__.py | 0 .../lms_course_review/lms_course_review.js | 8 + .../lms_course_review/lms_course_review.json | 49 ++++ .../lms_course_review/lms_course_review.py | 8 + .../test_lms_course_review.py | 8 + community/public/css/style.css | 223 +++++++++++++++--- community/public/css/style.less | 33 --- community/public/icons/black-arrow.svg | 3 + community/public/icons/calendar.svg | 3 + community/public/icons/clock.svg | 3 + community/public/icons/rating-filled.svg | 3 + community/public/icons/rating.svg | 3 + community/public/icons/user.svg | 4 + community/public/icons/white-arrow.svg | 3 + community/www/__init__.py | 0 community/www/__pycache__/__init__.py | 0 community/www/batch/__pycache__/__init__.py | 0 community/www/courses/__init__.py | 0 community/www/courses/__pycache__/__init__.py | 0 community/www/courses/index.html | 100 ++++++-- community/www/courses/index.py | 8 +- community/www/dashboard/__init__.py | 0 .../www/dashboard/__pycache__/__init__.py | 0 community/www/hackathons/__init__.py | 0 .../www/hackathons/__pycache__/__init__.py | 0 community/www/hackathons/macros/__init__.py | 0 community/www/home/__init__.py | 0 community/www/home/__pycache__/__init__.py | 0 community/www/macros/__init__.py | 0 community/www/my-courses/__init__.py | 0 .../www/my-courses/__pycache__/__init__.py | 0 community/www/profiles/__init__.py | 0 .../www/profiles/__pycache__/__init__.py | 0 community/www/sketches/__init__.py | 0 .../www/sketches/__pycache__/__init__.py | 0 37 files changed, 389 insertions(+), 94 deletions(-) create mode 100644 community/lms/doctype/lms_course_review/__init__.py create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.js create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.json create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.py create mode 100644 community/lms/doctype/lms_course_review/test_lms_course_review.py create mode 100644 community/public/icons/black-arrow.svg create mode 100644 community/public/icons/calendar.svg create mode 100644 community/public/icons/clock.svg create mode 100644 community/public/icons/rating-filled.svg create mode 100644 community/public/icons/rating.svg create mode 100644 community/public/icons/user.svg create mode 100644 community/public/icons/white-arrow.svg create mode 100644 community/www/__init__.py create mode 100644 community/www/__pycache__/__init__.py create mode 100644 community/www/batch/__pycache__/__init__.py create mode 100644 community/www/courses/__init__.py create mode 100644 community/www/courses/__pycache__/__init__.py create mode 100644 community/www/dashboard/__init__.py create mode 100644 community/www/dashboard/__pycache__/__init__.py create mode 100644 community/www/hackathons/__init__.py create mode 100644 community/www/hackathons/__pycache__/__init__.py create mode 100644 community/www/hackathons/macros/__init__.py create mode 100644 community/www/home/__init__.py create mode 100644 community/www/home/__pycache__/__init__.py create mode 100644 community/www/macros/__init__.py create mode 100644 community/www/my-courses/__init__.py create mode 100644 community/www/my-courses/__pycache__/__init__.py create mode 100644 community/www/profiles/__init__.py create mode 100644 community/www/profiles/__pycache__/__init__.py create mode 100644 community/www/sketches/__init__.py create mode 100644 community/www/sketches/__pycache__/__init__.py diff --git a/community/lms/doctype/lms_course/lms_course.json b/community/lms/doctype/lms_course/lms_course.json index 8b46e3ec..d35fa59f 100644 --- a/community/lms/doctype/lms_course/lms_course.json +++ b/community/lms/doctype/lms_course/lms_course.json @@ -21,12 +21,14 @@ "engine": "InnoDB", "field_order": [ "title", - "is_published", - "disable_self_learning", - "column_break_3", "short_code", "video_link", + "column_break_3", + "is_published", + "disable_self_learning", + "image", "section_break_5", + "tags", "short_introduction", "description" ], @@ -80,6 +82,17 @@ "fieldname": "disable_self_learning", "fieldtype": "Check", "label": "Disable Self Learning" + }, + { + "fieldname": "image", + "fieldtype": "Attach Image", + "label": "Preview Image", + "reqd": 1 + }, + { + "fieldname": "tags", + "fieldtype": "Data", + "label": "Tags" } ], "index_web_pages_for_search": 1, @@ -106,7 +119,7 @@ "link_fieldname": "course" } ], - "modified": "2021-06-21 11:34:04.552376", + "modified": "2021-06-28 12:04:21.524161", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py index a98a5e63..7889eb23 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -241,6 +241,9 @@ class LMSCourse(Document): member_names = [m['member'] for m in memberships] return find_all("User", name=["IN", member_names]) + def get_tags(self): + return self.tags.split(",") if self.tags else [] + def get_outline(self): return CourseOutline(self) diff --git a/community/lms/doctype/lms_course_review/__init__.py b/community/lms/doctype/lms_course_review/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/doctype/lms_course_review/lms_course_review.js b/community/lms/doctype/lms_course_review/lms_course_review.js new file mode 100644 index 00000000..8382eb52 --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('LMS Course Review', { + // refresh: function(frm) { + + // } +}); diff --git a/community/lms/doctype/lms_course_review/lms_course_review.json b/community/lms/doctype/lms_course_review/lms_course_review.json new file mode 100644 index 00000000..8db5bf63 --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.json @@ -0,0 +1,49 @@ +{ + "actions": [], + "creation": "2021-06-28 12:30:02.111289", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "review", + "rating" + ], + "fields": [ + { + "fieldname": "review", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Review", + "reqd": 1 + }, + { + "fieldname": "rating", + "fieldtype": "Rating", + "label": "Rating" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-06-28 12:30:15.953008", + "modified_by": "Administrator", + "module": "LMS", + "name": "LMS Course Review", + "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", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/lms/doctype/lms_course_review/lms_course_review.py b/community/lms/doctype/lms_course_review/lms_course_review.py new file mode 100644 index 00000000..e2361ad0 --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class LMSCourseReview(Document): + pass diff --git a/community/lms/doctype/lms_course_review/test_lms_course_review.py b/community/lms/doctype/lms_course_review/test_lms_course_review.py new file mode 100644 index 00000000..da8a1450 --- /dev/null +++ b/community/lms/doctype/lms_course_review/test_lms_course_review.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestLMSCourseReview(unittest.TestCase): + pass diff --git a/community/public/css/style.css b/community/public/css/style.css index a3116517..4c8b8311 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -17,7 +17,7 @@ --h-color: var(--c2); - --text-color: #333; + --text-color: #192734; --text-color-light: #ccc; --cta-color: var(--c4); @@ -25,6 +25,8 @@ --received-message: var(--c8); --checkbox-size: 14px; --control-bg: var(--gray-100); + --muted-text: #4C5A67; + --button-background: #EEF0F2; } body { @@ -32,18 +34,6 @@ body { margin: 0px; } - -/* .course-details { - margin: 20px 0px; -} - -.course-details h2 { - color: var(--h-color); - font-size: 1.4em; - font-weight: bold; - margin: 20px 0px 10px 0px; -} */ - .chapter-plan { border-radius: 10px; margin: 20px 0px; @@ -57,21 +47,6 @@ body { font-weight: bold; } -/* .chapter-number { - background: var(--text-color); - color: white; - border-radius: 50%; - height: 24px; - min-width: 24px; - align-items: center; - padding: 2px 8px 2px 8px; - margin-right: 5px; -} - -.chapter-description { - margin: 20px 0px; -} */ - .lessons { padding-left: 20px; } @@ -265,3 +240,195 @@ input[type=checkbox] { border-radius: 50px; padding: 5px; } + +.course-image { + height: 168px; + width: 352px; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + background-size: 352px 168px; +} + +@media (max-width: 768px) { + .course-image { + width: 336px; + } +} + +@media (max-width: 375px) { + .course-image { + width: 312px; + background-size: cover; + background-repeat: no-repeat; + } +} + +.course-tags { + display: flex; + position: relative; + top: 12px; + left: 12px; + height: 20px; +} + +.course-card-pills { + background: #ffffff; + margin: 0px 10px; + border-radius: 4px; + padding: 4px 6px; + font-size: 10px; + line-height: 120%; + text-align: center; + letter-spacing: 0.011em; + text-transform: uppercase; + color: #2C5477; + font-weight: bold; + box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); +} + +.common-page-style { + background: #F4F5F6; +} + +.common-card-style { + display: flex; + flex-direction: column; + align-items: flex-start; + background: #FFFFFF; + border-radius: 8px; + width: 352px; + height: 380px; + margin: 0px 16px 32px; + box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); +} + +@media (max-width: 768px) { + .common-card-style { + width: 336px; + } +} + +@media (max-width: 375px) { + .common-card-style { + width: 312px; + } +} + +.course-card-meta { + font-size: 12px; + line-height: 135%; + margin: 12px 16px 8px; + color: var(--muted-text); + height: 15px; +} + +.course-card-content { + width: 100%; +} + +.course-card-title { + font-weight: 600; + font-size: 18px; + line-height: 156%; + letter-spacing: -0.014em; + color: var(--text-color); + align-self: stretch; + margin: 0px 16px 16px; + height: 45px; +} + +.card-divider { + border: 1px solid #E2E6E9; + margin: 0px 16px 16px; +} + +.course-card-meta-2 { + margin: 0px 16px 16px; +} + +.course-instructor { + margin: 0px 8px; + font-size: 12px; + line-height: 135%; + color: var(--text-color); +} + +.course-student-count { + font-size: 12px; + line-height: 135%; + color: var(--muted-text); + float: right; +} + +.view-course-link { + height: 32px; + margin: 0px 16px 16px; + background: var(--button-background); + border-radius: 4px; + font-size: 12px; + padding: 8px 0px 8px; + text-align: center; + line-height: 135%; + color: var(--text-color); +} + +.course-cards-parent { + display: flex; + flex-wrap: wrap; +} + +@media (max-width: 375px) { + .course-cards-parent { + justify-content: center; + } +} + +.course-divider { + border: 1px solid #E2E6E9; + margin: 16px 0px 30px; +} + +.courses-header { + padding: 50px 0px 20px; + color: var(--text-color); + font-weight: 600; + font-size: 22px; + line-height: 145%; + letter-spacing: -0.0175em +} + +.course-top-section { + margin: 0px 140px 0px; +} + +@media (max-width: 768px) { + .course-top-section { + margin: 0px 40px 0px; + } +} + +@media (max-width: 375px) { + .course-top-section { + margin: 0px 24px 0px; + } +} + +.is-primary { + background: var(--primary-color); + color: #FFFFFF; +} + +.button-links:hover { + text-decoration: none; +} + +.icon-background { + border-radius: 50%; + padding: 3px; + width: 24px; + height: 24px; +} + +.small-margin { + margin-left: 10px; +} diff --git a/community/public/css/style.less b/community/public/css/style.less index 3de921c9..d7fdbb1c 100644 --- a/community/public/css/style.less +++ b/community/public/css/style.less @@ -138,39 +138,6 @@ section.lightgray { color: var(--tag-color); } -.course-header { - margin-top: 20px; -} - -/* -.course-header { - margin-top: 20px; - padding: 20px; - background: var(--header-bg); - color: var(--header-color); - border-radius: 9px; -} - -.course-author-avatar { - width: 20px; - height: 20px; - border-radius: 50%; - margin-right: 20px; -} - -.course-header h1 { - color: inherit; -} - -*/ - -// .gray-section { -// background:#F6F6F6; -// border: 1px solid #C4C4C4; -// padding: 20px; -// margin: 20px 0px; -// } - .instructor-title { color: black; } diff --git a/community/public/icons/black-arrow.svg b/community/public/icons/black-arrow.svg new file mode 100644 index 00000000..b242af38 --- /dev/null +++ b/community/public/icons/black-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/calendar.svg b/community/public/icons/calendar.svg new file mode 100644 index 00000000..fd4c50e4 --- /dev/null +++ b/community/public/icons/calendar.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/clock.svg b/community/public/icons/clock.svg new file mode 100644 index 00000000..fd6aed95 --- /dev/null +++ b/community/public/icons/clock.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/rating-filled.svg b/community/public/icons/rating-filled.svg new file mode 100644 index 00000000..260c7f4d --- /dev/null +++ b/community/public/icons/rating-filled.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/rating.svg b/community/public/icons/rating.svg new file mode 100644 index 00000000..dade2e61 --- /dev/null +++ b/community/public/icons/rating.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/user.svg b/community/public/icons/user.svg new file mode 100644 index 00000000..66b19fb9 --- /dev/null +++ b/community/public/icons/user.svg @@ -0,0 +1,4 @@ + + + + diff --git a/community/public/icons/white-arrow.svg b/community/public/icons/white-arrow.svg new file mode 100644 index 00000000..71bebd47 --- /dev/null +++ b/community/public/icons/white-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/www/__init__.py b/community/www/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/__pycache__/__init__.py b/community/www/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/batch/__pycache__/__init__.py b/community/www/batch/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/courses/__init__.py b/community/www/courses/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/courses/__pycache__/__init__.py b/community/www/courses/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/courses/index.html b/community/www/courses/index.html index 89de4c19..253f9ade 100644 --- a/community/www/courses/index.html +++ b/community/www/courses/index.html @@ -9,37 +9,87 @@ {% endblock %} {% block content %} -
-
-

{{ 'All Courses' }}

-
- {% for course in courses %} - {{ course_card(course) }} - {% endfor %} - +
+
+
+
+ {{ 'All Courses' }} +
+
+
+ {% for course in courses %} + {{ course_card(course) }} + {% endfor %} +
-
+ {% endblock %} {% macro course_card(course) %} -
- -
-
-
{{ course.title }}
- {% if course.description %} -
- {{ frappe.utils.md_to_html(course.description[:200]) }} -
- {% endif %} -
+
+
+
+ {% for tag in course.get_tags() %} +
{{ tag }}
+ {% endfor %}
- +
+
+
+ {% 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 %} +
+ + {% if course.get_membership(frappe.session.user) %} +
+ Continue Course +
+ {% else %} +
+ View Course +
+ {% endif %} + +
{% endmacro %} + +{% block script %} + +{% endblock %} diff --git a/community/www/courses/index.py b/community/www/courses/index.py index 49b1864a..86d6acf2 100644 --- a/community/www/courses/index.py +++ b/community/www/courses/index.py @@ -5,8 +5,8 @@ def get_context(context): context.courses = get_courses() def get_courses(): - courses = frappe.get_all( - "LMS Course", - fields=['name', 'title', 'description'] - ) + course_names = frappe.get_all("LMS Course", pluck="name") + courses = [] + for course in course_names: + courses.append(frappe.get_doc("LMS Course", course)) return courses diff --git a/community/www/dashboard/__init__.py b/community/www/dashboard/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/dashboard/__pycache__/__init__.py b/community/www/dashboard/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/hackathons/__init__.py b/community/www/hackathons/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/hackathons/__pycache__/__init__.py b/community/www/hackathons/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/hackathons/macros/__init__.py b/community/www/hackathons/macros/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/home/__init__.py b/community/www/home/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/home/__pycache__/__init__.py b/community/www/home/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/macros/__init__.py b/community/www/macros/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/my-courses/__init__.py b/community/www/my-courses/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/my-courses/__pycache__/__init__.py b/community/www/my-courses/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/profiles/__init__.py b/community/www/profiles/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/profiles/__pycache__/__init__.py b/community/www/profiles/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/sketches/__init__.py b/community/www/sketches/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/sketches/__pycache__/__init__.py b/community/www/sketches/__pycache__/__init__.py new file mode 100644 index 00000000..e69de29b From 3aa974f8bdf94f1b6882f72c170ed6c956413b97 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 28 Jun 2021 13:26:29 +0530 Subject: [PATCH 02/16] fix: removed review doctype --- .../lms/doctype/lms_course_review/__init__.py | 0 .../lms_course_review/lms_course_review.js | 8 --- .../lms_course_review/lms_course_review.json | 49 ------------------- .../lms_course_review/lms_course_review.py | 8 --- .../test_lms_course_review.py | 8 --- 5 files changed, 73 deletions(-) delete mode 100644 community/lms/doctype/lms_course_review/__init__.py delete mode 100644 community/lms/doctype/lms_course_review/lms_course_review.js delete mode 100644 community/lms/doctype/lms_course_review/lms_course_review.json delete mode 100644 community/lms/doctype/lms_course_review/lms_course_review.py delete mode 100644 community/lms/doctype/lms_course_review/test_lms_course_review.py diff --git a/community/lms/doctype/lms_course_review/__init__.py b/community/lms/doctype/lms_course_review/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/community/lms/doctype/lms_course_review/lms_course_review.js b/community/lms/doctype/lms_course_review/lms_course_review.js deleted file mode 100644 index 8382eb52..00000000 --- a/community/lms/doctype/lms_course_review/lms_course_review.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, FOSS United and contributors -// For license information, please see license.txt - -frappe.ui.form.on('LMS Course Review', { - // refresh: function(frm) { - - // } -}); diff --git a/community/lms/doctype/lms_course_review/lms_course_review.json b/community/lms/doctype/lms_course_review/lms_course_review.json deleted file mode 100644 index 8db5bf63..00000000 --- a/community/lms/doctype/lms_course_review/lms_course_review.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "actions": [], - "creation": "2021-06-28 12:30:02.111289", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "review", - "rating" - ], - "fields": [ - { - "fieldname": "review", - "fieldtype": "Small Text", - "in_list_view": 1, - "label": "Review", - "reqd": 1 - }, - { - "fieldname": "rating", - "fieldtype": "Rating", - "label": "Rating" - } - ], - "index_web_pages_for_search": 1, - "links": [], - "modified": "2021-06-28 12:30:15.953008", - "modified_by": "Administrator", - "module": "LMS", - "name": "LMS Course Review", - "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", - "track_changes": 1 -} \ No newline at end of file diff --git a/community/lms/doctype/lms_course_review/lms_course_review.py b/community/lms/doctype/lms_course_review/lms_course_review.py deleted file mode 100644 index e2361ad0..00000000 --- a/community/lms/doctype/lms_course_review/lms_course_review.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, FOSS United and contributors -# For license information, please see license.txt - -# import frappe -from frappe.model.document import Document - -class LMSCourseReview(Document): - pass diff --git a/community/lms/doctype/lms_course_review/test_lms_course_review.py b/community/lms/doctype/lms_course_review/test_lms_course_review.py deleted file mode 100644 index da8a1450..00000000 --- a/community/lms/doctype/lms_course_review/test_lms_course_review.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, FOSS United and Contributors -# See license.txt - -# import frappe -import unittest - -class TestLMSCourseReview(unittest.TestCase): - pass From 0c64d46e999c45f4a851ab173b491d563eab7572 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 28 Jun 2021 20:27:17 +0530 Subject: [PATCH 03/16] feat: reviews --- .gitignore | 3 + community/hooks.py | 3 +- .../lms/doctype/lms_course/lms_course.py | 33 +++++++++- .../lms/doctype/lms_course_review/__init__.py | 0 .../lms_course_review/lms_course_review.js | 8 +++ .../lms_course_review/lms_course_review.json | 54 ++++++++++++++++ .../lms_course_review/lms_course_review.py | 8 +++ .../test_lms_course_review.py | 8 +++ community/lms/widgets/Reviews.html | 61 +++++++++++++++++++ community/templates/pages/reviews.js | 37 +++++++++++ community/www/__init__.py | 0 community/www/courses/__init__.py | 0 community/www/courses/course.html | 3 +- community/www/courses/course.py | 4 +- community/www/dashboard/__init__.py | 0 community/www/hackathons/__init__.py | 0 community/www/hackathons/macros/__init__.py | 0 community/www/home/__init__.py | 0 community/www/macros/__init__.py | 0 community/www/my-courses/__init__.py | 0 community/www/profiles/__init__.py | 0 community/www/sketches/__init__.py | 0 22 files changed, 217 insertions(+), 5 deletions(-) create mode 100644 community/lms/doctype/lms_course_review/__init__.py create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.js create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.json create mode 100644 community/lms/doctype/lms_course_review/lms_course_review.py create mode 100644 community/lms/doctype/lms_course_review/test_lms_course_review.py create mode 100644 community/lms/widgets/Reviews.html create mode 100644 community/templates/pages/reviews.js create mode 100644 community/www/__init__.py create mode 100644 community/www/courses/__init__.py create mode 100644 community/www/dashboard/__init__.py create mode 100644 community/www/hackathons/__init__.py create mode 100644 community/www/hackathons/macros/__init__.py create mode 100644 community/www/home/__init__.py create mode 100644 community/www/macros/__init__.py create mode 100644 community/www/my-courses/__init__.py create mode 100644 community/www/profiles/__init__.py create mode 100644 community/www/sketches/__init__.py diff --git a/.gitignore b/.gitignore index f6a99e30..222921e1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ tags community/docs/current community/public/dist +__pycache__/ +*.py[cod] +*$py.class diff --git a/community/hooks.py b/community/hooks.py index 5666dd53..dbf8f2a2 100644 --- a/community/hooks.py +++ b/community/hooks.py @@ -165,7 +165,8 @@ whitelist = [ "/add-a-new-batch", "/new-sign-up", "/message", - "/about" + "/about", + "/lms-course-review" ] whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist] diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py index a98a5e63..613c5a6c 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -199,7 +199,12 @@ class LMSCourse(Document): } if batch: filters["batch"] = batch - membership = frappe.db.get_value("LMS Batch Membership", filters, ["name","batch", "current_lesson"], as_dict=True) + + membership = frappe.db.get_value("LMS Batch Membership", + filters, + ["name", "batch", "current_lesson", "member_type"], + as_dict=True) + if membership and membership.batch: membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title") return membership @@ -241,6 +246,32 @@ class LMSCourse(Document): member_names = [m['member'] for m in memberships] return find_all("User", name=["IN", member_names]) + def get_reviews(self): + reviews = frappe.get_all("LMS Course Review", + { + "course": self.name + }, + ["review", "rating", "owner"], + order_by= "creation desc") + + for review in reviews: + review.owner_details = frappe.get_doc("User", review.owner) + + return reviews + + def is_eligibleto_review(self, membership): + """ Checks if user is eligible to review the course """ + if not membership: + return False + if frappe.db.count("LMS Course Review", + { + "course": self.name, + "owner": frappe.session.user + }): + return False + return True + + def get_outline(self): return CourseOutline(self) diff --git a/community/lms/doctype/lms_course_review/__init__.py b/community/lms/doctype/lms_course_review/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/doctype/lms_course_review/lms_course_review.js b/community/lms/doctype/lms_course_review/lms_course_review.js new file mode 100644 index 00000000..8382eb52 --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, FOSS United and contributors +// For license information, please see license.txt + +frappe.ui.form.on('LMS Course Review', { + // refresh: function(frm) { + + // } +}); diff --git a/community/lms/doctype/lms_course_review/lms_course_review.json b/community/lms/doctype/lms_course_review/lms_course_review.json new file mode 100644 index 00000000..c2684bbe --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.json @@ -0,0 +1,54 @@ +{ + "actions": [], + "creation": "2021-06-28 13:36:36.146718", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "review", + "rating", + "course" + ], + "fields": [ + { + "fieldname": "review", + "fieldtype": "Small Text", + "label": "Review" + }, + { + "fieldname": "rating", + "fieldtype": "Rating", + "label": "Rating" + }, + { + "fieldname": "course", + "fieldtype": "Link", + "label": "Course", + "options": "LMS Course" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-06-28 15:00:35.146196", + "modified_by": "Administrator", + "module": "LMS", + "name": "LMS Course Review", + "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", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/lms/doctype/lms_course_review/lms_course_review.py b/community/lms/doctype/lms_course_review/lms_course_review.py new file mode 100644 index 00000000..e2361ad0 --- /dev/null +++ b/community/lms/doctype/lms_course_review/lms_course_review.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class LMSCourseReview(Document): + pass diff --git a/community/lms/doctype/lms_course_review/test_lms_course_review.py b/community/lms/doctype/lms_course_review/test_lms_course_review.py new file mode 100644 index 00000000..da8a1450 --- /dev/null +++ b/community/lms/doctype/lms_course_review/test_lms_course_review.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, FOSS United and Contributors +# See license.txt + +# import frappe +import unittest + +class TestLMSCourseReview(unittest.TestCase): + pass diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html new file mode 100644 index 00000000..5c20d42b --- /dev/null +++ b/community/lms/widgets/Reviews.html @@ -0,0 +1,61 @@ +
+
+
Review
+ {% if course.is_eligibleto_review(membership) %} + + Provide your Feedback + + {% endif %} +
+
+ {% for review in course.get_reviews() %} +
+
{{ review.review }}
+
+
+ {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }} {{ review.owner_details.full_name }} +
+
+ {% for i in [1, 2, 3, 4, 5] %} + + + + {% endfor %} +
+
+
+ {% endfor %} +
+
+ + + + + + diff --git a/community/templates/pages/reviews.js b/community/templates/pages/reviews.js new file mode 100644 index 00000000..eaa1bd6f --- /dev/null +++ b/community/templates/pages/reviews.js @@ -0,0 +1,37 @@ + +frappe.ready(() => { + $("#provide-feedback").click((e) => { + e.preventDefault(); + let d = new frappe.ui.Dialog({ + title: 'Provide your Feedback', + fields: [ + { + label: 'Rating', + fieldname: 'rating', + fieldtype: 'Rating' + }, + { + label: 'Review', + fieldname: 'review', + fieldtype: 'Small Text' + } + ], + primary_action_label: 'Submit', + primary_action(values) { + console.log(values); + frappe.call({ + method: "community.lms.doctype.lms_course.lms_course", + args: { + course: "{{ course.name }}", + rating: values.rating, + review: values.review + }, + callback: (data) => { + d.hide(); + } + }) + } + }); + d.show(); + }) +}) diff --git a/community/www/__init__.py b/community/www/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/courses/__init__.py b/community/www/courses/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/courses/course.html b/community/www/courses/course.html index 7947fd5f..b1e13352 100644 --- a/community/www/courses/course.html +++ b/community/www/courses/course.html @@ -15,7 +15,7 @@

{{course.title}}

- {% if not course.disable_self_learning and not course.is_mentor(frappe.session.user) %} + {% if not course.disable_self_learning and not membership %}
@@ -32,6 +32,7 @@ {{ widgets.InstructorSection(instructor=course.get_instructor()) }} {{ BatchSection(course) }} {{ widgets.CourseOutline(course=course, show_link=membership) }} + {{ widgets.Reviews(course=course, membership=membership) }}
diff --git a/community/www/courses/course.py b/community/www/courses/course.py index 7f5c5fab..c847cdba 100644 --- a/community/www/courses/course.py +++ b/community/www/courses/course.py @@ -20,5 +20,5 @@ def get_context(context): context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" context.membership = membership if not course.is_mentor(frappe.session.user) and membership: - frappe.local.flags.redirect_location = f"/courses/{course.name}/learn" - raise frappe.Redirect + """ frappe.local.flags.redirect_location = f"/courses/{course.name}/learn" + raise frappe.Redirect """ diff --git a/community/www/dashboard/__init__.py b/community/www/dashboard/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/hackathons/__init__.py b/community/www/hackathons/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/hackathons/macros/__init__.py b/community/www/hackathons/macros/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/home/__init__.py b/community/www/home/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/macros/__init__.py b/community/www/macros/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/my-courses/__init__.py b/community/www/my-courses/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/profiles/__init__.py b/community/www/profiles/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/www/sketches/__init__.py b/community/www/sketches/__init__.py new file mode 100644 index 00000000..e69de29b From ee8273fd30712d437cd1a2f0a76c8067aaf8808e Mon Sep 17 00:00:00 2001 From: pateljannat Date: Wed, 30 Jun 2021 16:16:22 +0530 Subject: [PATCH 04/16] feat: new fields in user doctype and new web form --- community/fixtures/custom_field.json | 108 +++++++++++++++++ community/hooks.py | 4 +- community/lms/web_form/profile/__init__.py | 0 community/lms/web_form/profile/profile.js | 3 + community/lms/web_form/profile/profile.json | 125 ++++++++++++++++++++ community/lms/web_form/profile/profile.py | 5 + community/lms/widgets/Reviews.html | 4 +- community/public/css/style.css | 15 +-- community/www/courses/index.html | 24 ++-- 9 files changed, 262 insertions(+), 26 deletions(-) create mode 100644 community/fixtures/custom_field.json create mode 100644 community/lms/web_form/profile/__init__.py create mode 100644 community/lms/web_form/profile/profile.js create mode 100644 community/lms/web_form/profile/profile.json create mode 100644 community/lms/web_form/profile/profile.py diff --git a/community/fixtures/custom_field.json b/community/fixtures/custom_field.json new file mode 100644 index 00000000..d3bb2124 --- /dev/null +++ b/community/fixtures/custom_field.json @@ -0,0 +1,108 @@ +[ + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "collapsible_depends_on": null, + "columns": 0, + "default": null, + "depends_on": null, + "description": null, + "docstatus": 0, + "doctype": "Custom Field", + "dt": "User", + "fetch_from": null, + "fetch_if_empty": 0, + "fieldname": "linkedin", + "fieldtype": "Data", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "mobile_no", + "label": "LinkedIn ID", + "length": 0, + "mandatory_depends_on": null, + "modified": "2021-06-30 14:46:55.834145", + "name": "User-linkedin", + "no_copy": 0, + "non_negative": 0, + "options": null, + "parent": null, + "parentfield": null, + "parenttype": null, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "print_width": null, + "read_only": 0, + "read_only_depends_on": null, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "translatable": 1, + "unique": 0, + "width": null + }, + { + "allow_in_quick_entry": 0, + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "collapsible_depends_on": null, + "columns": 0, + "default": null, + "depends_on": null, + "description": null, + "docstatus": 0, + "doctype": "Custom Field", + "dt": "User", + "fetch_from": null, + "fetch_if_empty": 0, + "fieldname": "github", + "fieldtype": "Data", + "hidden": 0, + "hide_border": 0, + "hide_days": 0, + "hide_seconds": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_global_search": 0, + "in_list_view": 0, + "in_preview": 0, + "in_standard_filter": 0, + "insert_after": "linkedin", + "label": "Github ID", + "length": 0, + "mandatory_depends_on": null, + "modified": "2021-06-30 14:46:55.834145", + "name": "User-github", + "no_copy": 0, + "non_negative": 0, + "options": null, + "parent": null, + "parentfield": null, + "parenttype": null, + "permlevel": 0, + "precision": "", + "print_hide": 0, + "print_hide_if_no_value": 0, + "print_width": null, + "read_only": 0, + "read_only_depends_on": null, + "report_hide": 0, + "reqd": 0, + "search_index": 0, + "translatable": 1, + "unique": 0, + "width": null + } +] diff --git a/community/hooks.py b/community/hooks.py index dbf8f2a2..f6a8b4ab 100644 --- a/community/hooks.py +++ b/community/hooks.py @@ -104,6 +104,8 @@ doc_events = { # ] #} +fixtures = ["Custom Field"] + # Testing # ------- @@ -166,7 +168,7 @@ whitelist = [ "/new-sign-up", "/message", "/about", - "/lms-course-review" + "/review" ] whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist] diff --git a/community/lms/web_form/profile/__init__.py b/community/lms/web_form/profile/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/web_form/profile/profile.js b/community/lms/web_form/profile/profile.js new file mode 100644 index 00000000..699703c5 --- /dev/null +++ b/community/lms/web_form/profile/profile.js @@ -0,0 +1,3 @@ +frappe.ready(function() { + // bind events here +}) \ No newline at end of file diff --git a/community/lms/web_form/profile/profile.json b/community/lms/web_form/profile/profile.json new file mode 100644 index 00000000..c4962a94 --- /dev/null +++ b/community/lms/web_form/profile/profile.json @@ -0,0 +1,125 @@ +{ + "accept_payment": 0, + "allow_comments": 0, + "allow_delete": 0, + "allow_edit": 1, + "allow_incomplete": 0, + "allow_multiple": 0, + "allow_print": 0, + "amount": 0.0, + "amount_based_on_field": 0, + "apply_document_permissions": 0, + "breadcrumbs": "", + "button_label": "Save", + "creation": "2021-06-30 13:48:13.682851", + "doc_type": "User", + "docstatus": 0, + "doctype": "Web Form", + "idx": 0, + "is_standard": 1, + "login_required": 1, + "max_attachment_size": 0, + "modified": "2021-06-30 15:53:20.967466", + "modified_by": "Administrator", + "module": "LMS", + "name": "profile", + "owner": "Administrator", + "payment_button_label": "Buy Now", + "published": 1, + "route": "profile", + "route_to_success_link": 0, + "show_attachments": 0, + "show_in_grid": 0, + "show_sidebar": 0, + "sidebar_items": [], + "success_url": "/profile", + "title": "Profile", + "web_form_fields": [ + { + "allow_read_on_all_link_options": 0, + "fieldname": "first_name", + "fieldtype": "Data", + "hidden": 0, + "label": "First Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 1, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "middle_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Middle Name (Optional)", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "last_name", + "fieldtype": "Data", + "hidden": 0, + "label": "Last Name", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "description": "Get your globally recognized avatar from Gravatar.com", + "fieldname": "user_image", + "fieldtype": "Attach Image", + "hidden": 0, + "label": "User Image", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "username", + "fieldtype": "Data", + "hidden": 0, + "label": "Username", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "mobile_no", + "fieldtype": "Data", + "hidden": 0, + "label": "Mobile No", + "max_length": 0, + "max_value": 0, + "options": "Phone", + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + }, + { + "allow_read_on_all_link_options": 0, + "fieldname": "bio", + "fieldtype": "Small Text", + "hidden": 0, + "label": "Bio", + "max_length": 0, + "max_value": 0, + "read_only": 0, + "reqd": 0, + "show_in_filter": 0 + } + ] +} \ No newline at end of file diff --git a/community/lms/web_form/profile/profile.py b/community/lms/web_form/profile/profile.py new file mode 100644 index 00000000..e1ada619 --- /dev/null +++ b/community/lms/web_form/profile/profile.py @@ -0,0 +1,5 @@ +import frappe + +def get_context(context): + # do your magic here + pass diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html index 9e0cf18b..962ad6fb 100644 --- a/community/lms/widgets/Reviews.html +++ b/community/lms/widgets/Reviews.html @@ -7,7 +7,7 @@ {% endif %} -
+
{% for review in course.get_reviews() %}
{{ review.review }}
@@ -19,7 +19,7 @@ {{ course.get_instructor().full_name }}
-
+
{% for i in [1, 2, 3, 4, 5] %} diff --git a/community/public/css/style.css b/community/public/css/style.css index 89efd067..06bc5b21 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -297,6 +297,7 @@ input[type=checkbox] { background: #FFFFFF; border-radius: 8px; box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); + position: relative; } .course-card { @@ -375,7 +376,7 @@ input[type=checkbox] { color: var(--text-color); } -.course-cards-parent { +.cards-parent { display: flex; flex-wrap: wrap; } @@ -386,13 +387,8 @@ input[type=checkbox] { } } -.course-divider { - border: 1px solid #E2E6E9; - margin: 16px 0px 30px; -} - .courses-header { - padding: 50px 0px 20px; + padding: 50px 30px 20px; color: var(--text-color); font-weight: 600; font-size: 22px; @@ -448,8 +444,8 @@ input[type=checkbox] { } .review-card { - width: 300px; - height: 200px; + width: 100%; + height: fit-content; margin: 0px 16px 32px; padding: 16px; } @@ -457,7 +453,6 @@ input[type=checkbox] { .review-card-footer { width: 100%; display: flex; - justify-content: space-between; } .review-content { diff --git a/community/www/courses/index.html b/community/www/courses/index.html index f10c0b1f..63ec84e1 100644 --- a/community/www/courses/index.html +++ b/community/www/courses/index.html @@ -15,8 +15,7 @@
{{ 'All Courses' }}
-
-
+
{% for course in courses %} {{ course_card(course) }} {% endfor %} @@ -66,18 +65,17 @@ {% endif %}
- - {% if course.get_membership(frappe.session.user) %} -
- Continue Course -
- {% else %} -
- View Course -
- {% endif %} - + {% if course.get_membership(frappe.session.user) %} +
+ Continue Course +
+ {% else %} +
+ View Course +
+ {% endif %}
+
{% endmacro %} From 45d88bdc08aab1877c1ce31a1298b7912e9be5ee Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 2 Jul 2021 15:43:21 +0530 Subject: [PATCH 05/16] feat: course header wide --- community/lms/doctype/chapter/chapter.py | 4 + community/lms/widgets/ChapterTeaser.html | 56 ++- community/lms/widgets/CourseOutline.html | 15 +- community/public/css/style.css | 596 +++++++++++++---------- community/public/icons/down-arrow.svg | 3 + community/public/icons/play.svg | 3 + community/public/icons/rating.svg | 2 +- community/public/icons/side-arrow.svg | 3 + community/public/icons/tick.svg | 3 + community/public/images/Vector.png | Bin 206 -> 200 bytes community/templates/quiz.html | 9 +- community/www/batch/members.html | 7 +- community/www/courses/course.html | 189 ++++--- 13 files changed, 503 insertions(+), 387 deletions(-) create mode 100644 community/public/icons/down-arrow.svg create mode 100644 community/public/icons/play.svg create mode 100644 community/public/icons/side-arrow.svg create mode 100644 community/public/icons/tick.svg diff --git a/community/lms/doctype/chapter/chapter.py b/community/lms/doctype/chapter/chapter.py index b616de2c..a563c7e0 100644 --- a/community/lms/doctype/chapter/chapter.py +++ b/community/lms/doctype/chapter/chapter.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from ...utils import slugify class Chapter(Document): def get_lessons(self): @@ -13,3 +14,6 @@ class Chapter(Document): fields='name', order_by="index_") return [frappe.get_doc('Lesson', row['name']) for row in rows] + + def get_slugified_chapter_title(self): + return slugify(self.title) diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html index 5a49f5b3..537c952c 100644 --- a/community/lms/widgets/ChapterTeaser.html +++ b/community/lms/widgets/ChapterTeaser.html @@ -1,28 +1,42 @@ -
-
-
{{index}}. {{ chapter.title }}
-
- {{ chapter.description or "" }} +
+ +
+
+ {{ chapter.description }}
-
+
{% for lesson in chapter.get_lessons() %} -
- {% if show_link or lesson.include_in_preview %} - {{ lesson.title }} - {% else %} -
- - {{ lesson.title }} - - +
+ {% if show_link or lesson.include_in_preview %} + + {{ loop.index }}. + {{ lesson.title }} + {% else %} +
+ + {{ loop.index }}. + {{ lesson.title }} + + +
+ {% endif %}
- {% endif %} - {% if show_progress and not course.is_mentor(frappe.session.user) and lesson.get_progress() %} - {{ lesson.get_progress() }} - {% endif %} -
{% endfor %}
+ diff --git a/community/lms/widgets/CourseOutline.html b/community/lms/widgets/CourseOutline.html index b4b5629c..0db98ce4 100644 --- a/community/lms/widgets/CourseOutline.html +++ b/community/lms/widgets/CourseOutline.html @@ -1,7 +1,10 @@ -
-

Course Outline

- - {% for chapter in course.get_chapters() %} - {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter, course=course, batch=batch, show_link=show_link, show_progress=show_progress)}} - {% endfor %} +
+

+ Course Outline +

+
+ {% for chapter in course.get_chapters() %} + {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter, course=course, batch=batch, show_link=show_link, show_progress=show_progress)}} + {% endfor %} +
diff --git a/community/public/css/style.css b/community/public/css/style.css index 06bc5b21..cad61117 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1,461 +1,547 @@ - :root { - --c1: #fefae0; - --c2: #264653; - --c3: #e9c46a; - --c4: #2a9d8f; - --c5: #f4a261; - --c6: #e76f51; - --c7: #ccd5ae; - --c8: #EEEEEE; - - --bg: var(--c1); - --header-bg: var(--c2); - --header-color: var(--c3); - --tag-color: var(--c7); - --sidebar-bg: var(--c7); - - --h-color: var(--c2); - - --text-color: #192734; - --text-color-light: #ccc; - - --cta-color: var(--c4); - --send-message: var(--c7); - --received-message: var(--c8); - --checkbox-size: 14px; - --control-bg: var(--gray-100); - --muted-text: #4C5A67; - --button-background: #EEF0F2; + --c1: #fefae0; + --c2: #264653; + --c3: #e9c46a; + --c4: #2a9d8f; + --c5: #f4a261; + --c6: #e76f51; + --c7: #ccd5ae; + --c8: #EEEEEE; + --bg: var(--c1); + --header-bg: var(--c2); + --header-color: var(--c3); + --tag-color: var(--c7); + --sidebar-bg: var(--c7); + --h-color: var(--c2); + --text-color: #192734; + --text-color-light: #ccc; + --cta-color: var(--c4); + --send-message: var(--c7); + --received-message: var(--c8); + --checkbox-size: 14px; + --control-bg: var(--gray-100); + --muted-text: #4C5A67; + --button-background: #EEF0F2; } body { - padding: 0px; - margin: 0px; + padding: 0px; + margin: 0px; } .chapter-plan { - border-radius: 10px; - margin: 20px 0px; - padding: 20px; - border: 1px solid #ddc; - background: white; + border-radius: 10px; + margin: 20px 0px; + padding: 20px; + border: 1px solid #ddc; + background: white; } .chapter-plan h3 { - font-size: 1.1em; - font-weight: bold; -} - -.lessons { - padding-left: 20px; -} -.lessons .lesson { - margin: 5px 0px; - font-weight: bold; + font-size: 1.1em; + font-weight: bold; } .batch { - border-radius: 10px; - margin: 10px 0px; - background: white; - box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); - border: 1px solid #ddc; + border-radius: 10px; + margin: 10px 0px; + background: white; + box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); + border: 1px solid #ddc; } .batch-details { - padding: 20px; + padding: 20px; } .batch .cta { - margin-top: 10px; - padding: 10px; - min-height: 28px; - text-align: right; - border-top: 1px solid #ddc; + margin-top: 10px; + padding: 10px; + min-height: 28px; + text-align: right; + border-top: 1px solid #ddc; } .batch .right { - float: right; + float: right; } img.profile-photo { - width: 24px; - height: 24px; - border-radius: 50%; + width: 24px; + height: 24px; + border-radius: 50%; } .lesson-type { - padding-right: 5px; + padding-right: 5px; } .preview-video { - margin: 20px 0px; + margin: 20px 0px; } .preview-video iframe { - max-width: 100% + max-width: 100% } .message { - border: 1px dashed var(--text-color); - padding: 20px; - border-radius: 10px; + border: 1px dashed var(--text-color); + padding: 20px; + border-radius: 10px; } .msger-inputarea { - width: 100%; - display: flex; - padding: 10px; - border-top: 2px solid #ddd; - background: #eee; - z-index: 1; + width: 100%; + display: flex; + padding: 10px; + border-top: 2px solid #ddd; + background: #eee; + z-index: 1; } + .msger-inputarea * { - padding: 10px; - border: none; - border-radius: 3px; - font-size: 1em; + padding: 10px; + border: none; + border-radius: 3px; + font-size: 1em; } + .msger-input { - flex: 1; - background: #ddd; + flex: 1; + background: #ddd; } .message-section { - margin-left: 3%; - display: inline-block; - width: 95%; + margin-left: 3%; + display: inline-block; + width: 95%; } .display-4 { - color: #2D005A; - font-weight: 600; - line-height: 51px; + color: #2D005A; + font-weight: 600; + line-height: 51px; } section { - padding: 5rem 0 5rem 0; + padding: 5rem 0 5rem 0; } .messages-container { - margin: 0 auto; - border: 1px solid black; + margin: 0 auto; + border: 1px solid black; } .messages { - overflow: auto; - height: 450px; - display: flex; - flex-direction: column; - align-items: flex-start; - padding: 8px; - list-style-type: none; + height: 450px; + display: flex; + flex-direction: column; + align-items: flex-start; + padding: 8px; + list-style-type: none; } .messages li { - background: #F7F5F5; - border-radius: 8px; - padding: 8px; - margin: 2px 8px 2px 0; - width: 40%; + background: #F7F5F5; + border-radius: 8px; + padding: 8px; + margin: 2px 8px 2px 0; + width: 40%; } .messages li.ours { - align-self: flex-end; - margin: 2px 0 2px 8px; - background: var(--primary-color); - color: #fff + align-self: flex-end; + margin: 2px 0 2px 8px; + background: var(--primary-color); + color: #fff } .message-para { - font-size: 20px; + font-size: 20px; } .batch-header { - background: #eee; - border: 2px solid #ddd; + background: #eee; + border: 2px solid #ddd; } - .page-card { - max-width: 360px; - padding: 15px; - margin: 70px auto; - border: 1px solid #d1d8dd; - border-radius: 4px; - background-color: #fff; - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); + max-width: 360px; + padding: 15px; + margin: 70px auto; + border: 1px solid #d1d8dd; + border-radius: 4px; + background-color: #fff; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); } + .page-card .page-card-head { - padding: 10px 15px; - margin: -15px; - margin-bottom: 15px; - border-bottom: 1px solid #d1d8dd; + padding: 10px 15px; + margin: -15px; + margin-bottom: 15px; + border-bottom: 1px solid #d1d8dd; } + .page-card .page-card-head .indicator { - color: #36414C; - font-size: 14px; + color: #36414C; + font-size: 14px; } + .page-card .page-card-head .indicator::before { - margin: 0 6px 0.5px 0px; + margin: 0 6px 0.5px 0px; } + .page-card .btn { - margin-top: 30px; + margin-top: 30px; } input[type=checkbox] { - appearance: auto; + appearance: auto; } .partiallycomplete { - background: #FEF4E2; - color: #976417; + background: #FEF4E2; + color: #976417; } .partiallycomplete img { - background: #976417; + background: #976417; } .complete { - background: #EAF5EE; - color: #38A160; + background: #EAF5EE; + color: #38A160; } .complete img { - background: #38A160; + background: #38A160; } .incomplete { - background: #FEECEC; - color: #E24C4C; + background: #FEECEC; + color: #E24C4C; } .incomplete img { - background: #E24C4C; + background: #E24C4C; } .progress-image { - margin-right: 3px; - border-radius: 50px; - padding: 5px; + margin-right: 3px; + border-radius: 50px; + padding: 5px; } .course-image { - height: 168px; - width: 352px; - border-top-left-radius: 8px; - border-top-right-radius: 8px; - background-size: 352px 168px; + height: 168px; + width: 352px; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + background-size: 352px 168px; } @media (max-width: 768px) { - .course-image { - width: 336px; - } + .course-image { + width: 336px; + } } @media (max-width: 375px) { - .course-image { - width: 312px; - background-size: cover; - background-repeat: no-repeat; - } + .course-image { + width: 312px; + background-size: cover; + background-repeat: no-repeat; + } } .course-tags { - display: flex; - position: relative; - top: 12px; - left: 12px; - height: 20px; + display: flex; + position: relative; + top: 12px; + left: 12px; + height: 20px; } .course-card-pills { - background: #ffffff; - margin: 0px 10px; - border-radius: 4px; - padding: 4px 6px; - font-size: 10px; - line-height: 120%; - text-align: center; - letter-spacing: 0.011em; - text-transform: uppercase; - color: #2C5477; - font-weight: bold; - box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); + background: #ffffff; + margin: 0px 10px; + border-radius: 4px; + padding: 4px 6px; + font-size: 10px; + line-height: 120%; + text-align: center; + letter-spacing: 0.011em; + text-transform: uppercase; + color: #2C5477; + font-weight: bold; + box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); } .common-page-style { - background: #F4F5F6; + background: #F4F5F6; } .common-card-style { - display: flex; - flex-direction: column; - align-items: flex-start; - background: #FFFFFF; - border-radius: 8px; - box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); - position: relative; + display: flex; + align-items: flex-start; + background: #FFFFFF; + border-radius: 8px; + box-shadow: 0px 5px 10px rgb(0 0 0 / 10%); + position: relative; } .course-card { - width: 352px; - height: 380px; - margin: 0px 16px 32px; + flex-direction: column; + width: 352px; + height: 380px; + margin: 0px 16px 32px; } @media (max-width: 768px) { - .common-card-style { - width: 336px; - } + .common-card-style { + width: 336px; + } } @media (max-width: 375px) { - .common-card-style { - width: 312px; - } + .common-card-style { + width: 312px; + } } .course-card-meta { - font-size: 12px; - line-height: 135%; - margin: 16px 0px 8px; - color: var(--muted-text); - height: 15px; + font-size: 12px; + line-height: 135%; + margin: 16px 0px 8px; + color: var(--muted-text); + height: 15px; } .course-card-content { - width: 100%; - padding: 0px 24px 20px; + width: 100%; + padding: 0px 24px 20px; } .course-card-title { - font-weight: 600; - font-size: 18px; - line-height: 156%; - letter-spacing: -0.014em; - color: var(--text-color); - align-self: stretch; - margin-bottom: 16px; - height: 45px; + font-weight: 600; + font-size: 18px; + line-height: 156%; + letter-spacing: -0.014em; + color: var(--text-color); + align-self: stretch; + margin-bottom: 16px; + height: 45px; } .card-divider { - border: 1px solid #E2E6E9; - margin-bottom: 16px; + border: 1px solid #E2E6E9; + margin-bottom: 16px; } .course-card-meta-2 { - margin-bottom: 16px; + margin-bottom: 16px; } .course-instructor { - margin: 0px 8px; - font-size: 12px; - line-height: 135%; - color: var(--text-color); + margin: 0px 8px; + font-size: 12px; + line-height: 135%; + color: var(--text-color); } .course-student-count { - font-size: 12px; - line-height: 135%; - color: var(--muted-text); - float: right; + font-size: 12px; + line-height: 135%; + color: var(--muted-text); + float: right; } .view-course-link { - height: 32px; - background: var(--button-background); - border-radius: 4px; - font-size: 12px; - padding: 8px 0px 8px; - text-align: center; - line-height: 135%; - color: var(--text-color); + height: 32px; + background: var(--button-background); + border-radius: 4px; + font-size: 12px; + padding: 8px 0px 8px; + text-align: center; + line-height: 135%; + color: var(--text-color); } .cards-parent { - display: flex; - flex-wrap: wrap; + display: flex; + flex-wrap: wrap; } @media (max-width: 375px) { - .course-cards-parent { - justify-content: center; - } + .course-cards-parent { + justify-content: center; + } } .courses-header { - padding: 50px 30px 20px; - color: var(--text-color); - font-weight: 600; - font-size: 22px; - line-height: 145%; - letter-spacing: -0.0175em + padding: 50px 30px 20px; + color: var(--text-color); + font-weight: 600; + font-size: 22px; + line-height: 145%; + letter-spacing: -0.0175em } .course-top-section { - margin: 0px 140px 0px; + margin: 0px 140px 0px; } @media (max-width: 768px) { - .course-top-section { - margin: 0px 40px 0px; - } + .course-top-section { + margin: 0px 40px 0px; + } } @media (max-width: 375px) { - .course-top-section { - margin: 0px 24px 0px; - } + .course-top-section { + margin: 0px 24px 0px; + } } .is-primary { - background: var(--primary-color); - color: #FFFFFF; + background: var(--primary-color); + color: #FFFFFF; } .button-links:hover { - text-decoration: none; + text-decoration: none; } .icon-background { - border-radius: 50%; - padding: 3px; - width: 24px; - height: 24px; + border-radius: 50%; + padding: 3px; + width: 24px; + height: 24px; } .small-margin { - margin-left: 10px; + margin-left: 10px; } .reviews-heading { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } .reviews-title { - font-weight: 600; - font-size: 22px; - line-height: 145%; + font-weight: 600; + font-size: 22px; + line-height: 145%; } .review-card { - width: 100%; - height: fit-content; - margin: 0px 16px 32px; - padding: 16px; + width: 100%; + height: fit-content; + margin: 0px 16px 32px; + padding: 16px; } .review-card-footer { - width: 100%; - display: flex; + width: 100%; + display: flex; } .review-content { - font-size: 15px; - line-height: 135%; + font-size: 15px; + line-height: 135%; } + +div.custom-checkbox>label>input { + visibility: hidden; +} + +div.custom-checkbox>label>img { + height: 20px; + width: 20px; + border: 1px solid black; + border-radius: 5px; +} + +div.custom-checkbox>label>input:checked+img { + background: url(/assets/community/images/Vector.png); + background-repeat: no-repeat; + background-position: center center; + background-size: 15px 15px; + object-fit: contain; +} + +.course-card-wide { + width: 1120px; + height: 248px; + display: flex; + flex-direction: row; + padding: 24px; + background: #E2E6E9; + border-radius: 12px; +} + +.course-image-wide { + width: 352px; + height: 200px; + background-size: 352px 200px; + margin-right: 32px; + border-radius: 5px; +} + +.course-home-page { + padding: 80px; +} + +.course-card-wide-content { + display: flex; + flex-direction: column; +} + +.course-card-wide-title { + font-style: normal; + font-weight: 600; + font-size: 40px; + line-height: 120%; + color: #192734; + margin-bottom: 8px; +} + +.course-card-wide-intro { + font-size: 16px; + line-height: 172%; + letter-spacing: -0.011em; + color: #4C5A67; + width: 688px; + height: 80px; + margin-bottom: 16px; +} + +.wide-button { + box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.13), 0px 0px 0.5px rgba(0, 0, 0, 0.5); + border-radius: 6px; + padding: 12px 0px 12px 24px; + margin-right: 16px; +} + +.start-learning { + background: var(--primary-color); + width: 185px; + height: 48px; + color: #FFFFFF; +} + +.video-preview { + background: #FFFFFF; + width: 234px; + height: 48px; +} + +.course-buttons { + display: flex; +} + +* { + outline: 1px solid #f00 !important; + opacity: 1 !important; + visibility: visible !important; +} \ No newline at end of file diff --git a/community/public/icons/down-arrow.svg b/community/public/icons/down-arrow.svg new file mode 100644 index 00000000..da0e07fc --- /dev/null +++ b/community/public/icons/down-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/play.svg b/community/public/icons/play.svg new file mode 100644 index 00000000..3b3aa8e7 --- /dev/null +++ b/community/public/icons/play.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/rating.svg b/community/public/icons/rating.svg index dade2e61..dcbe9644 100644 --- a/community/public/icons/rating.svg +++ b/community/public/icons/rating.svg @@ -1,3 +1,3 @@ - + diff --git a/community/public/icons/side-arrow.svg b/community/public/icons/side-arrow.svg new file mode 100644 index 00000000..aee8d7f0 --- /dev/null +++ b/community/public/icons/side-arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/icons/tick.svg b/community/public/icons/tick.svg new file mode 100644 index 00000000..2275a8d4 --- /dev/null +++ b/community/public/icons/tick.svg @@ -0,0 +1,3 @@ + + + diff --git a/community/public/images/Vector.png b/community/public/images/Vector.png index 9e3cbc7f216d7b9986fb24adfa3f949b4977335d..6089d34d8d2f1de8b1e4f15543a5496e4cbe879f 100644 GIT binary patch delta 156 zcmX@dc!E)}Gr-TCmrII^fq{Y7)59eQNOJ%&8wVSZ{KtC#_e4e0qF7HC$B+uf(%y}{ z4F&?t@131z3Q8!d-kuN`(a1T;$I1J+%$o+5`AV0(19f(8@SoP&cuhpS(V$nMPxxV> z>563bg)!0hRF}L+KfX5g+0uvz_M~w63f(@o-SO2|zc3ql%jSQ7U)Kh-kipZ{&t;uc GLK6U^BsN6= delta 162 zcmX@Xc#cuAGr-TCmrII^fq{Y7)59eQNb>+O7Y7@VY|z>NYoelQMY5-hV@L(#)c#n( z1_PdE?L;B9g+T>Od~M7HO(H4^OP7>CZN2S3ZMV&q-$jwG9y4biGUrbJ(KubQBKg6S z`wiuZEFYTu#q4YXsy}%Bee3lmSa(6;lw*62%~=}!zx9+rp6S*vOi|orTv@FjfwnR* Nc)I$ztaD0e0swm=JGuY> diff --git a/community/templates/quiz.html b/community/templates/quiz.html index 3e5de49e..0f851400 100644 --- a/community/templates/quiz.html +++ b/community/templates/quiz.html @@ -14,9 +14,12 @@ {% set options = [question.option_1, question.option_2, question.option_3, question.option_4] %} {% for option in options %} {% if option %} -
- +
+ {{ option }}
{% endif %} diff --git a/community/www/batch/members.html b/community/www/batch/members.html index 82448d6d..b1c9712c 100644 --- a/community/www/batch/members.html +++ b/community/www/batch/members.html @@ -20,19 +20,16 @@
{% for member in members %}
- {{ widgets.Avatar(member=member, avatar_class="avatar-large") }} + {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }}
-

{{ member.full_name }}

+
{{ member.full_name }}
 {% if course.is_mentor(member.name) %}
Mentor
{% endif %}
- {% if member.bio %} - {{member.bio}} - {% endif %}
{% if loop.index != member_count %} diff --git a/community/www/courses/course.html b/community/www/courses/course.html index b1e13352..c95af2a6 100644 --- a/community/www/courses/course.html +++ b/community/www/courses/course.html @@ -1,112 +1,109 @@ {% extends "templates/base.html" %} {% from "www/macros/common_macro.html" import MentorsSection %} -{% block title %}{{ course.title }}{% endblock %} -{% block head_include %} - - - +{% block title %}{{ course.title }} +{% endblock %} +{% block head_include %} + + + {% endblock %} - {% block content %} -
-
-
- Courses / {{ course.title }} -
-
-

{{course.title}}

- {% if not course.disable_self_learning and not membership %} -
- +
+
+
+
+ {% for tag in course.get_tags() %} +
{{ tag }}
+ {% endfor %} +
+
+
+ {{ course.title }} +
+
+ {{ course.short_introduction }} +
+
+
+ Start Learning + +
+
+ Watch Video Preview + +
+
+
+
+
+ {{ widgets.CourseOutline(course=course, show_link=membership) }} +
+
+{% endblock %} +{% macro CourseVideo(course) %} + {% if course.video_link %} +
+ +
+ {% endif %} +{% endmacro %} +{% macro CourseDescription(course) %} +
+

Course Description

+ +
+ {{ frappe.utils.md_to_html(course.description) }} +
+
+{% endmacro %} +{% macro BatchSection(course) %} +
+
+ {% if course.is_mentor(frappe.session.user) %} + {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }} + {% else %} + {{ BatchSectionForStudents(course, course.get_upcoming_batches()) }} {% endif %}
-
{{ course.short_introduction }}
+{% endmacro %} +{% macro BatchSectionForMentors(course, mentor_batches) %} +

Your Batches

-
-
-
- {{ CourseVideo(course) }} - {{ CourseDescription(course) }} - {{ widgets.InstructorSection(instructor=course.get_instructor()) }} - {{ BatchSection(course) }} - {{ widgets.CourseOutline(course=course, show_link=membership) }} - {{ widgets.Reviews(course=course, membership=membership) }} -
+ {% if mentor_batches %} + +
+ {% for batch in mentor_batches %} +
+ {{ widgets.RenderBatch(course=course, batch=batch, can_manage=True) }} +
+ {% endfor %}
-
-
-{% endblock %} -{% macro CourseVideo(course) %} -{% if course.video_link %} -
- -
-{% endif %} + Add a new batch + {% else %} +
+

+ You are a mentor for this course. +

+ Create your first batch +
+ {% endif %} {% endmacro %} - -{% macro CourseDescription(course) %} -
-

Course Description

- -
- {{ frappe.utils.md_to_html(course.description) }} -
-
-{% endmacro %} - -{% macro BatchSection(course) %} -
-
- {% if course.is_mentor(frappe.session.user) %} - {{ BatchSectionForMentors(course, course.get_batches(mentor=frappe.session.user)) }} +{% macro BatchSectionForStudents(course, upcoming_batches) %} + {% if upcoming_batches %} +
+

Upcoming Batches

+
+ {% for batch in upcoming_batches %} +
+ {{ widgets.RenderBatch(course=course, batch=batch, can_join=True) }} +
+ {% endfor %} +
{% else %} - {{ BatchSectionForStudents(course, course.get_upcoming_batches()) }} +
There are no Upcoming Batches for this course currently.
{% endif %}
-
-{% endmacro %} - -{% macro BatchSectionForMentors(course, mentor_batches) %} -

Your Batches

- -{% if mentor_batches %} - -
- {% for batch in mentor_batches %} -
- {{ widgets.RenderBatch(course=course, batch=batch, can_manage=True) }} -
- {% endfor %} -
- -Add a new - batch -{% else %} -
-

You are a mentor for this course.

- Create your first batch -
-{% endif %} -{% endmacro %} - -{% macro BatchSectionForStudents(course, upcoming_batches) %} -{% if upcoming_batches %} -
-

Upcoming Batches

-
- {% for batch in upcoming_batches %} -
- {{ widgets.RenderBatch(course=course, batch=batch, can_join=True) }} -
- {% endfor %} -
- {% else %} -
There are no Upcoming Batches for this course currently.
- {% endif %} -
{% endmacro %} From 5ea3b25d210a975e314e8b3ff6359f4bdd40f5e9 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 6 Jul 2021 17:58:36 +0530 Subject: [PATCH 06/16] feat: course home --- .../lms_batch_membership.js | 2 +- .../lms/doctype/lms_course/lms_course.py | 5 + .../lms_course_mentor_mapping.js | 12 +- .../lms_course_review/lms_course_review.json | 5 +- .../lms_course_review/lms_course_review.py | 12 +- community/lms/widgets/ChapterTeaser.html | 53 +- community/lms/widgets/CourseOutline.html | 8 +- community/lms/widgets/MemberCard.html | 14 + community/lms/widgets/Reviews.html | 71 +- community/public/css/style.css | 985 ++++++++++++------ community/public/images/play.png | Bin 0 -> 326 bytes community/www/courses/course.html | 284 +++-- community/www/courses/course.js | 279 +++-- community/www/courses/index.html | 2 +- 14 files changed, 1197 insertions(+), 535 deletions(-) create mode 100644 community/lms/widgets/MemberCard.html create mode 100644 community/public/images/play.png diff --git a/community/lms/doctype/lms_batch_membership/lms_batch_membership.js b/community/lms/doctype/lms_batch_membership/lms_batch_membership.js index 0a20239d..68ac4f55 100644 --- a/community/lms/doctype/lms_batch_membership/lms_batch_membership.js +++ b/community/lms/doctype/lms_batch_membership/lms_batch_membership.js @@ -10,5 +10,5 @@ frappe.ui.form.on('LMS Batch Membership', { } }; }); - }, + } }); diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py index c3d797fd..29b6bb8d 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -274,6 +274,11 @@ class LMSCourse(Document): return False return True + def get_average_rating(self): + ratings = [review.rating for review in self.get_reviews()] + if not len(ratings): + return None + return sum(ratings)/len(ratings) def get_outline(self): return CourseOutline(self) diff --git a/community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js b/community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js index 5b17f61a..c995587f 100644 --- a/community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js +++ b/community/lms/doctype/lms_course_mentor_mapping/lms_course_mentor_mapping.js @@ -2,7 +2,13 @@ // For license information, please see license.txt frappe.ui.form.on('LMS Course Mentor Mapping', { - // refresh: function(frm) { - - // } + onload: function(frm) { + frm.set_query('mentor', function(doc) { + return { + filters: { + "ignore_user_type": 1, + } + }; + }); + }, }); diff --git a/community/lms/doctype/lms_course_review/lms_course_review.json b/community/lms/doctype/lms_course_review/lms_course_review.json index c2684bbe..f2b78b5d 100644 --- a/community/lms/doctype/lms_course_review/lms_course_review.json +++ b/community/lms/doctype/lms_course_review/lms_course_review.json @@ -13,23 +13,26 @@ { "fieldname": "review", "fieldtype": "Small Text", + "in_list_view": 1, "label": "Review" }, { "fieldname": "rating", "fieldtype": "Rating", + "in_list_view": 1, "label": "Rating" }, { "fieldname": "course", "fieldtype": "Link", + "in_list_view": 1, "label": "Course", "options": "LMS Course" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-28 15:00:35.146196", + "modified": "2021-07-05 14:57:03.841430", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course Review", diff --git a/community/lms/doctype/lms_course_review/lms_course_review.py b/community/lms/doctype/lms_course_review/lms_course_review.py index e2361ad0..2c4199a4 100644 --- a/community/lms/doctype/lms_course_review/lms_course_review.py +++ b/community/lms/doctype/lms_course_review/lms_course_review.py @@ -1,8 +1,18 @@ # Copyright (c) 2021, FOSS United and contributors # For license information, please see license.txt -# import frappe +import frappe from frappe.model.document import Document class LMSCourseReview(Document): pass + +@frappe.whitelist() +def submit_review(rating, review, course): + frappe.get_doc({ + "doctype": "LMS Course Review", + "rating": rating, + "review": review, + "course": course + }).save(ignore_permissions=True) + return "OK" diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html index 537c952c..0d08b078 100644 --- a/community/lms/widgets/ChapterTeaser.html +++ b/community/lms/widgets/ChapterTeaser.html @@ -1,42 +1,33 @@
- +
-
+
{{ chapter.description }}
{% for lesson in chapter.get_lessons() %} -
- {% if show_link or lesson.include_in_preview %} - - {{ loop.index }}. - {{ lesson.title }} - {% else %} -
- - {{ loop.index }}. - {{ lesson.title }} - - -
- {% endif %} +
+ {% if show_link or lesson.include_in_preview %} + + {{ lesson.title }} + {% else %} +
+ + {{ lesson.title }} + +
+ {% endif %} +
{% endfor %}
- +{% if index != course.get_chapters() | length %} +
+{% endif %} diff --git a/community/lms/widgets/CourseOutline.html b/community/lms/widgets/CourseOutline.html index 0db98ce4..043b0057 100644 --- a/community/lms/widgets/CourseOutline.html +++ b/community/lms/widgets/CourseOutline.html @@ -1,10 +1,12 @@ +{% if course.get_chapters() | length %}
-

+
Course Outline -

+
{% for chapter in course.get_chapters() %} - {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter, course=course, batch=batch, show_link=show_link, show_progress=show_progress)}} + {{ widgets.ChapterTeaser(index=loop.index, chapter=chapter, course=course, batch=batch, show_link=show_link, show_progress=show_progress)}} {% endfor %}
+{% endif %} diff --git a/community/lms/widgets/MemberCard.html b/community/lms/widgets/MemberCard.html new file mode 100644 index 00000000..87cb60b8 --- /dev/null +++ b/community/lms/widgets/MemberCard.html @@ -0,0 +1,14 @@ +
+ {% set avatar_class = "avatar-xl" if dimension_class == "member-card-large" else "avatar-large"%} + {{ widgets.Avatar(member=member, avatar_class=avatar_class) }} +
+ {{ member.full_name }} +
+ {% set course_count = member.get_course_count() %} + {% if show_course_count and course_count > 0 %} + {% set suffix = "Courses" if course_count > 1 else "Course" %} +
+ Created {{ course_count }} {{ suffix }} +
+ {% endif %} +
diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html index 962ad6fb..2d64ae20 100644 --- a/community/lms/widgets/Reviews.html +++ b/community/lms/widgets/Reviews.html @@ -1,22 +1,22 @@ -
+{% if course.get_reviews() | length %} +
-
Review
+
Review
{% if course.is_eligible_to_review(membership) %} - + Provide your Feedback {% endif %}
-
+
{% for review in course.get_reviews() %} -
-
{{ review.review }}
-
+
+
{{ review.review }}
- {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-small") }} + {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }} - {{ course.get_instructor().full_name }} + {{ review.owner_details.full_name }}
@@ -32,33 +32,54 @@
- - - -