Merge pull request #128 from MSarari/develop

Feat(academia): Add validation for Tool Doctypes
Sana-a-Uni · Jul 30, 2024 · 40be27c · 40be27c
2 parents e1d364c + 74713ce
commit 40be27c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/academia/academia/doctype/course_enrollment_tool/course_enrollment_tool.js b/academia/academia/doctype/course_enrollment_tool/course_enrollment_tool.js
@@ -75,5 +75,11 @@ frappe.ui.form.on('Course Enrollment Tool', {
                 return {};
             }
         });
+    },
+    academic_program: function(frm){
+        frm.set_value('specific_program', null);
+    },
+    level: function(frm){
+        frm.set_value('specific_level', null);
     }
 });
diff --git a/academia/academia/doctype/course_study_tool/course_study_tool.js b/academia/academia/doctype/course_study_tool/course_study_tool.js
@@ -73,5 +73,13 @@ frappe.ui.form.on('Course Study Tool', {
                 return {};
             }
         });
+    },
+    based_on: function(frm){
+        frm.set_value('level', null);
+        frm.set_value('academic_program', null);
+        frm.set_value('program_specification', null);
+        frm.set_value('student_batch', null);
+        frm.set_value('specific_level', null);
+        frm.set_value('specific_program', null);
     }
 });
diff --git a/academia/academia/doctype/student_group/student_group.json b/academia/academia/doctype/student_group/student_group.json
@@ -48,8 +48,7 @@
    "fieldname": "faculty",
    "fieldtype": "Link",
    "label": "Faculty",
-   "options": "Faculty",
-   "reqd": 1
+   "options": "Faculty"
   },
   {
    "fieldname": "batch",
@@ -128,7 +127,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-27 05:00:15.731785",
+ "modified": "2024-07-30 18:05:05.377522",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Student Group",

diff --git a/academia/academia/doctype/student_group/student_group.py b/academia/academia/doctype/student_group/student_group.py
@@ -16,7 +16,7 @@ class StudentGroup(Document):
 		from frappe.types import DF
 
 		batch: DF.Link
-		faculty: DF.Link
+		faculty: DF.Link | None
 		group_based_on: DF.Data
 		program: DF.Link
 		student_group_name: DF.Data

diff --git a/academia/academia/doctype/student_group_tool/student_group_tool.js b/academia/academia/doctype/student_group_tool/student_group_tool.js
@@ -125,6 +125,9 @@ frappe.ui.form.on('Student Group Tool', {
                 return {};
             }
         });
+    },
+    grouping_by: function(frm){
+        frm.set_value('practical_capacity', 0);
     }
 });
 
diff --git a/academia/academia/doctype/student_group_tool/student_group_tool.json b/academia/academia/doctype/student_group_tool/student_group_tool.json
@@ -7,10 +7,10 @@
  "field_order": [
   "grouping_by",
   "based_on",
-  "program",
+  "faculty",
   "capacity",
   "column_break_gtdl",
-  "faculty",
+  "program",
   "student_batch",
   "student_group",
   "practical_capacity",
@@ -111,7 +111,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-07-21 15:00:56.612921",
+ "modified": "2024-07-30 18:31:15.830838",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Student Group Tool",