From 7a7bc3e0db3e77690809b37650e97b41059180ed Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 29 Aug 2022 09:21:45 +0530
Subject: [PATCH 01/41] fix: removed desk access from course instructor role

---
 lms/patches.txt                                   | 2 +-
 lms/patches/v0_0/create_course_instructor_role.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/patches.txt b/lms/patches.txt
index 6fe8bbf7..f8a1d28a 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -30,4 +30,4 @@ lms.patches.v0_0.move_certification_to_certificate
 lms.patches.v0_0.quiz_submission_member
 lms.patches.v0_0.delete_old_module_docs #08-07-2022
 lms.patches.v0_0.delete_course_web_forms #21-08-2022
-lms.patches.v0_0.create_course_instructor_role
+lms.patches.v0_0.create_course_instructor_role #29-08-2022
diff --git a/lms/patches/v0_0/create_course_instructor_role.py b/lms/patches/v0_0/create_course_instructor_role.py
index 25f5bd91..3653fbdd 100644
--- a/lms/patches/v0_0/create_course_instructor_role.py
+++ b/lms/patches/v0_0/create_course_instructor_role.py
@@ -6,5 +6,6 @@ def execute():
             "doctype": "Role",
             "role_name": "Course Instructor",
             "home_page": "/dashboard",
+            "desk_access": 0
         })
         role.save(ignore_permissions=True)

From b3a9274cd3e5533c17725fe8ec026848fe2e5b6e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 30 Aug 2022 12:50:26 +0530
Subject: [PATCH 02/41] fix: minor UI

---
 .../courses_enrolled/courses_enrolled.html    |  4 +-
 lms/public/js/common_functions.js             |  2 +-
 lms/www/batch/join.html                       | 40 +++++++++----------
 lms/www/batch/learn.html                      | 35 +++++++++-------
 lms/www/dashboard/index.html                  |  5 ++-
 5 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index f254a3ef..b165aa70 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,14 +1,16 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
+
 {% if enrolled | length %}
 <div class="cards-parent">
   {% for course in enrolled %}
   {{ widgets.CourseCard(course=course) }}
   {% endfor %}
 </div>
+
 {% else %}
 {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
 <div class="empty-state">
-  <div class="empty-state-text">
+  <div class="empty-state-text text-left">
     <div class="text-center">
       <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
       <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js
index d09baca3..17ace20d 100644
--- a/lms/public/js/common_functions.js
+++ b/lms/public/js/common_functions.js
@@ -67,7 +67,7 @@ const join_course = (e) => {
                 }, 3);
                 setTimeout(function () {
                     window.location.href = `/courses/${course}/learn/1.1`;
-                }, 3000);
+                }, 1000);
             }
         }
     })
diff --git a/lms/www/batch/join.html b/lms/www/batch/join.html
index ce46d291..824cf13d 100644
--- a/lms/www/batch/join.html
+++ b/lms/www/batch/join.html
@@ -48,25 +48,25 @@
 <script>
 frappe.ready(() => {
     $("#confirm").click((e) => {
-      frappe.call({
-        "method": "lms.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
-        "args": {
-          "batch": {{ batch.name }},
-          "course": {{ batch.course }}
-        },
-        "callback": (data) => {
-          if (data.message == "OK") {
-            frappe.msgprint({
-              message: __("You are now a member of this batch!"),
-              clear: true
-            });
-            setTimeout(function () {
-              window.location.href = "/courses/{{ batch.course }}/home";
-            }, 2000);
-          }
-        }
-      })
-    })
-  })
+        frappe.call({
+            "method": "lms.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
+            "args": {
+                "batch": {{ batch.name }},
+                "course": {{ batch.course }}
+            },
+            "callback": (data) => {
+            if (data.message == "OK") {
+                frappe.msgprint({
+                    message: __("You are now a member of this batch!"),
+                    clear: true
+                });
+                setTimeout(function () {
+                    window.location.href = "/courses/{{ batch.course }}/home";
+                }, 1000);
+            }
+            }
+        });
+    });
+});
 </script>
 {% endblock %}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index b364ca79..c3fb460a 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -67,7 +67,7 @@
             data-index="{{ lesson_index }}" data-course="{{ course.name }}" data-chapter="{{ chapter }}"
             {% if lesson.name %} data-lesson="{{ lesson.name }}" {% endif %}
             >{% if lesson.title %}{{ lesson.title }}{% endif %}</div>
-        <span class="lesson-progress {{ hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
+        <span class="indicator-pill green {{ hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
 
         <!-- Edit Button -->
         {% if is_instructor and not lesson.edit_mode %}
@@ -119,9 +119,13 @@
             {% endif %}
 
         {% else %}
+        {% set course_link = "<a class='join-batch' data-course=" + course.name | urlencode + " href=''>" + _('here') +  "</a>" %}
             <div class="">
