fix: flow UI and quiz progress

lms/lms/doctype/course_lesson/course_lesson.py

@@ -92,7 +92,17 @@ def save_progress(lesson, course, status):
 		"LMS Batch Membership", {"member": frappe.session.user, "course": course}
 	)
 	if not membership:
-		return
+		return 0
+
+	body = frappe.db.get_value("Course Lesson", lesson, "body")
+	macros = find_macros(body)
+	quizzes = [value for name, value in macros if name == "Quiz"]
+
+	for quiz in quizzes:
+		if not frappe.db.exists(
+			"LMS Quiz Submission", {"quiz": quiz, "owner": frappe.session.user}
+		):
+			return 0
 
 	filters = {"lesson": lesson, "owner": frappe.session.user, "course": course}
 	if frappe.db.exists("LMS Course Progress", filters):

lms/lms/doctype/lms_class/lms_class.js

@@ -21,10 +21,13 @@ frappe.ui.form.on("LMS Class", {
 			},
 			callback: (r) => {
 				if (r.message) {
+					let date = frappe.datetime.get_today();
 					r.message.forEach((lesson) => {
 						let row = frm.add_child("scheduled_flow");
 						row.lesson = lesson.name;
 						row.lesson_title = lesson.title;
+						row.date = date;
+						date = frappe.datetime.add_days(date, 1);
 					});
 					frm.refresh_field("scheduled_flow");
 				}

lms/lms/doctype/scheduled_flow/scheduled_flow.json

@@ -43,7 +43,8 @@
    "fieldname": "date",
    "fieldtype": "Date",
    "in_list_view": 1,
-   "label": "Date"
+   "label": "Date",
+   "reqd": 1
   },
   {
    "fetch_from": "lesson.title",
@@ -56,7 +57,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-08-01 12:31:27.512437",
+ "modified": "2023-08-07 12:10:28.095018",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Scheduled Flow",

lms/lms/utils.py

@@ -136,16 +136,26 @@ def get_lesson_details(chapter):
 			as_dict=True,
 		)
 		lesson_details.number = flt(f"{chapter.idx}.{row.idx}")
-		lesson_details.icon = "icon-list"
-		macros = find_macros(lesson_details.body)
+		lesson_details.icon = get_lesson_icon(lesson_details.body)
+
+		lessons.append(lesson_details)
+	return lessons
+
+
+def get_lesson_icon(content):
+	icon = None
+	macros = find_macros(content)
 
 	for macro in macros:
 		if macro[0] == "YouTubeVideo" or macro[0] == "Video":
-				lesson_details.icon = "icon-youtube"
+			icon = "icon-youtube"
 		elif macro[0] == "Quiz":
-				lesson_details.icon = "icon-quiz"
-		lessons.append(lesson_details)
-	return lessons
+			icon = "icon-quiz"
+
+	if not icon:
+		icon = "icon-list"
+
+	return icon
 
 
 def get_tags(course):
@@ -336,7 +346,7 @@ def is_eligible_to_review(course, membership):
 
 def get_course_progress(course, member=None):
 	"""Returns the course progress of the session user"""
-	lesson_count = len(get_lessons(course))
+	lesson_count = get_lessons(course, get_details=False)
 	if not lesson_count:
 		return 0
 	completed_lessons = frappe.db.count(

lms/lms/widgets/CourseOutline.html

@@ -36,7 +36,6 @@
             <!-- <div class="small ml-auto">
                 {{ lessons | length }} lessons
             </div> -->
-
         </div>
 
 
@@ -58,9 +57,7 @@
 
                 {% if membership or lesson.include_in_preview or is_instructor or has_course_moderator_role() %}
                 <a class="lesson-links"
-                {% if not from_class %}
-                href="{{ get_lesson_url(course.name, lesson.number) }}{{course.query_parameter}}"
-                {% endif %}
+                href="{{ get_lesson_url(course.name, lesson.number) }}{% if classname %}?class={{ classname }}{% endif %}{{course.query_parameter}}"
                 {% 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.') }}"
                 {% endif %}>

lms/public/css/style.css

@@ -621,7 +621,7 @@ input[type=checkbox] {
 }
 
 .lesson-info {
-  font-size: 16px;
+	padding: 0.5rem;
 	color: var(--gray-900);
 	letter-spacing: -0.011em;
 }
@@ -629,7 +629,6 @@ input[type=checkbox] {
 .lesson-links {
 	display: flex;
 	align-items: center;
-	padding: 0.5rem;
 	color: var(--gray-900);
 	font-size: var(--text-base);
 }
@@ -2204,3 +2203,9 @@ select {
 .grid-form-heading {
 	cursor: none;
 }
+
+.schedule-header {
+	display: flex;
+	font-size: var(--text-sm);
+	padding: 0.5rem 0.5rem 0 0.5rem;
+}

lms/templates/quiz/quiz.js

@@ -142,6 +142,9 @@ const quiz_summary = (e = undefined) => {
 			$("#try-again").attr("data-submission", data.message.submission);
 			$("#try-again").removeClass("hide");
 			self.quiz_submitted = true;
+			if (this.hasOwnProperty("marked_as_complete")) {
+				mark_progress();
+			}
 		},
 	});
 };

lms/www/batch/learn.html

@@ -39,8 +39,8 @@
                 {% endif %}
 
                 <div class="course-details-outline">
-                    {% set from_class = True if class_info else False %}
-                    {{ widgets.CourseOutline(course=course, membership=membership, lesson_page=True, from_class=from_class) }}
+                    {% set classname = class_info.name if class_info else False %}
+                    {{ widgets.CourseOutline(course=course, membership=membership, lesson_page=True, classname=classname) }}
                 </div>
             </div>
             <div class="lesson-parent">

lms/www/batch/learn.js

@@ -15,7 +15,6 @@ frappe.ready(() => {
 			!self.marked_as_complete &&
 			$(".title").hasClass("is-member")
 		) {
-			self.marked_as_complete = true;
 			mark_progress();
 		}
 	});
@@ -61,8 +60,11 @@ const mark_progress = () => {
 			status: status,
 		},
 		callback: (data) => {
+			if (data.message) {
 				change_progress_indicators();
 				show_certificate_if_course_completed(data);
+				self.marked_as_complete = true;
+			}
 		},
 	});
 };

