Merge pull request #554 from pateljannat/class-ui

fix: class improvements

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     - name: setup node
       uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '18'
         check-latest: true
     - name: setup cache for bench
       uses: actions/cache@v2

.github/workflows/ui-tests.yml

@@ -50,7 +50,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           check-latest: true
 
       - name: Add to Hosts

lms/lms/doctype/lms_assignment/lms_assignment.json

@@ -46,7 +46,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-05-29 14:50:55.259990",
+ "modified": "2023-06-26 18:09:29.809564",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Assignment",
@@ -64,9 +64,23 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Moderator",
+   "share": 1,
+   "write": 1
   }
  ],
+ "show_title_field_in_link": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": []
+ "states": [],
+ "title_field": "title"
 }

lms/lms/doctype/lms_class/lms_class.json

@@ -50,7 +50,8 @@
   {
    "fieldname": "description",
    "fieldtype": "Small Text",
-   "label": "Description"
+   "label": "Description",
+   "reqd": 1
   },
   {
    "fieldname": "section_break_6",
@@ -137,7 +138,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-06-15 12:30:26.929156",
+ "modified": "2023-06-22 15:57:25.190084",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Class",

lms/lms/doctype/lms_class/lms_class.py

@@ -2,19 +2,21 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe.model.document import Document
-from frappe import _
-from frappe.utils import cint, format_date, format_datetime
 import requests
 import base64
 import json
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import cint, format_date, format_datetime
 
 
 class LMSClass(Document):
 	def validate(self):
 		if self.seat_count:
 			self.validate_seats_left()
+		self.validate_duplicate_courses()
 		self.validate_duplicate_students()
+		self.validate_duplicate_assessments()
 		self.validate_membership()
 
 	def validate_duplicate_students(self):
@@ -27,6 +29,28 @@ def validate_duplicate_students(self):
 				)
 			)
 
+	def validate_duplicate_courses(self):
+		courses = [row.course for row in self.courses]
+		duplicates = {course for course in courses if courses.count(course) > 1}
+		if len(duplicates):
+			title = frappe.db.get_value("LMS Course", next(iter(duplicates)), "title")
+			frappe.throw(
+				_("Course {0} has already been added to this class.").format(frappe.bold(title))
+			)
+
+	def validate_duplicate_assessments(self):
+		assessments = [row.assessment_name for row in self.assessment]
+		for assessment in self.assessment:
+			if assessments.count(assessment.assessment_name) > 1:
+				title = frappe.db.get_value(
+					assessment.assessment_type, assessment.assessment_name, "title"
+				)
+				frappe.throw(
+					_("Assessment {0} has already been added to this class.").format(
+						frappe.bold(title)
+					)
+				)
+
 	def validate_membership(self):
 		for course in self.courses:
 			for student in self.students:
@@ -43,51 +67,30 @@ def validate_seats_left(self):
 			frappe.throw(_("There are no seats available in this class."))
 
 
-@frappe.whitelist()
-def add_student(email, class_name):
-	if not frappe.db.exists("User", email):
-		frappe.throw(_("There is no such user. Please create a user with this Email ID."))
-
-	filters = {
-		"student": email,
-		"parent": class_name,
-		"parenttype": "LMS Class",
-		"parentfield": "students",
-	}
-	if frappe.db.exists("Class Student", filters):
-		frappe.throw(
-			_("Student {0} has already been added to this class.").format(frappe.bold(email))
-		)
-
-	frappe.get_doc(
-		{
-			"doctype": "Class Student",
-			"student": email,
-			"student_name": frappe.db.get_value("User", email, "full_name"),
-			"parent": class_name,
-			"parenttype": "LMS Class",
-			"parentfield": "students",
-		}
-	).save()
-	return True
-
-
 @frappe.whitelist()
 def remove_student(student, class_name):
+	frappe.only_for("Moderator")
 	frappe.db.delete("Class Student", {"student": student, "parent": class_name})
 
 
 @frappe.whitelist()
 def remove_course(course, parent):
+	frappe.only_for("Moderator")
 	frappe.db.delete("Class Course", {"course": course, "parent": parent})
 
 
+@frappe.whitelist()
+def remove_assessment(assessment, parent):
+	frappe.only_for("Moderator")
+	frappe.db.delete("LMS Assessment", {"assessment_name": assessment, "parent": parent})
+
+
 @frappe.whitelist()
 def create_live_class(
 	class_name, title, duration, date, time, timezone, auto_recording, description=None
 ):
 	date = format_date(date, "yyyy-mm-dd", True)
