fix: achievements position

lms/lms/doctype/course_lesson/course_lesson.py

@@ -96,7 +96,7 @@ def save_progress(lesson, course):
 		return 0
 
 	quiz_completed = get_quiz_progress(lesson)
-	print(quiz_completed)
+
 	if not quiz_completed:
 		return 0
 

lms/lms/doctype/lms_badge/lms_badge.js

@@ -2,6 +2,9 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on("LMS Badge", {
+	refresh: (frm) => {
+		frm.events.set_fields_to_check(frm);
+	},
 	reference_doctype: (frm) => {
 		frm.events.set_fields_to_check(frm);
 	},

lms/lms/doctype/lms_badge/lms_badge.py

@@ -13,13 +13,18 @@ class LMSBadge(Document):
 
 	def rule_condition_satisfied(self, doc):
 		doc_before_save = doc.get_doc_before_save()
+		print(doc_before_save.as_dict())
+		print(doc.as_dict())
 		if self.event == "New" and doc_before_save != None:
 			return False
 		print("its new")
 		if self.event == "Value Change":
 			field_to_check = self.field_to_check
-			if not self.field_to_check:
+			print(field_to_check)
+			if not field_to_check:
 				return False
+			print(doc_before_save.get(field_to_check))
+			print(doc.get(field_to_check))
 			if doc_before_save and doc_before_save.get(field_to_check) == doc.get(
 				field_to_check
 			):

lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json

@@ -61,7 +61,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-30 17:19:39.554248",
+ "modified": "2024-05-08 14:18:39.455213",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Badge Assignment",
@@ -103,6 +103,15 @@
    "role": "LMS Student",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "LMS Student",
+   "share": 1
   }
  ],
  "show_title_field_in_link": 1,

lms/lms/doctype/lms_course/lms_course.json

@@ -274,7 +274,7 @@
   }
  ],
  "make_attachments_public": 1,
- "modified": "2024-04-16 17:40:50.899368",
+ "modified": "2024-05-08 15:11:07.833094",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
@@ -305,7 +305,7 @@
    "write": 1
   }
  ],
- "search_fields": "title",
+ "search_fields": "title, tags",
  "show_title_field_in_link": 1,
  "sort_field": "creation",
  "sort_order": "DESC",

lms/lms/doctype/lms_course_progress/lms_course_progress.py

@@ -1,9 +1,20 @@
 # Copyright (c) 2021, FOSS United and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
+from lms.lms.utils import get_course_progress
 
 
 class LMSCourseProgress(Document):
-	pass
+	def after_delete(self):
+		progress = get_course_progress(self.course, self.member)
+		membership = frappe.db.get_value(
+			"LMS Enrollment",
+			{
+				"member": self.member,
+				"course": self.course,
+			},
+			"name",
+		)
+		frappe.db.set_value("LMS Enrollment", membership, "progress", progress)

lms/lms/utils.py

@@ -383,7 +383,7 @@ def get_course_progress(course, member=None):
 		return 0
 	completed_lessons = frappe.db.count(
 		"LMS Course Progress",
-		{"course": course, "owner": member or frappe.session.user, "status": "Complete"},
+		{"course": course, "member": member or frappe.session.user, "status": "Complete"},
 	)
 	precision = cint(frappe.db.get_default("float_precision")) or 3
 	return flt(((completed_lessons / lesson_count) * 100), precision)