feat: assignment comments display

lms/lms/doctype/lesson_assignment/lesson_assignment.py

@@ -44,7 +44,7 @@ def get_assignment(lesson):
 	assignment = frappe.db.get_value(
 		"Lesson Assignment",
 		{"lesson": lesson, "member": frappe.session.user},
-		["lesson", "member", "assignment"],
+		["lesson", "member", "assignment", "comments", "status"],
 		as_dict=True,
 	)
 	assignment.file_name = frappe.db.get_value(

lms/lms/doctype/lms_class/lms_class.json

@@ -28,7 +28,8 @@
   {
    "fieldname": "end_date",
    "fieldtype": "Date",
-   "label": "End Date"
+   "label": "End Date",
+   "reqd": 1
   },
   {
    "fieldname": "column_break_4",
@@ -58,12 +59,13 @@
   {
    "fieldname": "start_date",
    "fieldtype": "Date",
-   "label": "Start Date"
+   "label": "Start Date",
+   "reqd": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-11-14 17:08:03.206840",
+ "modified": "2022-11-21 10:55:50.067225",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Class",

lms/lms/web_form/class/class.json

@@ -20,7 +20,7 @@
  "list_columns": [],
  "login_required": 0,
  "max_attachment_size": 0,
- "modified": "2022-11-11 12:23:14.664297",
+ "modified": "2022-11-21 10:56:01.627821",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "class",
@@ -56,7 +56,7 @@
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
-   "reqd": 0,
+   "reqd": 1,
    "show_in_filter": 0
   },
   {
@@ -68,7 +68,7 @@
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
-   "reqd": 0,
+   "reqd": 1,
    "show_in_filter": 0
   },
   {

lms/public/css/style.css

@@ -97,7 +97,7 @@ input[type=checkbox] {
   background: #FFFFFF;
   border-radius: var(--border-radius-md);
   position: relative;
-  box-shadow: var(--shadow-sm);
+  box-shadow: var(--shadow-base);
 }
 
 .course-card {
@@ -1133,7 +1133,8 @@ pre {
 }
 
 .preview-work {
-    width: 50%;
+	display: flex;
+	align-items: center;
 }
 
 .job-card {

lms/templates/assignment.html

@@ -1,15 +1,22 @@
 <div class="form-group">
 	<div class="">
-		<h3> {{ _("Assignment") }} </h3>
+		<h2 class="mt-5 mb-8"> {{ _("Assignment") }} </h2>
 		<div class="my-3"> {{ _(question) }} </div>
 		<div class="alert alert-info small">
-			{{ _("Only files of type {0} will be accepted").format(file_type) }}
+			{{ _("Only files of type {0} will be accepted.").format(file_type) }}
 		</div>
 		<input class="btn btn-default btn-sm border attach-file" type="file" accept="{{ accept }}" />
 		<div class="btn btn-secondary ml-2 submit-work">{{ _("Submit") }}</div>
 		<div class="preview-work hide">
 			<a target="_blank"></a>
+			<div class="assignment-status indicator-pill ml-3"></div>
 			<div class="btn btn-secondary btn-sm ml-2 clear-work">{{ _("Change") }}</div>
 		</div>
+		<div class="comments mt-3 hide">
+			<span class="subheading">
+				{{ _("Instructors Comments") }}:
+			</span>
+			<span class="comment"></span>
+		</div>
 	</div>
 </div>

lms/templates/quiz.html

@@ -1,6 +1,8 @@
 {% if attempts_exceeded %}
 <div class="">
-    <div class="font-weight-bold mb-4" style="font-size: var(--text-lg);">{{ quiz.title }}</div>
+	<h2 class="mt-3">
+		{{ quiz.title }}
+	</h2>
 	<div class="alert alert-info medium mb-0">
 		{{ _("You have already exceeded the maximum number of attempts allowed for this quiz.") }}
 		{{ _("Your latest score is {0}.").format(last_attempt_score) }}
@@ -9,15 +11,16 @@
 
 
 {% else %}
-<div id="quiz-title" class="hide" data-name="{{ quiz.name }}" data-max-attempts="{{ quiz.max_attempts }}">
-    {{ quiz.title }}
-</div>
 
 <div class="">
 	<div id="start-banner">
-        <button class="btn btn-secondary btn-sm btn-start-quiz pull-right"> {{ _("Start the Quiz") }} </button>
+		<button class="btn btn-secondary btn-sm btn-start-quiz pull-right">
+			{{ _("Start the Quiz") }}
+		</button>
 
-        <div class="font-weight-bold mb-5" style="font-size: var(--text-lg);"> {{ quiz.title }} </div>
+		<h2 class="mt-3" id="quiz-title" data-name="{{ quiz.name }}" data-max-attempts="{{ quiz.max_attempts }}">
+			{{ quiz.title }}
+		</h2>
 
 		<div class="alert alert-info medium">
 			{{ _("This quiz consists of {0} questions.").format(quiz.questions | length) }}

lms/www/batch/learn.js

@@ -412,10 +412,24 @@ const fetch_assignments = () => {
 		callback: (data) => {
 			if (data.message) {
 				const assignment = data.message;
+				const status = assignment.status
 				let target = $(".attach-file");
 				target.addClass("hide");
 				target.siblings(".submit-work").addClass("hide");
 				target.siblings(".preview-work").removeClass("hide");
+				if(status != "Not Graded") {
+					let color = status == "Pass" ? "green": "red";
+					$(".assignment-status")
+						.removeClass("hide")
+						.addClass(color)
+						.text(data.message.status)
+					target.siblings(".alert").addClass("hide");
+					$(".clear-work").addClass("hide");
+					if (assignment.comments) {
+						$(".comments").removeClass("hide");
+						$(".comment").text(assignment.comments)
+					}
+				}
 				target
 					.siblings(".preview-work")
 					.find("a")

lms/www/classes/index.html

@@ -11,28 +11,7 @@
 		</a>
 		<div class="course-home-headings"> {{ _("All Classes") }} </div>
 		{% if classes %}
-		<div class="cards-parent">
+		{{ ClassCards(classes) }}
-			{% for class in classes %}
-			<div class="common-card-style column-card">
-				<div class="course-card-title">
-					{{ class.title }}
-				</div>
-				<div class="medium">
-					{% if class.start_date %}
-					<span>
-						{{ frappe.utils.format_date(class.start_date, "medium") }} -
-					</span>
-					{% endif %}
-					{% if class.end_date %}
-					<span>
-						{{ frappe.utils.format_date(class.end_date, "medium") }}
-					</span>
-					{% endif %}
-				</div>
-				<a class="stretched-link" href="/classes/{{ class.name }}"></a>
-			</div>
-			{% endfor %}
-		</div>
 		{% else %}
 		<div class="empty-state">
 			<img class="icon icon-xl" src="/assets/lms/icons/comment.svg">
@@ -45,3 +24,43 @@
 	</div>
 </div>
 {% endblock %}
+
+
+{% macro ClassCards(classes) %}
+<div class="cards-parent">
+	{% for class in classes %}
+	{% set course_count = frappe.db.count("Class Course", {"parent": class.name}) %}
+    {% set student_count = frappe.db.count("Class Student", {"parent": class.name}) %}
+
+	<div class="common-card-style column-card">
+		<div class="text-muted small">
+			{% if course_count %}
+			<span>
+				{{ course_count }} {{ _("Courses") }}
+			</span>
+			{% endif %}
+
+			{% if student_count %}
+			<span class="ml-3">
+				{{ student_count }} {{ _("Students") }}
+			</span>
+			{% endif %}
+		</div>
+
+		<div class="course-card-title mb-4">
+			{{ class.title }}
+		</div>
+
+		<div class="">
+			<span>
+				{{ frappe.utils.format_date(class.start_date, "medium") }} -
+			</span>
+			<span>
+				{{ frappe.utils.format_date(class.end_date, "medium") }}
+			</span>
+		</div>
+		<a class="stretched-link" href="/classes/{{ class.name }}"></a>
+	</div>
+	{% endfor %}
+</div>
+{% endmacro %}