From 276d64a66a73157e23cfeb8b89305cc18c18cfaf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 20 Jul 2021 09:30:58 +0530 Subject: [PATCH 01/10] fix(style): don't mess with global container styles --- community/public/css/style.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/community/public/css/style.css b/community/public/css/style.css index ebd7da23..1aeb84bb 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -390,13 +390,6 @@ input[type=checkbox] { letter-spacing: -0.0175em } -@media (min-width: 576px) { - .container { - padding-left: 1rem; - padding-right: 1rem; - } -} - .button-links:hover { text-decoration: none; } From d125b02cec6c80a8fb77a72fa771d7e2c2dd767b Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Tue, 20 Jul 2021 13:05:15 +0530 Subject: [PATCH 02/10] fix: added max width to container padding --- community/public/css/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/community/public/css/style.css b/community/public/css/style.css index 1aeb84bb..32220a32 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -390,6 +390,13 @@ input[type=checkbox] { letter-spacing: -0.0175em } +@media (min-width: 576px) and (max-width: 992px) { + .container { + padding-left: 1rem; + padding-right: 1rem; + } +} + .button-links:hover { text-decoration: none; } From 86596d0cfe2974636586248544477b9e82933afa Mon Sep 17 00:00:00 2001 From: pateljannat Date: Tue, 20 Jul 2021 17:19:18 +0530 Subject: [PATCH 03/10] fix: minor issues --- community/overrides/user.py | 14 +++++-- community/public/css/style.css | 74 ++++++++++++++++------------------ 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/community/overrides/user.py b/community/overrides/user.py index 91cd5abd..bcb1496a 100644 --- a/community/overrides/user.py +++ b/community/overrides/user.py @@ -10,7 +10,8 @@ class CustomUser(User): """ return frappe.get_all( 'LMS Course', { - 'owner': self.name + 'owner': self.name, + 'is_published': True }) def get_palette(self): @@ -62,9 +63,16 @@ class CustomUser(User): def get_mentored_courses(self): """ Returns all courses mentored by this user """ - return frappe.get_all("LMS Course Mentor Mapping", + mentored_courses = [] + mapping = frappe.get_all("LMS Course Mentor Mapping", { - "mentor": self.name + "mentor": self.name, }, ["name", "course"] ) + + for map in mapping: + if frappe.db.get_value("LMS Course", map.course, "is_published"): + mentored_courses.append(map) + + return mentored_courses diff --git a/community/public/css/style.css b/community/public/css/style.css index 32220a32..a6ad848e 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -655,7 +655,6 @@ div.custom-checkbox>label>input:checked+img { .course-home-outline { margin-top: 3rem; - flex: 1; } .small-title { @@ -673,6 +672,7 @@ div.custom-checkbox>label>input:checked+img { .chapter-description { height: fit-content; padding-left: 1rem; + padding-right: 1rem; } .chapter-icon { @@ -680,26 +680,39 @@ div.custom-checkbox>label>input:checked+img { } .course-outline-instructor-parent { - display: flex; - justify-content: space-between; + display: grid; + grid-gap: 2rem; + grid-template-columns: 4fr 1fr; +} + +@media (max-width: 768px) { + .course-outline-instructor-parent { + grid-gap: 1rem; + } } @media (max-width: 600px) { .course-outline-instructor-parent { - flex-direction: column; padding: 0px 24px 0px; + grid-template-columns: none; } } - .profile-parent-section { - display: flex; - justify-content: space-between; + display: grid; + grid-gap: 2rem; + grid-template-columns: 4fr 1fr; +} + +@media (max-width: 768px) { + .profile-parent-section { + grid-gap: 1rem; + } } @media (max-width: 600px) { .profile-parent-section { - flex-direction: column; + grid-template-columns: none; } } @@ -731,18 +744,6 @@ div.custom-checkbox>label>input:checked+img { margin-top: 3rem; } -@media (min-width: 1024px) { - .course-overview-section { - margin-left: 2rem; - } -} - -@media (min-width: 600px) { - .course-overview-section { - margin-left: 1rem; - } -} - .lesson-info { font-size: 16px; line-height: 250%; @@ -900,14 +901,18 @@ div.custom-checkbox>label>input:checked+img { } .description-card { - padding: 24px; + padding: 1.5rem; flex-direction: column; } .overview-card { - padding: 24px 26px 24px; + padding: 1.5rem; width: 256px; flex-direction: column; + display: grid; + -moz-column-gap: 1rem; + column-gap: 1rem; + row-gap: 1rem; } @media (max-width: 768px) { @@ -940,10 +945,6 @@ div.custom-checkbox>label>input:checked+img { } } -.overtime-item { - margin: 16px 0px 16px; -} - .view-all-mentors { width: 100%; display: flex; @@ -1012,8 +1013,7 @@ div.custom-checkbox>label>input:checked+img { } .course-details-outline { - margin-top: 16px; - flex: 1; + margin-top: 1rem; } .lesson-content-card { @@ -1022,14 +1022,15 @@ div.custom-checkbox>label>input:checked+img { } .course-content-parent { - display: flex; - justify-content: space-between; + display: grid; + grid-gap: 2rem; + grid-template-columns: 2fr minmax(600px, 5fr); } -@media (max-width: 768px) { +@media (max-width: 1024px) { .course-content-parent { + display: flex; flex-direction: column-reverse; - justify-content: center; } } @@ -1044,8 +1045,7 @@ div.custom-checkbox>label>input:checked+img { } .lesson-pagination-parent { - margin: 1rem 0px 0px 2rem; - flex: 3; + margin-top: 1rem; } @media (max-width: 768px) { @@ -1216,12 +1216,6 @@ div.custom-checkbox>label>input:checked+img { flex-direction: column; } -@media (min-width: 600px) { - .course-creator-progress-parent { - margin-left: 2rem; - } -} - .course-creator-section { margin-top: 3rem; } From dd2f830a334f2d37caf44a27902c8419145f5fdc Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 23 Jul 2021 19:07:26 +0530 Subject: [PATCH 04/10] fix: upcoming course and doctype cleanup --- community/lms/doctype/chapter/chapter.json | 9 +------ .../lms/doctype/lms_course/lms_course.json | 26 +++++++++---------- community/lms/doctype/lms_quiz/lms_quiz.json | 5 ++-- community/lms/widgets/CourseCard.html | 8 ++++-- community/public/css/style.css | 6 +++++ 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/community/lms/doctype/chapter/chapter.json b/community/lms/doctype/chapter/chapter.json index 93a1c09f..8b60641a 100644 --- a/community/lms/doctype/chapter/chapter.json +++ b/community/lms/doctype/chapter/chapter.json @@ -9,7 +9,6 @@ "course", "title", "description", - "locked", "index_" ], "fields": [ @@ -24,12 +23,6 @@ "fieldtype": "Markdown Editor", "label": "Description" }, - { - "default": "0", - "fieldname": "locked", - "fieldtype": "Check", - "label": "Locked" - }, { "fieldname": "course", "fieldtype": "Link", @@ -52,7 +45,7 @@ "link_fieldname": "chapter" } ], - "modified": "2021-05-13 21:05:20.531890", + "modified": "2021-07-23 19:03:57.946831", "modified_by": "Administrator", "module": "LMS", "name": "Chapter", diff --git a/community/lms/doctype/lms_course/lms_course.json b/community/lms/doctype/lms_course/lms_course.json index a654c9e0..d6358fbf 100644 --- a/community/lms/doctype/lms_course/lms_course.json +++ b/community/lms/doctype/lms_course/lms_course.json @@ -21,14 +21,14 @@ "engine": "InnoDB", "field_order": [ "title", - "short_code", "video_link", - "column_break_3", - "is_published", - "disable_self_learning", "image", - "section_break_5", + "column_break_3", "tags", + "is_published", + "upcoming", + "disable_self_learning", + "section_break_5", "short_introduction", "description" ], @@ -53,11 +53,6 @@ "fieldtype": "Check", "label": "Published" }, - { - "fieldname": "short_code", - "fieldtype": "Data", - "label": "Short Code" - }, { "fieldname": "column_break_3", "fieldtype": "Column Break" @@ -92,6 +87,12 @@ "fieldname": "tags", "fieldtype": "Data", "label": "Tags" + }, + { + "default": "0", + "fieldname": "upcoming", + "fieldtype": "Check", + "label": "Is an Upcoming Course" } ], "index_web_pages_for_search": 1, @@ -118,7 +119,7 @@ "link_fieldname": "course" } ], - "modified": "2021-07-09 15:05:05.372430", + "modified": "2021-07-23 19:01:29.765570", "modified_by": "Administrator", "module": "LMS", "name": "LMS Course", @@ -141,6 +142,5 @@ "sort_field": "creation", "sort_order": "DESC", "title_field": "title", - "track_changes": 1, - "track_views": 1 + "track_changes": 1 } \ No newline at end of file diff --git a/community/lms/doctype/lms_quiz/lms_quiz.json b/community/lms/doctype/lms_quiz/lms_quiz.json index 85cd2c42..e76c35a5 100644 --- a/community/lms/doctype/lms_quiz/lms_quiz.json +++ b/community/lms/doctype/lms_quiz/lms_quiz.json @@ -27,12 +27,13 @@ "fieldname": "lesson", "fieldtype": "Link", "label": "Lesson", - "options": "Lesson" + "options": "Lesson", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-23 17:58:57.642873", + "modified": "2021-07-23 19:06:12.551633", "modified_by": "Administrator", "module": "LMS", "name": "LMS Quiz", diff --git a/community/lms/widgets/CourseCard.html b/community/lms/widgets/CourseCard.html index ba0250ee..04a8e47a 100644 --- a/community/lms/widgets/CourseCard.html +++ b/community/lms/widgets/CourseCard.html @@ -53,15 +53,19 @@ {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %} - {% if membership %} + {% if course.upcoming %} +
+ Upcoming Course +
+ + {% elif membership %}
Continue Course
{% else %} -
View Course
diff --git a/community/public/css/style.css b/community/public/css/style.css index 32220a32..397628c5 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -653,6 +653,12 @@ div.custom-checkbox>label>input:checked+img { color: #FFFFFF; } +.is-default { + background-color: white; + border: 1px solid #C8CFD5; + box-sizing: border-box; +} + .course-home-outline { margin-top: 3rem; flex: 1; From 11d070fa0ddbe92ee8c7375fe67575ed5fcb5bb0 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 23 Jul 2021 19:16:36 +0530 Subject: [PATCH 05/10] fix: condition for chapter description --- community/lms/widgets/ChapterTeaser.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html index 9f8afba0..59db20d7 100644 --- a/community/lms/widgets/ChapterTeaser.html +++ b/community/lms/widgets/ChapterTeaser.html @@ -8,9 +8,11 @@
+ {% if chapter.description %}
{{ chapter.description }}
+ {% endif %}
From 40842830a4108d2c7f3c10ca3c1dc9ff07d98dee Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 26 Jul 2021 11:14:32 +0530 Subject: [PATCH 06/10] fix: profile page social icons position --- community/public/css/style.css | 1 - community/www/profiles/profile.html | 52 +++++++++++++++-------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/community/public/css/style.css b/community/public/css/style.css index 397628c5..f2e88b9d 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1192,7 +1192,6 @@ div.custom-checkbox>label>input:checked+img { } .social-icons { - float: right; margin: 16px; } diff --git a/community/www/profiles/profile.html b/community/www/profiles/profile.html index c6e448c7..e07428f3 100644 --- a/community/www/profiles/profile.html +++ b/community/www/profiles/profile.html @@ -20,34 +20,36 @@ {% macro ProfileBanner(member) %}
-
- {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }} -
{{ member.full_name }}
- {% if member.get_authored_courses() | length %} -
Creator
- {% endif %} -
+
+ {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }} +
{{ member.full_name }}
+ {% if member.get_authored_courses() | length %} +
Creator
+ {% endif %} +
- {% if member.profession %} - {{ member.profession }} - {% endif %} -
From 709f0c2274619caf3bc5e82d0e4f2dcb6d8d5b68 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Mon, 26 Jul 2021 11:42:30 +0530 Subject: [PATCH 07/10] fix: profile profession section width --- community/public/css/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/community/public/css/style.css b/community/public/css/style.css index 611e0af0..1a719183 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -1135,7 +1135,7 @@ div.custom-checkbox>label>input:checked+img { line-height: 156%; letter-spacing: -0.0175em; text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.64); - padding: 20px; + padding: 1.5rem; } @media (max-width: 375px) { @@ -1159,7 +1159,7 @@ div.custom-checkbox>label>input:checked+img { height: fit-content; box-shadow: 0px 1px 1px rgb(0 0 0 / 16%); border-radius: 4px; - margin-top: 25px; + margin-top: 2rem; } @media (max-width: 375px) { @@ -1175,6 +1175,7 @@ div.custom-checkbox>label>input:checked+img { left: 174px; font-size: 12px; line-height: 165%; + width: fit-content; } @media (max-width: 500px) { From 33a12c2dec4b57c1f0bd4b7c50ed465005c1f5ed Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 29 Jul 2021 11:54:30 +0530 Subject: [PATCH 08/10] fix: lesson indexing --- community/lms/doctype/chapter/chapter.js | 12 +- community/lms/doctype/chapter/chapter.json | 12 +- community/lms/doctype/chapter/chapter.py | 11 +- community/lms/doctype/chapters/__init__.py | 0 community/lms/doctype/chapters/chapters.json | 32 +++++ community/lms/doctype/chapters/chapters.py | 8 ++ community/lms/doctype/lesson/lesson.json | 10 +- community/lms/doctype/lessons/__init__.py | 0 community/lms/doctype/lessons/lessons.json | 31 ++++ community/lms/doctype/lessons/lessons.py | 8 ++ .../lms/doctype/lms_course/lms_course.js | 12 +- .../lms/doctype/lms_course/lms_course.json | 22 ++- .../lms/doctype/lms_course/lms_course.py | 133 ++++++------------ community/lms/widgets/BatchTabs.html | 67 --------- community/lms/widgets/ChapterTeaser.html | 10 +- community/patches.txt | 1 + .../v0_0/chapter_lesson_index_table.py | 48 +++++++ community/public/css/style.css | 2 +- community/www/batch/discuss.html | 1 - community/www/batch/learn.html | 9 +- community/www/batch/learn.py | 20 +-- community/www/batch/utils.py | 4 +- community/www/courses/course.py | 3 +- 23 files changed, 230 insertions(+), 226 deletions(-) create mode 100644 community/lms/doctype/chapters/__init__.py create mode 100644 community/lms/doctype/chapters/chapters.json create mode 100644 community/lms/doctype/chapters/chapters.py create mode 100644 community/lms/doctype/lessons/__init__.py create mode 100644 community/lms/doctype/lessons/lessons.json create mode 100644 community/lms/doctype/lessons/lessons.py delete mode 100644 community/lms/widgets/BatchTabs.html create mode 100644 community/patches/v0_0/chapter_lesson_index_table.py diff --git a/community/lms/doctype/chapter/chapter.js b/community/lms/doctype/chapter/chapter.js index 9380a622..9b895f9e 100644 --- a/community/lms/doctype/chapter/chapter.js +++ b/community/lms/doctype/chapter/chapter.js @@ -2,7 +2,15 @@ // For license information, please see license.txt frappe.ui.form.on('Chapter', { - // refresh: function(frm) { - // } + onload: function (frm) { + frm.set_query("lesson", "lessons", function () { + return { + filters: { + "chapter": frm.doc.name, + } + }; + }); + } + }); diff --git a/community/lms/doctype/chapter/chapter.json b/community/lms/doctype/chapter/chapter.json index 8b60641a..ca5b3fa5 100644 --- a/community/lms/doctype/chapter/chapter.json +++ b/community/lms/doctype/chapter/chapter.json @@ -9,7 +9,7 @@ "course", "title", "description", - "index_" + "lessons" ], "fields": [ { @@ -31,10 +31,10 @@ "options": "LMS Course" }, { - "default": "1", - "fieldname": "index_", - "fieldtype": "Int", - "label": "Index" + "fieldname": "lessons", + "fieldtype": "Table", + "label": "Lessons", + "options": "Lessons" } ], "index_web_pages_for_search": 1, @@ -45,7 +45,7 @@ "link_fieldname": "chapter" } ], - "modified": "2021-07-23 19:03:57.946831", + "modified": "2021-07-27 16:28:08.667964", "modified_by": "Administrator", "module": "LMS", "name": "Chapter", diff --git a/community/lms/doctype/chapter/chapter.py b/community/lms/doctype/chapter/chapter.py index a563c7e0..8e0f3f82 100644 --- a/community/lms/doctype/chapter/chapter.py +++ b/community/lms/doctype/chapter/chapter.py @@ -5,15 +5,6 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -from ...utils import slugify class Chapter(Document): - def get_lessons(self): - rows = frappe.db.get_all("Lesson", - filters={"chapter": self.name}, - 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) + pass diff --git a/community/lms/doctype/chapters/__init__.py b/community/lms/doctype/chapters/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/doctype/chapters/chapters.json b/community/lms/doctype/chapters/chapters.json new file mode 100644 index 00000000..7ca73ed2 --- /dev/null +++ b/community/lms/doctype/chapters/chapters.json @@ -0,0 +1,32 @@ +{ + "actions": [], + "creation": "2021-07-27 16:25:02.903245", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "chapter" + ], + "fields": [ + { + "fieldname": "chapter", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Chapter", + "options": "Chapter", + "reqd": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2021-07-27 16:25:02.903245", + "modified_by": "Administrator", + "module": "LMS", + "name": "Chapters", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/lms/doctype/chapters/chapters.py b/community/lms/doctype/chapters/chapters.py new file mode 100644 index 00000000..5d07b66e --- /dev/null +++ b/community/lms/doctype/chapters/chapters.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 Chapters(Document): + pass diff --git a/community/lms/doctype/lesson/lesson.json b/community/lms/doctype/lesson/lesson.json index d2671804..5971085d 100644 --- a/community/lms/doctype/lesson/lesson.json +++ b/community/lms/doctype/lesson/lesson.json @@ -10,7 +10,6 @@ "include_in_preview", "column_break_4", "title", - "index_", "index_label", "section_break_6", "body", @@ -31,13 +30,6 @@ "in_list_view": 1, "label": "Title" }, - { - "default": "1", - "fieldname": "index_", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Index" - }, { "fieldname": "body", "fieldtype": "Markdown Editor", @@ -75,7 +67,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-29 13:34:49.077363", + "modified": "2021-07-27 16:28:29.203624", "modified_by": "Administrator", "module": "LMS", "name": "Lesson", diff --git a/community/lms/doctype/lessons/__init__.py b/community/lms/doctype/lessons/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/community/lms/doctype/lessons/lessons.json b/community/lms/doctype/lessons/lessons.json new file mode 100644 index 00000000..d4dfddd2 --- /dev/null +++ b/community/lms/doctype/lessons/lessons.json @@ -0,0 +1,31 @@ +{ + "actions": [], + "creation": "2021-07-27 16:25:48.269536", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "lesson" + ], + "fields": [ + { + "fieldname": "lesson", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Lesson", + "options": "Lesson" + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2021-07-27 16:53:52.732191", + "modified_by": "Administrator", + "module": "LMS", + "name": "Lessons", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/community/lms/doctype/lessons/lessons.py b/community/lms/doctype/lessons/lessons.py new file mode 100644 index 00000000..63370d40 --- /dev/null +++ b/community/lms/doctype/lessons/lessons.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 Lessons(Document): + pass diff --git a/community/lms/doctype/lms_course/lms_course.js b/community/lms/doctype/lms_course/lms_course.js index 195b896a..3bcaaaab 100644 --- a/community/lms/doctype/lms_course/lms_course.js +++ b/community/lms/doctype/lms_course/lms_course.js @@ -2,7 +2,15 @@ // For license information, please see license.txt frappe.ui.form.on('LMS Course', { - // refresh: function(frm) { - // } + onload: function (frm) { + frm.set_query("chapter", "chapters", function () { + return { + filters: { + "course": frm.doc.name, + } + }; + }); + } + }); diff --git a/community/lms/doctype/lms_course/lms_course.json b/community/lms/doctype/lms_course/lms_course.json index d6358fbf..cf2521b2 100644 --- a/community/lms/doctype/lms_course/lms_course.json +++ b/community/lms/doctype/lms_course/lms_course.json @@ -1,11 +1,5 @@ { "actions": [ - { - "action": "community.lms.doctype.lms_course.lms_course.reindex_lessons", - "action_type": "Server Action", - "group": "Reindex", - "label": "Reindex Lessons" - }, { "action": "community.lms.doctype.lms_course.lms_course.reindex_exercises", "action_type": "Server Action", @@ -30,7 +24,8 @@ "disable_self_learning", "section_break_5", "short_introduction", - "description" + "description", + "chapters" ], "fields": [ { @@ -93,6 +88,12 @@ "fieldname": "upcoming", "fieldtype": "Check", "label": "Is an Upcoming Course" + }, + { + "fieldname": "chapters", + "fieldtype": "Table", + "label": "Chapters", + "options": "Chapters" } ], "index_web_pages_for_search": 1, @@ -112,14 +113,9 @@ "group": "Mentors", "link_doctype": "LMS Course Mentor Mapping", "link_fieldname": "course" - }, - { - "group": "Mentors", - "link_doctype": "LMS Mentor Request", - "link_fieldname": "course" } ], - "modified": "2021-07-23 19:01:29.765570", + "modified": "2021-07-28 19:01:50.677445", "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 73b1d5e3..5ec7a17f 100644 --- a/community/lms/doctype/lms_course/lms_course.py +++ b/community/lms/doctype/lms_course/lms_course.py @@ -9,8 +9,10 @@ import json from ...utils import slugify from community.query import find, find_all from frappe.utils import flt, cint +from ...utils import slugify class LMSCourse(Document): + @staticmethod def find(name): """Returns the course with specified name. @@ -112,17 +114,42 @@ class LMSCourse(Document): def get_chapters(self): """Returns all chapters of this course. """ - # TODO: chapters should have a way to specify the order - return find_all("Chapter", course=self.name, order_by="index_") + chapters = [] + for row in self.chapters: + chapter_details = frappe.db.get_value("Chapter", row.chapter, + ["name", "title", "description"], + as_dict=True) + chapter_details.idx = row.idx + chapters.append(chapter_details) + return chapters - def get_lessons(self): - """ Returns all lessons of this course """ + def get_lessons(self, chapter=None): + """ If chapter is passed, returns lessons of only that chapter. + Else returns lessons of all chapters of the course """ lessons = [] - chapters = self.get_chapters() - for chapter in chapters: - lessons.append(frappe.get_all("Lesson", {"chapter": chapter.name})) + + if chapter: + return self.get_lesson_details(chapter) + + for chapter in self.get_chapters(): + lesson = self.get_lesson_details(chapter) + lessons += lesson + return lessons + def get_lesson_details(self, chapter): + lessons = [] + lesson_list = frappe.get_all("Lessons", {"parent": chapter.name}, + ["lesson", "idx"], order_by="idx") + for row in lesson_list: + lesson_details = frappe.get_doc("Lesson", row.lesson) + lesson_details.number = flt("{}.{}".format(chapter.idx, row.idx)) + lessons.append(lesson_details) + return lessons + + def get_slugified_chapter_title(self, chapter): + return slugify(chapter) + def get_course_progress(self): """ Returns the course progress of the session user """ lesson_count = len(self.get_lessons()) @@ -160,38 +187,12 @@ class LMSCourse(Document): visibility="Public") return batches - def get_chapter(self, index): - return find("Chapter", course=self.name, index_=index) - - def get_lesson(self, chapter_index, lesson_index): - chapter_name = frappe.get_value( - "Chapter", - {"course": self.name, "index_": chapter_index}, - "name") - lesson_name = chapter_name and frappe.get_value( - "Lesson", - {"chapter": chapter_name, "index_": lesson_index}, - "name") - return lesson_name and frappe.get_doc("Lesson", lesson_name) - def get_lesson_index(self, lesson_name): """Returns the {chapter_index}.{lesson_index} for the lesson. """ - lesson = frappe.get_doc("Lesson", lesson_name) - chapter = frappe.get_doc("Chapter", lesson.chapter) - return f"{chapter.index_}.{lesson.index_}" - - def reindex_lessons(self): - for i, c in enumerate(self.get_chapters(), start=1): - c.index_ = i - c.save() - self._reindex_lessons_in_chapter(c) - - def _reindex_lessons_in_chapter(self, c): - for i, lesson in enumerate(c.get_lessons(), start=1): - lesson.index = i - lesson.index_label = f"{c.index_}.{i}" - lesson.save() + lesson = frappe.db.get_value("Lessons", {"lesson": lesson_name}, ["idx", "parent"], as_dict=True) + chapter = frappe.db.get_value("Chapters", {"chapter": lesson.parent}, ["idx"], as_dict=True) + return f"{chapter.idx}.{lesson.idx}" def reindex_exercises(self): for i, c in enumerate(self.get_chapters(), start=1): @@ -202,7 +203,7 @@ class LMSCourse(Document): def _reindex_exercises_in_chapter(self, c): i = 1 - for lesson in c.get_lessons(): + for lesson in self.get_lessons(c): for exercise in lesson.get_exercises(): exercise.index_ = i exercise.index_label = f"{c.index_}.{i}" @@ -302,9 +303,6 @@ class LMSCourse(Document): return None return sum(ratings)/len(ratings) - def get_outline(self): - return CourseOutline(self) - def get_progress(self, lesson): return frappe.db.get_value("LMS Course Progress", { @@ -314,55 +312,14 @@ class LMSCourse(Document): }, ["status"]) -class CourseOutline: - def __init__(self, course): - self.course = course - self.chapters = self.get_chapters() - self.lessons = self.get_lessons() - - def get_next(self, current): + def get_neighbours(self, current, lessons): current = flt(current) - numbers = sorted(lesson['number'] for lesson in self.lessons) - try: - index = numbers.index(current) - return numbers[index+1] - except IndexError: - return None - - def get_prev(self, current): - current = flt(current) - numbers = sorted(lesson['number'] for lesson in self.lessons) - try: - index = numbers.index(current) - if index == 0: - return None - return numbers[index-1] - except IndexError: - return None - - def get_chapters(self): - return frappe.db.get_all("Chapter", - filters={"course": self.course.name}, - fields=["name", "title", "index_"], - order_by="index_") - - def get_lessons(self): - chapters = [c['name'] for c in self.chapters] - lessons = frappe.db.get_all("Lesson", - filters={"chapter": ["IN", chapters]}, - fields=["name", "title", "chapter", "index_"]) - - chapter_numbers = {c['name']: c['index_'] for c in self.chapters} - for lesson in lessons: - lesson['number'] = flt("{}.{}".format(chapter_numbers[lesson['chapter']], lesson['index_'])) - return lessons - -@frappe.whitelist() -def reindex_lessons(doc): - course_data = json.loads(doc) - course = frappe.get_doc("LMS Course", course_data['name']) - course.reindex_lessons() - frappe.msgprint("All lessons in this course have been re-indexed.") + numbers = sorted(lesson.number for lesson in lessons) + index = numbers.index(current) + return { + "prev": numbers[index-1] if index-1 >= 0 else None, + "next": numbers[index+1] if index+1 < len(numbers) else None + } @frappe.whitelist() def reindex_exercises(doc): diff --git a/community/lms/widgets/BatchTabs.html b/community/lms/widgets/BatchTabs.html deleted file mode 100644 index 07c4c71a..00000000 --- a/community/lms/widgets/BatchTabs.html +++ /dev/null @@ -1,67 +0,0 @@ -
- Courses /{% if course.is_mentor(frappe.session.user) %} {{ course.title }} {% else %} - {{ course.title }} {% endif %} - {% set all_memberships = course.get_all_memberships(frappe.session.user) %} - {% if membership and membership.batch and all_memberships | length > 1 %} - -
- {% for data in all_memberships %} - {% if data.batch != membership.batch %} - {{ data.batch_title }} - {% endif %} - {% endfor %} -
- {% endif %} -
-{% if not membership %} -{% set display_class = "hide" %} -{% else %} -{% set display_class = "" %} -{% endif %} - -
    -
  • - Home -
    • -
  • - {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and membership.current_lesson - else '1.1' %} - Lessons -
    • - -
  • - Members -
    • - - - {% if membership and membership.batch and course.is_mentor(frappe.session.user) %} -
  • - Progress -
    • - {% endif %} -
-{% block script %} - -{% endblock %} diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html index 59db20d7..1f6ce0b2 100644 --- a/community/lms/widgets/ChapterTeaser.html +++ b/community/lms/widgets/ChapterTeaser.html @@ -1,12 +1,12 @@
- -
+
{% if chapter.description %}
@@ -16,13 +16,13 @@
- {% for lesson in chapter.get_lessons() %} + {% for lesson in course.get_lessons(chapter) %} -
+
{% if membership or lesson.include_in_preview %} {{ lesson.title }} diff --git a/community/patches.txt b/community/patches.txt index d7889b69..6aec5e7b 100644 --- a/community/patches.txt +++ b/community/patches.txt @@ -6,3 +6,4 @@ community.patches.replace_member_with_user_in_batch_membership community.patches.replace_member_with_user_in_course_mentor_mapping community.patches.replace_member_with_user_in_lms_message community.patches.replace_member_with_user_in_mentor_request +community.patches.v0_0.chapter_lesson_index_table diff --git a/community/patches/v0_0/chapter_lesson_index_table.py b/community/patches/v0_0/chapter_lesson_index_table.py new file mode 100644 index 00000000..4202d307 --- /dev/null +++ b/community/patches/v0_0/chapter_lesson_index_table.py @@ -0,0 +1,48 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "lms_course") + frappe.reload_doc("lms", "doctype", "chapter") + frappe.reload_doc("lms", "doctype", "lesson") + + update_chapters() + update_lessons() + +def update_chapters(): + courses = frappe.get_all("LMS Course", pluck="name") + for course in courses: + course_details = frappe.get_doc("LMS Course", course) + chapters = frappe.get_all("Chapter", + { + "course": course + }, + ["name"], + order_by= "index_" + ) + for chapter in chapters: + course_details.append("chapters", + { + "chapter": chapter.name + }) + + course_details.save() + +def update_lessons(): + chapters = frappe.get_all("Chapter", pluck="name") + for chapter in chapters: + chapter_details = frappe.get_doc("Chapter", chapter) + lessons = frappe.get_all("Lesson", + { + "chapter": chapter + }, + ["name"], + order_by= "index_" + ) + for lesson in lessons: + chapter_details.append("lessons", + { + "lesson": lesson.name + }) + + chapter_details.save() diff --git a/community/public/css/style.css b/community/public/css/style.css index 1a719183..b5eba59a 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -757,7 +757,7 @@ div.custom-checkbox>label>input:checked+img { } .lesson-links { - display: block; + display: flex; padding: 0 1rem; margin-bottom: .25rem; color: inherit; diff --git a/community/www/batch/discuss.html b/community/www/batch/discuss.html index 75a6963f..10d35ea8 100644 --- a/community/www/batch/discuss.html +++ b/community/www/batch/discuss.html @@ -11,7 +11,6 @@ {% block content %}
- {{ widgets.BatchTabs(course=course, membership=membership) }}
{{ widgets.BatchHeader(batch_name=batch.title, member_count=member_count)}}
    diff --git a/community/www/batch/learn.html b/community/www/batch/learn.html index 73f8f844..8cd1a7a7 100644 --- a/community/www/batch/learn.html +++ b/community/www/batch/learn.html @@ -30,7 +30,7 @@
    {{ LessonContent(lesson) }} {% if membership %} - {{ pagination(prev_chap, prev_url, next_chap, next_url) }} + {{ pagination(prev_url, next_url) }} {% endif %}
@@ -49,16 +49,15 @@ {% if membership or lesson.include_in_preview %}
{{ lesson.render_html() }}
{% else %} -
- This lesson is not available for Preview. Please join the course to access this lesson. - Checkout Course Details. +
+ This lesson is not available for Preview. Please join the course to access this lesson. Checkout Course Details.
{% endif %}
{% endmacro %} -{% macro pagination(prev_chap, prev_url, next_chap, next_url) %} +{% macro pagination(prev_url, next_url) %}
diff --git a/community/www/batch/learn.py b/community/www/batch/learn.py index 66ab5be5..7cadf7a1 100644 --- a/community/www/batch/learn.py +++ b/community/www/batch/learn.py @@ -12,7 +12,6 @@ def get_context(context): lesson_index = frappe.form_dict.get("lesson") lesson_number = f"{chapter_index}.{lesson_index}" - course_name = context.course.name if not chapter_index or not lesson_index: if context.batch: index_ = get_lesson_index(context.course, context.batch, frappe.session.user) or "1.1" @@ -21,20 +20,12 @@ def get_context(context): frappe.local.flags.redirect_location = context.course.get_learn_url(index_) + context.course.query_parameter raise frappe.Redirect - context.lesson = context.course.get_lesson(chapter_index, lesson_index) - context.lesson_index = lesson_index - context.chapter_index = chapter_index - - outline = context.course.get_outline() - prev_ = outline.get_prev(lesson_number) - next_ = outline.get_next(lesson_number) - context.prev_chap = get_chapter_title(course_name, prev_) - context.next_chap = get_chapter_title(course_name, next_) - context.next_url = context.course.get_learn_url(next_) and context.course.get_learn_url(next_) + context.course.query_parameter - context.prev_url = context.course.get_learn_url(prev_) and context.course.get_learn_url(prev_) + context.course.query_parameter + context.lesson = list(filter(lambda x: cstr(x.number) == lesson_number, context.lessons))[0] + neighbours = context.course.get_neighbours(lesson_number, context.lessons) + context.next_url = get_learn_url(neighbours["next"], context.course) + context.prev_url = get_learn_url(neighbours["prev"], context.course) context.page_extensions = get_page_extensions() - context.page_context = { "course": context.course.name, "batch": context.get("batch") and context.batch.name, @@ -42,6 +33,9 @@ def get_context(context): "is_member": context.membership is not None } +def get_learn_url(lesson_number, course): + return course.get_learn_url(lesson_number) and course.get_learn_url(lesson_number) + course.query_parameter + def get_chapter_title(course_name, lesson_number): if not lesson_number: return diff --git a/community/www/batch/utils.py b/community/www/batch/utils.py index e8c99c74..b0e78da1 100644 --- a/community/www/batch/utils.py +++ b/community/www/batch/utils.py @@ -10,12 +10,12 @@ def get_common_context(context): except KeyError: batch_name = None - course = Course.find(course_name) + course = frappe.get_doc("LMS Course", course_name) if not course: context.template = "www/404.html" return context.course = course - + context.lessons = course.get_lessons() membership = course.get_membership(frappe.session.user, batch_name) context.membership = membership if membership: diff --git a/community/www/courses/course.py b/community/www/courses/course.py index 0248fead..5c102809 100644 --- a/community/www/courses/course.py +++ b/community/www/courses/course.py @@ -1,5 +1,4 @@ import frappe -from community.lms.models import Course def get_context(context): context.no_cache = 1 @@ -10,7 +9,7 @@ def get_context(context): frappe.local.flags.redirect_location = "/courses" raise frappe.Redirect - course = Course.find(course_name) + course = frappe.get_doc("LMS Course", course_name) if course is None: frappe.local.flags.redirect_location = "/courses" raise frappe.Redirect From a667643681966bf0968e92bd8aaeb4cc350d1cd8 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 29 Jul 2021 13:43:31 +0530 Subject: [PATCH 09/10] fix: chapter lesson patch --- community/patches/v0_0/chapter_lesson_index_table.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/community/patches/v0_0/chapter_lesson_index_table.py b/community/patches/v0_0/chapter_lesson_index_table.py index 4202d307..cbb489fb 100644 --- a/community/patches/v0_0/chapter_lesson_index_table.py +++ b/community/patches/v0_0/chapter_lesson_index_table.py @@ -5,6 +5,8 @@ def execute(): frappe.reload_doc("lms", "doctype", "lms_course") frappe.reload_doc("lms", "doctype", "chapter") frappe.reload_doc("lms", "doctype", "lesson") + frappe.reload_doc("lms", "doctype", "lessons") + frappe.reload_doc("lms", "doctype", "chapters") update_chapters() update_lessons() From d14b4f55a6b90617430cd3fa0596f82371a55a4c Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 30 Jul 2021 16:24:56 +0530 Subject: [PATCH 10/10] fix: default image, meta, reviews, lesson headers --- community/hooks.py | 1 - community/lms/widgets/CourseCard.html | 6 ++++- community/lms/widgets/Reviews.html | 26 +++++++++++--------- community/public/css/style.css | 34 ++++++++++++++++++++++++++- community/www/batch/learn.html | 9 ++----- community/www/batch/learn.py | 7 ++++++ community/www/courses/course.html | 8 ++++--- community/www/courses/course.py | 6 +++++ community/www/courses/index.html | 2 -- community/www/courses/index.py | 6 +++++ 10 files changed, 79 insertions(+), 26 deletions(-) diff --git a/community/hooks.py b/community/hooks.py index 691d75ee..2f9caf24 100644 --- a/community/hooks.py +++ b/community/hooks.py @@ -136,7 +136,6 @@ primary_rules = [ {"from_route": "/courses//", "to_route": "courses/topic"}, {"from_route": "/hackathons/", "to_route": "hackathons/hackathon"}, {"from_route": "/hackathons//", "to_route": "hackathons/project"}, - {"from_route": "/dashboard", "to_route": ""}, {"from_route": "/add-a-new-batch", "to_route": "add-a-new-batch"}, {"from_route": "/courses//home", "to_route": "batch/home"}, {"from_route": "/courses//learn", "to_route": "batch/learn"}, diff --git a/community/lms/widgets/CourseCard.html b/community/lms/widgets/CourseCard.html index 04a8e47a..3599604a 100644 --- a/community/lms/widgets/CourseCard.html +++ b/community/lms/widgets/CourseCard.html @@ -1,10 +1,14 @@
-
+
{% for tag in course.get_tags() %}
{{ tag }}
{% endfor %}
+ {% if not course.image %} +
{{ course.title[0] }}
+ {% endif %}
diff --git a/community/lms/widgets/Reviews.html b/community/lms/widgets/Reviews.html index 59f57fe3..25a99f7f 100644 --- a/community/lms/widgets/Reviews.html +++ b/community/lms/widgets/Reviews.html @@ -1,15 +1,18 @@ -{% if course.get_reviews() | length %}
-
-
Student Review
+ {% set reviews = course.get_reviews() %} + {% if reviews | length or course.is_eligible_to_review(membership) %} +
+ Reviews {% if course.is_eligible_to_review(membership) %} - - Provide your Feedback - + + Write a review + {% endif %}
+ {% endif %} + {% if reviews | length %}
- {% for review in course.get_reviews() %} + {% for review in reviews %}
{{ review.review }}
@@ -30,6 +33,7 @@
{% endfor %}
+ {% endif %}
-
Submit
+
+ Submit
-{% endif %} diff --git a/community/public/css/style.css b/community/public/css/style.css index b5eba59a..b2b98732 100644 --- a/community/public/css/style.css +++ b/community/public/css/style.css @@ -234,6 +234,22 @@ input[type=checkbox] { background-repeat: no-repeat; } +.default-image { + background-color: var(--avatar-frame-bg); + color: var(--avatar-frame-color); + display: flex; + flex-direction: column; +} + +.default-image-text { + display: flex; + flex: 1; + align-self: center; + justify-content: normal; + font-size: 7rem; + font-weight: bold; +} + .course-tags { display: flex; position: relative; @@ -601,7 +617,7 @@ div.custom-checkbox>label>input:checked+img { } .button { - box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.13), 0px 0px 0.5px rgba(0, 0, 0, 0.5); + box-shadow: var(--btn-shadow); border-radius: 6px; cursor: pointer; display: flex; @@ -1271,3 +1287,19 @@ pre { width: 100%; overflow-x: auto; } + +.markdown-source h1 { + font-size: 1.3rem; +} + +.markdown-source h2 { + font-size: 1.2rem; +} + +.markdown-source h3 { + font-size: 1.1rem; +} + +.markdown-source h4 { + font-size: 1rem; +} diff --git a/community/www/batch/learn.html b/community/www/batch/learn.html index 8cd1a7a7..4135ab0e 100644 --- a/community/www/batch/learn.html +++ b/community/www/batch/learn.html @@ -1,13 +1,8 @@ {% extends "templates/base.html" %} {% from "www/macros/livecode.html" import LiveCodeEditorJS, LiveCodeEditor with context %} -{% block title %}{{ lesson.title }}{% endblock %} +{% block title %} {{ lesson.title }} - {{ course.title }} {% endblock %} {% block head_include %} - - - - @@ -47,7 +42,7 @@
{% if membership or lesson.include_in_preview %} -
{{ lesson.render_html() }}
+
{{ lesson.render_html() }}
{% else %}
This lesson is not available for Preview. Please join the course to access this lesson. Checkout Course Details. diff --git a/community/www/batch/learn.py b/community/www/batch/learn.py index 7cadf7a1..54e96da1 100644 --- a/community/www/batch/learn.py +++ b/community/www/batch/learn.py @@ -25,6 +25,13 @@ def get_context(context): context.next_url = get_learn_url(neighbours["next"], context.course) context.prev_url = get_learn_url(neighbours["prev"], context.course) + meta_info = context.lesson.title + " - " + context.course.title + context.metatags = { + "title": meta_info, + "keywords": meta_info, + "description": meta_info + } + context.page_extensions = get_page_extensions() context.page_context = { "course": context.course.name, diff --git a/community/www/courses/course.html b/community/www/courses/course.html index 78391792..b3d3c5e3 100644 --- a/community/www/courses/course.html +++ b/community/www/courses/course.html @@ -3,8 +3,6 @@ {% block title %}{{ course.title }} {% endblock %} {% block head_include %} - - {% endblock %} {% block content %} @@ -24,12 +22,16 @@ {% macro CourseCardWide(course) %}
-
+
{% for tag in course.get_tags() %}
{{ tag }}
{% endfor %}
+ {% if not course.image %} +
{{ course.title[0] }}
+ {% endif %}
diff --git a/community/www/courses/course.py b/community/www/courses/course.py index 5c102809..f0fb0990 100644 --- a/community/www/courses/course.py +++ b/community/www/courses/course.py @@ -18,3 +18,9 @@ def get_context(context): membership = course.get_membership(frappe.session.user) context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" context.membership = membership + context.metatags = { + "title": course.title, + "image": course.image, + "description": course.short_introduction, + "keywords": course.title + } diff --git a/community/www/courses/index.html b/community/www/courses/index.html index a41343c3..058dc87f 100644 --- a/community/www/courses/index.html +++ b/community/www/courses/index.html @@ -2,8 +2,6 @@ {% from "www/hackathons/macros/card.html" import null_card %} {% block title %}{{ 'Courses' }}{% endblock %} {% block head_include %} - - {% endblock %} diff --git a/community/www/courses/index.py b/community/www/courses/index.py index f1027177..84343481 100644 --- a/community/www/courses/index.py +++ b/community/www/courses/index.py @@ -3,6 +3,12 @@ import frappe def get_context(context): context.no_cache = 1 context.courses = get_courses() + context.metatags = { + "title": "All Courses", + "image": frappe.db.get_single_value("Website Settings", "banner_image"), + "description": "This page lists all the courses published on our website", + "keywords": "All Courses, Courses, Learn" + } def get_courses(): course_names = frappe.get_all("LMS Course", filters={"is_published": True}, pluck="name")