lms/www/classes/class.html

@@ -10,7 +10,7 @@
 		{{ BreadCrumb(class_info) }}
 		<div class="">
 			{{ ClassDetails(class_info) }}
-			{{ ClassSections(class_info, class_courses, class_students, published_courses, flow) }}
+			{{ ClassSections(class_info, class_courses, class_students, flow) }}
 		</div>
 	</div>
 </div>
@@ -82,7 +82,7 @@
 
 
 <!-- Class Sections -->
-{% macro ClassSections(class_info, class_courses, class_students, published_courses, flow) %}
+{% macro ClassSections(class_info, class_courses, class_students, flow) %}
 <div class="mt-4">
 
 	{% if is_moderator %}
@@ -150,7 +150,7 @@
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="courses" role="tabpanel" aria-labelledby="courses">
-			{{ CoursesSection(class_info, class_courses, published_courses) }}
+			{{ CoursesSection(class_info, class_courses) }}
 		</div>
 
 		{% if flow | length %}
@@ -180,7 +180,7 @@
 {% endmacro %}
 
 
-{% macro CoursesSection(class_info, class_courses, published_courses) %}
+{% macro CoursesSection(class_info, class_courses) %}
 <article>
 	<header class="mb-5">
 		<div class="edit-header">
@@ -476,20 +476,64 @@
 			{{ _("Schedule") }}
 		</div>
 	</header>
-	<div class="form-grid">
-		<div class="grid-body">
-			<div class="rows">
-				{% for lesson in flow %}
-					<div class="grid-row">
-						<div class="row data-row">
-							<a class="col grid-static-col clickable" href="{{ lesson.url }}">
+
+	<div>
+		{% for chapter in flow %}
+			<div class="chapter-parent">
+				<div class="chapter-title" data-toggle="collapse" data-target="#{{ get_slugified_chapter_title(chapter.chapter_title) }}">
+					<img class="chapter-icon" src="/assets/lms/icons/chevron-right.svg">
+					<div class="chapter-title-main">
+						{{ chapter.chapter_title }}
+					</div>
+				</div>
+				<div class="chapter-content lessons collapse navbar-collapse" id="{{ get_slugified_chapter_title(chapter.chapter_title) }}">
+
+					<div class="schedule-header">
+						<div class="w-50">
+							{{ _("Lesson") }}
+						</div>
+						<div class="w-25">
+							{{ _("Date") }}
+						</div>
+						<div class="w-25 text-center">
+							{{ _("Start Time") }}
+						</div>
+						<div class="w-25 text-center">
+							{{ _("End Time") }}
+						</div>
+					</div>
+
+					{% for lesson in chapter.lessons %}
+						<div class="lesson-info flex align-center">
+							<a class="lesson-links w-50" href="{{ lesson.url }}">
+								<svg class="icon icon-sm mr-2">
+									<use class="" href="#{{ lesson.icon }}">
+								</svg>
+
 								{{ lesson.title }}
 							</a>