-                <div class="btn btn-primary pull-right join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
-                <div class=""> {{ _("This lesson is not available for preview. Please join the course to access it.") }} </div>
+                <div>
+                    {{ _("This lesson is not available for preview.
+                    Please join the course to access it.
+                    Click {0} to join the course.").format(course_link) }}
+                </div>
             </div>
         {% endif %}
     </div>
@@ -140,14 +144,14 @@
     <div>
         {% if prev_url %}
         <a class="btn btn-secondary dark-links prev" href="{{ prev_url }}">
-            <img class="mr-2" src="/assets/lms/icons/left-arrow.svg">
-            {{ _("Prev") }}
+            {{ _("Previous") }}
         </a>
         {% endif %}
     </div>
 
-    {% if not is_mentor(course.name, frappe.session.user) and membership %}
     {% set progress = get_progress(course.name, lesson.name) %}
+
+    {% if not is_mentor(course.name, frappe.session.user) and membership %}
     <div class="custom-checkbox {% if progress == 'Complete' %} hide {% endif %}">
         <label class="quiz-label">
             <input class="mark-progress" type="checkbox" checked>
@@ -155,18 +159,19 @@
             <span class="small">{{ _("Mark as complete on moving to the next lesson") }}</span>
         </label>
     </div>
-
-    <div class="btn btn-default mark-progress {{ progress }} {% if progress == 'Incomplete' or progress == None %} hide {% endif %}"
-        data-progress="Incomplete">
-        {{ _("Mark as Incomplete") }}
-    </div>
     {% endif %}
 
     <div>
-        <a class="btn btn-primary next {% if not next_url and (membership.progress|int == 100  or is_instructor)  %} hide {% endif %}"
-        {% if next_url %} data-href="{{ next_url }}" {% endif %} href="">
-        {% if next_url %} {{ _("Next") }} {% else %} {{ _("Mark as Complete") }} {% endif %}
-        <img class="ml-2" src="/assets/lms/icons/side-arrow-white.svg">
+        {% if not is_mentor(course.name, frappe.session.user) and membership %}
+        <div class="btn btn-default mark-progress {{ progress }} {% if progress == 'Incomplete' or progress == None %} hide {% endif %}"
+            data-progress="Incomplete">
+            {{ _("Mark as Incomplete") }}
+        </div>
+        {% endif %}
+
+        <a class="btn btn-primary next ml-2 {% if not next_url and (membership.progress|int == 100  or is_instructor)  %} hide {% endif %}"
+            {% if next_url %} data-href="{{ next_url }}" {% endif %} href="">
+            {% if next_url %} {{ _("Next") }} {% else %} {{ _("Mark as Complete") }} {% endif %}
         </a>
     </div>
 
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 1f6e5855..a24a2977 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -1,5 +1,6 @@
 {% extends "templates/base.html" %}
-{% block title %}{{ _("Dashboard")}}
+{% block title %}
+{{ _("Dashboard")}}
 {% endblock %}
 
 
@@ -20,6 +21,7 @@
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
             </li>
+
             {% if show_creators_section %}
             <li class="nav-item">
                 <a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}
@@ -34,6 +36,7 @@
             <div class="tab-pane active" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
                 {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
             </div>
+
             {% if show_creators_section %}
             <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
                 {% include "lms/templates/courses_created.html" %}

From 6f4677b36bed5c1ad6fe8ddd0b477610cbe1bed5 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 31 Aug 2022 15:34:18 +0530
Subject: [PATCH 03/41] fix: ui issues

---
 lms/public/css/style.css      |  10 +-
 lms/www/batch/learn.html      |  17 +-
 lms/www/batch/learn.js        |   9 +-
 lms/www/batch/quiz.html       |  15 +-
 lms/www/batch/quiz.js         |   7 +-
 lms/www/batch/quiz_list.html  |  41 ++-
 lms/www/courses/course.html   |   4 +-
 lms/www/courses/course.js     |   1 +
 lms/www/dashboard/index.html  |   4 +-
 lms/www/profiles/profile.html | 492 +++++++++++++++++++---------------
 10 files changed, 362 insertions(+), 238 deletions(-)

diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index a69010d9..69633fdb 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -661,7 +661,7 @@ input[type=checkbox] {
   font-size: var(--text-sm);
   display: flex;
   flex-direction: column;
-  margin-bottom: 3rem;
+  margin-bottom: 2.5rem;
   padding-left: 200px;
   padding-right: 1rem;
   box-shadow: var(--shadow-sm);
@@ -764,7 +764,7 @@ input[type=checkbox] {
 }
 
 .education-details {
-  margin-top: 3rem;
+  margin-top: 1.25rem;
 }
 
 .bold-title {
@@ -1661,3 +1661,9 @@ li {
 .help-article {
     font-size: var(--text-base);
 }
+
+.quiz-row {
+    position: relative;
+    color: var(--text-color);
+    cursor: pointer;
+}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index c3fb460a..12051a81 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -223,7 +223,7 @@
 <!-- Help Article -->
 {% macro HelpArticle() %}
 <div class="help-article">
-    <h3> {{ _("Help Article") }} </h3>
+    <h3> {{ _("Embed Components") }} </h3>
     <p>
         {{ _("You can add additional content to the lesson using a special syntax. The table below mentions
             all types of dynamic content that you can add to the lessons and the syntax for the same.") }}
@@ -239,11 +239,11 @@
                 {{ _("YouTube Video") }}
             </td>
             <td>
-                {% raw %} {{ YouTubeVideo("embed_src") }} {% endraw %}
+                {% raw %} {{ YouTubeVideo('Video ID') }} {% endraw %}
             </td>
             <td>
                 <span>
-                    {{ _("Copy and paste the syntax in the editor. Replace 'embed_src' with the embed source
+                    {{ _("Copy and paste the syntax in the editor. Replace 'Video ID' with the embed source
                         that YouTube provides. To get the source, follow the steps mentioned below.") }}
                 </span>
                 <ul class="p-4">
@@ -265,11 +265,12 @@
                 {{ _("Quiz") }}
             </td>
             <td>
-                {% raw %} {{ Quiz("lms_quiz_id") }} {% endraw %}
+                {% raw %} {{ Quiz('Quiz ID') }} {% endraw %}
             </td>
             <td>
                 {% set quiz_link = "<a href='/quizzes'> Quiz List </a>" %}
-                {{ _("Copy and paste the syntax in the editor. Replace 'lms_quiz_id' with the ID of the Quiz. You can get the ID of the quiz from the {0}.").format(quiz_link) }}
+                {{ _("Copy and paste the syntax in the editor. Replace 'Quiz ID' with the Id of the Quiz.
+                You can get the Id of the quiz from the {0}.").format(quiz_link) }}
             </td>
         </tr>
     </table>
@@ -279,8 +280,10 @@
 
 <!-- Discussions Component -->
 {% macro Discussions() %}
-{% set topics_count = frappe.db.count("Discussion Topic",
-    {"reference_doctype": "Course Lesson", "reference_docname": lesson.name}) %}
+{% set topics_count = frappe.db.count("Discussion Topic", {
+    "reference_doctype": "Course Lesson",
+    "reference_docname": lesson.name
+}) %}
 {% set is_instructor = frappe.session.user == course.instructor %}
 {% set condition = is_instructor if is_instructor else membership %}
 {% set doctype, docname = _("Course Lesson"), lesson.name %}
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 2468b741..0fe52cd6 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -66,7 +66,7 @@ frappe.ready(() => {
 
     $(".btn-back").click((e) => {
         window.location.href = window.location.href.split("?")[0];
-    })
+    });
 
     $(document).on("click", ".copy-link", (e) => {
         frappe.utils.copy_to_clipboard($(e.currentTarget).data("link"));
@@ -540,6 +540,11 @@ const build_attachment_table = (file_doc) => {
 
 
 const make_editor = () => {
+    let comment =  `<!--
+    {{ YouTubeVideo('Video Id') }}
+    {{ Quiz('Quiz Id') }}
+-->`
+
     this.code_field_group = new frappe.ui.FieldGroup({
         fields: [
             {
@@ -549,7 +554,7 @@ const make_editor = () => {
                 wrap: true,
                 max_lines: Infinity,
                 min_lines: 20,
-                default: $("#body").data("body"),
+                default: $("#body").data("body") || comment,
                 depends_on: 'eval:doc.type=="Markdown"',
             }
         ],
diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 97f8a435..28a66e4c 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -52,7 +52,7 @@
             <div class="d-flex justify-content-between option-{{ num }}">
                 <div contenteditable="true" data-placeholder="{{ _('Option') }}"
                     class="option-input">{% if option %}{{ option }}{% endif %}</div>
-                <div contenteditable="true" data-placeholder="{{ _('Explanation') }}"
+                <div contenteditable="true" data-placeholder="{{ _('Explain the option') }}"
                     class="option-input">{% if explanation %}{{ explanation }}{% endif %}</div>
                 <div class="option-checkbox">
                     <input type="checkbox" {% if question['is_correct_' + num] %} checked {% endif %}>
@@ -68,8 +68,17 @@
 
     <div class="mt-4">
         <button class="btn btn-secondary btn-sm btn-question"> {{ _("New Question") }} </button>
-        <button class="btn btn-primary btn-sm btn-save-question ml-2
-            {% if not quiz.name %} hide {% endif %}"> {{ _("Save Quiz") }} </button>
+
+        {% if quiz.name %}
+        <button class="btn btn-secondary btn-sm copy-quiz-id ml-2" data-name="'{{ quiz.name }}'">
+            {{ _("Copy Quiz ID") }}
+        </button>
+        {% endif %}
+
+        <button class="btn btn-primary btn-sm btn-save-question ml-2 {% if not quiz.name %} hide {% endif %}">
+            {{ _("Save Quiz") }}
+        </button>
+
     </div>
 </div>
 {% endmacro %}
diff --git a/lms/www/batch/quiz.js b/lms/www/batch/quiz.js
index 10c6698f..a7491fed 100644
--- a/lms/www/batch/quiz.js
+++ b/lms/www/batch/quiz.js
@@ -8,7 +8,11 @@ frappe.ready(() => {
         save_question(e);
     });
 
-    get_questions()
+    $(".copy-quiz-id").click((e) => {
+        frappe.utils.copy_to_clipboard($(e.currentTarget).data("name"));
+    });
+
+    get_questions();
 
 });
 
@@ -54,6 +58,7 @@ const save_question = (e) => {
     if (!$("#quiz-title").text()) {
         frappe.throw(__("Quiz Title is mandatory."));
     }
+
     frappe.call({
         method: "lms.lms.doctype.lms_quiz.lms_quiz.save_quiz",
         args: {
diff --git a/lms/www/batch/quiz_list.html b/lms/www/batch/quiz_list.html
index 41891b1d..8a34f17b 100644
--- a/lms/www/batch/quiz_list.html
+++ b/lms/www/batch/quiz_list.html
@@ -15,34 +15,46 @@
         {% if quiz_list | length %}
         <a class="btn btn-secondary btn-sm pull-right" href="/quizzes/new-quiz"> {{ _("Add Quiz") }} </a>
         <div class="course-home-headings"> {{ _("Quiz List") }} </div>
+
         <div class="common-card-style">
             <table class="table">
+
                 <tr style="background-color: var(--fg-hover-color); font-weight: bold">
                     <td style="width: 10%;"> {{ _("No.") }} </td>
                     <td style="width: 45%;"> {{ _("Title") }} </td>
                     <td> {{ _("ID") }} </td>
+                    <td>  </td>
                 </tr>
+
                 {% for quiz in quiz_list %}
-                <tr style="position: relative; color: var(--text-color);">
+                <tr class="quiz-row" data-name="{{ quiz.name }}">
                     <td> {{ loop.index }} </td>
                     <td>
-                        <a class="button-links" href="/quizzes/{{ quiz.name }}">{{ quiz.title }}</a>
+                        {{ quiz.title }}
                     </td>
                     <td>
-                        <a class="button-links" href="/quizzes/{{ quiz.name }}">{{ quiz.name }}</a>
+                        {{ quiz.name }}
+                    </td>
+                    <td>
+                        <a class="btn btn-secondary btn-sm copy-quiz-id" data-name="'{{ quiz.name }}'">
+                            {{ _("Copy Quiz ID") }}
+                        </a>
                     </td>
                 </tr>
                 {% endfor %}
+
             </table>
         </div>
+
         {% else %}
         <div class="empty-state">
             <div class="empty-state-text">
                 <div class="empty-state-heading">{{ _("You have not created any quiz yet.") }}</div>
                 <div class="course-meta mb-6">{{ _("Create a quiz and add it to your course to engage users.") }}</div>
                 <a class="btn btn-secondary btn-sm"
-                href="{% if frappe.session.user == 'Guest' %} /login?redirect-to=/quizzes {% else %} /quizzes/new-quiz  {% endif %}">
-                {{ _("Add Quiz") }} </a>
+                    href="{% if frappe.session.user == 'Guest' %} /login?redirect-to=/quizzes {% else %} /quizzes/new-quiz  {% endif %}">
+                    {{ _("Add Quiz") }}
+                </a>
             </div>
         </div>
         {% endif %}
@@ -50,3 +62,22 @@
 </div>
 {% endblock %}
 
+
+{% block script %}
+<script>
+    frappe.ready(() => {
+
+        $(".copy-quiz-id").click((e) => {
+            e.preventDefault();
+            frappe.utils.copy_to_clipboard($(e.currentTarget).data("name"));
+        });
+
+        $(".quiz-row").click((e) => {
+            if (!$(e.target).hasClass("copy-quiz-id")) {
+                window.location.href = `/quizzes/${$(e.currentTarget).data('name')}`;
+            }
+        });
+
+    });
+</script>
+{% endblock %}
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index c7a18944..d049ad31 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -114,7 +114,9 @@
         </div>
 
         <div class="course-image-attachment {% if not course.image %} hide {% endif %} ">
-            <a href="{{ course.image }}" id="image" target="_blank"> {{ course.image }} </a>
+            <a {% if course.image %} href="{{ course.image }}" {% endif %} id="image" target="_blank">
+                {{ course.image }}
+            </a>
             <button class="btn btn-sm btn-default btn-clear ml-4"> {{ _("Clear") }} </button>
         </div>
         <a class="btn btn-default btn-sm btn-attach mt-1 {% if course.image %} hide {% endif %}"> {{ _("Attach Image") }} </a>
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 8281669d..9e9f086b 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -329,6 +329,7 @@ const add_tag = (e) => {
 const save_course = (e) => {
     let tags = $('.course-card-pills').map((i, el) => $(el).text().trim()).get();
     tags = tags.filter(word => word.trim().length > 0);
+
     frappe.call({
         method: "lms.lms.doctype.lms_course.lms_course.save_course",
         args: {
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index a24a2977..083cb524 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -12,8 +12,8 @@
     <div class="container">
 
         {% if show_creators_section %}
-        <a class="btn btn-secondary btn-md pull-right" id="create-course-link" href="/courses/new-course">
-            {{ _("Create a Course")}}
+        <a class="btn btn-secondary btn-sm pull-right" id="create-course-link" href="/courses/new-course">
+            {{ _("Create a Course") }}
         </a>
         {% endif %}
 
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 7038e7c8..bbf242c7 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -3,342 +3,404 @@
 <meta name="description" content="{{ member.full_name }}" />
 {% endblock %}
 
+
 {% block content %}
 <div class="common-page-style profile-page">
-  {{ ProfileBanner(member) }}
-  <div class="profile-page-body">
-    <div class="container">
-      {% set read_only = member.name != frappe.session.user %}
-      {{ About(member) }}
-      {{ EducationDetails(member) }}
-      {{ WorkDetails(member) }}
-      {{ Certification(member) }}
-      {{ Contact(member) }}
-      {{ Skills(member) }}
-      {{ CareerPreference(member) }}
+    {{ ProfileBanner(member) }}
+
+    <div class="profile-page-body">
+        <div class="container">
+        {% set read_only = member.name != frappe.session.user %}
+        {{ About(member) }}
+        {{ EducationDetails(member) }}
+        {{ WorkDetails(member) }}
+        {{ Certification(member) }}
+        {{ Contact(member) }}
+        {{ Skills(member) }}
+        {{ CareerPreference(member) }}
+        </div>
+    </div>
+
+    <div class="container">
+        {{ CoursesCreated(member, read_only) }}
+        {{ CoursesMentored(member, read_only) }}
+        {{ ProfileTabs(profile_tabs) }}
     </div>
-  </div>
-  <div class="container">
-    {{ CoursesCreated(member, read_only) }}
-    {{ CoursesMentored(member, read_only) }}
-    {{ ProfileTabs(profile_tabs) }}
-  </div>
 </div>
 {% endblock %}
 
+
+<!-- Banner -->
 {% macro ProfileBanner(member) %}
 {% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %}
 {% set enrollment = get_course_membership(frappe.session.user, member_type="Student") | length %}
 {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
+
 <div class="container">
-  <div class="profile-banner" style="background-image: url({{ cover_image }})">
-    <div class="profile-avatar">
-      {{ widgets.Avatar(member=member, avatar_class="avatar-square") }}
-    </div>
-  </div>
-  <div class="profile-info">
-    <div class="profile-name-section">
-      <div class="profile-name"> {{ member.full_name }} </div>
-
-      {% if get_authored_courses(member.name) | length %}
-      <div class="creator-badge"> {{ _("Creator") }} </div>
-      {% endif %}
-
-      {% if member.looking_for_job %}
-      <div class="creator-badge"> {{ _("Open Network") }} </div>
-      {% endif %}
-
-      {% if frappe.session.user == member.email %}
-      <a class="button is-secondary ml-auto mt-1" href="/edit-profile?name={{ member.email }}"> {{ _("Edit Profile") }} </a>
-      {% endif %}
+    <div class="profile-banner" style="background-image: url({{ cover_image }})">
+        <div class="profile-avatar">
+            {{ widgets.Avatar(member=member, avatar_class="avatar-square") }}
+        </div>
     </div>
 
-    <div class="profile-meta">
-      {% if member.headline %}
-      <div class="course-meta mr-3"> {{ member.headline }} </div>
-      {% endif %}
+    <div class="profile-info">
+        <div class="profile-name-section">
+            <div class="profile-name"> {{ member.full_name }} </div>
 
-      {% if enrollment %}
-      <div class="course-meta">
-        <img src="/assets/lms/icons/book_plain.svg">
-        {{ enrollment }} {{ enrollment_suffix }} {{ _("taken") }} </div>
-      {% endif %}
+            {% if get_authored_courses(member.name) | length %}
+            <div class="creator-badge"> {{ _("Creator") }} </div>
+            {% endif %}
+
+            {% if member.looking_for_job %}
+            <div class="creator-badge"> {{ _("Open Network") }} </div>
+            {% endif %}
+
+            {% if frappe.session.user == member.email %}
+            <div class="ml-auto mt-1">
+                <a class="btn btn-secondary btn-sm" href="/dashboard"> {{ _("Visit Dashboard") }} </a>
+                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile?name={{ member.email }}"> {{ _("Edit Profile") }} </a>
+            </div>
+            {% endif %}
+        </div>
+
+        <div class="profile-meta">
+            {% if member.headline %}
+            <div class="course-meta mr-3"> {{ member.headline }} </div>
+            {% endif %}
+
+            {% if enrollment %}
+            <div class="course-meta">
+                <img src="/assets/lms/icons/book_plain.svg">
+                {{ enrollment }} {{ enrollment_suffix }} {{ _("taken") }}
+            </div>
+            {% endif %}
+        </div>
     </div>
-
-  </div>
 </div>
 {% endmacro %}
 
+
+<!-- Courses Created -->
 {% macro CoursesCreated(member, read_only) %}
 {% set authored_courses = get_authored_courses(member.name) %}
+
 {% if authored_courses | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Created") }} </div>
-  <div class="cards-parent">
-    {% for course in authored_courses %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Created") }} </div>
+    <div class="cards-parent">
+        {% for course in authored_courses %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Courses Mentored -->
 {% macro CoursesMentored(member, read_only) %}
 {% if member.get_mentored_courses() | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
-  <div class="cards-parent">
-    {% for course in member.get_mentored_courses() %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Mentored") }} </div>
+    <div class="cards-parent">
+        {% for course in member.get_mentored_courses() %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Courses Enrolled -->
 {% macro CoursesEnrolled(member, read_only) %}
 {% set enrolled = get_enrolled_courses() %}
 
 {% if enrolled.completed | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses Completed") }} </div>
-  <div class="cards-parent">
-    {% for course in enrolled.completed %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses Completed") }} </div>
+    <div class="cards-parent">
+        {% for course in enrolled.completed %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
 
 {% if enrolled.in_progress | length %}
 <div class="profile-courses">
-  <div class="course-home-headings"> {{ _("Courses In Progress") }} </div>
-  <div class="cards-parent">
-    {% for course in enrolled.in_progress %}
-    {{ widgets.CourseCard(course=course, read_only=read_only) }}
-    {% endfor %}
-  </div>
+    <div class="course-home-headings"> {{ _("Courses In Progress") }} </div>
+    <div class="cards-parent">
+        {% for course in enrolled.in_progress %}
+        {{ widgets.CourseCard(course=course, read_only=read_only) }}
+        {% endfor %}
+    </div>
 </div>
 {% endif %}
-
 {% endmacro %}
 
+
+<!-- Profile Tabs Extension -->
 {% macro ProfileTabs(profile_tabs) %}
 <div>
-  {% for tab in profile_tabs %}
-  {% set slug = title.lower().replace(" ", "-") %}
-  <div class="tab-content">
-    <div class="tab-pane fade py-4 show active" role="tabpanel" id="slug">
-      {{ tab.render() }}
+    {% for tab in profile_tabs %}
+    {% set slug = title.lower().replace(" ", "-") %}
+    <div class="tab-content">
+        <div class="tab-pane fade py-4 show active" role="tabpanel" id="slug">
+        {{ tab.render() }}
+        </div>
     </div>
-  </div>
-  {% endfor %}
+    {% endfor %}
 </div>
 {% endmacro %}
 
+
+<!-- About Section -->
 {% macro About(member) %}
 {% if member.bio %}
-  <div class="">
-    <div class="common-card-style profile-card">
-      <div class="course-home-headings"> {{ _("About") }} </div>
-      <div class="description">{{ member.bio }}</div>
+    <div class="">
+        <div class="common-card-style profile-card">
+            <div class="course-home-headings"> {{ _("About") }} </div>
+            <div class="description">{{ member.bio }}</div>
+        </div>
     </div>
-  </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Work Preference -->
 {% macro WorkPreference(member) %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Work Preference") }} </div>
-    <div> {{ member.attire }} </div>
-    <div> {{ member.collaboration }} </div>
-    <div> {{ member.role }} </div>
-    <div> {{ member.location_preference }} </div>
-    <div> {{ member.time }} </div>
-    <div> {{ member.company_type }} </div>
-  </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Work Preference") }} </div>
+        <div> {{ member.attire }} </div>
+        <div> {{ member.collaboration }} </div>
+        <div> {{ member.role }} </div>
+        <div> {{ member.location_preference }} </div>
+        <div> {{ member.time }} </div>
+        <div> {{ member.company_type }} </div>
+    </div>
 </div>
 {% endmacro %}
 
+
+<!-- Career Preference -->
 {% macro CareerPreference(member) %}
 {% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Career Preference") }} </div>
-    <div class="profile-column-grid">
-      {% if member.preferred_functions | length %}
-      <div>
-        <b>{{ _("Preferred Functions:") }}</b>
-        {% for function in member.preferred_functions %}
-        <div class="description">{{ function.function }}</div>
-        {% endfor %}
-      </div>
-      {% endif %}
+    <div class="common-card-style profile-card">
 
-      {% if member.preferred_industries | length %}
-      <div>
-        <b>{{ _("Preferred Industries:") }}</b>
-        {% for industry in member.preferred_industries %}
-        <div class="description">{{ industry.industry }}</div>
-        {% endfor %}
-      </div>
-      {% endif %}
+        <div class="course-home-headings"> {{ _("Career Preference") }} </div>
+        <div class="profile-column-grid">
 
-      {% if member.preferred_location %}
-      <div>
-        <b> {{ _("Preferred Locations:") }} </b>
-        <div class="description"> {{ member.preferred_location }} </div>
-      </div>
-      {% endif %}
+            {% if member.preferred_functions | length %}
+            <div>
+                <b>{{ _("Preferred Functions:") }}</b>
+                {% for function in member.preferred_functions %}
+                <div class="description">{{ function.function }}</div>
+                {% endfor %}
+            </div>
+            {% endif %}
 
-      {% if member.dream_companies %}
-      <div>
-        <b> {{ _("Dream Companies:") }} </b>
-        <div class="description"> {{ member.dream_companies }} </div>
-      </div>
-      {% endif %}
+            {% if member.preferred_industries | length %}
+            <div>
+                <b>{{ _("Preferred Industries:") }}</b>
+                {% for industry in member.preferred_industries %}
+                <div class="description">{{ industry.industry }}</div>
+                {% endfor %}
+            </div>
+            {% endif %}
+
+            {% if member.preferred_location %}
+            <div>
+                <b> {{ _("Preferred Locations:") }} </b>
+                <div class="description"> {{ member.preferred_location }} </div>
+            </div>
+            {% endif %}
+
+            {% if member.dream_companies %}
+            <div>
+                <b> {{ _("Dream Companies:") }} </b>
+                <div class="description"> {{ member.dream_companies }} </div>
+            </div>
+            {% endif %}
+
+        </div>
     </div>
-
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Contact Section -->
 {% macro Contact(member) %}
 {% if member.linkedin or member.medium or member.github %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Contact") }} </div>
-    <div class="profile-column-grid">
-      {% if member.linkedin %}
-      {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
-      <a class="button-links description" href="{{ member.linkedin }}">
-        <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
-      </a>
-    {% endif %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Contact") }} </div>
+        <div class="profile-column-grid">
+        {% if member.linkedin %}
+        {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
+        <a class="button-links description" href="{{ member.linkedin }}">
+            <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
+        </a>
+        {% endif %}
 
-    {% if member.medium %}
-    <a class="button-links description" href="{{ member.medium}}">
-      <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
-    </a>
-    {% endif %}
+        {% if member.medium %}
+        <a class="button-links description" href="{{ member.medium}}">
+            <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
+        </a>
+        {% endif %}
 
-    {% if member.github %}
-    <a class="button-links description" href="{{ member.github }}">
-      <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
-    </a>
-    {% endif %}
+        {% if member.github %}
+        <a class="button-links description" href="{{ member.github }}">
+            <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
+        </a>
+        {% endif %}
 
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Skills -->
 {% macro Skills(member) %}
 {% if member.skill | length %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Skills")}} </div>
-    <div class="profile-column-grid">
-      {% for skill in member.skill %}
-      <div class="description"> {{ skill.skill_name }} </div>
-      {% endfor %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Skills")}} </div>
+        <div class="profile-column-grid">
+            {% for skill in member.skill %}
+            <div class="description"> {{ skill.skill_name }} </div>
+            {% endfor %}
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Education Details -->
 {% macro EducationDetails(member) %}
 {% if member.education %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Education") }} </div>
-    <div class="profile-grid-card">
-      {% for edu in member.education %}
-      <div class="profile-card-row">
-        <div class="bold-title"> {{ edu.institution_name }} </div>
-        <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
-          {% if not member.hide_private %}
-          <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
-          {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
-          {% endif %}
-        </div>
-        <div class="description">
-          {% if edu.start_date %}
-          {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
-          {% endif %}
-          {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }} </div>
-        <div class="description"> {{ edu.location }} </div>
-      </div>
-      {% endfor %}
-    </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Education") }} </div>
 
-  </div>
+        <div class="profile-grid-card">
+            {% for edu in member.education %}
+            <div class="profile-card-row">
+                <div class="bold-title"> {{ edu.institution_name }} </div>
+                <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
+                    {% if not member.hide_private %}
+                    <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
+                    {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
+                    {% endif %}
+                </div>
+
+                <div class="description">
+                    {% if edu.start_date %}
+                    {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
+                    {% endif %}
+                    {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }}
+                </div>
+                <div class="description"> {{ edu.location }} </div>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Work Details -->
 {% macro WorkDetails(member) %}
 {% set work_details = member.work_experience + member.internship %}
+
 {% if work_details | length %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-   <div class="course-home-headings"> {{ _("Work Experience") }} </div>
-   <div class="profile-grid-card">
-    {% for work in work_details %}
-    <div class="">
-      <div class="bold-title"> {{ work.title }} </div>
-      <div class="profile-item"> {{ work.company }} </div>
-      <div class="description"> {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
-        {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }} {% else %} Present {% endif %} </div>
-        <div class="description"> {{ work.location }} </div>
-        {% if work.description %} <div class="profile-item"> {{ work.description }} </div> {% endif %}
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Work Experience") }} </div>
+        <div class="profile-grid-card">
+
+            {% for work in work_details %}
+            <div class="">
+                <div class="bold-title"> {{ work.title }} </div>
+                <div class="profile-item"> {{ work.company }} </div>
+                <div class="description">
+                    {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
+                    {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }}
+                    {% else %} Present {% endif %}
+                </div>
+
+                <div class="description"> {{ work.location }} </div>
+
+                {% if work.description %}
+                <div class="profile-item">
+                    {{ work.description }}
+                </div>
+                {% endif %}
+            </div>
+            {% endfor %}
+
+        </div>
     </div>
-    {% endfor %}
-   </div>
-  </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
+<!-- Certifications -->
 {% macro Certification(member) %}
 {% if member.certification %}
 <div class="education-details">
-  <div class="common-card-style profile-card">
-    <div class="course-home-headings"> {{ _("Certification") }} </div>
-    <div class="profile-grid-card">
-      {% for cert in member.certification %}
-      <div class="">
-        <div class="bold-title"> {{ cert.certification_name }} </div>
-        <div class="profile-item"> {{ cert.organization }} </div>
-        <div class="description"> {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
-          {% if cert.expiration_date %} - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }} {% endif %} </div>
-          {% if cert.description %} <div class="profile-item"> {{ cert.description }} </div> {% endif %}
-      </div>
-      {% endfor %}
-    </div>
+    <div class="common-card-style profile-card">
+        <div class="course-home-headings"> {{ _("Certification") }} </div>
+        <div class="profile-grid-card">
+            {% for cert in member.certification %}
+            <div class="">
 
-  </div>
+                <div class="bold-title"> {{ cert.certification_name }} </div>
+                <div class="profile-item"> {{ cert.organization }} </div>
+
+                <div class="description">
+                    {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
+                    {% if cert.expiration_date %}
+                    - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }}
+                    {% endif %}
+                </div>
+
+                {% if cert.description %}
+                <div class="profile-item">
+                    {{ cert.description }}
+                </div>
+                {% endif %}
+
+            </div>
+            {% endfor %}
+        </div>
+    </div>
 </div>
 {% endif %}
 {% endmacro %}
 
+
 {% block script %}
 <script>
-  frappe.ready(() => {
-    if ("{{ member.name }}" == frappe.session.user) {
-      setTimeout(() => {
-        var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
-        link_array.length && $(link_array[0]).addClass("active");
-      }, 0)
-    }
+    frappe.ready(() => {
+        if ("{{ member.name }}" == frappe.session.user) {
+            setTimeout(() => {
+                var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+                link_array.length && $(link_array[0]).addClass("active");
+            }, 0)
+        }
 
-    if ($(".profile-column-one").children().length == 0) {
-      $(".profile-column-one").hide();
-    }
-  });
+        if ($(".profile-column-one").children().length == 0) {
+            $(".profile-column-one").hide();
+        }
+    });
 </script>
 {% endblock %}

From ad20c1cbf1b1ede3c49b3350bbfa5d13af4b5405 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 1 Sep 2022 17:12:32 +0530
Subject: [PATCH 04/41] fix: membership doctype structure

---
 .../lms_batch_membership.json                 | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json
index 7a8123f0..6574cf21 100644
--- a/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json
+++ b/lms/lms/doctype/lms_batch_membership/lms_batch_membership.json
@@ -6,19 +6,19 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
+  "member_type",
+  "batch",
+  "column_break_3",
+  "member",
+  "member_name",
+  "member_username",
+  "section_break_8",
   "cohort",
   "subgroup",
-  "column_break_3",
-  "batch",
-  "current_lesson",
-  "role",
-  "member_section",
-  "member",
-  "member_type",
-  "progress",
   "column_break_12",
-  "member_name",
-  "member_username"
+  "current_lesson",
+  "progress",
+  "role"
  ],
  "fields": [
   {
@@ -33,7 +33,8 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Member",
-   "options": "User"
+   "options": "User",
+   "reqd": 1
   },
   {
    "default": "Student",
@@ -70,7 +71,8 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Course",
-   "options": "LMS Course"
+   "options": "LMS Course",
+   "reqd": 1
   },
   {
    "fieldname": "current_lesson",
@@ -103,19 +105,18 @@
    "label": "Subgroup",
    "options": "Cohort Subgroup"
   },
-  {
-   "fieldname": "member_section",
-   "fieldtype": "Section Break",
-   "label": "Member"
-  },
   {
    "fieldname": "column_break_12",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-03-29 09:47:05.007133",
+ "modified": "2022-09-01 17:11:08.065998",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",

From dfc1c9c228118bc3ab6cfb5de69def8743186e60 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 2 Sep 2022 13:05:26 +0530
Subject: [PATCH 05/41] feat: seperate inputs for adding youtube video and quiz

---
 .../doctype/course_lesson/course_lesson.json  |  26 ++-
 .../doctype/course_lesson/course_lesson.py    |   6 +
 lms/lms/doctype/lms_course/lms_course.py      |   6 +-
 lms/lms/utils.py                              |  39 +++-
 lms/overrides/user.py                         |   5 +-
 lms/public/css/style.css                      |   2 +-
 lms/www/batch/learn.html                      | 192 ++++++++++--------
 lms/www/batch/learn.js                        |   4 +-
 8 files changed, 187 insertions(+), 93 deletions(-)

diff --git a/lms/lms/doctype/course_lesson/course_lesson.json b/lms/lms/doctype/course_lesson/course_lesson.json
index 6e61622b..d74a463d 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.json
+++ b/lms/lms/doctype/course_lesson/course_lesson.json
@@ -15,6 +15,10 @@
   "include_in_preview",
   "index_label",
   "section_break_6",
+  "youtube",
+  "column_break_9",
+  "quiz_id",
+  "section_break_11",
   "body",
   "help_section",
   "help"
@@ -81,11 +85,31 @@
    "label": "Course",
    "options": "LMS Course",
    "read_only": 1
+  },
+  {
+   "description": "Quiz will appear at the bottom of the lesson.",
+   "fieldname": "quiz_id",
+   "fieldtype": "Data",
+   "label": "Quiz ID"
+  },
+  {
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break"
+  },
+  {
+   "description": "YouTube Video will appear at the top of the lesson.",
+   "fieldname": "youtube",
+   "fieldtype": "Data",
+   "label": "YouTube Video URL"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-05-02 17:16:12.450460",
+ "modified": "2022-09-02 11:30:15.450624",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Course Lesson",
diff --git a/lms/lms/doctype/course_lesson/course_lesson.py b/lms/lms/doctype/course_lesson/course_lesson.py
index ac639e24..ab74884a 100644
--- a/lms/lms/doctype/course_lesson/course_lesson.py
+++ b/lms/lms/doctype/course_lesson/course_lesson.py
@@ -4,6 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
 from ...md import find_macros
 from lms.lms.utils import get_course_progress, get_lesson_url
@@ -11,6 +12,11 @@ from lms.lms.utils import get_course_progress, get_lesson_url
 class CourseLesson(Document):
     def validate(self):
         self.check_and_create_folder()
+        self.validate_quiz_id()
+
+    def validate_quiz_id(self):
+        if self.quiz_id and not frappe.db.exists("LMS Quiz", self.quiz_id):
+            frappe.throw(_("Invalid Quiz ID"))
 
     def on_update(self):
         dynamic_documents = ["Exercise", "Quiz"]
diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index 76b8e097..1d8096a4 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -249,7 +249,7 @@ def save_chapter(course, title, chapter_description, idx, chapter):
 
 
 @frappe.whitelist()
-def save_lesson(title, body, chapter, preview, idx, lesson):
+def save_lesson(title, body, chapter, preview, idx, lesson, youtube=None, quiz_id=None):
     if lesson:
         doc = frappe.get_doc("Course Lesson", lesson)
     else:
@@ -261,7 +261,9 @@ def save_lesson(title, body, chapter, preview, idx, lesson):
         "chapter": chapter,
         "title": title,
         "body": body,
-        "include_in_preview": preview
+        "include_in_preview": preview,
+        "youtube": youtube,
+        "quiz_id": quiz_id
     })
     doc.save(ignore_permissions=True)
 
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index c8c8e28a..30b201a0 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -7,6 +7,7 @@ from frappe import _
 
 RE_SLUG_NOTALLOWED = re.compile("[^a-z0-9]+")
 
+
 def slugify(title, used_slugs=[]):
     """Converts title to a slug.
 
@@ -59,6 +60,7 @@ def get_membership(course, member, batch=None):
         membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
     return membership
 
+
 def get_chapters(course):
     """Returns all chapters of this course.
     """
@@ -85,6 +87,7 @@ def get_lessons(course, chapter=None):
 
     return lessons
 
+
 def get_lesson_details(chapter):
     lessons = []
     lesson_list = frappe.get_all("Lesson Reference",
@@ -94,10 +97,11 @@ def get_lesson_details(chapter):
 
     for row in lesson_list:
         lesson_details = frappe.db.get_value("Course Lesson", row.lesson,
-            ["name", "title", "include_in_preview", "body", "creation"], as_dict=True)
+            ["name", "title", "include_in_preview", "body", "creation", "youtube", "quiz_id"], as_dict=True)
         lesson_details.number = flt("{}.{}".format(chapter.idx, row.idx))
         lesson_details.icon = "icon-list"
         macros = find_macros(lesson_details.body)
+
         for macro in macros:
             if macro[0] == "YouTubeVideo":
                 lesson_details.icon = "icon-video"
@@ -106,10 +110,12 @@ def get_lesson_details(chapter):
         lessons.append(lesson_details)
     return lessons
 
+
 def get_tags(course):
     tags = frappe.db.get_value("LMS Course", course, "tags")
     return tags.split(",") if tags else []
 
+
 def get_instructors(course):
     instructor_details = []
     instructors = frappe.get_all("Course Instructor", {"parent": course},
@@ -123,6 +129,7 @@ def get_instructors(course):
             as_dict=True))
     return instructor_details
 
+
 def get_students(course, batch=None):
     """Returns (email, full_name, username) of all the students of this batch as a list of dict.
     """
@@ -137,12 +144,14 @@ def get_students(course, batch=None):
         filters,
         ["member"])
 
+
 def get_average_rating(course):
     ratings = [review.rating for review in get_reviews(course)]
     if not len(ratings):
         return None
     return sum(ratings)/len(ratings)
 
+
 def get_reviews(course):
     reviews = frappe.get_all("LMS Course Review",
                 {
@@ -164,6 +173,7 @@ def get_reviews(course):
 
     return reviews
 
+
 def get_sorted_reviews(course):
     rating_count = rating_percent = frappe._dict()
     keys = ["5.0", "4.0", "3.0", "2.0", "1.0"]
@@ -180,6 +190,7 @@ def get_sorted_reviews(course):
 
     return rating_percent
 
+
 def is_certified(course):
     certificate = frappe.get_all("LMS Certificate",
                     {
@@ -190,6 +201,7 @@ def is_certified(course):
         return certificate[0].name
     return
 
+
 def get_lesson_index(lesson_name):
     """Returns the {chapter_index}.{lesson_index} for the lesson.
     """
@@ -205,6 +217,7 @@ def get_lesson_index(lesson_name):
 
     return f"{chapter.idx}.{lesson.idx}"
 
+
 def get_lesson_url(course, lesson_number):
     if not lesson_number:
         return
@@ -224,8 +237,16 @@ def get_progress(course, lesson):
         },
         ["status"])
 
-def render_html(body):
-    return markdown_to_html(body)
+
+def render_html(body, youtube, quiz_id):
+    if "/" in youtube:
+        youtube = youtube.split("/")[-1]
+
+    quiz_id = "{{ Quiz('" + quiz_id + "') }}" if quiz_id else ""
+    youtube = "{{ YouTubeVideo('" + youtube + "') }}" if youtube else ""
+    text = youtube + body + quiz_id
+    return markdown_to_html(text)
+
 
 def is_mentor(course, email):
     """Checks if given user is a mentor for this course.
@@ -238,6 +259,7 @@ def is_mentor(course, email):
             "mentor": email
         })
 
+
 def is_cohort_staff(course, user_email):
     """Returns True if the user is either a mentor or a staff for one or more active cohorts of this course.
     """
@@ -253,6 +275,7 @@ def is_cohort_staff(course, user_email):
     }
     return frappe.db.exists(staff) or frappe.db.exists(mentor)
 
+
 def get_mentors(course):
     """Returns the list of all mentors for this course.
     """
@@ -269,6 +292,7 @@ def get_mentors(course):
         course_mentors.append(member)
     return course_mentors
 
+
 def is_eligible_to_review(course, membership):
     """ Checks if user is eligible to review the course """
     if not membership:
@@ -281,6 +305,7 @@ def is_eligible_to_review(course, membership):
         return False
     return True
 
+
 def get_course_progress(course, member=None):
     """ Returns the course progress of the session user """
     lesson_count = len(get_lessons(course))
@@ -295,6 +320,7 @@ def get_course_progress(course, member=None):
     precision = cint(frappe.db.get_default("float_precision")) or 3
     return flt(((completed_lessons/lesson_count) * 100), precision)
 
+
 def get_initial_members(course):
     members = frappe.get_all("LMS Batch Membership",
         {
@@ -310,12 +336,15 @@ def get_initial_members(course):
 
     return member_details
 
+
 def is_instructor(course):
     return len(list(filter(lambda x: x.name == frappe.session.user, get_instructors(course)))) > 0
 
+
 def convert_number_to_character(number):
     return string.ascii_uppercase[number]
 
+
 def get_signup_optin_checks():
 
     mapper = frappe._dict({
@@ -343,6 +372,7 @@ def get_signup_optin_checks():
 
     return (", ").join(links)
 
+
 def get_popular_courses():
     courses = frappe.get_all("LMS Course", {"published": 1, "upcoming": 0})
     course_membership = []
@@ -356,6 +386,7 @@ def get_popular_courses():
     course_membership = sorted(course_membership, key = lambda x: x.get("members"), reverse=True)
     return course_membership[:3]
 
+
 def get_evaluation_details(course, member=None):
     info = frappe.db.get_value("LMS Course", course, ["grant_certificate_after", "max_attempts", "duration"], as_dict=True)
     request = frappe.db.get_value("LMS Certificate Request", {
@@ -378,6 +409,7 @@ def get_evaluation_details(course, member=None):
         "no_of_attempts": no_of_attempts
     })
 
+
 def format_amount(amount, currency):
     amount_reduced = amount / 1000
     if amount_reduced < 1:
@@ -397,6 +429,7 @@ def first_lesson_exists(course):
 
     return True
 
+
 def redirect_to_courses_list():
     frappe.local.flags.redirect_location = "/courses"
     raise frappe.Redirect
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index ff587647..324cf83c 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -145,7 +145,7 @@ def get_enrolled_courses():
     }
 
 def get_course_membership(member, member_type=None):
-    """ Returns all memberships of the user  """
+    """ Returns all memberships of the user.  """
     filters = {
         "member": member
     }
@@ -156,8 +156,7 @@ def get_course_membership(member, member_type=None):
 
 
 def get_authored_courses(member, only_published=True):
-    """Returns the number of courses authored by this user.
-    """
+    """ Returns the number of courses authored by this user. """
     course_details = []
 
     filters = {
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 69633fdb..6cdfe14b 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -1658,7 +1658,7 @@ li {
     padding: 1rem;
 }
 
-.help-article {
+.medium {
     font-size: var(--text-base);
 }
 
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 12051a81..b8cfc684 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -115,7 +115,7 @@
             {% if lesson.edit_mode %}
             {{ EditLesson(lesson) }}
             {% else %}
-            {{ render_html(lesson.body) }}
+            {{ render_html(lesson.body, lesson.youtube, lesson.quiz_id) }}
             {% endif %}
 
         {% else %}
@@ -181,20 +181,34 @@
 
 <!-- Edit Lesson -->
 {% macro EditLesson(lesson) %}
-<div id="body" {% if lesson.body %} data-body="{{ lesson.body }}" {% endif %}></div>
 
-<label class="preview">
-    <input {% if lesson.include_in_preview %} checked {% endif %} type="checkbox"
-    id="preview"> {{ _("Show preview of this lesson to Guest users.") }}
-</label>
+    <div class="medium mt-2" contenteditable="true" data-placeholder="{{ _('YouTube Video ID') }}"
+    id="youtube">{% if lesson.youtube %}{{ lesson.youtube }}{% endif %}</div>
+    <div id="body" {% if lesson.body %} data-body="{{ lesson.body }}" {% endif %}></div>
+    <div class="medium mb-4" contenteditable="true" data-placeholder="{{ _('Quiz ID') }}"
+    id="quiz-id">{% if lesson.quiz_id %}{{ lesson.quiz_id }}{% endif %}</div>
 
-<div class="mt-4">
-    <button class="btn btn-primary btn-sm btn-lesson pull-right ml-2"> {{ _("Save") }} </button>
-    {% if lesson.name %}
-    <button class="btn btn-secondary btn-sm pull-right btn-back ml-2"> {{ _("Back to Lesson") }} </button>
-    <a class="btn btn-secondary btn-sm pull-right" href="/quizzes"> {{ _("Create Quiz") }} </a>
-    {% endif %}
+    <label class="preview">
+        <input {% if lesson.include_in_preview %} checked {% endif %} type="checkbox"
+        id="preview"> {{ _("Show preview of this lesson to Guest users.") }}
+    </label>
 
+    <div class="mt-4">
+        <button class="btn btn-primary btn-sm btn-lesson pull-right ml-2"> {{ _("Save") }} </button>
+        {% if lesson.name %}
+        <button class="btn btn-secondary btn-sm pull-right btn-back ml-2"> {{ _("Back to Lesson") }} </button>
+        <a class="btn btn-secondary btn-sm pull-right" href="/quizzes"> {{ _("Create Quiz") }} </a>
+        {% endif %}
+
+        {{ UploadAttachments() }}
+
+    </div>
+
+    {{ HelpArticle() }}
+{% endmacro %}
+
+
+{% macro UploadAttachments() %}
     <div class="attachments-parent">
         <div class="attachment-controls">
             <div class="show-attachments" data-toggle="collapse" data-target="#collapse-attachments" aria-expanded="false">
@@ -214,97 +228,111 @@
         </div>
         <table class="attachments common-card-style collapse hide" id="collapse-attachments"></table>
     </div>
-</div>
-
-{{ HelpArticle() }}
 {% endmacro %}
 
 
 <!-- Help Article -->
 {% macro HelpArticle() %}
-<div class="help-article">
-    <h3> {{ _("Embed Components") }} </h3>
-    <p>
-        {{ _("You can add additional content to the lesson using a special syntax. The table below mentions
-            all types of dynamic content that you can add to the lessons and the syntax for the same.") }}
-    </p>
-    <table class="table w-100">
-        <tr>
-            <th style="width: 20%;"> {{ _("Content Type") }} </th>
-            <th style="width: 40%;"> {{ _("Syntax") }} </th>
-            <th> {{ _("Description") }} </th>
-        </tr>
-        <tr>
-            <td>
-                {{ _("YouTube Video") }}
-            </td>
-            <td>
-                {% raw %} {{ YouTubeVideo('Video ID') }} {% endraw %}
-            </td>
-            <td>
-                <span>
-                    {{ _("Copy and paste the syntax in the editor. Replace 'Video ID' with the embed source
-                        that YouTube provides. To get the source, follow the steps mentioned below.") }}
-                </span>
-                <ul class="p-4">
+    <div class="medium">
+        <h3> {{ _("Embed Components") }} </h3>
+        <p>
+            {{ _("You can add additional content to the lesson using a special syntax. The table below mentions
+                all types of dynamic content that you can add to the lessons and the syntax for the same.") }}
+        </p>
+        <ol>
+            <li>
+                <b> {{ _("YouTube Video") }} </b>
+                <p> To get the YouTube Video ID, follow the steps mentioned below. </p>
+                <ul class="px-4">
                     <li>
                         {{ _("Upload the video on youtube.") }}
                     </li>
                     <li>
-                        {{ _("When you share a youtube video, it shows an option called Embed.") }}
+                        {{ _("When you share a youtube video, it shows a URL") }}
                     </li>
                     <li>
-                        {{ _("On clicking it, it provides an iframe. Copy the source (src) of the iframe and
-                            paste it here.") }}
+                        {{ _("Copy the last parameter of the URL and paste it here.") }}
                     </li>
                 </ul>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                {{ _("Quiz") }}
-            </td>
-            <td>
-                {% raw %} {{ Quiz('Quiz ID') }} {% endraw %}
-            </td>
-            <td>
-                {% set quiz_link = "<a href='/quizzes'> Quiz List </a>" %}
-                {{ _("Copy and paste the syntax in the editor. Replace 'Quiz ID' with the Id of the Quiz.
-                You can get the Id of the quiz from the {0}.").format(quiz_link) }}
-            </td>
-        </tr>
-    </table>
-</div>
+            </li>
+        </ol>
+        <!-- <table class="table w-100">
+            <tr>
+                <th style="width: 20%;"> {{ _("Content Type") }} </th>
+                <th style="width: 40%;"> {{ _("Syntax") }} </th>
+                <th> {{ _("Description") }} </th>
+            </tr>
+            <tr>
+                <td>
+                    {{ _("YouTube Video") }}
+                </td>
+                <td>
+                    {% raw %} {{ YouTubeVideo('Video ID') }} {% endraw %}
+                </td>
+                <td>
+                    <span>
+                        {{ _("Copy and paste the syntax in the editor. Replace 'Video ID' with the embed source
+                            that YouTube provides. To get the source, follow the steps mentioned below.") }}
+                    </span>
+                    <ul class="p-4">
+                        <li>
+                            {{ _("Upload the video on youtube.") }}
+                        </li>
+                        <li>
+                            {{ _("When you share a youtube video, it shows an option called Embed.") }}
+                        </li>
+                        <li>
+                            {{ _("On clicking it, it provides an iframe. Copy the source (src) of the iframe and
+                                paste it here.") }}
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    {{ _("Quiz") }}
+                </td>
+                <td>
+                    {% raw %} {{ Quiz('Quiz ID') }} {% endraw %}
+                </td>
+                <td>
+                    {% set quiz_link = "<a href='/quizzes'> Quiz List </a>" %}
+                    {{ _("Copy and paste the syntax in the editor. Replace 'Quiz ID' with the Id of the Quiz.
+                    You can get the Id of the quiz from the {0}.").format(quiz_link) }}
+                </td>
+            </tr>
+        </table> -->
+    </div>
 {% endmacro %}
 
 
 <!-- Discussions Component -->
 {% macro Discussions() %}
-{% set topics_count = frappe.db.count("Discussion Topic", {
-    "reference_doctype": "Course Lesson",
-    "reference_docname": lesson.name
-}) %}
-{% set is_instructor = frappe.session.user == course.instructor %}
-{% set condition = is_instructor if is_instructor else membership %}
-{% set doctype, docname = _("Course Lesson"), lesson.name %}
-{% set title = "Questions" if topics_count else "" %}
-{% set cta_title = "Ask a Question" %}
-{% set button_name = _("Start Learning") %}
-{% set redirect_to = "/courses/" + course.name %}
-{% set empty_state_title = _("Have a doubt?") %}
-{% set empty_state_subtitle = _("Post it here, our mentors will help you out.") %}
-{% include "frappe/templates/discussions/discussions_section.html" %}
+    {% set topics_count = frappe.db.count("Discussion Topic", {
+        "reference_doctype": "Course Lesson",
+        "reference_docname": lesson.name
+    }) %}
+    {% set is_instructor = frappe.session.user == course.instructor %}
+    {% set condition = is_instructor if is_instructor else membership %}
+    {% set doctype, docname = _("Course Lesson"), lesson.name %}
+    {% set title = "Questions" if topics_count else "" %}
+    {% set cta_title = "Ask a Question" %}
+    {% set button_name = _("Start Learning") %}
+    {% set redirect_to = "/courses/" + course.name %}
+    {% set empty_state_title = _("Have a doubt?") %}
+    {% set empty_state_subtitle = _("Post it here, our mentors will help you out.") %}
+    {% include "frappe/templates/discussions/discussions_section.html" %}
 {% endmacro %}
 
 
 <!-- Scripts -->
 {%- block script %}
-{{ super() }}
-<script type="text/javascript">
-    var page_context = {{ page_context | tojson }};
-</script>
-{{ include_script('controls.bundle.js') }}
-{% for ext in page_extensions %}
-{{ ext.render_footer() }}
-{% endfor %}
+    {{ super() }}
+    <script type="text/javascript">
+        var page_context = {{ page_context | tojson }};
+    </script>
+    {{ include_script('controls.bundle.js') }}
+    {% for ext in page_extensions %}
+    {{ ext.render_footer() }}
+    {% endfor %}
 {%- endblock %}
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 0fe52cd6..197ca8a7 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -490,7 +490,9 @@ const save_lesson = (e) => {
         method: "lms.lms.doctype.lms_course.lms_course.save_lesson",
         args: {
             "title": $("#title").text(),
-            "body": this.code_field_group.fields_dict["code_md"].last_value,
+            "body": this.code_field_group.fields_dict["code_md"].value,
+            "youtube": $("#youtube").text(),
+            "quiz_id": $("#quiz-id").text(),
             "chapter": $("#title").data("chapter"),
             "preview": $("#preview").prop("checked") ? 1 : 0,
             "idx": $("#title").data("index"),

From c37cdbdc5fc95c26ae955cd13c9bfa3c08f61924 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 2 Sep 2022 17:18:57 +0530
Subject: [PATCH 06/41] chore: added logs

---
 lms/lms/web_template/courses_enrolled/courses_enrolled.html | 2 +-
 lms/templates/courses_created.html                          | 2 +-
 lms/www/dashboard/index.html                                | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index b165aa70..236e8dec 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,5 +1,5 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
-
+{{ enrolled }}
 {% if enrolled | length %}
 <div class="cards-parent">
   {% for course in enrolled %}
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index a219ebe1..083317d1 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,5 +1,5 @@
 {% set courses = get_authored_courses(frappe.session.user, only_published=False) %}
-
+{{ courses }}
 {% if courses | length %}
 <div class="cards-parent">
     {% for course in courses %}
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 083cb524..93f303a1 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -8,6 +8,8 @@
 {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
 {% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %}
 
+{{ show_creators_section }}
+{{ frappe.session.user }}
 <div class="common-page-style dashboard">
     <div class="container">
 

From eabbe3e3ed71cfd7758759102d1e16ad61f53c6d Mon Sep 17 00:00:00 2001
From: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Date: Fri, 2 Sep 2022 17:50:29 +0530
Subject: [PATCH 07/41] fix: readme

---
 README.md | 74 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index b46849e7..edb0f99e 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,68 @@
 <p align="center">
+
     <a href="https://github.com/frappe/lms/commits/main">
+
     <img src="https://img.shields.io/github/last-commit/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
+
          alt="GitHub last commit">
+
     <a href="https://github.com/frappe/lms/issues">
+
     <img src="https://img.shields.io/github/issues-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
+
          alt="GitHub issues">
+
     <a href="https://github.com/frappe/lms/pulls">
+
     <img src="https://img.shields.io/github/issues-pr-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
+
          alt="GitHub pull requests">
+
      <a href="https://github.com/frappe/lms/license">
+
     <img src="https://img.shields.io/github/license/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
+
          alt="GitHub pull requests">
+
 </p>
 
-
 <div align="center">
+
   <a href="https://www.frappelms.com/">
+
     <img src="https://www.frappelms.com/files/flms.svg" alt="Frappe LMS" width="80" height="80">
+
   </a>
 
   <h3 align="center">Frappe LMS</h3>
 
   <p align="center">
+
     Easy to Use, Open Source Learning Management System
+
     <br />
+
     <a href="https://www.frappelms.com"><strong>Visit the website »</strong></a>
+
     <br />
+
     <br />
+
     <a href="https://www.frappelms.com/introduction">Explore the docs</a>.
+
     <a href="https://github.com/frappe/lms/issues">Report Bug</a>
+
   </p>
+
 </div>
 
-
 <!-- ABOUT THE PROJECT -->
+
 ## About The Project
 
 ![Frappe LMS](/lms/public/images/course-home.png)
 
-
-Frappe LMS is an easy to use, open source learning management system. It has a clear UI that helps students focus only on whats important and assists in a distraction-free learning.
+Frappe LMS is an easy-to-use, open-source learning management system. It has a clear UI that helps students focus only on what's important and assists in distraction-free learning.
 
 You can create courses and lessons through simple forms in the backend that you can analyze with the help of reports. Course Instructors and students can reach out to each other through the discussions section available for each lesson and get queries resolved.
 
@@ -48,21 +71,29 @@ Lessons can be in the form of text, videos, quizzes or a combination of all thes
 <p align="right">(<a href="#top">back to top</a>)</p>
 
 <!-- GETTING STARTED -->
+
 ## Getting Started
 
-Frappe LMS app is build using [Frappe Framework](https://frappeframework.com).
+Frappe LMS app is built1 using [Frappe Framework](https://frappeframework.com).
 
 ### Direct installation through bench
 
-To setup the repository locally follow the steps mentioned below:
+To setup the repository locally, follow the steps mentioned below:
+
+1.  Install bench and set up a frappe-bench directory by following the  [Installation Steps](https://frappeframework.com/docs/user/en/installation).
 
-1.  Install bench and setup a frappe-bench directory by following the  [Installation Steps](https://frappeframework.com/docs/user/en/installation).
 2.  Start the server by running ```bench start```.
+
 3.  In a separate terminal window, create a new site by running ```bench new-site lms.test```.
+
 4.  Fork the Frappe LMS app and clone it.
-5.  Run ```bench get-app lms``` to get the app on your bench .
+
+5.  Run ```bench get-app lms``` to get the app on your bench.
+
 6.  Run ```bench --site lms.test install-app lms```.
+
 7.  Map your site to localhost with the command  ```bench --site lms.test add-to-hosts```.
+
 8.  Now open the URL  [http://lms.test:8000/](http://lms.test:8000/)  in your browser, you should see the app running.
 
 <p align="right">(<a href="#top">back to top</a>)</p>
@@ -72,6 +103,7 @@ To setup the repository locally follow the steps mentioned below:
 1. Clone the repo.
 
 ```
+
 $ git clone https://github.com/frappe/lms.git
 
 $ cd lms
@@ -81,55 +113,63 @@ $ cd lms
 2. Run docker-compose
 
 ```
+
 $ docker-compose up
 
 ```
 
 3. Visit the website at  [http://localhost:8000/](http://localhost:8000/)
 
-You'll have to go through the setup wizard to setup the website for the first time you access it. Login using the following credentiasl to complete the setup wizard.
+You'll have to go through the setup wizard to set up the website the first time you access it. Log in using the following credentials to complete the setup wizard.
 
 ```
+
 Username: Administrator
+
 password: admin
 
 ```
 
 ## [](https://github.com/frappe/lms/blob/main/docker-installation.md#stopping-the-server)Stopping the server
 
-Press  `ctrl+c`  in the terminal to stop the server. You can also run  `docker-compose down`  in another terminal to stop it.
+Press  ctrl+c  in the terminal to stop the server. You can also run  docker-compose down  in another terminal to stop it.
 
 To completely reset the instance, do the following:
 
 ```
+
 $ docker-compose down --volumes
+
 $ docker-compose up
+
 ```
 
-
 <!-- CONTRIBUTING -->
+
 ## Contributing
 
-Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Contributions are what makes the open source community such an amazing place to learn, inspire, and create. Any contributions you make are greatly appreciated.
 
-Thank you for your interest in contributing to an open-source project! Our world works on people taking initiative to contribute to the "commons" and contributing to open source means you are contributing to make things better for not only yourself but everyone else too! So thank you for taking this initiative.
+Thank you for your interest in contributing to an open-source project! Our world works on people taking initiative to contribute to the "commons" and contributing to open source means you are contributing to making things better for not only yourself but everyone else too! So thank you for taking this initiative.
 
-Great projects also work because of great quality. Open source or not, the user really cares that things should work as they are advertised, and consistently. New features should follow the same pattern and so that users don't have to learn things again and again.
+Great projects also work because of great quality. Open source or not, the user really cares that things should work as they are advertised, and consistently. New features should follow the same pattern so that users don't have to learn things again and again.
 
 Developers who maintain open source also expect that you follow certain guidelines. These guidelines ensure that developers are able to quickly give feedback on your contribution and how to make it better. Most probably you might have to go back and change a few things, but it will be in the interest of making this process better for everyone. So be prepared for some back and forth.
+
 Don't forget to give the project a star! Thanks again!
 
+1.  Go to the apps/lms directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also, fork the frappe/lms repository on GitHub.
 
-1.  Go to the apps/lms directory of your installation and execute git pull --unshallow to ensure that you have the full git repository. Also fork the frappe/lms repository on GitHub.
 2.  Check out a working branch in git (e.g. ```git checkout -b my-new-branch```).
+
 3.  Run your local version (e.g. bench start in your bench installation). Make sure that your changes work the way you want them to.
+
 4.  Commit your changes to your branch. Make sure to use a semantic commit message.
+
 6.  Push your branch to your fork on Github, and create a pull request.
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
 ## License
 
-
-
 Distributed under [GNU AFFERO GENERAL PUBLIC LICENSE](license.txt)

From 2d5b8430bdb836013f62618c1affe0e4bea02d14 Mon Sep 17 00:00:00 2001
From: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Date: Fri, 2 Sep 2022 17:55:00 +0530
Subject: [PATCH 08/41] fix: images and links in readme

---
 README.md | 43 +++++++------------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index edb0f99e..28655dd6 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,26 @@
 <p align="center">
-
     <a href="https://github.com/frappe/lms/commits/main">
-
-    <img src="https://img.shields.io/github/last-commit/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
-
-         alt="GitHub last commit">
-
+    <img src="https://img.shields.io/github/last-commit/frappe/lms.svg?style=flat-square&logo=github&logoColor=white" alt="GitHub last commit">
     <a href="https://github.com/frappe/lms/issues">
-
-    <img src="https://img.shields.io/github/issues-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
-
-         alt="GitHub issues">
-
+    <img src="https://img.shields.io/github/issues-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white" alt="GitHub issues">
     <a href="https://github.com/frappe/lms/pulls">
-
-    <img src="https://img.shields.io/github/issues-pr-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
-
-         alt="GitHub pull requests">
-
+    <img src="https://img.shields.io/github/issues-pr-raw/frappe/lms.svg?style=flat-square&logo=github&logoColor=white" alt="GitHub pull requests">
      <a href="https://github.com/frappe/lms/license">
-
-    <img src="https://img.shields.io/github/license/frappe/lms.svg?style=flat-square&logo=github&logoColor=white"
-
-         alt="GitHub pull requests">
-
+    <img src="https://img.shields.io/github/license/frappe/lms.svg?style=flat-square&logo=github&logoColor=white" alt="GitHub pull requests">
 </p>
 
 <div align="center">
-
   <a href="https://www.frappelms.com/">
-
     <img src="https://www.frappelms.com/files/flms.svg" alt="Frappe LMS" width="80" height="80">
-
   </a>
-
   <h3 align="center">Frappe LMS</h3>
-
   <p align="center">
-
     Easy to Use, Open Source Learning Management System
-
-    <br />
-
+    <br/>
     <a href="https://www.frappelms.com"><strong>Visit the website »</strong></a>
-
-    <br />
-
-    <br />
-
+    <br/>
+    <br/>
     <a href="https://www.frappelms.com/introduction">Explore the docs</a>.
-
     <a href="https://github.com/frappe/lms/issues">Report Bug</a>
 
   </p>

From e41c83a68cdc2c56690b5b41ab89cd514305c0da Mon Sep 17 00:00:00 2001
From: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
Date: Fri, 2 Sep 2022 17:58:52 +0530
Subject: [PATCH 09/41] fix: spelling in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28655dd6..60b632a6 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Lessons can be in the form of text, videos, quizzes or a combination of all thes
 
 ## Getting Started
 
-Frappe LMS app is built1 using [Frappe Framework](https://frappeframework.com).
+Frappe LMS app is built using [Frappe Framework](https://frappeframework.com).
 
 ### Direct installation through bench
 

From 8088a464ad12fb7aa41ab2a78df9def2c5236888 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 09:16:57 +0530
Subject: [PATCH 10/41] fix: dashboard creators section issue

---
 lms/lms/doctype/lms_course/lms_course.py |  9 ++++-----
 lms/lms/utils.py                         |  2 +-
 lms/overrides/user.py                    | 18 ++++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index 1d8096a4..0f497eb3 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -34,11 +34,10 @@ class LMSCourse(Document):
             self.send_email_to_interested_users()
 
     def send_email_to_interested_users(self):
-        interested_users = frappe.get_all("LMS Course Interest",
-                                            {
-                                                "course": self.name
-                                            },
-                                            ["name", "user"])
+        interested_users = frappe.get_all("LMS Course Interest", {
+            "course": self.name
+        },
+        ["name", "user"])
         subject = self.title + " is available!"
         args = {
             "title": self.title,
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 30b201a0..5fd64ca3 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -239,7 +239,7 @@ def get_progress(course, lesson):
 
 
 def render_html(body, youtube, quiz_id):
-    if "/" in youtube:
+    if youtube and "/" in youtube:
         youtube = youtube.split("/")[-1]
 
     quiz_id = "{{ Quiz('" + quiz_id + "') }}" if quiz_id else ""
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index 324cf83c..00805c7a 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -128,6 +128,7 @@ def get_enrolled_courses():
     in_progress = []
     completed = []
     memberships = get_course_membership(frappe.session.user, member_type="Student")
+
     for membership in memberships:
         course = frappe.db.get_value("LMS Course", membership.course, ["name", "upcoming", "title", "image",
             "enable_certification", "paid_certificate", "price_certificate", "currency", "published"], as_dict=True)
@@ -146,6 +147,7 @@ def get_enrolled_courses():
 
 def get_course_membership(member, member_type=None):
     """ Returns all memberships of the user.  """
+
     filters = {
         "member": member
     }
@@ -158,20 +160,20 @@ def get_course_membership(member, member_type=None):
 def get_authored_courses(member, only_published=True):
     """ Returns the number of courses authored by this user. """
     course_details = []
-
-    filters = {
+    courses = frappe.get_all("Course Instructor", {
         "instructor": member
-    }
-    if only_published:
-        filters["published"] = True
-    courses = frappe.get_all('LMS Course', filters)
+    }, ["parent"])
 
     for course in courses:
-        course_details.append(frappe.db.get_value("LMS Course", course,
-      ["name", "upcoming", "title", "image", "enable_certification", "status"], as_dict=True))
+        detail = frappe.db.get_value("LMS Course", course.parent,
+            ["name", "upcoming", "title", "image", "enable_certification", "status", "published"], as_dict=True)
+        if only_published and not detail.published:
+            continue
+        course_details.append(detail)
 
     return course_details
 
+
 def get_palette(full_name):
         """
         Returns a color unique to each member for Avatar """

From 6a760c3019598d5bfb02a943774ceefbec42e269 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 09:25:00 +0530
Subject: [PATCH 11/41] chore: removed logs

---
 lms/lms/web_template/courses_enrolled/courses_enrolled.html | 2 +-
 lms/templates/courses_created.html                          | 2 +-
 lms/www/dashboard/index.html                                | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index 236e8dec..b165aa70 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,5 +1,5 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
-{{ enrolled }}
+
 {% if enrolled | length %}
 <div class="cards-parent">
   {% for course in enrolled %}
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index 083317d1..a219ebe1 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,5 +1,5 @@
 {% set courses = get_authored_courses(frappe.session.user, only_published=False) %}
-{{ courses }}
+
 {% if courses | length %}
 <div class="cards-parent">
     {% for course in courses %}
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 93f303a1..083cb524 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -8,8 +8,6 @@
 {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
 {% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %}
 
-{{ show_creators_section }}
-{{ frappe.session.user }}
 <div class="common-page-style dashboard">
     <div class="container">
 

From 2819e55a61b1cf15c773295f0887ef33a50c5213 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 10:34:40 +0530
Subject: [PATCH 12/41] fix: dashboard function parameters

---
 lms/overrides/user.py              | 10 +++++-----
 lms/templates/courses_created.html |  2 +-
 lms/www/courses/course.html        | 17 -----------------
 lms/www/profiles/profile.html      |  2 +-
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index 00805c7a..617f72bd 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -127,7 +127,7 @@ class CustomUser(User):
 def get_enrolled_courses():
     in_progress = []
     completed = []
-    memberships = get_course_membership(frappe.session.user, member_type="Student")
+    memberships = get_course_membership(None, member_type="Student")
 
     for membership in memberships:
         course = frappe.db.get_value("LMS Course", membership.course, ["name", "upcoming", "title", "image",
@@ -145,11 +145,11 @@ def get_enrolled_courses():
         "completed": completed
     }
 
-def get_course_membership(member, member_type=None):
+def get_course_membership(member=None, member_type=None):
     """ Returns all memberships of the user.  """
 
     filters = {
-        "member": member
+        "member": member or frappe.session.user
     }
     if member_type:
         filters["member_type"] = member_type
@@ -157,11 +157,11 @@ def get_course_membership(member, member_type=None):
     return frappe.get_all("LMS Batch Membership", filters, ["name", "course", "progress"])
 
 
-def get_authored_courses(member, only_published=True):
+def get_authored_courses(member=None, only_published=True):
     """ Returns the number of courses authored by this user. """
     course_details = []
     courses = frappe.get_all("Course Instructor", {
-        "instructor": member
+        "instructor": member or frappe.session.user
     }, ["parent"])
 
     for course in courses:
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index a219ebe1..f51d9d13 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,4 +1,4 @@
-{% set courses = get_authored_courses(frappe.session.user, only_published=False) %}
+{% set courses = get_authored_courses(None, only_published=False) %}
 
 {% if courses | length %}
 <div class="cards-parent">
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index d049ad31..c8f04de8 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -227,23 +227,6 @@
 {% endmacro %}
 
 
-{% macro CourseCreator(course) %}
-    <div class="course-home-headings"> {{ _("Course Creators") }} </div>
-    <div class="common-card-style course-creators-card">
-        {% set instructors = get_instructors(course.name) %}
-        {% for instructor in instructors %}
-            <div class="d-flex align-items-center">
-                {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
-                <div class="ml-4">
-                <div class="course-creator-name"> {{ instructor.full_name }} </div>
-                <div class="course-meta"> {{ get_authored_courses(instructor.name) | length }} {{ _("Courses Created") }} </div>
-                </div>
-            </div>
-        {% endfor %}
-    </div>
-{% endmacro %}
-
-
 <!-- Related Courses Section -->
 {% macro RelatedCourses(course) %}
     {% if course.related_courses | length %}
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index bbf242c7..0878c6a4 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -33,7 +33,7 @@
 <!-- Banner -->
 {% macro ProfileBanner(member) %}
 {% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %}
-{% set enrollment = get_course_membership(frappe.session.user, member_type="Student") | length %}
+{% set enrollment = get_course_membership(None, member_type="Student") | length %}
 {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
 
 <div class="container">

From 7ef625c59800b1a4a6f7ef258e89f2aefb542acf Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 11:35:21 +0530
Subject: [PATCH 13/41] chore: logging user

---
 lms/lms/doctype/lms_course/lms_course.js | 46 ++++++++++++------------
 lms/www/dashboard/index.html             |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lms/lms/doctype/lms_course/lms_course.js b/lms/lms/doctype/lms_course/lms_course.js
index 2fc82620..c08e1683 100644
--- a/lms/lms/doctype/lms_course/lms_course.js
+++ b/lms/lms/doctype/lms_course/lms_course.js
@@ -3,31 +3,31 @@
 
 frappe.ui.form.on('LMS Course', {
 
-  onload: function (frm) {
+    onload: function (frm) {
 
-    frm.set_query("chapter", "chapters", function () {
-      return {
-        filters: {
-          "course": frm.doc.name,
-        }
-      };
-    });
+        frm.set_query("chapter", "chapters", function () {
+            return {
+                filters: {
+                    "course": frm.doc.name,
+                }
+            };
+        });
 
-    frm.set_query("instructor", function (doc) {
-      return {
-        filters: {
-          "ignore_user_type": 1,
-        }
-      };
-    });
+        frm.set_query("instructor", "instructors", function () {
+            return {
+                filters: {
+                    "ignore_user_type": 1,
+                }
+            };
+        });
 
-    frm.set_query("course", "related_courses", function () {
-      return {
-        filters: {
-          "published": true,
-        }
-      };
-    });
-  }
+        frm.set_query("course", "related_courses", function () {
+            return {
+                filters: {
+                    "published": true,
+                }
+            };
+        });
 
+    }
 });
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 083cb524..d4897187 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -7,7 +7,7 @@
 {% block content %}
 {% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
 {% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %}
-
+{{ frappe.session.user }}
 <div class="common-page-style dashboard">
     <div class="container">
 

From e84e02ff07dbb933e14b8c5ebb84dcedd6fb4941 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 13:32:51 +0530
Subject: [PATCH 14/41] fix: profile, dashboard and tests

---
 lms/lms/doctype/exercise/test_exercise.py     |  9 ++--
 lms/lms/doctype/lms_course/test_lms_course.py | 18 +++++++
 lms/lms/web_form/profile/profile.json         | 20 ++------
 lms/overrides/user.py                         |  3 +-
 lms/public/css/style.css                      | 50 +++++++++++--------
 lms/www/dashboard/index.html                  |  4 +-
 lms/www/dashboard/index.py                    |  8 +++
 lms/www/profiles/profile.html                 |  2 +-
 8 files changed, 68 insertions(+), 46 deletions(-)
 create mode 100644 lms/www/dashboard/index.py

diff --git a/lms/lms/doctype/exercise/test_exercise.py b/lms/lms/doctype/exercise/test_exercise.py
index 139b6f7a..9deaa690 100644
--- a/lms/lms/doctype/exercise/test_exercise.py
+++ b/lms/lms/doctype/exercise/test_exercise.py
@@ -6,10 +6,6 @@ import unittest
 from lms.lms.doctype.lms_course.test_lms_course import new_course
 
 class TestExercise(unittest.TestCase):
-    def setUp(self):
-        frappe.db.sql('delete from `tabLMS Batch Membership`')
-        frappe.db.sql('delete from `tabExercise Submission`')
-        frappe.db.sql('delete from `tabExercise`')
 
     def new_exercise(self):
         course = new_course("Test Course")
@@ -47,3 +43,8 @@ class TestExercise(unittest.TestCase):
         user_submission = e.get_user_submission()
         assert user_submission is not None
         assert user_submission.name == submission.name
+
+    def tearDown(self):
+        frappe.db.sql('delete from `tabLMS Batch Membership`')
+        frappe.db.sql('delete from `tabExercise Submission`')
+        frappe.db.sql('delete from `tabExercise`')
diff --git a/lms/lms/doctype/lms_course/test_lms_course.py b/lms/lms/doctype/lms_course/test_lms_course.py
index 542db568..ef133bda 100644
--- a/lms/lms/doctype/lms_course/test_lms_course.py
+++ b/lms/lms/doctype/lms_course/test_lms_course.py
@@ -7,13 +7,16 @@ import frappe
 from .lms_course import LMSCourse
 import unittest
 
+
 class TestLMSCourse(unittest.TestCase):
 
+
     def test_new_course(self):
         course = new_course("Test Course")
         assert course.title == "Test Course"
         assert course.name == "test-course"
 
+
     # disabled this test as it is failing
     def _test_add_mentors(self):
         course = new_course("Test Course")
@@ -26,10 +29,23 @@ class TestLMSCourse(unittest.TestCase):
         mentors_data = [dict(email=mentor.email, batch_count=mentor.batch_count) for mentor in mentors]
         assert mentors_data == [{"email": "tester@example.com", "batch_count": 0}]
 
+
     def tearDown(self):
         if frappe.db.exists("User", "tester@example.com"):
             frappe.delete_doc("User", "tester@example.com")
 
+        if frappe.db.exists("LMS Course", "test-course"):
+            frappe.db.delete("Exercise Submission", {"course": "test-course"})
+            frappe.db.delete("Exercise Latest Submission", {"course": "test-course"})
+            frappe.db.delete("Exercise", {"course": "test-course"})
+            frappe.db.delete("LMS Batch Membership", {"course": "test-course"})
+            frappe.db.delete("LMS Batch", {"course": "test-course"})
+            frappe.db.delete("LMS Course Mentor Mapping", {"course": "test-course"})
+            frappe.db.delete("Course Instructor", {"parent": "test-course"})
+            frappe.db.sql('delete from `tabCourse Instructor`')
+            frappe.delete_doc("LMS Course", "test-course")
+
+
 def new_user(name, email):
     user = frappe.db.exists("User", email)
     if user:
@@ -46,6 +62,7 @@ def new_user(name, email):
         doc.insert()
         return doc
 
+
 def new_course(title, additional_filters=None):
     course = frappe.db.exists("LMS Course", { "title": title })
     if course:
@@ -66,6 +83,7 @@ def new_course(title, additional_filters=None):
         doc.insert(ignore_permissions=True)
         return doc
 
+
 def create_evaluator():
     if not frappe.db.exists("Course Evaluator", "evaluator@example.com"):
         new_user("Evaluator", "evaluator@example.com")
diff --git a/lms/lms/web_form/profile/profile.json b/lms/lms/web_form/profile/profile.json
index 705b1e0d..f0e5ab81 100644
--- a/lms/lms/web_form/profile/profile.json
+++ b/lms/lms/web_form/profile/profile.json
@@ -18,11 +18,11 @@
  "docstatus": 0,
  "doctype": "Web Form",
  "idx": 0,
- "is_multi_step_form": 0,
  "is_standard": 1,
+ "list_columns": [],
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2022-06-24 19:08:29.197279",
+ "modified": "2022-09-05 13:08:40.071348",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "profile",
@@ -30,11 +30,9 @@
  "payment_button_label": "Buy Now",
  "published": 1,
  "route": "edit-profile",
- "route_to_success_link": 0,
  "show_attachments": 0,
- "show_in_grid": 0,
+ "show_list": 0,
  "show_sidebar": 0,
- "sidebar_items": [],
  "success_url": "/profile",
  "title": "Profile",
  "web_form_fields": [
@@ -50,18 +48,6 @@
    "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",
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index 617f72bd..52db13c7 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -167,7 +167,8 @@ def get_authored_courses(member=None, only_published=True):
     for course in courses:
         detail = frappe.db.get_value("LMS Course", course.parent,
             ["name", "upcoming", "title", "image", "enable_certification", "status", "published"], as_dict=True)
-        if only_published and not detail.published:
+
+        if only_published and detail and not detail.published:
             continue
         course_details.append(detail)
 
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 6cdfe14b..5a4c85ed 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -44,32 +44,32 @@ input[type=checkbox] {
 }
 
 .course-image .course-tags {
-  width: 95%;
+    width: fit-content;
 }
 
 .course-card-pills {
-  background: #ffffff;
-  margin-left: 0;
-  margin-right: 1rem;
-  border-radius: var(--border-radius);
-  padding: 3.5px 8px;
-  font-size: 11px;
-  text-align: center;
-  letter-spacing: 0.011em;
-  text-transform: uppercase;
-  font-weight: 600;
-  color: var(--gray-900);
-  width: fit-content;
-  box-shadow: var(--shadow-sm);
+    background: #ffffff;
+    margin-left: 0;
+    margin-right: 1rem;
+    border-radius: var(--border-radius);
+    padding: 3.5px 8px;
+    font-size: 11px;
+    text-align: center;
+    letter-spacing: 0.011em;
+    text-transform: uppercase;
+    font-weight: 600;
+    color: var(--gray-900);
+    width: fit-content;
+    box-shadow: var(--shadow-sm);
 }
 
 .dark-pills {
-  background: rgba(25, 39, 52, 0.8);
-  color: #ffffff;
+    background: rgba(25, 39, 52, 0.8);
+    color: #ffffff;
 }
 .dark-pills img {
-  width: 0.75rem;
-  height: 0.75rem;
+    width: 0.75rem;
+    height: 0.75rem;
 }
 
 .common-page-style {
@@ -903,7 +903,7 @@ pre {
 .empty-state {
   background: var(--gray-200);
   border-radius: var(--border-radius-lg);
-  padding: 2rem;
+  padding: 1.25rem;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -911,7 +911,6 @@ pre {
 
 .empty-state-text {
     flex: 1;
-    margin-left: 1.25rem;
     text-align: center;
 }
 
@@ -1667,3 +1666,14 @@ li {
     color: var(--text-color);
     cursor: pointer;
 }
+
+.course-creation-link {
+    float: right;
+}
+
+@media (max-width: 500px) {
+    .course-creation-link {
+        float: inherit;
+        margin-bottom: 1rem;
+    }
+}
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index d4897187..03025f98 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -5,14 +5,12 @@
 
 
 {% block content %}
-{% set portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation") %}
-{% set show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role() %}
 {{ frappe.session.user }}
 <div class="common-page-style dashboard">
     <div class="container">
 
         {% if show_creators_section %}
-        <a class="btn btn-secondary btn-sm pull-right" id="create-course-link" href="/courses/new-course">
+        <a class="btn btn-secondary btn-sm course-creation-link" id="create-course-link" href="/courses/new-course">
             {{ _("Create a Course") }}
         </a>
         {% endif %}
diff --git a/lms/www/dashboard/index.py b/lms/www/dashboard/index.py
new file mode 100644
index 00000000..23616076
--- /dev/null
+++ b/lms/www/dashboard/index.py
@@ -0,0 +1,8 @@
+import frappe
+from lms.lms.utils import has_course_instructor_role
+
+
+def get_content(context):
+    context.no_cache = 1
+    portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation")
+    context.show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role()
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 0878c6a4..962f4cea 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -58,7 +58,7 @@
             {% if frappe.session.user == member.email %}
             <div class="ml-auto mt-1">
                 <a class="btn btn-secondary btn-sm" href="/dashboard"> {{ _("Visit Dashboard") }} </a>
-                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile?name={{ member.email }}"> {{ _("Edit Profile") }} </a>
+                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile/{{ member.email }}"> {{ _("Edit Profile") }} </a>
             </div>
             {% endif %}
         </div>

From 8f86a8aba63db5bc4ba995f4d0928abddae12717 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 14:46:40 +0530
Subject: [PATCH 15/41] chore: removed log

---
 lms/www/dashboard/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index 03025f98..fb93273d 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -5,7 +5,6 @@
 
 
 {% block content %}
-{{ frappe.session.user }}
 <div class="common-page-style dashboard">
     <div class="container">
 

From 3a08f57fb1aa163e0dc5463758c1f16748fb1b96 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 14:53:13 +0530
Subject: [PATCH 16/41] fix: context for dashboard

---
 lms/www/dashboard/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/www/dashboard/index.py b/lms/www/dashboard/index.py
index 23616076..487ebdd1 100644
--- a/lms/www/dashboard/index.py
+++ b/lms/www/dashboard/index.py
@@ -2,7 +2,7 @@ import frappe
 from lms.lms.utils import has_course_instructor_role
 
 
-def get_content(context):
+def get_context(context):
     context.no_cache = 1
     portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation")
     context.show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role()

From 36aca1e664d6f76f0f0e6f7e215894276bfd3635 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 5 Sep 2022 18:05:16 +0530
Subject: [PATCH 17/41] fix: ui for review, instructors and profile

---
 lms/lms/widgets/CourseCard.html |  8 +++++---
 lms/lms/widgets/Reviews.html    |  2 +-
 lms/public/css/style.css        | 10 ++++++++++
 lms/www/batch/learn.html        | 14 ++++++++------
 lms/www/profiles/profile.html   |  2 +-
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html
index e601811a..6c3b4599 100644
--- a/lms/lms/widgets/CourseCard.html
+++ b/lms/lms/widgets/CourseCard.html
@@ -90,10 +90,12 @@
         <a class="button-links" href="{{ get_profile_url(instructors[0].username) }}">
             <span class="course-instructor">
             {% if ins_len == 1 %}
-            {{ instructors[0].full_name }}
+                {{ instructors[0].full_name }}
+            {% elif ins_len == 2 %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
             {% else %}
-            {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
-            {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
+                {% set suffix = "other" if ins_len - 2 == 1 else "others"  %}
+                {{ instructors[0].full_name.split(" ")[0] }}, {{ instructors[1].full_name.split(" ")[0] }} and {{ ins_len - 2 }} {{ suffix }}
             {% endif %}
             </span>
         </a>
diff --git a/lms/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html
index b91ce99f..29015da1 100644
--- a/lms/lms/widgets/Reviews.html
+++ b/lms/lms/widgets/Reviews.html
@@ -4,7 +4,7 @@
   <div class="mb-5">
     <span class="course-home-headings"> {{ _("Reviews") }} </span>
     {% if is_eligible_to_review(course.name, membership) and reviews | length %}
-    <span class="review-link button is-secondary pull-right">
+    <span class="btn btn-secondary btn-sm review-link">
       {{ _("Write a review") }}
     </span>
     {% endif %}
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 5a4c85ed..2fe71a33 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -1677,3 +1677,13 @@ li {
         margin-bottom: 1rem;
     }
 }
+
+.indicator-pill::before {
+    width: 0;
+    height: 0;
+    margin-right: 0;
+}
+
+.review-link {
+    float: right
+}
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index b8cfc684..5929946a 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -90,12 +90,14 @@
         {% endfor %}
         <a class="button-links ml-1" href="{{ get_profile_url(instructors[0].username) }}">
         <span class="course-meta">
-        {% if ins_len == 1 %}
-            {{ instructors[0].full_name }}
-        {% else %}
-            {% set suffix = _("other") if ins_len - 1 == 1 else _("others")  %}
-            {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
-        {% endif %}
+            {% if ins_len == 1 %}
+                {{ instructors[0].full_name }}
+            {% elif ins_len == 2 %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
+            {% else %}
+                {% set suffix = "other" if ins_len - 2 == 1 else "others"  %}
+                {{ instructors[0].full_name.split(" ")[0] }}, {{ instructors[1].full_name.split(" ")[0] }} and {{ ins_len - 2 }} {{ suffix }}
+            {% endif %}
         </span>
         </a>
         <div class="ml-5 course-meta"> {{ frappe.utils.format_date(lesson.creation, "medium") }} </div>
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 962f4cea..3a4a6560 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -58,7 +58,7 @@
             {% if frappe.session.user == member.email %}
             <div class="ml-auto mt-1">
                 <a class="btn btn-secondary btn-sm" href="/dashboard"> {{ _("Visit Dashboard") }} </a>
-                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile/{{ member.email }}"> {{ _("Edit Profile") }} </a>
+                <a class="btn btn-secondary btn-sm ml-2" href="/edit-profile/{{ member.email }}/edit"> {{ _("Edit Profile") }} </a>
             </div>
             {% endif %}
         </div>

From 4c969420f3fae60fdef579c8ddd733150cae716e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 6 Sep 2022 11:19:11 +0530
Subject: [PATCH 18/41] feat: course moderator

---
 lms/hooks.py                                  |  1 +
 lms/lms/utils.py                              | 12 ++++++++++
 lms/patches.txt                               |  1 +
 .../v0_0/create_course_moderator_role.py      | 11 +++++++++
 lms/templates/courses_under_review.html       | 20 ++++++++++++++++
 lms/www/batch/learn.py                        |  4 ++--
 lms/www/courses/course.py                     |  4 ++--
 lms/www/dashboard/index.html                  | 23 ++++++++++++++++---
 lms/www/dashboard/index.py                    |  3 ++-
 9 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 lms/patches/v0_0/create_course_moderator_role.py
 create mode 100644 lms/templates/courses_under_review.html

diff --git a/lms/hooks.py b/lms/hooks.py
index 3e1e92d2..e45b76d4 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -192,6 +192,7 @@ jinja = {
         "lms.lms.utils.get_popular_courses",
         "lms.lms.utils.format_amount",
         "lms.lms.utils.first_lesson_exists",
+        "lms.lms.utils.get_courses_under_review",
         "lms.lms.utils.has_course_instructor_role"
     ],
     "filters": []
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 5fd64ca3..1eaf9ca3 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -440,3 +440,15 @@ def has_course_instructor_role():
         "parent": frappe.session.user,
         "role": "Course Instructor"
         }, "name")
+
+
+def has_course_moderator_role():
+    return frappe.db.get_value("Has Role", {
+        "parent": frappe.session.user,
+        "role": "Course Moderator"
+        }, "name")
+
+
+def get_courses_under_review():
+    return "jan"
+
diff --git a/lms/patches.txt b/lms/patches.txt
index f8a1d28a..8ea2108a 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -31,3 +31,4 @@ lms.patches.v0_0.quiz_submission_member
 lms.patches.v0_0.delete_old_module_docs #08-07-2022
 lms.patches.v0_0.delete_course_web_forms #21-08-2022
 lms.patches.v0_0.create_course_instructor_role #29-08-2022
+lms.patches.v0_0.create_course_moderator_role
diff --git a/lms/patches/v0_0/create_course_moderator_role.py b/lms/patches/v0_0/create_course_moderator_role.py
new file mode 100644
index 00000000..f7127c81
--- /dev/null
+++ b/lms/patches/v0_0/create_course_moderator_role.py
@@ -0,0 +1,11 @@
+import frappe
+
+def execute():
+    if not frappe.db.exists("Role", "Course Moderator"):
+        role = frappe.get_doc({
+            "doctype": "Role",
+            "role_name": "Course Moderator",
+            "home_page": "/dashboard",
+            "desk_access": 0
+        })
+        role.save(ignore_permissions=True)
diff --git a/lms/templates/courses_under_review.html b/lms/templates/courses_under_review.html
new file mode 100644
index 00000000..7b0fa109
--- /dev/null
+++ b/lms/templates/courses_under_review.html
@@ -0,0 +1,20 @@
+{% set courses = get_courses_under_review() %}
+
+{% if courses | length %}
+<div class="cards-parent">
+    {% for course in courses %}
+    {{ widgets.CourseCard(course=course) }}
+    {% endfor %}
+</div>
+
+{% else %}
+<div class="empty-state">
+    <div>
+        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
+    </div>
+    <div class="empty-state-text">
+        <div class="empty-state-heading">{{ _("No courses created") }}</div>
+        <div class="course-meta">{{ _("Help others learn something new.") }}</div>
+    </div>
+</div>
+{% endif %}
diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py
index b3f59b76..659654dc 100644
--- a/lms/www/batch/learn.py
+++ b/lms/www/batch/learn.py
@@ -1,6 +1,6 @@
 import frappe
 from lms.www.utils import get_common_context, redirect_to_lesson
-from lms.lms.utils import get_lesson_url, is_instructor, redirect_to_courses_list
+from lms.lms.utils import get_lesson_url, has_course_moderator_role, is_instructor, redirect_to_courses_list
 from frappe.utils import cstr, flt
 
 def get_context(context):
@@ -27,7 +27,7 @@ def get_context(context):
         context.lesson = frappe._dict()
 
     if frappe.form_dict.get("edit"):
-        if not is_instructor(context.course.name):
+        if not is_instructor(context.course.name) or has_course_moderator_role():
             redirect_to_courses_list()
         context.lesson.edit_mode = True
     else:
diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py
index fb83fd9b..4bf95a8e 100644
--- a/lms/www/courses/course.py
+++ b/lms/www/courses/course.py
@@ -1,6 +1,6 @@
 import frappe
 from lms.lms.doctype.lms_settings.lms_settings import check_profile_restriction
-from lms.lms.utils import get_membership, is_instructor, is_certified, get_evaluation_details, redirect_to_courses_list
+from lms.lms.utils import get_membership, has_course_moderator_role, is_instructor, is_certified, get_evaluation_details, redirect_to_courses_list
 
 def get_context(context):
     context.no_cache = 1
@@ -28,7 +28,7 @@ def set_course_context(context, course_name):
         as_dict=True)
 
     if frappe.form_dict.get("edit"):
-        if not is_instructor(course.name):
+        if not is_instructor(course.name) or not has_course_moderator_role():
             redirect_to_courses_list()
         course.edit_mode = True
 
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index fb93273d..c7d76e57 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -16,12 +16,23 @@
 
         <ul class="nav" id="courses-tab">
             <li class="nav-item">
-                <a class="nav-link active" data-toggle="tab" href="#courses-enrolled"> {{ _("Courses Enrolled") }} </a>
+                <a class="nav-link active" data-toggle="tab" href="#courses-enrolled">
+                    {{ _("Courses Enrolled") }}
+                </a>
             </li>
 
             {% if show_creators_section %}
             <li class="nav-item">
-                <a class="nav-link" data-toggle="tab" href="#courses-created">{{ _("Courses Created") }}
+                <a class="nav-link" data-toggle="tab" href="#courses-created">
+                    {{ _("Courses Created") }}
+                </a>
+            </li>
+            {% endif %}
+
+            {% if show_review_section %}
+            <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#courses-under-review">
+                    {{ _("Courses Under Review") }}
                 </a>
             </li>
             {% endif %}
@@ -39,8 +50,14 @@
                 {% include "lms/templates/courses_created.html" %}
             </div>
             {% endif %}
-        </div>
 
+            {% if show_review_section %}
+            <div class="tab-pane fade" id="courses-under-review" role="tabpanel" aria-labelledby="courses-under-review">
+                {% include "lms/templates/courses_under_review.html" %}
+            </div>
+            {% endif %}
+
+        </div>
     </div>
 </div>
 
diff --git a/lms/www/dashboard/index.py b/lms/www/dashboard/index.py
index 487ebdd1..68951425 100644
--- a/lms/www/dashboard/index.py
+++ b/lms/www/dashboard/index.py
@@ -1,8 +1,9 @@
 import frappe
-from lms.lms.utils import has_course_instructor_role
+from lms.lms.utils import has_course_instructor_role, has_course_moderator_role
 
 
 def get_context(context):
     context.no_cache = 1
     portal_course_creation = frappe.db.get_single_value("LMS Settings", "portal_course_creation")
     context.show_creators_section = portal_course_creation == "Anyone" or has_course_instructor_role()
+    context.show_review_section = has_course_moderator_role()

From ce7f3ffca9da5f729f21a25644ed6da8452c707e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 6 Sep 2022 11:38:40 +0530
Subject: [PATCH 19/41] fix: no preview message

---
 lms/lms/widgets/CourseCard.html | 4 ++--
 lms/www/batch/learn.html        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html
index 6c3b4599..a7555a65 100644
--- a/lms/lms/widgets/CourseCard.html
+++ b/lms/lms/widgets/CourseCard.html
@@ -94,8 +94,8 @@
             {% elif ins_len == 2 %}
                 {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
             {% else %}
-                {% set suffix = "other" if ins_len - 2 == 1 else "others"  %}
-                {{ instructors[0].full_name.split(" ")[0] }}, {{ instructors[1].full_name.split(" ")[0] }} and {{ ins_len - 2 }} {{ suffix }}
+                {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
             {% endif %}
             </span>
         </a>
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 5929946a..78896567 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -95,8 +95,8 @@
             {% elif ins_len == 2 %}
                 {{ instructors[0].full_name.split(" ")[0] }} and {{ instructors[1].full_name.split(" ")[0] }}
             {% else %}
-                {% set suffix = "other" if ins_len - 2 == 1 else "others"  %}
-                {{ instructors[0].full_name.split(" ")[0] }}, {{ instructors[1].full_name.split(" ")[0] }} and {{ ins_len - 2 }} {{ suffix }}
+                {% set suffix = "other" if ins_len - 1 == 1 else "others"  %}
+                {{ instructors[0].full_name.split(" ")[0] }} and {{ ins_len - 1 }} {{ suffix }}
             {% endif %}
         </span>
         </a>
@@ -124,9 +124,9 @@
         {% set course_link = "<a class='join-batch' data-course=" + course.name | urlencode + " href=''>" + _('here') +  "</a>" %}
             <div class="">
                 <div>
-                    {{ _("This lesson is not available for preview.
+                    {{ _("There is no preview available for this lesson.
                     Please join the course to access it.
-                    Click {0} to join the course.").format(course_link) }}
+                    Click {0} to enroll.").format(course_link) }}
                 </div>
             </div>
         {% endif %}

From 9dc10c3756443749b8ac4494862de157e00ff268 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 9 Sep 2022 15:37:35 +0530
Subject: [PATCH 20/41] feat: allow moderators to edit course

---
 lms/hooks.py                       | 3 ++-
 lms/lms/utils.py                   | 5 ++++-
 lms/lms/widgets/CourseCard.html    | 2 +-
 lms/lms/widgets/CourseOutline.html | 3 +++
 lms/www/batch/learn.js             | 6 +-----
 lms/www/batch/learn.py             | 2 +-
 lms/www/courses/course.html        | 8 ++++----
 lms/www/courses/course.js          | 2 +-
 lms/www/courses/course.py          | 2 +-
 9 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lms/hooks.py b/lms/hooks.py
index e45b76d4..188a9e45 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -193,7 +193,8 @@ jinja = {
         "lms.lms.utils.format_amount",
         "lms.lms.utils.first_lesson_exists",
         "lms.lms.utils.get_courses_under_review",
-        "lms.lms.utils.has_course_instructor_role"
+        "lms.lms.utils.has_course_instructor_role",
+        "lms.lms.utils.has_course_moderator_role"
     ],
     "filters": []
 }
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 1eaf9ca3..047b43f7 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -450,5 +450,8 @@ def has_course_moderator_role():
 
 
 def get_courses_under_review():
-    return "jan"
+    return frappe.get_all("LMS Course", {
+        "status": "Under Review"
+    }, ["name", "upcoming", "title", "image", "enable_certification", "status", "published"]
+    )
 
diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html
index a7555a65..c84ab45d 100644
--- a/lms/lms/widgets/CourseCard.html
+++ b/lms/lms/widgets/CourseCard.html
@@ -3,7 +3,7 @@
 <div class="common-card-style course-card" data-course="{{ course.name }}">
 
   <div class="course-image {% if not course.image %}default-image{% endif %}" {% if course.image %}
-    style="background-image: url( {{ course.image }} );" {% endif %}>
+    style="background-image: url( {{ course.image | urlencode }} );" {% endif %}>
     <div class="course-tags">
       {% for tag in get_tags(course.name) %}
       <div class="course-card-pills">{{ tag }}</div>
diff --git a/lms/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html
index b146c3fd..d2f47904 100644
--- a/lms/lms/widgets/CourseOutline.html
+++ b/lms/lms/widgets/CourseOutline.html
@@ -185,3 +185,6 @@ const show_no_preview_dialog = (e) => {
 };
 
 </script>
+dahanukar
+sandesh
+chetna
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 197ca8a7..50178845 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -542,10 +542,6 @@ const build_attachment_table = (file_doc) => {
 
 
 const make_editor = () => {
-    let comment =  `<!--
-    {{ YouTubeVideo('Video Id') }}
-    {{ Quiz('Quiz Id') }}
--->`
 
     this.code_field_group = new frappe.ui.FieldGroup({
         fields: [
@@ -556,7 +552,7 @@ const make_editor = () => {
                 wrap: true,
                 max_lines: Infinity,
                 min_lines: 20,
-                default: $("#body").data("body") || comment,
+                default: $("#body").data("body"),
                 depends_on: 'eval:doc.type=="Markdown"',
             }
         ],
diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py
index 659654dc..9519c776 100644
--- a/lms/www/batch/learn.py
+++ b/lms/www/batch/learn.py
@@ -27,7 +27,7 @@ def get_context(context):
         context.lesson = frappe._dict()
 
     if frappe.form_dict.get("edit"):
-        if not is_instructor(context.course.name) or has_course_moderator_role():
+        if not is_instructor(context.course.name) and not has_course_moderator_role():
             redirect_to_courses_list()
         context.lesson.edit_mode = True
     else:
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index c8f04de8..75d26a28 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -270,7 +270,7 @@
     membership.current_lesson else "1.1" if first_lesson_exists(course.name) else None %}
 
     {% if show_start_learing_cta %}
-    <div class="btn btn-primary wide-button join-batch" data-course="{{ course.name | urlencode }}">
+    <div class="btn btn-primary wide-button join-batch mb-2" data-course="{{ course.name | urlencode }}">
         {{ _("Start Learning") }}
         <img class="ml-2" src="/assets/lms/icons/white-arrow.svg" />
     </div>
@@ -323,7 +323,7 @@
     {% endif %}
     {% endif %}
 
-    {% if is_instructor(course.name) %}
+    {% if is_instructor(course.name) or has_course_moderator_role() %}
     <a class="btn btn-secondary wide-button" href="/courses/{{ course.name }}?edit=1"> {{ _("Edit Course") }} </a>
     {% endif %}
 {% endmacro %}
@@ -341,9 +341,9 @@
         frappe.utils.format_time(certificate_request.start_time, "short")) }} </p>
     {% endif %}
 
-    {% if course.status == "Under Review" %}
+    {% if course.status == "Under Review" and is_instructor(course.name) %}
     <div class="mb-4">
-        {{ _("Your course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }}
+        {{ _("This course is currently under review. Once the review is complete, the System Admins will publish it on the website.") }}
     </div>
     {% endif %}
 
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 9e9f086b..083391f7 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -206,7 +206,7 @@ const submit_for_review = (e) => {
                 }, 3);
                 setTimeout(() => {
                     window.location.reload();
-                }, 3000);
+                }, 1000);
             }
         }
     });
diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py
index 4bf95a8e..f56f1ad2 100644
--- a/lms/www/courses/course.py
+++ b/lms/www/courses/course.py
@@ -28,7 +28,7 @@ def set_course_context(context, course_name):
         as_dict=True)
 
     if frappe.form_dict.get("edit"):
-        if not is_instructor(course.name) or not has_course_moderator_role():
+        if not is_instructor(course.name) and not has_course_moderator_role():
             redirect_to_courses_list()
         course.edit_mode = True
 

From 6d14bc2f54d8fa0061aed29c40a3074b5205b816 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 9 Sep 2022 16:04:53 +0530
Subject: [PATCH 21/41] fix: encode course image

---
 lms/lms/widgets/CourseCard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/lms/widgets/CourseCard.html b/lms/lms/widgets/CourseCard.html
index a7555a65..c84ab45d 100644
--- a/lms/lms/widgets/CourseCard.html
+++ b/lms/lms/widgets/CourseCard.html
@@ -3,7 +3,7 @@
 <div class="common-card-style course-card" data-course="{{ course.name }}">
 
   <div class="course-image {% if not course.image %}default-image{% endif %}" {% if course.image %}
-    style="background-image: url( {{ course.image }} );" {% endif %}>
+    style="background-image: url( {{ course.image | urlencode }} );" {% endif %}>
     <div class="course-tags">
       {% for tag in get_tags(course.name) %}
       <div class="course-card-pills">{{ tag }}</div>

From 212ed8e428bc17eb288c42e1b8f9192a7d3e87d0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 9 Sep 2022 18:16:02 +0530
Subject: [PATCH 22/41] feat: course settings from website

---
 lms/lms/doctype/lms_course/lms_course.py |  6 ++++--
 lms/lms/widgets/CourseOutline.html       |  6 ++----
 lms/public/css/style.css                 |  1 -
 lms/www/batch/learn.html                 | 11 ++++++-----
 lms/www/batch/learn.py                   |  5 ++++-
 lms/www/batch/quiz.html                  |  6 ++++--
 lms/www/courses/course.html              | 20 ++++++++++++++++++++
 lms/www/courses/course.js                |  4 +++-
 8 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index 0f497eb3..f6008f3d 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -194,7 +194,7 @@ def submit_for_review(course):
 
 
 @frappe.whitelist()
-def save_course(tags, title, short_introduction, video_link, description, course, image=None):
+def save_course(tags, title, short_introduction, video_link, description, course, published, upcoming,  image=None):
     if course:
         doc = frappe.get_doc("LMS Course", course)
     else:
@@ -208,7 +208,9 @@ def save_course(tags, title, short_introduction, video_link, description, course
         "video_link": video_link,
         "image": image,
         "description": description,
-        "tags": tags
+        "tags": tags,
+        "published": published,
+        "upcoming": upcoming
     })
     doc.save(ignore_permissions=True)
     return doc.name
diff --git a/lms/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html
index d2f47904..2aec5324 100644
--- a/lms/lms/widgets/CourseOutline.html
+++ b/lms/lms/widgets/CourseOutline.html
@@ -55,7 +55,7 @@
                 {% set active = membership.current_lesson == lesson.name %}
                 <div class="lesson-info {% if active and not course.edit_mode %} active-lesson {% endif %}">
 
-                {% if membership or lesson.include_in_preview or is_instructor %}
+                {% if membership or lesson.include_in_preview or is_instructor or has_course_moderator_role() %}
                 <a class="lesson-links" data-course="{{ course.name }}"
                 {% if is_instructor and not lesson.include_in_preview %}
                 title="{{ _('This lesson is not available for preview. As you are the Instructor of the course only you can see it.') }}"
@@ -185,6 +185,4 @@ const show_no_preview_dialog = (e) => {
 };
 
 </script>
-dahanukar
-sandesh
-chetna
+
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 2fe71a33..b8b2b9f7 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -74,7 +74,6 @@ input[type=checkbox] {
 
 .common-page-style {
   padding: 2rem 0 5rem;
-  min-height: 60vh;
   padding-top: 3rem;
   background-color: var(--bg-color);
 }
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 78896567..629e4ca0 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -57,6 +57,7 @@
 {% macro LessonContent(lesson) %}
 {% set instructors = get_instructors(course.name) %}
 {% set is_instructor = is_instructor(course.name) %}
+
 <div class="common-card-style lesson-content">
     <div class="lesson-title">
 
@@ -70,7 +71,7 @@
         <span class="indicator-pill green {{ hide if get_progress(course.name, lesson.name) != 'Complete' else ''}}">{{ _("COMPLETED") }}</span>
 
         <!-- Edit Button -->
-        {% if is_instructor and not lesson.edit_mode %}
+        {% if (is_instructor or has_course_moderator_role()) and not lesson.edit_mode %}
         <button class="button is-default button-links ml-auto btn-edit"> {{ _("Edit") }} </button>
         {% endif %}
     </div>
@@ -105,7 +106,7 @@
 
     <!-- Lesson Content -->
     <div class="markdown-source lesson-content-card {% if lesson.edit_mode %} mb-0 mt-2 {% endif %} ">
-        {% if membership or lesson.include_in_preview or is_instructor %}
+        {% if show_lesson %}
 
             {% if is_instructor and not lesson.include_in_preview and not lesson.edit_mode %}
             <div class="small alert alert-secondary alert-dismissible mb-4">
@@ -190,9 +191,9 @@
     <div class="medium mb-4" contenteditable="true" data-placeholder="{{ _('Quiz ID') }}"
     id="quiz-id">{% if lesson.quiz_id %}{{ lesson.quiz_id }}{% endif %}</div>
 
-    <label class="preview">
-        <input {% if lesson.include_in_preview %} checked {% endif %} type="checkbox"
-        id="preview"> {{ _("Show preview of this lesson to Guest users.") }}
+    <label class="preview" for="preview">
+        <input {% if lesson.include_in_preview %} checked {% endif %} type="checkbox" id="preview">
+        {{ _("Show preview of this lesson to Guest users.") }}
     </label>
 
     <div class="mt-4">
diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py
index 9519c776..fd8066fe 100644
--- a/lms/www/batch/learn.py
+++ b/lms/www/batch/learn.py
@@ -23,11 +23,14 @@ def get_context(context):
         redirect_to_lesson(context.course, index_)
 
     context.lesson = get_current_lesson_details(lesson_number, context)
+    instructor = is_instructor(context.course.name)
+    context.show_lesson = context.membership or context.lesson.include_in_preview or instructor or has_course_moderator_role()
+
     if not context.lesson:
         context.lesson = frappe._dict()
 
     if frappe.form_dict.get("edit"):
-        if not is_instructor(context.course.name) and not has_course_moderator_role():
+        if not instructor and not has_course_moderator_role():
             redirect_to_courses_list()
         context.lesson.edit_mode = True
     else:
diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 28a66e4c..26a2ca7f 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -55,8 +55,10 @@
                 <div contenteditable="true" data-placeholder="{{ _('Explain the option') }}"
                     class="option-input">{% if explanation %}{{ explanation }}{% endif %}</div>
                 <div class="option-checkbox">
-                    <input type="checkbox" {% if question['is_correct_' + num] %} checked {% endif %}>
-                    <label class="mb-0"> {{ _("Is Correct") }} </label>
+                    <label class="mb-0">
+                        <input type="checkbox" {% if question['is_correct_' + num] %} checked {% endif %}>
+                        {{ _("Is Correct") }}
+                    </label>
                 </div>
             </div>
         </div>
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 75d26a28..7472880a 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -18,6 +18,7 @@
             <div class="container">
                 <div class="course-body-container">
                     {{ CourseHeaderOverlay(course) }}
+                    {{ CourseSettings(course) }}
                     {{ Description(course) }}
                     {{ Save(course) }}
                     {{ widgets.CourseOutline(course=course, membership=membership, is_user_interested=is_user_interested) }}
@@ -210,6 +211,25 @@
 {% endmacro %}
 
 
+<!-- Course Settings -->
+{% macro CourseSettings(course) %}
+
+    {% if has_course_moderator_role() %}
+    <div class="mb-4">
+        <label for="published" class="mb-0">
+            <input type="checkbox" id="published" {% if course.published %} checked {% endif %}>
+            {{ _("Published") }}
+        </label>
+        <label for="upcoming" class="mb-0 ml-20">
+            <input type="checkbox" id="upcoming" {% if course.upcoming %} checked {% endif %}>
+            {{ _("Upcoming") }}
+        </label>
+    </div>
+    {% endif %}
+
+{% endmacro %}
+
+
 <!-- Save -->
 {% macro Save(course) %}
     {% if course.edit_mode %}
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 083391f7..0669f119 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -339,7 +339,9 @@ const save_course = (e) => {
             "video_link": $("#video-link").text(),
             "image": $("#image").attr("href"),
             "description": $("#description").text(),
-            "course": $("#title").data("course") ? $("#title").data("course") : ""
+            "course": $("#title").data("course") ? $("#title").data("course") : "",
+            "published": $("#published").prop("checked") ? 1 : 0,
+            "upcoming": $("#upcoming").prop("checked") ? 1 : 0
         },
         callback: (data) => {
             frappe.show_alert({

From b94a4ef9d6e4752d2e8d769375582011b819d5ac Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Sep 2022 12:06:36 +0530
Subject: [PATCH 23/41] feat: role settings from profile

---
 lms/lms/utils.py              | 10 ++++----
 lms/overrides/user.py         | 19 ++++++++++++++
 lms/public/css/style.css      |  5 ++++
 lms/www/courses/course.html   |  4 +--
 lms/www/profiles/profile.html | 47 ++++++++++++++++++++---------------
 lms/www/profiles/profile.js   | 42 +++++++++++++++++++++++++++++++
 lms/www/profiles/profile.py   |  5 +++-
 7 files changed, 104 insertions(+), 28 deletions(-)
 create mode 100644 lms/www/profiles/profile.js

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 047b43f7..22f78197 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -435,16 +435,16 @@ def redirect_to_courses_list():
     raise frappe.Redirect
 
 
-def has_course_instructor_role():
+def has_course_instructor_role(member=None):
     return frappe.db.get_value("Has Role", {
-        "parent": frappe.session.user,
+        "parent": member or frappe.session.user,
         "role": "Course Instructor"
         }, "name")
 
 
-def has_course_moderator_role():
+def has_course_moderator_role(member=None):
     return frappe.db.get_value("Has Role", {
-        "parent": frappe.session.user,
+        "parent": member or frappe.session.user,
         "role": "Course Moderator"
         }, "name")
 
@@ -453,5 +453,5 @@ def get_courses_under_review():
     return frappe.get_all("LMS Course", {
         "status": "Under Review"
     }, ["name", "upcoming", "title", "image", "enable_certification", "status", "published"]
-    )
+)
 
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index 52db13c7..820a4be5 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -330,3 +330,22 @@ def get_users(or_filters, start, page_length, text):
 	""".format(or_filters = or_filters, start=start, page_length=page_length), as_dict=1)
 
     return users
+
+
+@frappe.whitelist()
+def save_role(user, role, value):
+    if cint(value):
+        doc = frappe.get_doc({
+            "doctype": "Has Role",
+            "parent": user,
+            "role": role,
+            "parenttype": "User",
+            "parentfield": "roles"
+        })
+        doc.save(ignore_permissions=True)
+    else:
+        frappe.db.delete("Has Role", {
+            "parent": user,
+            "role": role
+        })
+    return True
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index b8b2b9f7..d24d8ff8 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -1686,3 +1686,8 @@ li {
 .review-link {
     float: right
 }
+
+.role {
+    margin-bottom: 0;
+    cursor: pointer;
+}
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 7472880a..4fdaf48e 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -214,7 +214,7 @@
 <!-- Course Settings -->
 {% macro CourseSettings(course) %}
 
-    {% if has_course_moderator_role() %}
+    {% if course.edit_mode and has_course_moderator_role() %}
     <div class="mb-4">
         <label for="published" class="mb-0">
             <input type="checkbox" id="published" {% if course.published %} checked {% endif %}>
@@ -306,7 +306,7 @@
     {{ _("Checkout Course") }} <img class="ml-2" src="/assets/lms/icons/white-arrow.svg" />
     </a>
 
-    {% elif course.upcoming and not is_user_interested %}
+    {% elif course.upcoming and not is_user_interested and not is_instructor %}
     <div class="btn btn-secondary wide-button notify-me" data-course="{{course.name | urlencode}}">
     {{ _("Notify me when available") }}
     </div>
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 3a4a6560..ad3ff2bc 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -11,6 +11,7 @@
     <div class="profile-page-body">
         <div class="container">
         {% set read_only = member.name != frappe.session.user %}
+        {{ RoleSettings(member) }}
         {{ About(member) }}
         {{ EducationDetails(member) }}
         {{ WorkDetails(member) }}
@@ -45,7 +46,7 @@
 
     <div class="profile-info">
         <div class="profile-name-section">
-            <div class="profile-name"> {{ member.full_name }} </div>
+            <div class="profile-name" data-name="{{ member.name }}"> {{ member.full_name }} </div>
 
             {% if get_authored_courses(member.name) | length %}
             <div class="creator-badge"> {{ _("Creator") }} </div>
@@ -155,10 +156,34 @@
 {% endmacro %}
 
 
+<!-- Role Settings -->
+{% macro RoleSettings(member) %}
+    {% if has_course_moderator_role() %}
+        <div class="">
+            <div class="common-card-style profile-card">
+                <div class="course-home-headings"> {{ _("Role Settings") }} </div>
+                <div>
+                    <label class="role">
+                        <input type="checkbox" id="instructor" data-role="Course Instructor"
+                        {% if has_course_instructor_role(member.name) %} checked {% endif %}>
+                        {{ _("Course Instructor") }}
+                    </label>
+                    <label class="role ml-20">
+                        <input type="checkbox" id="moderator" data-role="Course Moderator"
+                            {% if has_course_moderator_role(member.name) %} checked {% endif %}>
+                        {{ _("Course Moderator") }}
+                    </label>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endmacro %}
+
+
 <!-- About Section -->
 {% macro About(member) %}
 {% if member.bio %}
-    <div class="">
+    <div class="education-details">
         <div class="common-card-style profile-card">
             <div class="course-home-headings"> {{ _("About") }} </div>
             <div class="description">{{ member.bio }}</div>
@@ -386,21 +411,3 @@
 </div>
 {% endif %}
 {% endmacro %}
-
-
-{% block script %}
-<script>
-    frappe.ready(() => {
-        if ("{{ member.name }}" == frappe.session.user) {
-            setTimeout(() => {
-                var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
-                link_array.length && $(link_array[0]).addClass("active");
-            }, 0)
-        }
-
-        if ($(".profile-column-one").children().length == 0) {
-            $(".profile-column-one").hide();
-        }
-    });
-</script>
-{% endblock %}
diff --git a/lms/www/profiles/profile.js b/lms/www/profiles/profile.js
new file mode 100644
index 00000000..da344e2a
--- /dev/null
+++ b/lms/www/profiles/profile.js
@@ -0,0 +1,42 @@
+frappe.ready(() => {
+
+    make_profile_active_in_navbar();
+
+    $(".role").change((e) => {
+        save_role(e);
+    });
+
+});
+
+
+const make_profile_active_in_navbar = () => {
+    let member_name = $(".profile-name").data("name");
+    if (member_name == frappe.session.user) {
+        setTimeout(() => {
+            let link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+            link_array.length && $(link_array[0]).addClass("active");
+        }, 0)
+    }
+}
+
+
+const save_role = (e) => {
+    let member_name = $(".profile-name").data("name");
+    let role =  $(e.currentTarget).children("input");
+    frappe.call({
+        method: "lms.overrides.user.save_role",
+        args: {
+            "user": member_name,
+            "role": role.data("role"),
+            "value": role.prop("checked") ? 1 : 0
+        },
+        callback: (data) => {
+            if (data.message) {
+                frappe.show_alert({
+                    message: __("Saved"),
+                    indicator: "green",
+                });
+            }
+        }
+    })
+}
diff --git a/lms/www/profiles/profile.py b/lms/www/profiles/profile.py
index 93ac9136..ddbdf481 100644
--- a/lms/www/profiles/profile.py
+++ b/lms/www/profiles/profile.py
@@ -1,6 +1,6 @@
 import frappe
 from lms.page_renderers import get_profile_url_prefix
-from urllib.parse import urlencode
+
 
 def get_context(context):
     context.no_cache = 1
@@ -12,13 +12,16 @@ def get_context(context):
         if username:
             frappe.local.flags.redirect_location = get_profile_url_prefix() + username
             raise frappe.Redirect
+
     try:
         context.member = frappe.get_doc("User", {"username": username})
     except:
         context.template = "www/404.html"
         return
+
     context.profile_tabs = get_profile_tabs(context.member)
 
+
 def get_profile_tabs(user):
     """Returns the enabled ProfileTab objects.
 

From d8d0ce5b451fbf344b45337af56e5c79118e47a0 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Sep 2022 12:15:30 +0530
Subject: [PATCH 24/41] fix: empty state for review section

---
 lms/templates/courses_under_review.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lms/templates/courses_under_review.html b/lms/templates/courses_under_review.html
index 7b0fa109..394ec66e 100644
--- a/lms/templates/courses_under_review.html
+++ b/lms/templates/courses_under_review.html
@@ -13,8 +13,7 @@
         <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     </div>
     <div class="empty-state-text">
-        <div class="empty-state-heading">{{ _("No courses created") }}</div>
-        <div class="course-meta">{{ _("Help others learn something new.") }}</div>
+        <div class="empty-state-heading">{{ _("No courses under review") }}</div>
     </div>
 </div>
 {% endif %}

From 46861486c9011c2c718185c914b13dd6b57efa15 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Sep 2022 13:00:51 +0530
Subject: [PATCH 25/41] fix: text editor for description field

---
 lms/www/batch/learn.js      |  1 -
 lms/www/courses/course.html | 16 +++++++++++++---
 lms/www/courses/course.js   | 29 ++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 50178845..620c2b53 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -542,7 +542,6 @@ const build_attachment_table = (file_doc) => {
 
 
 const make_editor = () => {
-
     this.code_field_group = new frappe.ui.FieldGroup({
         fields: [
             {
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 4fdaf48e..e4c24cc4 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -205,9 +205,13 @@
 
 <!-- Description -->
 {% macro Description(course) %}
-    <div class="course-description-section" {% if course.edit_mode %} style="min-height: 100px" {% endif %}
-    {% if course.edit_mode %} contenteditable="true" {% endif %} id="description"
-    data-placeholder="Description">{% if course.description %}{{ frappe.utils.md_to_html(course.description) }}{% endif %}</div>
+    {% if course.edit_mode %}
+        <div id="description" {% if course.description %} data-description="{{ course.description }}" {% endif %}></div>
+    {% else %}
+        <div class="course-description-section">
+            {{ frappe.utils.md_to_html(course.description) }}
+        </div>
+    {% endif %}
 {% endmacro %}
 
 
@@ -419,3 +423,9 @@
     </div>
 </div>
 {% endmacro %}
+
+
+{% block base_scripts %}
+    {{ include_script("frappe-web.bundle.js") }}
+    {{ include_script('controls.bundle.js') }}
+{% endblock %}
diff --git a/lms/www/courses/course.js b/lms/www/courses/course.js
index 0669f119..06fbec3e 100644
--- a/lms/www/courses/course.js
+++ b/lms/www/courses/course.js
@@ -70,6 +70,10 @@ frappe.ready(() => {
         remove_tag(e);
     });
 
+    if ($("#description").length) {
+        make_editor();
+    }
+
 });
 
 
@@ -338,7 +342,7 @@ const save_course = (e) => {
             "short_introduction": $("#intro").text(),
             "video_link": $("#video-link").text(),
             "image": $("#image").attr("href"),
-            "description": $("#description").text(),
+            "description": this.code_field_group.fields_dict["code_md"].value,
             "course": $("#title").data("course") ? $("#title").data("course") : "",
             "published": $("#published").prop("checked") ? 1 : 0,
             "upcoming": $("#upcoming").prop("checked") ? 1 : 0
@@ -359,3 +363,26 @@ const save_course = (e) => {
 const remove_tag = (e) => {
     $(e.currentTarget).closest(".course-card-pills").remove();
 };
+
+
+const make_editor = () => {
+    this.code_field_group = new frappe.ui.FieldGroup({
+        fields: [
+            {
+                fieldname: "code_md",
+                fieldtype: "Code",
+                options: "Markdown",
+                wrap: true,
+                max_lines: Infinity,
+                min_lines: 20,
+                default: $("#description").data("description"),
+                depends_on: 'eval:doc.type=="Markdown"',
+            }
+        ],
+        body: $("#description").get(0),
+    });
+    this.code_field_group.make();
+    $("#description .form-section:last").removeClass("empty-section");
+    $("#description .frappe-control").removeClass("hide-control");
+    $("#description .form-column").addClass("p-0");
+};

From 7d7f674d9eba78b18fe938315f8a05cd5d2a485e Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 12 Sep 2022 18:17:06 +0530
Subject: [PATCH 26/41] fix: empty states

---
 .../courses_enrolled/courses_enrolled.html    |  38 ++-
 lms/lms/widgets/Reviews.html                  | 309 +++++++++---------
 lms/public/css/style.css                      |  12 +-
 lms/templates/courses_created.html            |   4 +-
 lms/templates/courses_under_review.html       |   5 +-
 lms/www/batch/quiz_list.html                  |  24 +-
 lms/www/community/index.html                  |   2 +-
 lms/www/courses/index.html                    |  50 +--
 lms/www/jobs/index.html                       |  11 +-
 9 files changed, 232 insertions(+), 223 deletions(-)

diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index b165aa70..298a2363 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -1,29 +1,31 @@
 {% set enrolled = get_enrolled_courses().in_progress + get_enrolled_courses().completed %}
 
+
 {% if enrolled | length %}
 <div class="cards-parent">
-  {% for course in enrolled %}
-  {{ widgets.CourseCard(course=course) }}
-  {% endfor %}
+    {% for course in enrolled %}
+        {{ widgets.CourseCard(course=course) }}
+    {% endfor %}
 </div>
 
+
 {% else %}
 {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
-<div class="empty-state">
-  <div class="empty-state-text text-left">
-    <div class="text-center">
-      <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
-      <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+<div class="empty-state p-5">
+    <div style="text-align: left; flex: 1;">
+        <div class="text-center">
+            <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
+            <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+        </div>
+        {% set recommended_courses = get_popular_courses() %}
+        <div class="cards-parent">
+            {% for course in recommended_courses %}
+                {% if course %}
+                    {% set course_details = frappe.get_doc("LMS Course", course.course) %}
+                    {{ widgets.CourseCard(course=course_details) }}
+                {% endif %}
+            {% endfor %}
+        </div>
     </div>
-    {% set recommended_courses = get_popular_courses() %}
-    <div class="cards-parent">
-    {% for course in recommended_courses %}
-    {% if course %}
-    {% set course_details = frappe.get_doc("LMS Course", course.course) %}
-    {{ widgets.CourseCard(course=course_details) }}
-    {% endif %}
-    {% endfor %}
-    </div>
-  </div>
 </div>
 {% endif %}
diff --git a/lms/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html
index 29015da1..89904e55 100644
--- a/lms/lms/widgets/Reviews.html
+++ b/lms/lms/widgets/Reviews.html
@@ -1,166 +1,169 @@
 {% if not course.upcoming %}
 <div class="reviews-parent">
-  {% set reviews = get_reviews(course.name) %}
-  <div class="mb-5">
-    <span class="course-home-headings"> {{ _("Reviews") }} </span>
-    {% if is_eligible_to_review(course.name, membership) and reviews | length %}
-    <span class="btn btn-secondary btn-sm review-link">
-      {{ _("Write a review") }}
-    </span>
-    {% endif %}
-  </div>
-
-  {% set avg_rating = get_average_rating(course.name) %}
-  {% if avg_rating %}
-  <div class="reviews-header">
-    <div class="text-center">
-      <div class="avg-rating"> {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} </div>
-      <div class="course-meta"> {{ reviews | length }} {{ _("ratings") }} </div>
-      <div class="avg-rating-stars">
-        <div class="rating">
-          {% for i in [1, 2, 3, 4, 5] %}
-          <svg class="icon icon-md {% if i <= frappe.utils.ceil(avg_rating) %} star-click {% endif %}" data-rating="{{ i }}">
-            <use href="#icon-star"></use>
-          </svg>
-          {% endfor %}
-        </div>
-      </div>
-        <div class="course-meta">
-            {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }}
-        </div>
-    </div>
-    <div class="vertical-divider"></div>
-    {% set sorted_reviews = get_sorted_reviews(course.name) %}
-    <div>
-      {% for review in sorted_reviews %}
-      <div class="d-flex align-items-center mb-3">
-        <div class="course-meta mr-2"> {{ frappe.utils.cint(review) }} {{ _("stars") }} </div>
-        <div class="progress">
-          <div class="progress-bar" role="progressbar" aria-valuenow="{{ sorted_reviews[review] }}"
-          aria-valuemin="0" aria-valuemax="100" style="width:{{ sorted_reviews[review] }}%">
-            <span class="sr-only"> {{ sorted_reviews[review] }} Complete</span>
-          </div>
-        </div>
-        <div class="course-meta ml-3"> {{ frappe.utils.cint(sorted_reviews[review]) }}% </div>
-      </div>
-      {% endfor %}
-    </div>
-  </div>
-  {% endif %}
-
-  {% if reviews | length %}
-  <div class="mt-12">
-    {% for review in reviews %}
-    <div class="mb-4">
-      <div class="d-flex align-items-center">
-
-        <div class="mr-4">
-          {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
-        </div>
-
-        <div>
-          <div class="d-flex align-items-center">
-            <a class="button-links mr-4" href="{{get_profile_url(review.owner_details.username) }}">
-              <span class="bold-heading">
-                {{ review.owner_details.full_name }}
-              </span>
-            </a>
-          <div class="frappe-timestamp course-meta" data-timestamp="{{ review.creation }}"> frappe.utils.pretty_date(review.creation) </div>
-          </div>
-
-          <div class="rating">
-            {% for i in [1, 2, 3, 4, 5] %}
-            <svg class="icon icon-md {% if i <= review.rating %} star-click {% endif %}" data-rating="{{ i }}">
-              <use href="#icon-star"></use>
-            </svg>
-            {% endfor %}
-          </div>
-        </div>
-      </div>
-
-      <div class="review-content"> {{ review.review }} </div>
-    </div>
-    {% if loop.index != reviews | length %}
-    <div class="card-divider"></div>
-    {% endif %}
-    {% endfor %}
-  </div>
-
-  {% else %}
-  <div class="empty-state">
-    <div>
-      <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
-    <div class="empty-state-text">
-      <div class="empty-state-heading">{{ _("Review the course") }}</div>
-      <div class="course-meta">{{ _("Help us improve our course material.") }}</div>
-    </div>
-    <div>
-      {% if not is_instructor(course.name) %}
+    {% set reviews = get_reviews(course.name) %}
+    <div class="mb-5">
+        <span class="course-home-headings"> {{ _("Reviews") }} </span>
         {% if is_eligible_to_review(course.name, membership) %}
-        <span class="review-link button is-secondary">
-          {{ _("Write a review") }}
-        </span>
-        {% elif frappe.session.user == "Guest" %}
-        <a class="button is-primary" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
-        {% elif not membership %}
-        <div class="button is-primary join-batch" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
+            <span class="btn btn-secondary btn-sm review-link">
+                {{ _("Write a review") }}
+            </span>
+        {% elif not is_instructor(course.name) and frappe.session.user == "Guest" %}
+            <a class="btn btn-secondary btn-s pull-rightm" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
+        {% elif not is_instructor(course.name) and not membership %}
+            <div class="btn btn-secondary btn-sm join-batch pull-right" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
         {% endif %}
-      {% endif %}
     </div>
-  </div>
-  {% endif %}
+
+
+    {% set avg_rating = get_average_rating(course.name) %}
+    {% if avg_rating %}
+    <div class="reviews-header">
+        <div class="text-center">
+            <div class="avg-rating">
+                {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }}
+            </div>
+            <div class="course-meta"> {{ reviews | length }} {{ _("ratings") }} </div>
+            <div class="avg-rating-stars">
+                <div class="rating">
+                    {% for i in [1, 2, 3, 4, 5] %}
+                    <svg class="icon icon-md {% if i <= frappe.utils.ceil(avg_rating) %} star-click {% endif %}" data-rating="{{ i }}">
+                        <use href="#icon-star"></use>
+                    </svg>
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="course-meta">
+                {{ frappe.utils.flt(avg_rating, frappe.get_system_settings("float_precision") or 3) }} {{ _("out of 5 ") }}
+            </div>
+        </div>
+
+
+        <div class="vertical-divider"></div>
+        {% set sorted_reviews = get_sorted_reviews(course.name) %}
+        <div>
+            {% for review in sorted_reviews %}
+            <div class="d-flex align-items-center mb-3">
+                <div class="course-meta mr-2">
+                    {{ frappe.utils.cint(review) }} {{ _("stars") }}
+                </div>
+                <div class="progress">
+                    <div class="progress-bar" role="progressbar" aria-valuenow="{{ sorted_reviews[review] }}"
+                        aria-valuemin="0" aria-valuemax="100" style="width:{{ sorted_reviews[review] }}%">
+                        <span class="sr-only"> {{ sorted_reviews[review] }} Complete</span>
+                    </div>
+                </div>
+                <div class="course-meta ml-3"> {{ frappe.utils.cint(sorted_reviews[review]) }}% </div>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+    {% endif %}
+
+
+    {% if reviews | length %}
+    <div class="mt-12">
+        {% for review in reviews %}
+        <div class="mb-4">
+            <div class="d-flex align-items-center">
+                <div class="mr-4">
+                {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
+                </div>
+                <div>
+                    <div class="d-flex align-items-center">
+                        <a class="button-links mr-4" href="{{get_profile_url(review.owner_details.username) }}">
+                        <span class="bold-heading">
+                            {{ review.owner_details.full_name }}
+                        </span>
+                        </a>
+                        <div class="frappe-timestamp course-meta" data-timestamp="{{ review.creation }}">
+                            {{ frappe.utils.pretty_date(review.creation) }}
+                        </div>
+                    </div>
+                    <div class="rating">
+                        {% for i in [1, 2, 3, 4, 5] %}
+                            <svg class="icon icon-md {% if i <= review.rating %} star-click {% endif %}" data-rating="{{ i }}">
+                                <use href="#icon-star"></use>
+                            </svg>
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+            <div class="review-content"> {{ review.review }} </div>
+        </div>
+        {% if loop.index != reviews | length %}
+            <div class="card-divider"></div>
+        {% endif %}
+        {% endfor %}
+    </div>
+
+
+    {% else %}
+    <div class="empty-state">
+        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
+        <div class="empty-state-text">
+            <div class="empty-state-heading">{{ _("Review the course") }}</div>
+            <div class="course-meta">{{ _("Help us improve our course material.") }}</div>
+        </div>
+    </div>
+    {% endif %}
 </div>
 
-<div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-  aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <div class="font-weight-bold">{{ _("Write a review") }}</div>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <form class="review-form" id="review-form">
-          <div class="form-group">
-            <div class="clearfix">
-              <label class="control-label reqd" style="padding-right: 0px;">{{ _("Rating") }}</label>
-            </div>
-            <div class="control-input-wrapper">
-              <div class="control-input">
-                <div class="rating rating-field" id="rating">
-                  {% for i in [1, 2, 3, 4, 5] %}
-                  <svg class="icon icon-md icon-rating" data-rating="{{ i }}">
-                    <use href="#icon-star"></use>
-                  </svg>
-                  {% endfor %}
-                </div>
-              </div>
-            </div>
-          </div>
 
-          <div class="form-group">
-            <div class="clearfix">
-              <label class="control-label reqd" style="padding-right: 0px;">{{ _("Review") }}</label>
+<div class="modal fade review-modal" id="review-modal" tabindex="-1" role="dialog"
+    aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="font-weight-bold">{{ _("Write a review") }}</div>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
-            <div class="control-input-wrapper">
-              <div class="control-input">
-                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field"
-                  data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
-                  spellcheck="false"></textarea>
-              </div>
+
+
+            <div class="modal-body">
+                <form class="review-form" id="review-form">
+                    <div class="form-group">
+                        <div class="clearfix">
+                            <label class="control-label reqd" style="padding-right: 0px;">{{ _("Rating") }}</label>
+                        </div>
+                        <div class="control-input-wrapper">
+                            <div class="control-input">
+                                <div class="rating rating-field" id="rating">
+                                    {% for i in [1, 2, 3, 4, 5] %}
+                                    <svg class="icon icon-md icon-rating" data-rating="{{ i }}">
+                                        <use href="#icon-star"></use>
+                                    </svg>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="form-group">
+                        <div class="clearfix">
+                            <label class="control-label reqd" style="padding-right: 0px;">{{ _("Review") }}</label>
+                        </div>
+                        <div class="control-input-wrapper">
+                            <div class="control-input">
+                                <textarea type="text" autocomplete="off" class="input-with-feedback form-control review-field"
+                                data-fieldtype="Text" data-fieldname="feedback_comments" placeholder="" style="height: 300px;"
+                                spellcheck="false"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                    <p class="error-field muted-text"></p>
+                </form>
             </div>
-          </div>
-          <p class="error-field muted-text"></p>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">
-          {{ _("Submit") }}</div>
-      </div>
+
+
+            <div class="modal-footer">
+                <div class="button submit-review is-primary" data-course="{{ course.name | urlencode}}" id="submit-review">
+                    {{ _("Submit") }}
+                </div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
 {% endif %}
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index d24d8ff8..777074bd 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -902,15 +902,14 @@ pre {
 .empty-state {
   background: var(--gray-200);
   border-radius: var(--border-radius-lg);
-  padding: 1.25rem;
+  padding: 4rem;
   display: flex;
-  justify-content: space-between;
+  justify-content: center;
   align-items: center;
 }
 
 .empty-state-text {
-    flex: 1;
-    text-align: center;
+    margin-left: 1rem;
 }
 
 .empty-state-heading {
@@ -1691,3 +1690,8 @@ li {
     margin-bottom: 0;
     cursor: pointer;
 }
+
+.icon-xl {
+    width: 2.75rem;
+    height: 2.75rem;
+}
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index f51d9d13..028fe5e0 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -9,9 +9,7 @@
 
 {% else %}
 <div class="empty-state">
-    <div>
-        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
+    <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
         <div class="empty-state-heading">{{ _("No courses created") }}</div>
         <div class="course-meta">{{ _("Help others learn something new.") }}</div>
diff --git a/lms/templates/courses_under_review.html b/lms/templates/courses_under_review.html
index 394ec66e..d825513a 100644
--- a/lms/templates/courses_under_review.html
+++ b/lms/templates/courses_under_review.html
@@ -9,11 +9,10 @@
 
 {% else %}
 <div class="empty-state">
-    <div>
-        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-    </div>
+    <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
         <div class="empty-state-heading">{{ _("No courses under review") }}</div>
+        <div class="course-meta">{{ _("When a course gets submitted for review, it will be listed here.") }}</div>
     </div>
 </div>
 {% endif %}
diff --git a/lms/www/batch/quiz_list.html b/lms/www/batch/quiz_list.html
index 8a34f17b..eecd28c8 100644
--- a/lms/www/batch/quiz_list.html
+++ b/lms/www/batch/quiz_list.html
@@ -12,10 +12,15 @@
 {% block content %}
 <div class="common-page-style">
     <div class="container">
-        {% if quiz_list | length %}
-        <a class="btn btn-secondary btn-sm pull-right" href="/quizzes/new-quiz"> {{ _("Add Quiz") }} </a>
-        <div class="course-home-headings"> {{ _("Quiz List") }} </div>
 
+        <a class="btn btn-secondary btn-sm pull-right" href="/quizzes/new-quiz">
+            {{ _("Add Quiz") }}
+        </a>
+        <div class="course-home-headings">
+            {{ _("Quiz List") }}
+        </div>
+
+        {% if quiz_list | length %}
         <div class="common-card-style">
             <table class="table">
 
@@ -48,13 +53,14 @@
 
         {% else %}
         <div class="empty-state">
+            <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
             <div class="empty-state-text">
-                <div class="empty-state-heading">{{ _("You have not created any quiz yet.") }}</div>
-                <div class="course-meta mb-6">{{ _("Create a quiz and add it to your course to engage users.") }}</div>
-                <a class="btn btn-secondary btn-sm"
-                    href="{% if frappe.session.user == 'Guest' %} /login?redirect-to=/quizzes {% else %} /quizzes/new-quiz  {% endif %}">
-                    {{ _("Add Quiz") }}
-                </a>
+                <div class="empty-state-heading">
+                    {{ _("You have not created any quiz yet.") }}
+                </div>
+                <div class="course-meta ">
+                    {{ _("Create a quiz and add it to your course to engage your users.") }}
+                </div>
             </div>
         </div>
         {% endif %}
diff --git a/lms/www/community/index.html b/lms/www/community/index.html
index 7cb18823..f073a39e 100644
--- a/lms/www/community/index.html
+++ b/lms/www/community/index.html
@@ -5,7 +5,7 @@
 <div class="common-page-style">
   <div class="container">
 
-    <input class="search" id="search-user" placeholder="{{ _('Try a Name, Company, or Industry') }}">
+    <input class="search pull-right" id="search-user" placeholder="{{ _('Search') }}">
 
     <div class="course-home-headings">{{ _("Community") }} </div>
 
diff --git a/lms/www/courses/index.html b/lms/www/courses/index.html
index 10dc5dd7..e57a5da9 100644
--- a/lms/www/courses/index.html
+++ b/lms/www/courses/index.html
@@ -6,29 +6,33 @@
 
 {% block content %}
 <div class="common-page-style">
-  <div class="container">
-    {% if restriction.restrict %}
-    {% set profile_link = "<a href='/edit-profile'> profile </a>" %}
-    <div class="empty-state">
-      <div class="course-home-headings text-center mb-0" style="color: inherit;">{{ _("You haven't completed your profile.") }}</div>
-      <p class="small text-center">{{ _("Complete your {0} to access the courses.").format(profile_link) }}</p>
+    <div class="container">
+        {% if restriction.restrict %}
+        {% set profile_link = "<a href='/edit-profile'> profile </a>" %}
+        <div class="empty-state">
+            <div class="course-home-headings text-center mb-0" style="color: inherit;">
+                {{ _("You haven't completed your profile.") }}
+            </div>
+            <p class="small text-center">
+                {{ _("Complete your {0} to access the courses.").format(profile_link) }}
+            </p>
+        </div>
+
+        {% else %}
+        {% include "lms/templates/search_course/search_course.html" %}
+
+        <div class="course-list">
+            {% set courses = live_courses %}
+            {% set title = _("Live Courses ({0})").format(courses | length) %}
+            {% set classes = "live-courses" %}
+            {% include "lms/templates/course_list.html" %}
+
+            {% set courses = upcoming_courses %}
+            {% set title = _("Upcoming Courses ({0})").format(courses | length) %}
+            {% set classes = "upcoming-courses mt-10" %}
+            {% include "lms/templates/course_list.html" %}
+        </div>
+        {% endif %}
     </div>
-
-    {% else %}
-    {% include "lms/templates/search_course/search_course.html" %}
-
-    <div class="course-list">
-      {% set courses = live_courses %}
-      {% set title = _("Live Courses ({0})").format(courses | length) %}
-      {% set classes = "live-courses" %}
-      {% include "lms/templates/course_list.html" %}
-
-      {% set courses = upcoming_courses %}
-      {% set title = _("Upcoming Courses ({0})").format(courses | length) %}
-      {% set classes = "upcoming-courses mt-10" %}
-      {% include "lms/templates/course_list.html" %}
-    </div>
-    {% endif %}
-  </div>
 </div>
 {% endblock %}
diff --git a/lms/www/jobs/index.html b/lms/www/jobs/index.html
index fea346ff..d1b448fa 100644
--- a/lms/www/jobs/index.html
+++ b/lms/www/jobs/index.html
@@ -9,7 +9,7 @@
 <div class="common-page-style">
 
     <div class="container">
-        {% if allow_posting and jobs | length %}
+        {% if allow_posting %}
         <a class="button is-primary pull-right" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
         {% endif %}
 
@@ -48,18 +48,11 @@
     {% else %}
 
     <div class="empty-state">
-        <div>
-            <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
-        </div>
+        <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
         <div class="empty-state-text">
             <div class="empty-state-heading">{{ _("No open jobs") }}</div>
             <div class="course-meta">{{ _("There are no job openings at present.") }}</div>
         </div>
-        <div>
-            {% if allow_posting %}
-            <a class="button is-secondary dark-links m-auto" href="/job-opportunity?new=1">{{ _("Post a Job") }}</a>
-            {% endif %}
-        </div>
     </div>
     {% endif %}
     </div>

From 7d18215bc963bebd7d6726de75f31dd905d505ff Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 13 Sep 2022 12:47:01 +0530
Subject: [PATCH 27/41] feat: certificates section in profile

---
 lms/hooks.py                                  |   3 +-
 lms/lms/utils.py                              |   5 +
 .../courses_enrolled/courses_enrolled.html    |  40 ++---
 lms/public/css/style.css                      |  12 +-
 lms/templates/certificate.html                |  26 ++--
 lms/templates/certificates_section.html       |  30 ++++
 lms/templates/courses_created.html            |   2 +-
 lms/www/courses/certificate.html              |   4 +-
 lms/www/courses/certificate.py                |   3 +-
 lms/www/dashboard/index.html                  |   2 +-
 lms/www/profiles/profile.html                 | 143 +++++++++---------
 lms/www/profiles/profile.py                   |   3 +
 12 files changed, 158 insertions(+), 115 deletions(-)
 create mode 100644 lms/templates/certificates_section.html

diff --git a/lms/hooks.py b/lms/hooks.py
index 188a9e45..9c94b94c 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -194,7 +194,8 @@ jinja = {
         "lms.lms.utils.first_lesson_exists",
         "lms.lms.utils.get_courses_under_review",
         "lms.lms.utils.has_course_instructor_role",
-        "lms.lms.utils.has_course_moderator_role"
+        "lms.lms.utils.has_course_moderator_role",
+        "lms.lms.utils.get_certificates"
     ],
     "filters": []
 }
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 22f78197..3e1da754 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -455,3 +455,8 @@ def get_courses_under_review():
     }, ["name", "upcoming", "title", "image", "enable_certification", "status", "published"]
 )
 
+
+def get_certificates(member=None):
+    return frappe.get_all("LMS Certificate", {
+        "member": member or frappe.session.user
+    }, ["course", "member", "issue_date", "expiry_date", "name"])
diff --git a/lms/lms/web_template/courses_enrolled/courses_enrolled.html b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
index b165aa70..7e17c865 100644
--- a/lms/lms/web_template/courses_enrolled/courses_enrolled.html
+++ b/lms/lms/web_template/courses_enrolled/courses_enrolled.html
@@ -2,28 +2,28 @@
 
 {% if enrolled | length %}
 <div class="cards-parent">
-  {% for course in enrolled %}
-  {{ widgets.CourseCard(course=course) }}
-  {% endfor %}
+    {% for course in enrolled %}
+        {{ widgets.CourseCard(course=course) }}
+    {% endfor %}
 </div>
 
 {% else %}
-{% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
-<div class="empty-state">
-  <div class="empty-state-text text-left">
-    <div class="text-center">
-      <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
-      <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+    {% set site_name = frappe.db.get_single_value("System Settings", "app_name") %}
+    <div class="empty-state">
+        <div class="empty-state-text text-left">
+            <div class="text-center">
+                <div class="empty-state-heading">{{ _("You haven't enrolled for any courses") }}</div>
+                <div class="course-meta mb-6">{{ _("Here are a few courses we recommend for you to get started with {0}").format(site_name) }}</div>
+            </div>
+            {% set recommended_courses = get_popular_courses() %}
+            <div class="cards-parent">
+                {% for course in recommended_courses %}
+                    {% if course %}
+                        {% set course_details = frappe.get_doc("LMS Course", course.course) %}
+                        {{ widgets.CourseCard(course=course_details) }}
+                    {% endif %}
+                {% endfor %}
+            </div>
+        </div>
     </div>
-    {% set recommended_courses = get_popular_courses() %}
-    <div class="cards-parent">
-    {% for course in recommended_courses %}
-    {% if course %}
-    {% set course_details = frappe.get_doc("LMS Course", course.course) %}
-    {{ widgets.CourseCard(course=course_details) }}
-    {% endif %}
-    {% endfor %}
-    </div>
-  </div>
-</div>
 {% endif %}
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index d24d8ff8..6d43a2bd 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -894,9 +894,9 @@ pre {
     }
 }
 
-.profile-card {
-  flex-direction: column;
-  padding: 1rem 1.25rem;
+.column-card {
+    flex-direction: column;
+    padding: 1.25rem;
 }
 
 .empty-state {
@@ -1398,19 +1398,19 @@ pre {
   overflow: inherit;
 }
 
-.dashboard .nav-link {
+.lms-nav .nav-link {
     color: var(--text-muted);
     padding: 0 0 var(--padding-md);
     margin-right: var(--margin-xl);
 }
 
-.dashboard .nav-link.active {
+.lms-nav .nav-link.active {
   font-weight: 600;
   border-bottom: 1px solid var(--primary);
   color: var(--text-color);
 }
 
-.dashboard .nav-link:hover {
+.lma.nav .nav-link:hover {
   color: inherit;
 }
 
diff --git a/lms/templates/certificate.html b/lms/templates/certificate.html
index e798cc1d..6851422d 100644
--- a/lms/templates/certificate.html
+++ b/lms/templates/certificate.html
@@ -1,18 +1,25 @@
 
 <div id="certificate-card" style="background: #FFFFFF; border-radius: 0.5rem; position: relative;
     box-shadow: 0px 1px 2px rgba(25, 39, 52, 0.05), 0px 0px 4px rgba(25, 39, 52, 0.1); padding: 1rem;">
+
     <div style="border: 10px solid var(--primary-color); display: flex; flex-direction: column; align-items: center; padding: 4rem;
         justify-content: center; background-color: #FFFFFF;">
+
         <img src="{{ logo }}" style="height: 1.5rem;">
         <div style="margin-top: 4rem;">
             {{ _("This certifies that") }}
         </div>
-        <div style="font-size: 2rem; font-weight: 500; color: #192734;"> {{ member.full_name }} </div>
-        <div style="margin-top: 0.5rem;"> {{ _("has successfully completed the course on") }}
-            <b> {{ course.title }} </b> on {{ frappe.utils.format_date(certificate.issue_date, "medium") }}. </div>
+
+        <div style="font-size: 2rem; font-weight: 500; color: #192734;">
+            {{ member.full_name }}
+        </div>
+        <div style="margin-top: 0.5rem;">
+            {{ _("has successfully completed the course on") }}
+            <b> {{ course.title }} </b>
+            on {{ frappe.utils.format_date(certificate.issue_date, "medium") }}.
+        </div>
 
         <div style="display: flex; justify-content: center; margin: 4rem auto 0; width: fit-content;">
-
             {% if instructors %}
             <div>
                 <div style="color: #192734; font-weight: bold; font-family: cursive; font-size: 1.25rem;">
@@ -25,14 +32,13 @@
 
             {% if certificate.expiry_date %}
             <div style="margin-left: 2rem;">
-            <div style="color: #192734; font-weight: bold; font-family: cursive; font-size: 1.25rem;">
-                {{ frappe.utils.format_date(certificate.expiry_date, "medium") }}
-            </div>
-            <hr style="margin: 0.5rem 0;">
-            <div> {{ _("Expiry date") }} </div>
+                <div style="color: #192734; font-weight: bold; font-family: cursive; font-size: 1.25rem;">
+                    {{ frappe.utils.format_date(certificate.expiry_date, "medium") }}
+                </div>
+                <hr style="margin: 0.5rem 0;">
+                <div> {{ _("Expiry date") }} </div>
             </div>
             {% endif %}
-
         </div>
     </div>
 </div>
diff --git a/lms/templates/certificates_section.html b/lms/templates/certificates_section.html
new file mode 100644
index 00000000..a60a8b5c
--- /dev/null
+++ b/lms/templates/certificates_section.html
@@ -0,0 +1,30 @@
+{% set certificates = get_certificates(user) %}
+
+{% if certificates | length %}
+<div class="cards-parent">
+    {% for certificate in certificates %}
+        {% set course = frappe.db.get_value("LMS Course", certificate.course, ["title", "name", "image"], as_dict=True) %}
+
+        <div class="common-card-style column-card">
+            <div class="font-weight-bold">
+                {{ course.title }}
+            </div>
+            <div>
+                {{ _("Issued on") }} : {{ frappe.utils.format_date(certificate.issue_date, "medium") }}
+            </div>
+            <a class="stretched-link" href="/courses/{{ course.name }}/{{ certificate.name }}"></a>
+        </div>
+    {% endfor %}
+</div>
+
+{% else %}
+{% set course_list_link = "<a href='/courses'> course list </a>" %}
+<div class="empty-state">
+    <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
+    <div class="empty-state-text">
+        <div class="empty-state-heading">{{ _("No certificates") }}</div>
+        <div class="course-meta">{{ _("Check out the {0} to know more about certification.").format(course_list_link) }}</div>
+    </div>
+</div>
+{% endif %}
+
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index f51d9d13..b70db8a8 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,4 +1,4 @@
-{% set courses = get_authored_courses(None, only_published=False) %}
+{% set courses = get_authored_courses(user or None, only_published=False) %}
 
 {% if courses | length %}
 <div class="cards-parent">
diff --git a/lms/www/courses/certificate.html b/lms/www/courses/certificate.html
index 61d48d53..85b164d7 100644
--- a/lms/www/courses/certificate.html
+++ b/lms/www/courses/certificate.html
@@ -16,9 +16,9 @@
         <a class="dark-links" href="/courses/{{ course.name }}">{{ course.title }}</a>
     </div>
     {% if custom_template %}
-    {{ custom_template }}
+        {{ custom_template }}
     {% else %}
-    {% include "lms/templates/certificate.html" %}
+        {% include "lms/templates/certificate.html" %}
     {% endif %}
     <script src="/assets/lms/js/html2canvas.js"></script>
 
diff --git a/lms/www/courses/certificate.py b/lms/www/courses/certificate.py
index 70dd7ff9..f624311d 100644
--- a/lms/www/courses/certificate.py
+++ b/lms/www/courses/certificate.py
@@ -19,8 +19,7 @@ def get_context(context):
 
     context.course = frappe.db.get_value("LMS Course", course_name, ["title", "name", "image"], as_dict=True)
     context.instructors = (", ").join([x.full_name for x in get_instructors(course_name)])
-    context.member = frappe.db.get_value("User", context.certificate.member,
-                ["full_name"], as_dict=True)
+    context.member = frappe.db.get_value("User", context.certificate.member, ["full_name"], as_dict=True)
 
     context.logo = frappe.db.get_single_value("Website Settings", "banner_image")
     template_name = frappe.db.get_single_value("LMS Settings", "custom_certificate_template")
diff --git a/lms/www/dashboard/index.html b/lms/www/dashboard/index.html
index c7d76e57..fff3a979 100644
--- a/lms/www/dashboard/index.html
+++ b/lms/www/dashboard/index.html
@@ -14,7 +14,7 @@
         </a>
         {% endif %}
 
-        <ul class="nav" id="courses-tab">
+        <ul class="nav lms-nav" id="courses-tab">
             <li class="nav-item">
                 <a class="nav-link active" data-toggle="tab" href="#courses-enrolled">
                     {{ _("Courses Enrolled") }}
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index ad3ff2bc..b8dab10b 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -5,28 +5,72 @@
 
 
 {% block content %}
+{% set read_only = member.name != frappe.session.user %}
+{% set user = member.name %}
+
 <div class="common-page-style profile-page">
     {{ ProfileBanner(member) }}
-
     <div class="profile-page-body">
         <div class="container">
-        {% set read_only = member.name != frappe.session.user %}
-        {{ RoleSettings(member) }}
-        {{ About(member) }}
-        {{ EducationDetails(member) }}
-        {{ WorkDetails(member) }}
-        {{ Certification(member) }}
-        {{ Contact(member) }}
-        {{ Skills(member) }}
-        {{ CareerPreference(member) }}
+
+            <ul class="nav lms-nav" id="courses-tab">
+
+                <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#profile">
+                        {{ _("Profile") }}
+                    </a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#courses-created">
+                        {{ _("Courses Created") }}
+                    </a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#certificates">
+                        {{ _("Certificates") }}
+                    </a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#settings">
+                        {{ _("Settings") }}
+                    </a>
+                </li>
+
+            </ul>
+
+            <div class="border-bottom mb-4"></div>
+
+            <div class="tab-content">
+                <div class="tab-pane active" id="profile" role="tabpanel" aria-labelledby="profile">
+                    {{ About(member) }}
+                    {{ EducationDetails(member) }}
+                    {{ WorkDetails(member) }}
+                    {{ ExternalCertification(member) }}
+                    {{ Contact(member) }}
+                    {{ Skills(member) }}
+                    {{ CareerPreference(member) }}
+                    {{ ProfileTabs(profile_tabs) }}
+                </div>
+
+                <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
+                    {% include "lms/templates/courses_created.html" %}
+                </div>
+
+                <div class="tab-pane fade" id="certificates" role="tabpanel" aria-labelledby="certificates">
+                    {% include "lms/templates/certificates_section.html" %}
+                </div>
+
+                <div class="tab-pane fade" id="settings" role="tabpanel" aria-labelledby="settings">
+                    {{ RoleSettings(member) }}
+                </div>
+
+            </div>
         </div>
     </div>
 
-    <div class="container">
-        {{ CoursesCreated(member, read_only) }}
-        {{ CoursesMentored(member, read_only) }}
-        {{ ProfileTabs(profile_tabs) }}
-    </div>
 </div>
 {% endblock %}
 
@@ -81,23 +125,6 @@
 {% endmacro %}
 
 
-<!-- Courses Created -->
-{% macro CoursesCreated(member, read_only) %}
-{% set authored_courses = get_authored_courses(member.name) %}
-
-{% if authored_courses | length %}
-<div class="profile-courses">
-    <div class="course-home-headings"> {{ _("Courses Created") }} </div>
-    <div class="cards-parent">
-        {% for course in authored_courses %}
-        {{ widgets.CourseCard(course=course, read_only=read_only) }}
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-{% endmacro %}
-
-
 <!-- Courses Mentored -->
 {% macro CoursesMentored(member, read_only) %}
 {% if member.get_mentored_courses() | length %}
@@ -113,34 +140,6 @@
 {% endmacro %}
 
 
-<!-- Courses Enrolled -->
-{% macro CoursesEnrolled(member, read_only) %}
-{% set enrolled = get_enrolled_courses() %}
-
-{% if enrolled.completed | length %}
-<div class="profile-courses">
-    <div class="course-home-headings"> {{ _("Courses Completed") }} </div>
-    <div class="cards-parent">
-        {% for course in enrolled.completed %}
-        {{ widgets.CourseCard(course=course, read_only=read_only) }}
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-{% if enrolled.in_progress | length %}
-<div class="profile-courses">
-    <div class="course-home-headings"> {{ _("Courses In Progress") }} </div>
-    <div class="cards-parent">
-        {% for course in enrolled.in_progress %}
-        {{ widgets.CourseCard(course=course, read_only=read_only) }}
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-{% endmacro %}
-
-
 <!-- Profile Tabs Extension -->
 {% macro ProfileTabs(profile_tabs) %}
 <div>
@@ -160,7 +159,7 @@
 {% macro RoleSettings(member) %}
     {% if has_course_moderator_role() %}
         <div class="">
-            <div class="common-card-style profile-card">
+            <div class="common-card-style column-card">
                 <div class="course-home-headings"> {{ _("Role Settings") }} </div>
                 <div>
                     <label class="role">
@@ -184,7 +183,7 @@
 {% macro About(member) %}
 {% if member.bio %}
     <div class="education-details">
-        <div class="common-card-style profile-card">
+        <div class="common-card-style column-card">
             <div class="course-home-headings"> {{ _("About") }} </div>
             <div class="description">{{ member.bio }}</div>
         </div>
@@ -196,7 +195,7 @@
 <!-- Work Preference -->
 {% macro WorkPreference(member) %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
         <div class="course-home-headings"> {{ _("Work Preference") }} </div>
         <div> {{ member.attire }} </div>
         <div> {{ member.collaboration }} </div>
@@ -213,7 +212,7 @@
 {% macro CareerPreference(member) %}
 {% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
 
         <div class="course-home-headings"> {{ _("Career Preference") }} </div>
         <div class="profile-column-grid">
@@ -261,7 +260,7 @@
 {% macro Contact(member) %}
 {% if member.linkedin or member.medium or member.github %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
         <div class="course-home-headings"> {{ _("Contact") }} </div>
         <div class="profile-column-grid">
         {% if member.linkedin %}
@@ -294,7 +293,7 @@
 {% macro Skills(member) %}
 {% if member.skill | length %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
         <div class="course-home-headings"> {{ _("Skills")}} </div>
         <div class="profile-column-grid">
             {% for skill in member.skill %}
@@ -311,12 +310,12 @@
 {% macro EducationDetails(member) %}
 {% if member.education %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
         <div class="course-home-headings"> {{ _("Education") }} </div>
 
         <div class="profile-grid-card">
             {% for edu in member.education %}
-            <div class="profile-card-row">
+            <div class="column-card-row">
                 <div class="bold-title"> {{ edu.institution_name }} </div>
                 <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
                     {% if not member.hide_private %}
@@ -347,7 +346,7 @@
 
 {% if work_details | length %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
+    <div class="common-card-style column-card">
         <div class="course-home-headings"> {{ _("Work Experience") }} </div>
         <div class="profile-grid-card">
 
@@ -379,11 +378,11 @@
 
 
 <!-- Certifications -->
-{% macro Certification(member) %}
+{% macro ExternalCertification(member) %}
 {% if member.certification %}
 <div class="education-details">
-    <div class="common-card-style profile-card">
-        <div class="course-home-headings"> {{ _("Certification") }} </div>
+    <div class="common-card-style column-card">
+        <div class="course-home-headings"> {{ _("External Certification") }} </div>
         <div class="profile-grid-card">
             {% for cert in member.certification %}
             <div class="">
diff --git a/lms/www/profiles/profile.py b/lms/www/profiles/profile.py
index ddbdf481..921dd658 100644
--- a/lms/www/profiles/profile.py
+++ b/lms/www/profiles/profile.py
@@ -1,5 +1,6 @@
 import frappe
 from lms.page_renderers import get_profile_url_prefix
+from frappe.utils.jinja import render_template
 
 
 def get_context(context):
@@ -20,6 +21,8 @@ def get_context(context):
         return
 
     context.profile_tabs = get_profile_tabs(context.member)
+    template_name = frappe.db.get_single_value("LMS Settings", "custom_certificate_template")
+    context.custom_certificate_template = frappe.db.get_value("Web Template", template_name, "template")
 
 
 def get_profile_tabs(user):

From 15b832eefb01514f8edf1fbbcb6d12ba17e92967 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 13 Sep 2022 13:03:21 +0530
Subject: [PATCH 28/41] fix: styles

---
 lms/public/css/style.css                | 2 +-
 lms/templates/certificates_section.html | 2 +-
 lms/www/profiles/profile.py             | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 272acabb..62d0b8a0 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -1409,7 +1409,7 @@ pre {
   color: var(--text-color);
 }
 
-.lma.nav .nav-link:hover {
+.lms-nav .nav-link:hover {
   color: inherit;
 }
 
diff --git a/lms/templates/certificates_section.html b/lms/templates/certificates_section.html
index a60a8b5c..16935676 100644
--- a/lms/templates/certificates_section.html
+++ b/lms/templates/certificates_section.html
@@ -18,7 +18,7 @@
 </div>
 
 {% else %}
-{% set course_list_link = "<a href='/courses'> course list </a>" %}
+{% set course_list_link = "<a href='/courses'>course list</a>" %}
 <div class="empty-state">
     <img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
     <div class="empty-state-text">
diff --git a/lms/www/profiles/profile.py b/lms/www/profiles/profile.py
index 921dd658..ddbdf481 100644
--- a/lms/www/profiles/profile.py
+++ b/lms/www/profiles/profile.py
@@ -1,6 +1,5 @@
 import frappe
 from lms.page_renderers import get_profile_url_prefix
-from frappe.utils.jinja import render_template
 
 
 def get_context(context):
@@ -21,8 +20,6 @@ def get_context(context):
         return
 
     context.profile_tabs = get_profile_tabs(context.member)
-    template_name = frappe.db.get_single_value("LMS Settings", "custom_certificate_template")
-    context.custom_certificate_template = frappe.db.get_value("Web Template", template_name, "template")
 
 
 def get_profile_tabs(user):

From efe73a21d9bbb066e803f76673ef435f718272ea Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 13 Sep 2022 17:13:25 +0530
Subject: [PATCH 29/41] fix: profile ui

---
 lms/lms/widgets/MemberCard.html    |  2 +-
 lms/public/css/style.css           | 23 ++++++++++++++++++-----
 lms/templates/courses_created.html |  2 +-
 lms/www/profiles/profile.html      | 15 +++++++++++++--
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/lms/lms/widgets/MemberCard.html b/lms/lms/widgets/MemberCard.html
index 580a1263..70906eb3 100644
--- a/lms/lms/widgets/MemberCard.html
+++ b/lms/lms/widgets/MemberCard.html
@@ -8,7 +8,7 @@
   <div> {{ member.headline }} </div>
   {% endif %}
 
-  {% set course_count = get_authored_courses(member.name) | length %}
+  {% set course_count = get_authored_courses(member.name, True) | length %}
   {% if show_course_count and course_count > 0 %}
   {% set suffix = "Courses" if course_count > 1 else "Course" %}
   <div class="">
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index 62d0b8a0..e4b39e55 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -125,9 +125,10 @@ input[type=checkbox] {
 }
 
 .course-card-title {
-  font-weight: 600;
-  color: var(--gray-900);
-  margin-bottom: 1.25rem;
+    font-weight: 600;
+    color: var(--gray-900);
+    margin-bottom: 1.25rem;
+    font-size: 1.125rem;
 }
 
 .card-divider {
@@ -1399,8 +1400,8 @@ pre {
 
 .lms-nav .nav-link {
     color: var(--text-muted);
-    padding: 0 0 var(--padding-md);
-    margin-right: var(--margin-xl);
+    padding: var(--padding-md) 0;
+    margin: 0 var(--margin-md);
 }
 
 .lms-nav .nav-link.active {
@@ -1409,6 +1410,12 @@ pre {
   color: var(--text-color);
 }
 
+@media (min-width: 500px) {
+    .lms-nav .nav-item:first-child .nav-link {
+        margin-left: 0;
+    }
+}
+
 .lms-nav .nav-link:hover {
   color: inherit;
 }
@@ -1691,6 +1698,12 @@ li {
     cursor: pointer;
 }
 
+@media (min-width: 500px) {
+    .role:last-child {
+        margin-left: 5rem
+    }
+}
+
 .icon-xl {
     width: 2.75rem;
     height: 2.75rem;
diff --git a/lms/templates/courses_created.html b/lms/templates/courses_created.html
index f58db0b0..1bcc0d4a 100644
--- a/lms/templates/courses_created.html
+++ b/lms/templates/courses_created.html
@@ -1,4 +1,4 @@
-{% set courses = get_authored_courses(user or None, only_published=False) %}
+{% set courses = get_authored_courses(user or None, only_published or False) %}
 
 {% if courses | length %}
 <div class="cards-parent">
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index b8dab10b..1a121516 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -7,6 +7,8 @@
 {% block content %}
 {% set read_only = member.name != frappe.session.user %}
 {% set user = member.name %}
+{% set courses_created = get_authored_courses(member.name, True) %}
+{% set certificates = get_certificates(user) %}
 
 <div class="common-page-style profile-page">
     {{ ProfileBanner(member) }}
@@ -21,17 +23,21 @@
                     </a>
                 </li>
 
+                {% if courses_created | length %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#courses-created">
                         {{ _("Courses Created") }}
                     </a>
                 </li>
+                {% endif %}
 
+                {% if certificates | length %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#certificates">
                         {{ _("Certificates") }}
                     </a>
                 </li>
+                {% endif %}
 
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#settings">
@@ -55,13 +61,18 @@
                     {{ ProfileTabs(profile_tabs) }}
                 </div>
 
+                {% if courses_created | length %}
+                {% set only_published = True %}
                 <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
                     {% include "lms/templates/courses_created.html" %}
                 </div>
+                {% endif %}
 
+                {% if certificates | length %}
                 <div class="tab-pane fade" id="certificates" role="tabpanel" aria-labelledby="certificates">
                     {% include "lms/templates/certificates_section.html" %}
                 </div>
+                {% endif %}
 
                 <div class="tab-pane fade" id="settings" role="tabpanel" aria-labelledby="settings">
                     {{ RoleSettings(member) }}
@@ -92,7 +103,7 @@
         <div class="profile-name-section">
             <div class="profile-name" data-name="{{ member.name }}"> {{ member.full_name }} </div>
 
-            {% if get_authored_courses(member.name) | length %}
+            {% if courses_created | length %}
             <div class="creator-badge"> {{ _("Creator") }} </div>
             {% endif %}
 
@@ -167,7 +178,7 @@
                         {% if has_course_instructor_role(member.name) %} checked {% endif %}>
                         {{ _("Course Instructor") }}
                     </label>
-                    <label class="role ml-20">
+                    <label class="role">
                         <input type="checkbox" id="moderator" data-role="Course Moderator"
                             {% if has_course_moderator_role(member.name) %} checked {% endif %}>
                         {{ _("Course Moderator") }}

From af059141f0d3a597571e3ec8f04b70a37c7be818 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 13 Sep 2022 17:48:54 +0530
Subject: [PATCH 30/41] fix: profile ux

---
 lms/www/profiles/profile.html | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 1a121516..4b636ae8 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -39,11 +39,13 @@
                 </li>
                 {% endif %}
 
+                {% if has_course_moderator_role() %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#settings">
                         {{ _("Settings") }}
                     </a>
                 </li>
+                {% endif %}
 
             </ul>
 
@@ -192,14 +194,18 @@
 
 <!-- About Section -->
 {% macro About(member) %}
-{% if member.bio %}
     <div class="education-details">
         <div class="common-card-style column-card">
             <div class="course-home-headings"> {{ _("About") }} </div>
-            <div class="description">{{ member.bio }}</div>
+            <div class="description">
+                {% if member.bio  %}
+                    {{ member.bio }}
+                {% else %}
+                    {{ _("Hey, my name is ") }} {{ member.full_name }}
+                {% endif %}
+            </div>
         </div>
     </div>
-{% endif %}
 {% endmacro %}
 
 

From 62ac0089c9c341578c1c21d88f641cf82e7266df Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 14 Sep 2022 17:10:38 +0530
Subject: [PATCH 31/41] fix: misc ux

---
 .../job_opportunity/job_opportunity.json      |   5 +-
 lms/lms/doctype/lms_course/lms_course.json    |   3 +-
 lms/lms/doctype/lms_course/lms_course.py      |  21 +-
 lms/lms/widgets/Reviews.html                  |   2 +-
 lms/public/css/style.css                      |   6 +-
 lms/templates/certificate.html                |   4 +-
 lms/www/courses/course.py                     |   2 +-
 lms/www/profiles/profile.html                 | 330 ++++++++----------
 8 files changed, 179 insertions(+), 194 deletions(-)

diff --git a/lms/job/doctype/job_opportunity/job_opportunity.json b/lms/job/doctype/job_opportunity/job_opportunity.json
index b0637b5f..b1684238 100644
--- a/lms/job/doctype/job_opportunity/job_opportunity.json
+++ b/lms/job/doctype/job_opportunity/job_opportunity.json
@@ -114,7 +114,8 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-07-28 13:41:29.224332",
+ "make_attachments_public": 1,
+ "modified": "2022-09-14 12:47:20.840223",
  "modified_by": "Administrator",
  "module": "Job",
  "name": "Job Opportunity",
@@ -152,4 +153,4 @@
  "sort_order": "DESC",
  "states": [],
  "title_field": "job_title"
-}
+}
\ No newline at end of file
diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json
index 1a12c77a..f2e4ce4a 100644
--- a/lms/lms/doctype/lms_course/lms_course.json
+++ b/lms/lms/doctype/lms_course/lms_course.json
@@ -260,7 +260,8 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2022-05-19 16:59:21.933367",
+ "make_attachments_public": 1,
+ "modified": "2022-09-14 13:26:53.153822",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index f6008f3d..b3bd9987 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -9,12 +9,14 @@ from ...utils import generate_slug
 from frappe.utils import flt, cint
 from lms.lms.utils import get_chapters
 
+
 class LMSCourse(Document):
 
     def validate(self):
         self.validate_instructors()
         self.validate_status()
 
+
     def validate_instructors(self):
         if self.is_new() and not self.instructors:
             frappe.get_doc({
@@ -25,14 +27,17 @@ class LMSCourse(Document):
                 "parenttype": "LMS Course"
             }).save(ignore_permissions=True)
 
+
     def validate_status(self):
         if self.published:
             self.status = "Approved"
 
+
     def on_update(self):
         if not self.upcoming and self.has_value_changed("upcoming"):
             self.send_email_to_interested_users()
 
+
     def send_email_to_interested_users(self):
         interested_users = frappe.get_all("LMS Course Interest", {
             "course": self.name
@@ -67,6 +72,7 @@ class LMSCourse(Document):
     def __repr__(self):
         return f"<Course#{self.name}>"
 
+
     def has_mentor(self, email):
         """Checks if this course has a mentor with given email.
         """
@@ -76,6 +82,7 @@ class LMSCourse(Document):
         mapping = frappe.get_all("LMS Course Mentor Mapping", {"course": self.name, "mentor": email})
         return mapping != []
 
+
     def add_mentor(self, email):
         """Adds a new mentor to the course.
         """
@@ -96,7 +103,6 @@ class LMSCourse(Document):
         doc.insert()
 
 
-
     def get_student_batch(self, email):
         """Returns the batch the given student is part of.
 
@@ -115,6 +121,7 @@ class LMSCourse(Document):
             fieldname="batch")
         return batch_name and frappe.get_doc("LMS Batch", batch_name)
 
+
     def get_batches(self, mentor=None):
         batches = frappe.get_all("LMS Batch", {"course": self.name})
         if mentor:
@@ -126,17 +133,21 @@ class LMSCourse(Document):
             batch_names = {m.batch for m in memberships}
             return [b for b in batches if b.name in batch_names]
 
+
     def get_cohorts(self):
         return frappe.get_all("Cohort", {"course": self.name}, order_by="creation")
 
+
     def get_cohort(self, cohort_slug):
         name = frappe.get_value("Cohort", {"course": self.name, "slug": cohort_slug})
         return name and frappe.get_doc("Cohort", name)
 
+
     def reindex_exercises(self):
         for i, c in enumerate(get_chapters(self.name), start=1):
             self._reindex_exercises_in_chapter(c, i)
 
+
     def _reindex_exercises_in_chapter(self, c, index):
         i = 1
         for lesson in self.get_lessons(c):
@@ -146,12 +157,14 @@ class LMSCourse(Document):
                 exercise.save()
                 i += 1
 
+
     def get_all_memberships(self, member):
         all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch"])
         for membership in all_memberships:
             membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
         return all_memberships
 
+
 @frappe.whitelist()
 def reindex_exercises(doc):
     course_data = json.loads(doc)
@@ -159,6 +172,7 @@ def reindex_exercises(doc):
     course.reindex_exercises()
     frappe.msgprint("All exercises in this course have been re-indexed.")
 
+
 @frappe.whitelist(allow_guest=True)
 def search_course(text):
     search_courses = []
@@ -184,6 +198,7 @@ def search_course(text):
 
     return courses
 
+
 @frappe.whitelist()
 def submit_for_review(course):
     chapters = frappe.get_all("Chapter Reference", {"parent": course})
@@ -209,8 +224,8 @@ def save_course(tags, title, short_introduction, video_link, description, course
         "image": image,
         "description": description,
         "tags": tags,
-        "published": published,
-        "upcoming": upcoming
+        "published": cint(published),
+        "upcoming": cint(upcoming)
     })
     doc.save(ignore_permissions=True)
     return doc.name
diff --git a/lms/lms/widgets/Reviews.html b/lms/lms/widgets/Reviews.html
index 89904e55..db871e54 100644
--- a/lms/lms/widgets/Reviews.html
+++ b/lms/lms/widgets/Reviews.html
@@ -9,7 +9,7 @@
             </span>
         {% elif not is_instructor(course.name) and frappe.session.user == "Guest" %}
             <a class="btn btn-secondary btn-s pull-rightm" href="/login?redirect-to=/courses/{{ course.name }}"> {{ _("Login") }} </a>
-        {% elif not is_instructor(course.name) and not membership %}
+        {% elif not is_instructor(course.name) and not membership and course.status == "Approved" %}
             <div class="btn btn-secondary btn-sm join-batch pull-right" data-course="{{ course.name | urlencode }}"> {{ _("Start Learning") }} </div>
         {% endif %}
     </div>
diff --git a/lms/public/css/style.css b/lms/public/css/style.css
index e4b39e55..f42a7e66 100644
--- a/lms/public/css/style.css
+++ b/lms/public/css/style.css
@@ -1545,7 +1545,7 @@ li {
     }
 }
 
-[contenteditable] {
+[contenteditable="true"] {
     outline: none;
     background-color: var(--bg-light-gray);
     border-radius: var(--border-radius);
@@ -1554,7 +1554,7 @@ li {
     color: var(--gray-900);
 }
 
-[contenteditable]:empty:before {
+[contenteditable="true"]:empty:before {
     content: attr(data-placeholder);
     color: var(--gray-600);
 }
@@ -1592,7 +1592,7 @@ li {
     padding: 0.5rem 0;
 }
 
-.course-card-pills[contenteditable] {
+.course-card-pills[contenteditable="true"] {
     box-shadow: none;
 }
 
diff --git a/lms/templates/certificate.html b/lms/templates/certificate.html
index 6851422d..245970cb 100644
--- a/lms/templates/certificate.html
+++ b/lms/templates/certificate.html
@@ -26,7 +26,7 @@
                     {{ instructors }}
                 </div>
                 <hr style="margin: 0.5rem 0;">
-                <div> {{ _("Course Instructor") }} </div>
+                <div class="text-center"> {{ _("Course Instructor") }} </div>
             </div>
             {% endif %}
 
@@ -36,7 +36,7 @@
                     {{ frappe.utils.format_date(certificate.expiry_date, "medium") }}
                 </div>
                 <hr style="margin: 0.5rem 0;">
-                <div> {{ _("Expiry date") }} </div>
+                <div class="text-center"> {{ _("Expiry date") }} </div>
             </div>
             {% endif %}
         </div>
diff --git a/lms/www/courses/course.py b/lms/www/courses/course.py
index f56f1ad2..e09aa052 100644
--- a/lms/www/courses/course.py
+++ b/lms/www/courses/course.py
@@ -73,4 +73,4 @@ def get_user_interest(course):
 
 
 def show_start_learing_cta(course, membership, restriction):
-    return not course.disable_self_learning and not membership and not course.upcoming and not restriction.get("restrict") and not is_instructor(course.name)
+    return not course.disable_self_learning and not membership and not course.upcoming and not restriction.get("restrict") and not is_instructor(course.name) and course.status == "Approved"
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 4b636ae8..81a3304c 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -53,14 +53,16 @@
 
             <div class="tab-content">
                 <div class="tab-pane active" id="profile" role="tabpanel" aria-labelledby="profile">
-                    {{ About(member) }}
-                    {{ EducationDetails(member) }}
-                    {{ WorkDetails(member) }}
-                    {{ ExternalCertification(member) }}
-                    {{ Contact(member) }}
-                    {{ Skills(member) }}
-                    {{ CareerPreference(member) }}
-                    {{ ProfileTabs(profile_tabs) }}
+                    <div class="common-card-style column-card mt-5">
+                        {{ About(member) }}
+                        {{ EducationDetails(member) }}
+                        {{ WorkDetails(member) }}
+                        {{ ExternalCertification(member) }}
+                        {{ Contact(member) }}
+                        {{ Skills(member) }}
+                        {{ CareerPreference(member) }}
+                        {{ ProfileTabs(profile_tabs) }}
+                    </div>
                 </div>
 
                 {% if courses_created | length %}
@@ -194,236 +196,202 @@
 
 <!-- About Section -->
 {% macro About(member) %}
-    <div class="education-details">
-        <div class="common-card-style column-card">
-            <div class="course-home-headings"> {{ _("About") }} </div>
-            <div class="description">
-                {% if member.bio  %}
-                    {{ member.bio }}
-                {% else %}
-                    {{ _("Hey, my name is ") }} {{ member.full_name }}
-                {% endif %}
-            </div>
-        </div>
+    <div class="course-home-headings"> {{ _("About") }} </div>
+    <div class="description">
+        {% if member.bio  %}
+            {{ member.bio }}
+        {% else %}
+            {{ _("Hey, my name is ") }} {{ member.full_name }}
+        {% endif %}
     </div>
 {% endmacro %}
 
 
 <!-- Work Preference -->
 {% macro WorkPreference(member) %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("Work Preference") }} </div>
-        <div> {{ member.attire }} </div>
-        <div> {{ member.collaboration }} </div>
-        <div> {{ member.role }} </div>
-        <div> {{ member.location_preference }} </div>
-        <div> {{ member.time }} </div>
-        <div> {{ member.company_type }} </div>
-    </div>
-</div>
+    <div class="course-home-headings mt-10"> {{ _("Work Preference") }} </div>
+    <div> {{ member.attire }} </div>
+    <div> {{ member.collaboration }} </div>
+    <div> {{ member.role }} </div>
+    <div> {{ member.location_preference }} </div>
+    <div> {{ member.time }} </div>
+    <div> {{ member.company_type }} </div>
 {% endmacro %}
 
 
 <!-- Career Preference -->
 {% macro CareerPreference(member) %}
-{% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-
-        <div class="course-home-headings"> {{ _("Career Preference") }} </div>
-        <div class="profile-column-grid">
-
-            {% if member.preferred_functions | length %}
-            <div>
-                <b>{{ _("Preferred Functions:") }}</b>
-                {% for function in member.preferred_functions %}
-                <div class="description">{{ function.function }}</div>
-                {% endfor %}
-            </div>
-            {% endif %}
-
-            {% if member.preferred_industries | length %}
-            <div>
-                <b>{{ _("Preferred Industries:") }}</b>
-                {% for industry in member.preferred_industries %}
-                <div class="description">{{ industry.industry }}</div>
-                {% endfor %}
-            </div>
-            {% endif %}
-
-            {% if member.preferred_location %}
-            <div>
-                <b> {{ _("Preferred Locations:") }} </b>
-                <div class="description"> {{ member.preferred_location }} </div>
-            </div>
-            {% endif %}
-
-            {% if member.dream_companies %}
-            <div>
-                <b> {{ _("Dream Companies:") }} </b>
-                <div class="description"> {{ member.dream_companies }} </div>
-            </div>
-            {% endif %}
+    {% if member.preferred_functions or member.preferred_industries or member.preferred_location or member.dream_companies %}
+    <div class="course-home-headings mt-10"> {{ _("Career Preference") }} </div>
+    <div class="profile-column-grid">
 
+        {% if member.preferred_functions | length %}
+        <div>
+            <b>{{ _("Preferred Functions:") }}</b>
+            {% for function in member.preferred_functions %}
+            <div class="description">{{ function.function }}</div>
+            {% endfor %}
         </div>
+        {% endif %}
+
+        {% if member.preferred_industries | length %}
+        <div>
+            <b>{{ _("Preferred Industries:") }}</b>
+            {% for industry in member.preferred_industries %}
+            <div class="description">{{ industry.industry }}</div>
+            {% endfor %}
+        </div>
+        {% endif %}
+
+        {% if member.preferred_location %}
+        <div>
+            <b> {{ _("Preferred Locations:") }} </b>
+            <div class="description"> {{ member.preferred_location }} </div>
+        </div>
+        {% endif %}
+
+        {% if member.dream_companies %}
+        <div>
+            <b> {{ _("Dream Companies:") }} </b>
+            <div class="description"> {{ member.dream_companies }} </div>
+        </div>
+        {% endif %}
+
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}
 
 
 <!-- Contact Section -->
 {% macro Contact(member) %}
-{% if member.linkedin or member.medium or member.github %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("Contact") }} </div>
-        <div class="profile-column-grid">
-        {% if member.linkedin %}
-        {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
-        <a class="button-links description" href="{{ member.linkedin }}">
-            <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
-        </a>
-        {% endif %}
+    {% if member.linkedin or member.medium or member.github %}
+    <div class="course-home-headings mt-10"> {{ _("Contact") }} </div>
+    <div class="profile-column-grid">
+    {% if member.linkedin %}
+    {% set linkedin = member.linkedin[:-1] if member.linkedin[-1] == "/" else member.linkedin %}
+    <a class="button-links description" href="{{ member.linkedin }}">
+        <img src="/assets/lms/icons/linkedin.svg"> {{ linkedin.split("/")[-1] }}
+    </a>
+    {% endif %}
 
-        {% if member.medium %}
-        <a class="button-links description" href="{{ member.medium}}">
-            <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
-        </a>
-        {% endif %}
+    {% if member.medium %}
+    <a class="button-links description" href="{{ member.medium}}">
+        <img src="/assets/lms/icons/medium.svg"> {{ member.medium.split("/")[-1] }}
+    </a>
+    {% endif %}
 
-        {% if member.github %}
-        <a class="button-links description" href="{{ member.github }}">
-            <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
-        </a>
-        {% endif %}
+    {% if member.github %}
+    <a class="button-links description" href="{{ member.github }}">
+        <img src="/assets/lms/icons/github.svg"> {{ member.github.split("/")[-1] }}
+    </a>
+    {% endif %}
 
-        </div>
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}
 
 
 <!-- Skills -->
 {% macro Skills(member) %}
-{% if member.skill | length %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("Skills")}} </div>
-        <div class="profile-column-grid">
-            {% for skill in member.skill %}
-            <div class="description"> {{ skill.skill_name }} </div>
-            {% endfor %}
-        </div>
+    {% if member.skill | length %}
+    <div class="course-home-headings mt-10"> {{ _("Skills")}} </div>
+    <div class="profile-column-grid">
+        {% for skill in member.skill %}
+        <div class="description"> {{ skill.skill_name }} </div>
+        {% endfor %}
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}
 
 
 <!-- Education Details -->
 {% macro EducationDetails(member) %}
-{% if member.education %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("Education") }} </div>
-
-        <div class="profile-grid-card">
-            {% for edu in member.education %}
-            <div class="column-card-row">
-                <div class="bold-title"> {{ edu.institution_name }} </div>
-                <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
-                    {% if not member.hide_private %}
-                    <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
-                    {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
-                    {% endif %}
-                </div>
-
-                <div class="description">
-                    {% if edu.start_date %}
-                    {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
-                    {% endif %}
-                    {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }}
-                </div>
-                <div class="description"> {{ edu.location }} </div>
+    {% if member.education %}
+    <div class="course-home-headings mt-10"> {{ _("Education") }} </div>
+    <div class="profile-grid-card">
+        {% for edu in member.education %}
+        <div class="column-card-row">
+            <div class="bold-title"> {{ edu.institution_name }} </div>
+            <div class="profile-item"> {{ edu.degree_type }} <span></span> {{ edu.major }}
+                {% if not member.hide_private %}
+                <!-- {% if edu.grade_type %} {{ edu.grade_type }}  {% endif %} -->
+                {% if edu.grade %} <span></span> {{ edu.grade }}  {% endif %}
+                {% endif %}
             </div>
-            {% endfor %}
+
+            <div class="description">
+                {% if edu.start_date %}
+                {{ frappe.utils.format_date(edu.start_date, "MMM YYYY") }} -
+                {% endif %}
+                {{ frappe.utils.format_date(edu.end_date, "MMM YYYY") }}
+            </div>
+            <div class="description"> {{ edu.location }} </div>
         </div>
+        {% endfor %}
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}
 
 
 <!-- Work Details -->
 {% macro WorkDetails(member) %}
-{% set work_details = member.work_experience + member.internship %}
+    {% set work_details = member.work_experience + member.internship %}
 
-{% if work_details | length %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("Work Experience") }} </div>
-        <div class="profile-grid-card">
+    {% if work_details | length %}
+    <div class="course-home-headings mt-10"> {{ _("Work Experience") }} </div>
+    <div class="profile-grid-card">
 
-            {% for work in work_details %}
-            <div class="">
-                <div class="bold-title"> {{ work.title }} </div>
-                <div class="profile-item"> {{ work.company }} </div>
-                <div class="description">
-                    {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
-                    {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }}
-                    {% else %} Present {% endif %}
-                </div>
-
-                <div class="description"> {{ work.location }} </div>
-
-                {% if work.description %}
-                <div class="profile-item">
-                    {{ work.description }}
-                </div>
-                {% endif %}
+        {% for work in work_details %}
+        <div class="">
+            <div class="bold-title"> {{ work.title }} </div>
+            <div class="profile-item"> {{ work.company }} </div>
+            <div class="description">
+                {{ frappe.utils.format_date(work.from_date, "MMM YYYY") }} -
+                {% if work.to_date %} {{ frappe.utils.format_date(work.to_date, "MMM YYYY") }}
+                {% else %} Present {% endif %}
             </div>
-            {% endfor %}
 
+            <div class="description"> {{ work.location }} </div>
+
+            {% if work.description %}
+            <div class="profile-item">
+                {{ work.description }}
+            </div>
+            {% endif %}
         </div>
+        {% endfor %}
+
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}
 
 
 <!-- Certifications -->
 {% macro ExternalCertification(member) %}
-{% if member.certification %}
-<div class="education-details">
-    <div class="common-card-style column-card">
-        <div class="course-home-headings"> {{ _("External Certification") }} </div>
-        <div class="profile-grid-card">
-            {% for cert in member.certification %}
-            <div class="">
+    {% if member.certification %}
+    <div class="course-home-headings mt-10"> {{ _("External Certification") }} </div>
+    <div class="profile-grid-card">
+        {% for cert in member.certification %}
+        <div class="">
 
-                <div class="bold-title"> {{ cert.certification_name }} </div>
-                <div class="profile-item"> {{ cert.organization }} </div>
+            <div class="bold-title"> {{ cert.certification_name }} </div>
+            <div class="profile-item"> {{ cert.organization }} </div>
 
-                <div class="description">
-                    {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
-                    {% if cert.expiration_date %}
-                    - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }}
-                    {% endif %}
-                </div>
-
-                {% if cert.description %}
-                <div class="profile-item">
-                    {{ cert.description }}
-                </div>
+            <div class="description">
+                {{ frappe.utils.format_date(cert.issue_date, "MMM YYYY") }}
+                {% if cert.expiration_date %}
+                - {{ frappe.utils.format_date(cert.expiration_date, "MMM YYYY") }}
                 {% endif %}
-
             </div>
-            {% endfor %}
+
+            {% if cert.description %}
+            <div class="profile-item">
+                {{ cert.description }}
+            </div>
+            {% endif %}
+
         </div>
+        {% endfor %}
     </div>
-</div>
-{% endif %}
+    {% endif %}
 {% endmacro %}

From bc9225f8edaed5289cc7562aa3c13f39c14d1c99 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 14 Sep 2022 20:07:58 +0530
Subject: [PATCH 32/41] fix: course count on profile page

---
 lms/www/profiles/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 81a3304c..1854cd86 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -93,7 +93,7 @@
 <!-- Banner -->
 {% macro ProfileBanner(member) %}
 {% set cover_image = member.cover_image if member.cover_image else "/assets/lms/images/profile-banner.png" %}
-{% set enrollment = get_course_membership(None, member_type="Student") | length %}
+{% set enrollment = get_course_membership(member.name, member_type="Student") | length %}
 {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
 
 <div class="container">

From 47b9b1dcd6cfd9f0fe4f6af955272c883d350379 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 15 Sep 2022 22:52:17 +0530
Subject: [PATCH 33/41] fix: show first chapter and question form by default

---
 .../job_opportunity/job_opportunity.json      |  3 ++-
 .../job_opportunity/job_opportunity.py        | 13 ++++++++++
 .../job_opportunity/job_opportunity.json      |  9 +++----
 lms/lms/widgets/CourseOutline.html            | 16 +++++++++---
 lms/public/js/common_functions.js             |  4 +--
 lms/www/batch/learn.html                      |  4 ++-
 lms/www/batch/learn.js                        | 10 ++++++--
 lms/www/batch/learn.py                        |  2 +-
 lms/www/batch/quiz.html                       |  2 +-
 lms/www/batch/quiz.js                         | 25 ++++++++++++++++---
 lms/www/courses/course.html                   |  2 +-
 11 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/lms/job/doctype/job_opportunity/job_opportunity.json b/lms/job/doctype/job_opportunity/job_opportunity.json
index b1684238..7ac25e65 100644
--- a/lms/job/doctype/job_opportunity/job_opportunity.json
+++ b/lms/job/doctype/job_opportunity/job_opportunity.json
@@ -45,6 +45,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "default": "Full Time",
    "fieldname": "type",
    "fieldtype": "Select",
    "label": "Type",
@@ -115,7 +116,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2022-09-14 12:47:20.840223",
+ "modified": "2022-09-15 17:22:21.662675",
  "modified_by": "Administrator",
  "module": "Job",
  "name": "Job Opportunity",
diff --git a/lms/job/doctype/job_opportunity/job_opportunity.py b/lms/job/doctype/job_opportunity/job_opportunity.py
index fc4ebc75..fbb648e6 100644
--- a/lms/job/doctype/job_opportunity/job_opportunity.py
+++ b/lms/job/doctype/job_opportunity/job_opportunity.py
@@ -9,10 +9,23 @@ from frappe.utils import get_link_to_form
 
 class JobOpportunity(Document):
 
+
     def validate(self):
+        self.validate_urls()
+        self.validate_logo()
+
+
+    def validate_urls(self):
         frappe.utils.validate_url(self.company_website, True)
         frappe.utils.validate_url(self.application_link, True)
 
+
+    def validate_logo(self):
+        if "/private" in self.company_logo:
+            frappe.db.set_value("File", {"file_url": self.company_logo}, "is_private", 0)
+            frappe.db.set_value("File", {"file_url": self.company_logo}, "file_url", self.company_logo.replace("/private", ""))
+            self.company_logo = self.company_logo.replace("/private", "")
+
 @frappe.whitelist()
 def report(job, reason):
     system_managers = get_system_managers(only_name=True)
diff --git a/lms/job/web_form/job_opportunity/job_opportunity.json b/lms/job/web_form/job_opportunity/job_opportunity.json
index a8f1e611..f54dc557 100644
--- a/lms/job/web_form/job_opportunity/job_opportunity.json
+++ b/lms/job/web_form/job_opportunity/job_opportunity.json
@@ -16,11 +16,11 @@
  "docstatus": 0,
  "doctype": "Web Form",
  "idx": 0,
- "is_multi_step_form": 0,
  "is_standard": 1,
+ "list_columns": [],
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2022-02-24 11:31:25.290524",
+ "modified": "2022-09-15 17:22:43.957184",
  "modified_by": "Administrator",
  "module": "Job",
  "name": "job-opportunity",
@@ -28,11 +28,9 @@
  "payment_button_label": "Buy Now",
  "published": 1,
  "route": "job-opportunity",
- "route_to_success_link": 1,
  "show_attachments": 0,
- "show_in_grid": 0,
+ "show_list": 1,
  "show_sidebar": 0,
- "sidebar_items": [],
  "success_message": "",
  "success_url": "/jobs",
  "title": "Job Opportunity",
@@ -63,6 +61,7 @@
   },
   {
    "allow_read_on_all_link_options": 0,
+   "default": "Full Time",
    "fieldname": "type",
    "fieldtype": "Select",
    "hidden": 0,
diff --git a/lms/lms/widgets/CourseOutline.html b/lms/lms/widgets/CourseOutline.html
index 2aec5324..41c22908 100644
--- a/lms/lms/widgets/CourseOutline.html
+++ b/lms/lms/widgets/CourseOutline.html
@@ -1,18 +1,28 @@
 <div class="course-home-outline">
 
+    {% set chapters = get_chapters(course.name) %}
+
     {% if course.edit_mode and course.name %}
     <button class="btn btn-md btn-secondary btn-chapter pull-right"> {{ _("New Chapter") }} </button>
     {% endif %}
 
-    {% if course.name and (course.edit_mode or get_chapters(course.name) | length) %}
+    {% if course.name and (course.edit_mode or chapters | length) %}
     <div class="course-home-headings" id="outline-heading">
         {{ _("Course Content") }}
     </div>
     {% endif %}
 
-    {% if get_chapters(course.name) | length %}
+    {% if course.edit_mode and course.name and not chapters | length %}
+    <div class="chapter-parent chapter-edit new-chapter">
+        <div contenteditable="true" data-placeholder="{{ _('Chapter Name') }}" class="chapter-title-main"></div>
+        <div class="chapter-description small my-2" contenteditable="true" data-placeholder="{{ _('Short Description') }}"></div>
+        <button class="btn btn-sm btn-secondary d-block btn-save-chapter" data-index="1"> {{ _('Save') }} </button>
+    </div>
+    {% endif %}
 
-    {% for chapter in get_chapters(course.name) %}
+    {% if chapters | length %}
+
+    {% for chapter in chapters %}
     <div class="chapter-parent {% if course.edit_mode %} chapter-edit {% endif %} ">
         <div class="chapter-title" {% if not course.edit_mode %}  data-toggle="collapse" aria-expanded="false"
         data-target="#{{ get_slugified_chapter_title(chapter.title) }}" {% endif %} >
diff --git a/lms/public/js/common_functions.js b/lms/public/js/common_functions.js
index 17ace20d..ccdf3632 100644
--- a/lms/public/js/common_functions.js
+++ b/lms/public/js/common_functions.js
@@ -127,7 +127,7 @@ const scroll_to_chapter_container = () => {
         scrollTop: $(".new-chapter").offset().top
     }, 1000);
     $(".new-chapter").find(".chapter-title-main").focus();
-}
+};
 
 
 const save_chapter = (e) => {
@@ -150,7 +150,7 @@ const save_chapter = (e) => {
             });
             setTimeout(() => {
                 window.location.reload();
-            }, 1000)
+            }, 1000);
         }
     });
 };
diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 629e4ca0..6c5eb03c 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -33,7 +33,9 @@
             </div>
             <div class="lesson-pagination-parent">
                 {{ LessonContent(lesson) }}
-                {% if not lesson.edit_mode %} {{ Discussions() }} {% endif %}
+                {% if not lesson.edit_mode and course.staus == "Approved" and not course.upcoming %}
+                {{ Discussions() }}
+                {% endif %}
             </div>
         </div>
     </div>
diff --git a/lms/www/batch/learn.js b/lms/www/batch/learn.js
index 620c2b53..435ff01c 100644
--- a/lms/www/batch/learn.js
+++ b/lms/www/batch/learn.js
@@ -498,8 +498,14 @@ const save_lesson = (e) => {
             "idx": $("#title").data("index"),
             "lesson": lesson ? lesson : ""
         },
-        callback: (data) => {
-            window.location.href = window.location.href.split("?")[0];
+        callback: (data) => {;
+            frappe.show_alert({
+                message: __("Saved"),
+                indicator: "green",
+            });
+            setTimeout(() => {
+                window.location.href = window.location.href.split("?")[0];
+            }, 1000);
         }
     });
 };
diff --git a/lms/www/batch/learn.py b/lms/www/batch/learn.py
index fd8066fe..a1674156 100644
--- a/lms/www/batch/learn.py
+++ b/lms/www/batch/learn.py
@@ -24,7 +24,7 @@ def get_context(context):
 
     context.lesson = get_current_lesson_details(lesson_number, context)
     instructor = is_instructor(context.course.name)
-    context.show_lesson = context.membership or context.lesson.include_in_preview or instructor or has_course_moderator_role()
+    context.show_lesson = context.membership or (context.lesson and context.lesson.include_in_preview) or instructor or has_course_moderator_role()
 
     if not context.lesson:
         context.lesson = frappe._dict()
diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 26a2ca7f..53f8cb0a 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -40,7 +40,7 @@
     {% for question in quiz.questions %}
     <div class="quiz-card">
         <div contenteditable="true" data-placeholder="{{ _('Question') }}" data-question="{{ question.name }}"
-        class="question mb-4">{% if question.question %} {{ question.question }} {% endif %}</div>
+        class="question mb-4 req">{% if question.question %} {{ question.question }} {% endif %}</div>
 
         {% for i in range(1,5) %}
         {% set num = frappe.utils.cstr(i) %}
diff --git a/lms/www/batch/quiz.js b/lms/www/batch/quiz.js
index a7491fed..f114e2c6 100644
--- a/lms/www/batch/quiz.js
+++ b/lms/www/batch/quiz.js
@@ -1,7 +1,11 @@
 frappe.ready(() => {
 
+    if(!$(".quiz-card").length) {
+        add_question();
+    }
+
     $(".btn-question").click((e) => {
-        add_question(e);
+        add_question();
     });
 
     $(".btn-save-question").click((e) => {
@@ -17,10 +21,15 @@ frappe.ready(() => {
 });
 
 
-const add_question = (e) => {
+const add_question = () => {
+    if ($(".new-quiz-card").length) {
+        scroll_to_question_container();
+        return;
+    }
+
     let add_after = $(".quiz-card").length ? $(".quiz-card:last") : $("#quiz-title");
-    let question_template = `<div class="quiz-card">
-            <div contenteditable="true" data-placeholder="${__("Question")}" class="question mb-4"></div>
+    let question_template = `<div class="quiz-card new-quiz-card">
+            <div contenteditable="true" data-placeholder="${__("Question")}" class="question req mb-4"></div>
         </div>`;
     $(question_template).insertAfter(add_after);
     get_question_template();
@@ -109,3 +118,11 @@ const get_questions = () => {
 
     return questions;
 };
+
+
+const scroll_to_question_container = () => {
+    $([document.documentElement, document.body]).animate({
+        scrollTop: $(".new-quiz-card").offset().top
+    }, 1000);
+    $(".new-quiz-card").find(".question").focus();
+}
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index e4c24cc4..163e1c5e 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -22,7 +22,7 @@
                     {{ Description(course) }}
                     {{ Save(course) }}
                     {{ widgets.CourseOutline(course=course, membership=membership, is_user_interested=is_user_interested) }}
-                    {% if not course.edit_mode %}
+                    {% if not course.edit_mode and course.staus == "Approved" and not course.upcoming %}
                     {{ widgets.Reviews(course=course, membership=membership) }}
                     {% endif %}
                 </div>

From f7ba72217b84a84b9d29a600d79bf908e4b8eed2 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 16 Sep 2022 11:37:11 +0530
Subject: [PATCH 34/41] fix: controls script loading

---
 lms/hooks.py                | 2 +-
 lms/www/courses/course.html | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lms/hooks.py b/lms/hooks.py
index 9c94b94c..fc70e0e6 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -21,7 +21,7 @@ app_license = "AGPL"
 # include js, css files in header of web template
 web_include_css = "lms.bundle.css"
 # web_include_css = "/assets/lms/css/lms.css"
-web_include_js = "website.bundle.js"
+web_include_js = ["website.bundle.js", "controls.bundle.js"]
 
 # include custom scss in every website theme (without file extension ".scss")
 # website_theme_scss = "lms/public/scss/website"
diff --git a/lms/www/courses/course.html b/lms/www/courses/course.html
index 163e1c5e..27e7257a 100644
--- a/lms/www/courses/course.html
+++ b/lms/www/courses/course.html
@@ -6,7 +6,6 @@
 
 {% block head_include %}
     {% include "public/icons/symbol-defs.svg" %}
-    <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 {% endblock %}
 
 
@@ -22,7 +21,7 @@
                     {{ Description(course) }}
                     {{ Save(course) }}
                     {{ widgets.CourseOutline(course=course, membership=membership, is_user_interested=is_user_interested) }}
-                    {% if not course.edit_mode and course.staus == "Approved" and not course.upcoming %}
+                    {% if not course.edit_mode and course.status == "Approved" and not frappe.utils.cint(course.upcoming) %}
                     {{ widgets.Reviews(course=course, membership=membership) }}
                     {% endif %}
                 </div>
@@ -423,9 +422,3 @@
     </div>
 </div>
 {% endmacro %}
-
-
-{% block base_scripts %}
-    {{ include_script("frappe-web.bundle.js") }}
-    {{ include_script('controls.bundle.js') }}
-{% endblock %}

From 023fd73b86fd00a29bda0c06899fae3ee2ef0709 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 16 Sep 2022 16:05:33 +0530
Subject: [PATCH 35/41] fix: removed unused classes

---
 lms/www/batch/quiz.html | 2 +-
 lms/www/batch/quiz.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/www/batch/quiz.html b/lms/www/batch/quiz.html
index 53f8cb0a..26a2ca7f 100644
--- a/lms/www/batch/quiz.html
+++ b/lms/www/batch/quiz.html
@@ -40,7 +40,7 @@
     {% for question in quiz.questions %}
     <div class="quiz-card">
         <div contenteditable="true" data-placeholder="{{ _('Question') }}" data-question="{{ question.name }}"
-        class="question mb-4 req">{% if question.question %} {{ question.question }} {% endif %}</div>
+        class="question mb-4">{% if question.question %} {{ question.question }} {% endif %}</div>
 
         {% for i in range(1,5) %}
         {% set num = frappe.utils.cstr(i) %}
diff --git a/lms/www/batch/quiz.js b/lms/www/batch/quiz.js
index f114e2c6..140d9fdf 100644
--- a/lms/www/batch/quiz.js
+++ b/lms/www/batch/quiz.js
@@ -29,7 +29,7 @@ const add_question = () => {
 
     let add_after = $(".quiz-card").length ? $(".quiz-card:last") : $("#quiz-title");
     let question_template = `<div class="quiz-card new-quiz-card">
-            <div contenteditable="true" data-placeholder="${__("Question")}" class="question req mb-4"></div>
+            <div contenteditable="true" data-placeholder="${__("Question")}" class="question mb-4"></div>
         </div>`;
     $(question_template).insertAfter(add_after);
     get_question_template();

From 7c1c061681f12b5fa3443c1c2fd96c0b38b43d9c Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 16 Sep 2022 19:06:53 +0530
Subject: [PATCH 36/41] fix: change private files to public for company logo,
 user image and course image

---
 lms/job/doctype/job_opportunity/job_opportunity.py | 10 +++-------
 lms/lms/doctype/lms_course/lms_course.py           |  6 +++---
 lms/lms/utils.py                                   |  9 +++++++++
 lms/overrides/user.py                              |  7 ++++++-
 lms/www/profiles/profile.html                      |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lms/job/doctype/job_opportunity/job_opportunity.py b/lms/job/doctype/job_opportunity/job_opportunity.py
index fbb648e6..6bff10fd 100644
--- a/lms/job/doctype/job_opportunity/job_opportunity.py
+++ b/lms/job/doctype/job_opportunity/job_opportunity.py
@@ -6,13 +6,15 @@ from frappe.model.document import Document
 from frappe.utils.user import get_system_managers
 from frappe import _
 from frappe.utils import get_link_to_form
+from lms.lms.utils import validate_image
+from lms.lms.utils import validate_image
 
 class JobOpportunity(Document):
 
 
     def validate(self):
         self.validate_urls()
-        self.validate_logo()
+        self.company_logo = validate_image(self.company_logo)
 
 
     def validate_urls(self):
@@ -20,12 +22,6 @@ class JobOpportunity(Document):
         frappe.utils.validate_url(self.application_link, True)
 
 
-    def validate_logo(self):
-        if "/private" in self.company_logo:
-            frappe.db.set_value("File", {"file_url": self.company_logo}, "is_private", 0)
-            frappe.db.set_value("File", {"file_url": self.company_logo}, "file_url", self.company_logo.replace("/private", ""))
-            self.company_logo = self.company_logo.replace("/private", "")
-
 @frappe.whitelist()
 def report(job, reason):
     system_managers = get_system_managers(only_name=True)
diff --git a/lms/lms/doctype/lms_course/lms_course.py b/lms/lms/doctype/lms_course/lms_course.py
index b3bd9987..4de53314 100644
--- a/lms/lms/doctype/lms_course/lms_course.py
+++ b/lms/lms/doctype/lms_course/lms_course.py
@@ -5,8 +5,8 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 import json
-from ...utils import generate_slug
-from frappe.utils import flt, cint
+from ...utils import generate_slug, validate_image
+from frappe.utils import cint
 from lms.lms.utils import get_chapters
 
 
@@ -15,7 +15,7 @@ class LMSCourse(Document):
     def validate(self):
         self.validate_instructors()
         self.validate_status()
-
+        self.image = validate_image(self.image)
 
     def validate_instructors(self):
         if self.is_new() and not self.instructors:
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 3e1da754..b5aae2c6 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -460,3 +460,12 @@ def get_certificates(member=None):
     return frappe.get_all("LMS Certificate", {
         "member": member or frappe.session.user
     }, ["course", "member", "issue_date", "expiry_date", "name"])
+
+
+def validate_image(path):
+    if "/private" in path:
+        file = frappe.get_doc("File", {"file_url": path})
+        file.is_private = 0
+        file.save(ignore_permissions=True)
+        return file.file_url
+    return path
diff --git a/lms/overrides/user.py b/lms/overrides/user.py
index 820a4be5..7273077d 100644
--- a/lms/overrides/user.py
+++ b/lms/overrides/user.py
@@ -6,17 +6,22 @@ import random
 import re
 from frappe import _
 from frappe.website.utils import is_signup_disabled
+from lms.lms.utils import validate_image
 import requests
-from frappe.geo.country_info import get_all
 from lms.widgets import Widgets
 
+
 class CustomUser(User):
 
+
     def validate(self):
         super(CustomUser, self).validate()
         self.validate_username_characters()
         self.validate_skills()
         self.validate_completion()
+        self.user_image = validate_image(self.user_image)
+        self.cover_image = validate_image(self.cover_image)
+
 
     def validate_username_characters(self):
         if len(self.username):
diff --git a/lms/www/profiles/profile.html b/lms/www/profiles/profile.html
index 1854cd86..9c083e14 100644
--- a/lms/www/profiles/profile.html
+++ b/lms/www/profiles/profile.html
@@ -97,7 +97,7 @@
 {% set enrollment_suffix = _("Courses") if enrollment > 1 else _("Course") %}
 
 <div class="container">
-    <div class="profile-banner" style="background-image: url({{ cover_image }})">
+    <div class="profile-banner" style="background-image: url({{ cover_image | urlencode }})">
         <div class="profile-avatar">
             {{ widgets.Avatar(member=member, avatar_class="avatar-square") }}
         </div>

From 4ba6ea9190c79bdec02a77778d69a9f9a03d00c1 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Sep 2022 10:34:49 +0530
Subject: [PATCH 37/41] fix: removed unnecessary import

---
 lms/job/doctype/job_opportunity/job_opportunity.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/job/doctype/job_opportunity/job_opportunity.py b/lms/job/doctype/job_opportunity/job_opportunity.py
index 6bff10fd..643638ba 100644
--- a/lms/job/doctype/job_opportunity/job_opportunity.py
+++ b/lms/job/doctype/job_opportunity/job_opportunity.py
@@ -7,7 +7,6 @@ from frappe.utils.user import get_system_managers
 from frappe import _
 from frappe.utils import get_link_to_form
 from lms.lms.utils import validate_image
-from lms.lms.utils import validate_image
 
 class JobOpportunity(Document):
 

From 37f2e7eeda2a1e265ea67fc09e50697129300b33 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Mon, 19 Sep 2022 17:56:49 +0530
Subject: [PATCH 38/41] fix: check if path is present

---
 lms/lms/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index b5aae2c6..a36f8438 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -463,7 +463,7 @@ def get_certificates(member=None):
 
 
 def validate_image(path):
-    if "/private" in path:
+    if path and "/private" in path:
         file = frappe.get_doc("File", {"file_url": path})
         file.is_private = 0
         file.save(ignore_permissions=True)

From b9fe05c27f5effbff1793ff705241db471c1a089 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 21 Sep 2022 17:37:56 +0530
Subject: [PATCH 39/41] feat: subscription add ons

---
 lms/subscription_utils.py | 45 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 lms/subscription_utils.py

diff --git a/lms/subscription_utils.py b/lms/subscription_utils.py
new file mode 100644
index 00000000..5da134e7
--- /dev/null
+++ b/lms/subscription_utils.py
@@ -0,0 +1,45 @@
+import frappe
+
+
+@frappe.whitelist(allow_guest=True)
+def get_add_on_details(plan: str) -> dict[str, int]:
+    """
+    Returns the number of courses and course members to be billed under add-ons for SAAS subscription
+    """
+
+    return {
+        "courses": get_add_on_courses(plan),
+        "members": get_add_on_members(plan)
+    }
+
+
+def get_published_courses() -> int:
+    return frappe.db.count("LMS Course", {"published": 1})
+
+
+def get_add_on_courses(plan: str) -> int:
+    COURSE_LIMITS = {"Lite": 5, "Essential": 20}
+    add_on_courses = 0
+    courses_included_in_plans = COURSE_LIMITS.get(plan)
+
+    if courses_included_in_plans:
+        published_courses = get_published_courses()
+        add_on_courses = published_courses - courses_included_in_plans if published_courses > courses_included_in_plans else 0
+
+    return add_on_courses
+
+
+def get_add_on_members(plan: str) -> int:
+    MEMBER_LIMITS = {"Lite": 100, "Essential": 500}
+    add_on_members = 0
+    members_included_in_plans = MEMBER_LIMITS.get(plan)
+
+    if members_included_in_plans:
+        active_members = get_members()
+        add_on_members = active_members - members_included_in_plans if active_members > members_included_in_plans else 0
+
+    return add_on_members
+
+
+def get_members() -> int:
+    return frappe.db.count("LMS Batch Membership")

From 247017d19aab7f28f0fbbc8f2495a2104ebc70ae Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Wed, 21 Sep 2022 20:38:56 +0530
Subject: [PATCH 40/41] fix: changed essential plan to pro

---
 lms/subscription_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/subscription_utils.py b/lms/subscription_utils.py
index 5da134e7..b4d5e766 100644
--- a/lms/subscription_utils.py
+++ b/lms/subscription_utils.py
@@ -18,7 +18,7 @@ def get_published_courses() -> int:
 
 
 def get_add_on_courses(plan: str) -> int:
-    COURSE_LIMITS = {"Lite": 5, "Essential": 20}
+    COURSE_LIMITS = {"Lite": 5, "Pro": 20}
     add_on_courses = 0
     courses_included_in_plans = COURSE_LIMITS.get(plan)
 
@@ -30,7 +30,7 @@ def get_add_on_courses(plan: str) -> int:
 
 
 def get_add_on_members(plan: str) -> int:
-    MEMBER_LIMITS = {"Lite": 100, "Essential": 500}
+    MEMBER_LIMITS = {"Lite": 100, "Pro": 500}
     add_on_members = 0
     members_included_in_plans = MEMBER_LIMITS.get(plan)
 

From c9fd1f52521dd11557963428b704c1ec6488f8bf Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Fri, 23 Sep 2022 07:12:12 +0530
Subject: [PATCH 41/41] fix: discussions component visibility conditions

---
 lms/www/batch/learn.html | 2 +-
 lms/www/utils.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/www/batch/learn.html b/lms/www/batch/learn.html
index 6c5eb03c..f71d1580 100644
--- a/lms/www/batch/learn.html
+++ b/lms/www/batch/learn.html
@@ -33,7 +33,7 @@
             </div>
             <div class="lesson-pagination-parent">
                 {{ LessonContent(lesson) }}
-                {% if not lesson.edit_mode and course.staus == "Approved" and not course.upcoming %}
+                {% if not lesson.edit_mode and course.status == "Approved" and not course.upcoming %}
                 {{ Discussions() }}
                 {% endif %}
             </div>
diff --git a/lms/www/utils.py b/lms/www/utils.py
index 81228e4e..167c6c01 100644
--- a/lms/www/utils.py
+++ b/lms/www/utils.py
@@ -9,7 +9,7 @@ def get_common_context(context):
         batch_name = None
 
     course = frappe.db.get_value("LMS Course",
-        frappe.form_dict["course"], ["name", "title", "video_link", "enable_certification"], as_dict=True)
+        frappe.form_dict["course"], ["name", "title", "video_link", "enable_certification", "status"], as_dict=True)
     if not course:
         context.template = "www/404.html"
         return