-
+	frappe.only_for("Moderator")
 	payload = {
 		"topic": title,
 		"start_time": format_datetime(f"{date} {time}", "yyyy-MM-ddTHH:mm:ssZ"),
@@ -164,6 +167,7 @@ def create_class(
 	category=None,
 	name=None,
 ):
+	frappe.only_for("Moderator")
 	if name:
 		class_details = frappe.get_doc("LMS Class", name)
 	else:
@@ -184,23 +188,3 @@ def create_class(
 	)
 	class_details.save()
 	return class_details
-
-
-@frappe.whitelist()
-def update_assessment(type, name, value, class_name):
-	value = cint(value)
-	filters = {
-		"assessment_type": type,
-		"assessment_name": name,
-		"parent": class_name,
-		"parenttype": "LMS Class",
-		"parentfield": "assessment",
-	}
-	exists = frappe.db.exists("LMS Assessment", filters)
-
-	if exists and not value:
-		frappe.db.delete("LMS Assessment", exists)
-	elif not exists and value:
-		doc = frappe.new_doc("LMS Assessment")
-		doc.update(filters)
-		doc.insert()

lms/lms/doctype/lms_quiz/lms_quiz.json

@@ -70,7 +70,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-06-21 09:13:01.322701",
+ "modified": "2023-06-23 12:35:25.204131",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",
@@ -87,6 +87,18 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Moderator",
+   "share": 1,
+   "write": 1
   }
  ],
  "show_title_field_in_link": 1,

lms/lms/utils.py

@@ -733,3 +733,23 @@ def is_onboarding_complete():
 		if course_created
 		else None,
 	}
+
+
+def has_submitted_assessment(assessment, type, member=None):
+	if not member:
+		member = frappe.session.user
+
+	doctype = (
+		"LMS Assignment Submission" if type == "LMS Assignment" else "LMS Quiz Submission"
+	)
+	docfield = "assignment" if type == "LMS Assignment" else "quiz"
+
+	filters = {}
+	filters[docfield] = assessment
+	filters["member"] = member
+	return frappe.db.exists(doctype, filters)
+
+
+def has_graded_assessment(submission):
+	status = frappe.db.get_value("LMS Assignment Submission", submission, "status")
+	return False if status == "Not Graded" else True

lms/lms/widgets/CourseCard.html

@@ -72,6 +72,9 @@
             {% endif %}
         </div>
         <div class="course-card-title">{{ course.title }}</div>
+        <div class="short-introduction">
+            {{ course.short_introduction }}
+        </div>
 
         {% if membership and not is_instructor(course.name) and not read_only %}
         <div class="progress">

lms/patches.txt

@@ -53,4 +53,6 @@ lms.patches.v0_0.share_certificates
 execute:frappe.delete_doc("Web Form", "class", ignore_missing=True, force=True)
 lms.patches.v0_0.amend_course_and_lesson_editor_fields
 lms.patches.v0_0.convert_course_description_to_html #11-05-2023
-lms.patches.v1_0.rename_assignment_doctype
+lms.patches.v1_0.rename_assignment_doctype
+execute:frappe.permissions.reset_perms("LMS Assignment")
+execute:frappe.permissions.reset_perms("LMS Quiz")

lms/public/css/style.css

@@ -374,10 +374,20 @@ input[type=checkbox] {
 .course-card-title {
 	font-weight: 600;
 	color: var(--gray-900);
-	margin-bottom: 1.25rem;
 	font-size: 1.125rem;
 }
 
+.short-introduction {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	text-overflow: ellipsis;
+	width: 100%;
+	overflow: hidden;
+	white-space: nowrap;
+	margin-bottom: 1.25rem;
+}
+
 .card-divider {
   border-top: 1px solid var(--gray-300);
   margin-bottom: 1rem;
@@ -1385,6 +1395,10 @@ pre {
   margin: 0 1rem;
 }
 
+.seperator::after {
+	content: "\00B7";
+}
+
 .course-overlay-card {
 	background-color: white;
 	border-radius: var(--border-radius-lg);
@@ -1890,6 +1904,14 @@ li {
 	padding: 0 1rem !important;
 }
 
+.modal-dialog-scrollable .modal-body {
+	overflow-y: unset;
+}
+
+.modal-dialog-scrollable .modal-content {
+	overflow: unset;
+}
+
 .modal-header, .modal-body {
 	margin-bottom: 0.5rem !important;
 }
@@ -2167,4 +2189,25 @@ select {
 
 .awesomplete ul li:last-child {
 	display: none;
+}
+
+.students-parent {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, 150px);
+	grid-gap: 1rem;
+}
+
+.btn-remove-course {
+	opacity: 0;
+	margin-top: 0.25rem;
+}
+
+.btn-remove-course:hover {
+	opacity: 1;
+}
+
+.rows .grid-row .data-row,
+.rows .grid-row .grid-footer-toolbar,
+.grid-form-heading {
+	cursor: none;
 }

lms/public/js/common_functions.js

@@ -326,6 +326,7 @@ const open_class_dialog = () => {
 				label: __("Description"),
 				fieldname: "description",
 				default: class_info && class_info.description,
+				reqd: 1,
 			},
 		],
 		primary_action_label: __("Save"),