+							<div class="w-25">
+								{{ frappe.utils.format_date(lesson.date, "medium") }}
+							</div>
+							<div class="w-25 text-center">
+								{% if lesson.start_time %}
+								{{ frappe.utils.format_time(lesson.start_time, "HH:mm a") }}
+								{% else %}
+								-
+								{% endif %}
+							</div>
+							<div class="w-25 text-center">
+								{% if lesson.end_time %}
+								{{ frappe.utils.format_time(lesson.end_time, "HH:mm a") }}
+								{% else %}
+								-
+								{% endif %}
 							</div>
 						</div>
 					{% endfor %}
 				</div>
 			</div>
+		{% endfor %}
 	</div>
 </article>
 {% endmacro %}

lms/www/classes/class.py

@@ -10,6 +10,7 @@ from lms.lms.utils import (
 	has_graded_assessment,
 	get_lesson_index,
 	get_lesson_url,
+	get_lesson_icon,
 )
 
 
@@ -38,10 +39,6 @@ def get_context(context):
 		as_dict=True,
 	)
 
-	context.published_courses = frappe.get_all(
-		"LMS Course", {"published": 1}, ["name", "title"]
-	)
-
 	class_courses = frappe.get_all(
 		"Class Course",
 		{"parent": class_name},
@@ -56,15 +53,8 @@ def get_context(context):
 		order_by="creation desc",
 	)
 
-	context.live_classes = frappe.get_all(
-		"LMS Live Class",
-		{"class_name": class_name, "date": [">=", getdate()]},
-		["title", "description", "time", "date", "start_url", "join_url", "owner"],
-		order_by="date",
-	)
-
 	context.class_courses = get_class_course_details(class_courses)
-	context.all_courses = frappe.get_list(
+	context.all_courses = frappe.get_all(
 		"LMS Course", fields=["name", "title"], limit_page_length=0
 	)
 	context.course_name_list = [course.course for course in context.class_courses]
@@ -73,6 +63,17 @@ def get_context(context):
 		class_students, class_courses, context.assessments
 	)
 	context.is_student = is_student(class_students)
+
+	if not context.is_student and not context.is_moderator and not context.is_evaluator:
+		raise frappe.PermissionError(_("You don't have permission to access this page."))
+
+	context.live_classes = frappe.get_all(
+		"LMS Live Class",
+		{"class_name": class_name, "date": [">=", getdate()]},
+		["title", "description", "time", "date", "start_url", "join_url", "owner"],
+		order_by="date",
+	)
+
 	context.all_assignments = get_all_assignments(class_name)
 	context.all_quizzes = get_all_quizzes(class_name)
 	context.flow = get_scheduled_flow(class_name)
@@ -191,17 +192,37 @@ def is_student(class_students):
 
 
 def get_scheduled_flow(class_name):
+	chapters = []
+
 	lessons = frappe.get_all(
-		"Scheduled Flow", {"parent": class_name}, ["name", "lesson"], order_by="idx"
+		"Scheduled Flow",
+		{"parent": class_name},
+		["name", "lesson", "date", "start_time", "end_time"],
+		order_by="idx",
 	)
 
 	for lesson in lessons:
 		lesson.update(
 			frappe.db.get_value(
-				"Course Lesson", lesson.lesson, ["title", "body", "course"], as_dict=True
+				"Course Lesson", lesson.lesson, ["title", "body", "course", "chapter"], as_dict=True
 			)
 		)
-		lesson["index"] = get_lesson_index(lesson.lesson)
-		lesson["url"] = get_lesson_url(lesson.course, lesson.index) + "?class=" + class_name
+		lesson.index = get_lesson_index(lesson.lesson)
+		lesson.url = get_lesson_url(lesson.course, lesson.index) + "?class=" + class_name
+		lesson.icon = get_lesson_icon(lesson.body)
 
-	return lessons
+		chapter_exists = list(filter(lambda x: x.chapter == lesson.chapter, chapters))
+		if len(chapter_exists) == 0:
+			chapters.append(
+				frappe._dict(
+					{
+						"chapter": lesson.chapter,
+						"chapter_title": frappe.db.get_value("Course Chapter", lesson.chapter, "title"),
+						"lessons": [lesson],
+					}
+				)
+			)
+		else:
+			chapter_exists[0]["lessons"].append(lesson)
+
+	return chapters