Merge pull request #1627 from pateljannat/badge-management

feat: badge management from settings

lms/lms/doctype/lms_badge/lms_badge.json

@@ -9,11 +9,11 @@
   "enabled",
   "title",
   "description",
+  "reference_doctype",
+  "event",
   "image",
   "column_break_wgum",
   "grant_only_once",
-  "event",
-  "reference_doctype",
   "user_field",
   "field_to_check",
   "condition"
@@ -91,6 +91,7 @@
    "reqd": 1
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [
   {
@@ -98,7 +99,7 @@
    "link_fieldname": "badge"
   }
  ],
- "modified": "2024-05-27 17:25:55.399830",
+ "modified": "2025-07-04 13:02:19.048994",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Badge",
@@ -127,9 +128,10 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
+}

lms/lms/doctype/lms_badge/lms_badge.py

@@ -27,17 +27,9 @@ class LMSBadge(Document):
 	def rule_condition_satisfied(self, doc):
 		doc_before_save = doc.get_doc_before_save()
 
-		if self.event == "Manual Assignment":
-			return False
-
 		if self.event == "New" and doc_before_save != None:
 			return False
 
-		if self.event == "Value Change":
-			field_to_check = self.field_to_check
-			if not field_to_check:
-				return False
-
 		if self.condition:
 			return eval_condition(doc, self.condition)
 

lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json

@@ -7,8 +7,10 @@
  "field_order": [
   "member",
   "member_name",
-  "issued_on",
+  "member_username",
+  "member_image",
   "column_break_ugix",
+  "issued_on",
   "badge",
   "badge_image",
   "badge_description"
@@ -65,12 +67,25 @@
    "fieldtype": "Data",
    "label": "Member Name",
    "read_only": 1
+  },
+  {
+   "fetch_from": "member.username",
+   "fieldname": "member_username",
+   "fieldtype": "Data",
+   "label": "Member Username"
+  },
+  {
+   "fetch_from": "member.user_image",
+   "fieldname": "member_image",
+   "fieldtype": "Attach Image",
+   "label": "Member Image"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-06 12:32:28.450028",
- "modified_by": "Administrator",
+ "modified": "2025-07-07 20:37:22.449149",
+ "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Badge Assignment",
  "owner": "Administrator",
@@ -122,9 +137,10 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "show_title_field_in_link": 1,
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "member"
-}
+}

lms/lms/doctype/lms_zoom_settings/lms_zoom_settings.json

@@ -11,6 +11,7 @@
   "account_name",
   "member",
   "member_name",
+  "member_image",
   "column_break_fxxg",
   "account_id",
   "client_id",
@@ -71,12 +72,18 @@
   {
    "fieldname": "column_break_fxxg",
    "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "member.user_image",
+   "fieldname": "member_image",
+   "fieldtype": "Attach Image",
+   "label": "Member Image"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-05-26 18:09:09.392368",
+ "modified": "2025-07-08 12:20:48.314056",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Zoom Settings",