From 9ee58b477e961db8639ce1af32cde433ff0f7fce Mon Sep 17 00:00:00 2001
From: Abdullah <asalih@creativeadvtech.com>
Date: Sun, 7 Jul 2024 13:48:43 +0300
Subject: [PATCH 1/5] Class to Page

---
 kalima/kalima/doctype/class/class.json        |   2 +-
 .../kalima/doctype/group_class/group_class.py |  16 +-
 .../page/class_distribution_t/__init__.py     |   0
 .../class_distribution_t.js                   | 314 ++++++++++++++++++
 .../class_distribution_t.json                 |  19 ++
 5 files changed, 345 insertions(+), 6 deletions(-)
 create mode 100644 kalima/kalima/page/class_distribution_t/__init__.py
 create mode 100644 kalima/kalima/page/class_distribution_t/class_distribution_t.js
 create mode 100644 kalima/kalima/page/class_distribution_t/class_distribution_t.json

diff --git a/kalima/kalima/doctype/class/class.json b/kalima/kalima/doctype/class/class.json
index 78d1621..df003b3 100644
--- a/kalima/kalima/doctype/class/class.json
+++ b/kalima/kalima/doctype/class/class.json
@@ -146,7 +146,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-06-10 13:44:05.474622",
+ "modified": "2024-07-07 13:32:35.881782",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Class",
diff --git a/kalima/kalima/doctype/group_class/group_class.py b/kalima/kalima/doctype/group_class/group_class.py
index a41e420..96a4c14 100644
--- a/kalima/kalima/doctype/group_class/group_class.py
+++ b/kalima/kalima/doctype/group_class/group_class.py
@@ -7,6 +7,8 @@
 
 class GroupClass(Document):
     pass
+
+
 @frappe.whitelist()
 def fetch_students(selected_modules, department):
     if not selected_modules or not department:
@@ -60,17 +62,21 @@ def fetch_students(selected_modules, department):
 
     return students
 
-
-
 @frappe.whitelist()
-def create_classes(group_class_doc,group_class_modules,students):
+def create_classes(group_title,year,stage,semester,department,group_class_modules,students):
     group_class_modules = json.loads(str(group_class_modules))
     for module in group_class_modules:
         # Convert the group_class_doc to a dictionary
-        group_class_doc = json.loads(str(group_class_doc))
+        # group_class_doc = json.loads(str(group_class_doc))
         students = json.loads(str(students))
 
-        create_class(group_class_doc["group_title"],module,group_class_doc["year"],group_class_doc["stage"],group_class_doc["semester"],group_class_doc["department"],students)
+        create_class(group_title,
+                     module,
+                     year,
+                     stage,
+                     semester,
+                     department,
+                     students)
 
     return "Classes created successfully."
 
diff --git a/kalima/kalima/page/class_distribution_t/__init__.py b/kalima/kalima/page/class_distribution_t/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.js b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
new file mode 100644
index 0000000..4046641
--- /dev/null
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
@@ -0,0 +1,314 @@
+frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
+    var page = frappe.ui.make_app_page({
+        parent: wrapper,
+        title: 'Class Distribution Tool',
+        single_column: true
+    });
+
+    // Create a form container
+    let form = new frappe.ui.FieldGroup({
+        fields: [
+            {
+                fieldtype: 'Data',
+                fieldname: 'group_title',
+                label: 'Title',
+                read_only: 0
+            },
+            {
+                fieldtype: 'Link',
+                fieldname: 'year',
+                label: 'Year',
+                options: 'Educational Year'
+            },
+            {
+                fieldtype: 'Select',
+                fieldname: 'stage',
+                label: 'Stage',
+                options: 'First Year\nSecond Year\nThird Year\nFourth Year\nFifth Year\nBologna',
+            },
+            {
+                fieldtype: 'Link',
+                fieldname: 'faculty',
+                label: 'Faculty',
+                options: 'Faculty',
+            }, 
+            {
+                fieldtype: 'Column Break',
+                fieldname: 'clmn',
+            },
+            {
+                fieldtype: 'Link',
+                fieldname: 'department',
+                label: 'Department',
+                options: 'Faculty Department',
+                onchange: function () {
+                    let stage = form.get_value('stage');
+                    let department = form.get_value('department');
+                    let faculty = form.get_value('faculty');
+                    get_modules(faculty, stage, department);
+                }
+            },
+            {
+                fieldtype: 'Select',
+                fieldname: 'time',
+                label: 'Time',
+                options: 'Morning\nEvening',
+            },
+            {
+                fieldtype: 'Select',
+                fieldname: 'semester',
+                label: 'Semester',
+                options: 'Fall Semester\nSprint Semester\nShort Semester\nAnnual',
+            },
+			{
+                fieldtype: 'Section Break',
+                fieldname: 'clmn',
+            },
+			{
+                fieldtype: 'Button',
+                fieldname: 'fetch_students',
+                label: 'Fetch Students',
+                click: function () {
+                    let stage = form.get_value('stage');
+                    let department = form.get_value('department');
+                    let semester = form.get_value('semester');
+                    let time = form.get_value('time');
+                    let year = form.get_value('year');
+                    let faculty = form.get_value('faculty');
+                    fetch_students(stage, department, semester, time, year, faculty);
+                }
+            },  {
+                fieldtype: 'Column Break',
+                fieldname: 'clmn',
+            },
+            {
+                fieldtype: 'Button',
+                fieldname: 'fetch_students',
+                label: 'Create Classes',
+
+                click: function () {
+					let group_title = form.get_value('group_title');
+					let department = form.get_value('department');
+					let stage = form.get_value('stage');
+                    let semester = form.get_value('semester');
+                    let year = form.get_value('year');
+					generate_classes(group_title,
+						year,
+						stage,
+						semester,
+						department,);
+                }
+            }, {
+                fieldtype: 'Column Break',
+                fieldname: 'clmn',
+            }, {
+                fieldtype: 'Column Break',
+                fieldname: 'clmn',
+            },
+            {
+                fieldtype: 'Section Break',
+                fieldname: 'clmn',
+            },
+           
+        ],
+        body: page.body
+    });
+
+    form.make();
+
+    let studentListContainer = $('<div id="student-list"></div>').appendTo(page.body);
+    let moduleListContainer = $('<div id="module-list"></div>').appendTo(page.body);
+
+    // Function to fetch and display students
+    function fetch_students() {
+        const selected_modules = [];
+        const department = form.get_value('department');
+
+        // Get selected modules from moduleListContainer
+        moduleListContainer.find('input[type="checkbox"]:checked').each(function () {
+            selected_modules.push($(this).val());
+        });
+
+        if (selected_modules.length === 0 || !department) {
+            frappe.msgprint(__('Please select at least one module and ensure department is selected.'));
+            return;
+        }
+
+        frappe.call({
+            method: "kalima.kalima.doctype.group_class.group_class.fetch_students",
+            args: {
+                selected_modules: JSON.stringify(selected_modules),
+                department: department
+            },
+            callback: function (r) {
+                if (r.message) {
+                    // Determine the number of tables and rows per table
+                    let studentsPerTable = Math.ceil(r.message.length / 3);
+
+                    // Initialize the HTML string
+                    let html = '<div class="row">';
+
+                    // Loop through to create 3 tables
+                    for (let tableIndex = 0; tableIndex < 3; tableIndex++) {
+                        html += '<div class="col-md-4"><table class="table table-bordered">';
+                        html += `
+                        <thead>
+                            <tr>
+                                <th>Checkbox</th>
+                                <th>Full Name in Arabic</th>
+                            </tr>
+                        </thead>
+                        <tbody>`;
+
+                        // Add rows for the current table
+                        for (let i = tableIndex * studentsPerTable; i < (tableIndex + 1) * studentsPerTable && i < r.message.length; i++) {
+                            let student = r.message[i];
+                            html += `
+                            <tr id="row_${i}" class="clickable-cell" data-index="${i}">
+                                <td>
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" name="students" value="${student.name}" id="student_${i}">
+                                        <label class="form-check-label" for="student_${i}"></label>
+                                    </div>
+                                </td>
+                                <td class="clickable-cell-content">
+                                    ${student.full_name_in_arabic}
+                                </td>
+                            </tr>`;
+                        }
+
+                        html += '</tbody></table></div>';
+                    }
+
+                    html += '</div>';
+                    // Inject the HTML into the wrapper
+                    $('#student-list').html(html);
+
+                    // Add event listeners to handle cell click, checkbox toggle, and background color change
+                    r.message.forEach(function (student, index) {
+                        let row = document.getElementById(`row_${index}`);
+                        let checkbox = document.getElementById(`student_${index}`);
+
+                        row.addEventListener('click', function (event) {
+                            // Only toggle the checkbox and color if the click is not on the checkbox itself
+                            if (event.target.type !== 'checkbox') {
+                                checkbox.checked = !checkbox.checked;
+                            }
+                            updateRowStyle(row, checkbox);
+                        });
+
+                        checkbox.addEventListener('change', function () {
+                            updateRowStyle(row, checkbox);
+                        });
+                    });
+
+                    function updateRowStyle(row, checkbox) {
+                        if (checkbox.checked) {
+                            row.style.backgroundColor = 'lightgreen';
+                            row.style.color = 'white';
+                        } else {
+                            row.style.backgroundColor = '';
+                            row.style.color = '';
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    async function get_modules(faculty, stage, department) {
+        if (faculty && department) {
+            // Fetch presented modules based on the selected department and faculty
+            frappe.call({
+                method: "frappe.client.get_list",
+                args: {
+                    doctype: "Presented Module",
+                    filters: {
+                        "faculty": faculty,
+                        "stage": stage,
+                        // "department": department
+                    },
+                    fields: ["module"]
+                },
+                callback: function (r) {
+                    if (r.message) {
+                        // Create an HTML form with checkboxes from the fetched modules
+                        let html = '<div class="form-check">';
+
+                        r.message.forEach(function (module, index) {
+                            html += `
+                                  <div class="form-check">
+                                      <input class="form-check-input my-1" type="checkbox" name="modules" value="${module.module}" id="module_${index}">
+                                      <label class="form-check-label my-1" for="module_${index}">
+                                          ${module.module}
+                                      </label>
+                                  </div><br>`;
+                        });
+
+                        html += '</div>';
+                        moduleListContainer.html(html);
+                    }
+                }
+            });
+        } else {
+            moduleListContainer.html("");
+        }
+    }
+
+	function generate_classes(group_title,
+		year,
+		stage,
+		semester,
+		department,) {
+		const selected_modules = [];
+		const selected_students = [];
+		// const department = frm.doc.department;
+	
+		// Get selected modules from moduleListContainer
+		$('#module-list').find('input[type="checkbox"]:checked').each(function () {
+			selected_modules.push($(this).val());
+		});
+	
+		// Get selected students from studentListContainer
+		$('#student-list').find('input[type="checkbox"]:checked').each(function () {
+			selected_students.push($(this).val());
+		});
+		if (selected_modules.length === 0 || selected_students.length === 0 || !department) {
+			frappe.msgprint(__('Please select at least one module and one student, and ensure department is selected.'));
+			return;
+		}
+	
+		frappe.call({
+			method: "kalima.kalima.doctype.group_class.group_class.create_classes",
+			args: {
+				group_title: group_title,
+				year: year,
+				stage: stage,
+				semester: semester,
+				department: department,
+				group_class_modules: selected_modules,
+				students: selected_students
+			},
+			callback: function (r) {
+				if (r.message) {
+					frappe.msgprint(__('Classes have been successfully generated.'));+
+
+					form.set_value('group_title', "");
+                    form.set_value('department', "");
+                    form.set_value('stage', "");
+                    form.set_value('semester', "");
+                    form.set_value('year', "");
+
+					  // Clear form fields
+						$('input[type="text"], input[type="checkbox"], select').val('');
+						$('input[type="checkbox"]').prop('checked', false);
+
+						// Clear the student and module lists
+						$('#student-list').html('');
+						$('#module-list').html('');
+				}
+			}
+		});
+	}
+	
+};
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.json b/kalima/kalima/page/class_distribution_t/class_distribution_t.json
new file mode 100644
index 0000000..0e1e383
--- /dev/null
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.json
@@ -0,0 +1,19 @@
+{
+ "content": null,
+ "creation": "2024-07-07 10:51:35.442350",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2024-07-07 10:51:35.442350",
+ "modified_by": "Administrator",
+ "module": "Kalima",
+ "name": "class-distribution-t",
+ "owner": "Administrator",
+ "page_name": "class-distribution-t",
+ "roles": [],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Class Distribution Tool"
+}
\ No newline at end of file

From 4588eca2ac8c315ec781dc26029f6c999acde5bf Mon Sep 17 00:00:00 2001
From: Abdullah <asalih@creativeadvtech.com>
Date: Sun, 7 Jul 2024 15:37:59 +0300
Subject: [PATCH 2/5] Departments Change

---
 kalima/kalima/custom/department.json          | 1521 +++++++++++++++++
 .../activity_departments.json                 |    2 +-
 .../applicant_student/applicant_student.js    |    3 +-
 .../applicant_student/applicant_student.json  |    2 +-
 kalima/kalima/doctype/class/class.json        |    2 +-
 .../kalima/doctype/complaints/complaints.json |    2 +-
 kalima/kalima/doctype/constant/constant.json  |    2 +-
 .../continuous_exam_result.json               |    2 +-
 .../department_module/department_module.json  |    2 +-
 .../exam_departments/exam_departments.json    |    2 +-
 .../exam_result_entry/exam_result_entry.json  |    2 +-
 .../doctype/exam_students/exam_students.json  |    2 +-
 .../kalima/doctype/group_class/group_class.js |   12 -
 .../doctype/group_class/group_class.json      |    2 +-
 kalima/kalima/doctype/library/library.json    |    2 +-
 kalima/kalima/doctype/outgoing/outgoing.js    |    5 +-
 kalima/kalima/doctype/outgoing/outgoing.json  |    2 +-
 .../preferred_departments.json                |    2 +-
 .../presented_department.json                 |    2 +-
 .../presented_module/presented_module.json    |    7 +-
 kalima/kalima/doctype/student/student.json    |    7 +-
 .../student_attendance_entry.json             |    2 +-
 .../student_result_log.json                   |    2 +-
 .../student_scores/student_scores.json        |   12 +-
 .../doctype/students_fees/students_fees.json  |    2 +-
 kalima/kalima/doctype/transfer/transfer.json  |    2 +-
 .../class_distribution_t.js                   |    3 +-
 .../page/class_managment/class_managment.js   |    6 +-
 .../page/student_portal/student_portal.js     |    4 +-
 .../student_result_sheet_1.js                 |    3 +-
 30 files changed, 1569 insertions(+), 52 deletions(-)
 create mode 100644 kalima/kalima/custom/department.json

diff --git a/kalima/kalima/custom/department.json b/kalima/kalima/custom/department.json
new file mode 100644
index 0000000..45ca86e
--- /dev/null
+++ b/kalima/kalima/custom/department.json
@@ -0,0 +1,1521 @@
+{
+ "custom_fields": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:02:12.481791",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_abbreviation_title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 33,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_code",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Abbreviation Title",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:02:12.481791",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_abbreviation_title",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:02:12.334663",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_code",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 32,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_column_break_bxnzq",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Code",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:02:12.334663",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_code",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:02:12.209765",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_column_break_bxnzq",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 31,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_arabic_title",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:02:12.209765",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_column_break_bxnzq",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.976723",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_arabic_title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 30,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_english_title",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Arabic Title",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.976723",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_arabic_title",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.764112",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_english_title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 29,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_section_break_rsosl",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "English Title",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.764112",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_english_title",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.581077",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_section_break_rsosl",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 28,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_total_of_required_credits",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.581077",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_section_break_rsosl",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.783018",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_total_of_required_credits",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 27,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_department",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Total of Required Credits",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:00:17.783018",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_total_of_required_credits",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.634700",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 26,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_faculty",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Department",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:00:17.634700",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_department",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Faculty Department",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.481028",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_faculty",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 25,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_column_break_wpctr",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Faculty",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:00:17.481028",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_faculty",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Faculty",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:56:19.888257",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_column_break_wpctr",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 24,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_max_available_semester",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:56:19.888257",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_column_break_wpctr",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:56:19.726653",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_max_available_semester",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 23,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_entrance_type",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Max Available Semester",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:56:19.726653",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_max_available_semester",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Morning\nEvening",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:56:01.518087",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_entrance_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 22,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_academic_system_type",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Entrance Type",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:56:01.518087",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_entrance_type",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Morning\nEvening",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:55:44.919335",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_academic_system_type",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 21,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_study_level",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Academic System Type",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:55:44.919335",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_academic_system_type",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Coursat\nBologna\nAnnual",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:55:44.774128",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_study_level",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 20,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_academic_semester",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Study Level",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:55:44.774128",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_study_level",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Bachelor\nMaster\nPhd",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:55:44.629796",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_academic_semester",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 19,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_section_break_ygczg",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Academic Semester",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:55:44.629796",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_academic_semester",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Fall Semester\nSprint Semester\nShort Semester\nAnnual",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:55:44.505797",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_section_break_ygczg",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 18,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "old_parent",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:55:44.505797",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_section_break_ygczg",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.355098",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "expense_approvers",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "leave_approvers",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Expense Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.355098",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-expense_approvers",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Department Approver",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.351025",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "leave_approvers",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "shift_request_approver",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Leave Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.351025",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-leave_approvers",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Department Approver",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.347102",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "shift_request_approver",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "approvers",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Shift Request Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.347102",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-shift_request_approver",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Department Approver",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.343201",
+   "default": null,
+   "depends_on": null,
+   "description": "The first Approver in the list will be set as the default Approver.",
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "approvers",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "leave_block_list",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Approvers",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.343201",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-approvers",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.339183",
+   "default": null,
+   "depends_on": null,
+   "description": "Days for which Holidays are blocked for this department.",
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "leave_block_list",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "column_break_9",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Leave Block List",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.339183",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-leave_block_list",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Leave Block List",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.335098",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_9",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "payroll_cost_center",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": null,
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.335098",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-column_break_9",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.331256",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "payroll_cost_center",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "section_break_4",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Payroll Cost Center",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.331256",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-payroll_cost_center",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Cost Center",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.327396",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "disabled",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": null,
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.327396",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-section_break_4",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  }
+ ],
+ "custom_perms": [],
+ "doctype": "Department",
+ "links": [],
+ "property_setters": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2024-07-07 14:53:35.424420",
+   "default_value": null,
+   "doc_type": "Department",
+   "docstatus": 0,
+   "doctype_or_field": "DocType",
+   "field_name": null,
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2024-07-07 14:53:35.424420",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-main-field_order",
+   "owner": "Administrator",
+   "property": "field_order",
+   "property_type": "Data",
+   "row_name": null,
+   "value": "[\"department_name\", \"parent_department\", \"column_break_3\", \"company\", \"is_group\", \"disabled\", \"section_break_4\", \"payroll_cost_center\", \"column_break_9\", \"leave_block_list\", \"approvers\", \"shift_request_approver\", \"leave_approvers\", \"expense_approvers\", \"lft\", \"rgt\", \"old_parent\", \"custom_section_break_ygczg\", \"custom_academic_semester\", \"custom_study_level\", \"custom_academic_system_type\", \"custom_entrance_type\", \"custom_max_available_semester\", \"custom_column_break_wpctr\", \"custom_faculty\", \"custom_department\", \"custom_total_of_required_credits\", \"custom_section_break_rsosl\", \"custom_english_title\", \"custom_arabic_title\", \"custom_column_break_bxnzq\", \"custom_code\", \"custom_abbreviation_title\"]"
+  }
+ ],
+ "sync_on_migrate": 1
+}
\ No newline at end of file
diff --git a/kalima/kalima/doctype/activity_departments/activity_departments.json b/kalima/kalima/doctype/activity_departments/activity_departments.json
index 4ee0c9c..6f51572 100644
--- a/kalima/kalima/doctype/activity_departments/activity_departments.json
+++ b/kalima/kalima/doctype/activity_departments/activity_departments.json
@@ -14,7 +14,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   }
  ],
diff --git a/kalima/kalima/doctype/applicant_student/applicant_student.js b/kalima/kalima/doctype/applicant_student/applicant_student.js
index 8d9d90d..ed73126 100644
--- a/kalima/kalima/doctype/applicant_student/applicant_student.js
+++ b/kalima/kalima/doctype/applicant_student/applicant_student.js
@@ -12,7 +12,8 @@ frappe.ui.form.on("Applicant Student", {
                             label: 'Department',
                             fieldname: 'department',
                             fieldtype: 'Link',
-                            options: "Faculty Department",
+                            // options: "Faculty Department",
+                            options: "Department",
                             reqd: 1,
                             get_query: function () {
                                 return {
diff --git a/kalima/kalima/doctype/applicant_student/applicant_student.json b/kalima/kalima/doctype/applicant_student/applicant_student.json
index 3277adf..ed1ad73 100644
--- a/kalima/kalima/doctype/applicant_student/applicant_student.json
+++ b/kalima/kalima/doctype/applicant_student/applicant_student.json
@@ -782,7 +782,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-03 11:13:25.512499",
+ "modified": "2024-07-07 15:37:40.143362",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Applicant Student",
diff --git a/kalima/kalima/doctype/class/class.json b/kalima/kalima/doctype/class/class.json
index df003b3..f2b9bfe 100644
--- a/kalima/kalima/doctype/class/class.json
+++ b/kalima/kalima/doctype/class/class.json
@@ -98,7 +98,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/complaints/complaints.json b/kalima/kalima/doctype/complaints/complaints.json
index 1c3a402..a529adb 100644
--- a/kalima/kalima/doctype/complaints/complaints.json
+++ b/kalima/kalima/doctype/complaints/complaints.json
@@ -32,7 +32,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "read_only": 1
   },
   {
diff --git a/kalima/kalima/doctype/constant/constant.json b/kalima/kalima/doctype/constant/constant.json
index 0b1b931..73de5f8 100644
--- a/kalima/kalima/doctype/constant/constant.json
+++ b/kalima/kalima/doctype/constant/constant.json
@@ -60,7 +60,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/continuous_exam_result/continuous_exam_result.json b/kalima/kalima/doctype/continuous_exam_result/continuous_exam_result.json
index 5655807..1c339e7 100644
--- a/kalima/kalima/doctype/continuous_exam_result/continuous_exam_result.json
+++ b/kalima/kalima/doctype/continuous_exam_result/continuous_exam_result.json
@@ -33,7 +33,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "score",
diff --git a/kalima/kalima/doctype/department_module/department_module.json b/kalima/kalima/doctype/department_module/department_module.json
index 0e75ee7..a84b0d3 100644
--- a/kalima/kalima/doctype/department_module/department_module.json
+++ b/kalima/kalima/doctype/department_module/department_module.json
@@ -46,7 +46,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "column_break_aolq",
diff --git a/kalima/kalima/doctype/exam_departments/exam_departments.json b/kalima/kalima/doctype/exam_departments/exam_departments.json
index 6b23ae7..4609645 100644
--- a/kalima/kalima/doctype/exam_departments/exam_departments.json
+++ b/kalima/kalima/doctype/exam_departments/exam_departments.json
@@ -16,7 +16,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/exam_result_entry/exam_result_entry.json b/kalima/kalima/doctype/exam_result_entry/exam_result_entry.json
index 72a136d..fd83402 100644
--- a/kalima/kalima/doctype/exam_result_entry/exam_result_entry.json
+++ b/kalima/kalima/doctype/exam_result_entry/exam_result_entry.json
@@ -29,7 +29,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "module",
diff --git a/kalima/kalima/doctype/exam_students/exam_students.json b/kalima/kalima/doctype/exam_students/exam_students.json
index 5b8bb2e..0efef07 100644
--- a/kalima/kalima/doctype/exam_students/exam_students.json
+++ b/kalima/kalima/doctype/exam_students/exam_students.json
@@ -32,7 +32,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "stage",
diff --git a/kalima/kalima/doctype/group_class/group_class.js b/kalima/kalima/doctype/group_class/group_class.js
index 393e8ea..5500a7f 100644
--- a/kalima/kalima/doctype/group_class/group_class.js
+++ b/kalima/kalima/doctype/group_class/group_class.js
@@ -16,18 +16,6 @@ frappe.ui.form.on("Group Class", {
         pres(frm);
     },
     after_save: function (frm) {
-        // const selected_modules = [];
-        // const department = frm.doc.department;
-
-        // // Get selected modules
-        // frm.fields_dict.presented_modules.$wrapper.find('input[type="checkbox"]:checked').each(function () {
-        //     selected_modules.push($(this).val());
-        // });
-
-        // if (selected_modules.length === 0 || !department) {
-        //     return;
-        // }
-        // generate_classes(frm);
     },
     async refresh(frm) {
         await pres(frm);
diff --git a/kalima/kalima/doctype/group_class/group_class.json b/kalima/kalima/doctype/group_class/group_class.json
index 500dea3..5b0a341 100644
--- a/kalima/kalima/doctype/group_class/group_class.json
+++ b/kalima/kalima/doctype/group_class/group_class.json
@@ -74,7 +74,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/library/library.json b/kalima/kalima/doctype/library/library.json
index c4d78bb..50b8e90 100644
--- a/kalima/kalima/doctype/library/library.json
+++ b/kalima/kalima/doctype/library/library.json
@@ -30,7 +30,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "column_break_qkzn",
diff --git a/kalima/kalima/doctype/outgoing/outgoing.js b/kalima/kalima/doctype/outgoing/outgoing.js
index 777a084..32f776b 100644
--- a/kalima/kalima/doctype/outgoing/outgoing.js
+++ b/kalima/kalima/doctype/outgoing/outgoing.js
@@ -7,8 +7,9 @@ frappe.ui.form.on("Outgoing", {
                 } else if (frm.doc.receivers_type == "Teachers") {
                     await getEntitiesAndShowDialog("Employee", ["name", "employee_name"], "employee_name", "receive_teachers", "teacher");
                 } else if (frm.doc.receivers_type == "Departments") {
-                    var all_students = await frappe.db.get_list("Faculty Department", {
-                        fields: ['name', 'arabic_title']
+                    // var all_students = await frappe.db.get_list("Faculty Department", {
+                    var all_students = await frappe.db.get_list("Department", {
+                            fields: ['name', 'arabic_title']
                     });
 
                     var fields = [];
diff --git a/kalima/kalima/doctype/outgoing/outgoing.json b/kalima/kalima/doctype/outgoing/outgoing.json
index d431e67..94c9cd0 100644
--- a/kalima/kalima/doctype/outgoing/outgoing.json
+++ b/kalima/kalima/doctype/outgoing/outgoing.json
@@ -54,7 +54,7 @@
    "fieldname": "sent_to",
    "fieldtype": "Link",
    "label": "Sender",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "document_number",
diff --git a/kalima/kalima/doctype/preferred_departments/preferred_departments.json b/kalima/kalima/doctype/preferred_departments/preferred_departments.json
index 1424d71..10bbf6a 100644
--- a/kalima/kalima/doctype/preferred_departments/preferred_departments.json
+++ b/kalima/kalima/doctype/preferred_departments/preferred_departments.json
@@ -15,7 +15,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "study_type",
diff --git a/kalima/kalima/doctype/presented_department/presented_department.json b/kalima/kalima/doctype/presented_department/presented_department.json
index 3097c37..d541c2e 100644
--- a/kalima/kalima/doctype/presented_department/presented_department.json
+++ b/kalima/kalima/doctype/presented_department/presented_department.json
@@ -71,7 +71,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/presented_module/presented_module.json b/kalima/kalima/doctype/presented_module/presented_module.json
index b16cfcd..fbb348d 100644
--- a/kalima/kalima/doctype/presented_module/presented_module.json
+++ b/kalima/kalima/doctype/presented_module/presented_module.json
@@ -83,14 +83,15 @@
    "fetch_from": "module.faculty",
    "fieldname": "faculty",
    "fieldtype": "Data",
-   "label": "Faculty"
+   "label": "Faculty",
+   "read_only": 1
   },
   {
    "fieldname": "department",
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
@@ -426,7 +427,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-04 09:37:21.128000",
+ "modified": "2024-07-07 15:27:55.467903",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Presented Module",
diff --git a/kalima/kalima/doctype/student/student.json b/kalima/kalima/doctype/student/student.json
index 66b88a6..d19d3bd 100644
--- a/kalima/kalima/doctype/student/student.json
+++ b/kalima/kalima/doctype/student/student.json
@@ -242,8 +242,9 @@
   },
   {
    "fieldname": "graduation_year",
-   "fieldtype": "Date",
-   "label": "Graduation Year"
+   "fieldtype": "Select",
+   "label": "Graduation Year",
+   "options": "2030\n2029\n2028\n2027\n2026\n2025\n2024\n2023\n2022\n2021\n2020\n2019\n2018\n2017\n2016\n2015\n2014\n2013\n2012\n2011\n2010"
   },
   {
    "fieldname": "branch",
@@ -908,7 +909,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-06 11:38:45.932457",
+ "modified": "2024-07-07 15:23:53.002388",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Student",
diff --git a/kalima/kalima/doctype/student_attendance_entry/student_attendance_entry.json b/kalima/kalima/doctype/student_attendance_entry/student_attendance_entry.json
index 6c4a9d9..05ee712 100644
--- a/kalima/kalima/doctype/student_attendance_entry/student_attendance_entry.json
+++ b/kalima/kalima/doctype/student_attendance_entry/student_attendance_entry.json
@@ -34,7 +34,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/student_result_log/student_result_log.json b/kalima/kalima/doctype/student_result_log/student_result_log.json
index b9a1993..7a68161 100644
--- a/kalima/kalima/doctype/student_result_log/student_result_log.json
+++ b/kalima/kalima/doctype/student_result_log/student_result_log.json
@@ -249,7 +249,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "continuous_score",
diff --git a/kalima/kalima/doctype/student_scores/student_scores.json b/kalima/kalima/doctype/student_scores/student_scores.json
index da310b9..bc9470b 100644
--- a/kalima/kalima/doctype/student_scores/student_scores.json
+++ b/kalima/kalima/doctype/student_scores/student_scores.json
@@ -31,37 +31,37 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "continuous",
    "fieldtype": "Float",
    "label": "Continuous",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "practical",
    "fieldtype": "Float",
    "label": "Practical",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "final",
    "fieldtype": "Float",
    "label": "Final",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "curve",
    "fieldtype": "Float",
    "label": "Curve",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "total",
    "fieldtype": "Float",
    "label": "Total",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "default": "0",
diff --git a/kalima/kalima/doctype/students_fees/students_fees.json b/kalima/kalima/doctype/students_fees/students_fees.json
index c53de2f..89e428e 100644
--- a/kalima/kalima/doctype/students_fees/students_fees.json
+++ b/kalima/kalima/doctype/students_fees/students_fees.json
@@ -113,7 +113,7 @@
    "fieldname": "faculty",
    "fieldtype": "Link",
    "label": "Faculty",
-   "options": "Faculty Department",
+   "options": "Department",
    "reqd": 1
   },
   {
diff --git a/kalima/kalima/doctype/transfer/transfer.json b/kalima/kalima/doctype/transfer/transfer.json
index b42c371..41c350e 100644
--- a/kalima/kalima/doctype/transfer/transfer.json
+++ b/kalima/kalima/doctype/transfer/transfer.json
@@ -45,7 +45,7 @@
    "fieldname": "department",
    "fieldtype": "Link",
    "label": "Department",
-   "options": "Faculty Department"
+   "options": "Department"
   },
   {
    "fieldname": "date",
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.js b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
index 4046641..c12be86 100644
--- a/kalima/kalima/page/class_distribution_t/class_distribution_t.js
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
@@ -40,7 +40,8 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
                 fieldtype: 'Link',
                 fieldname: 'department',
                 label: 'Department',
-                options: 'Faculty Department',
+                // options: 'Faculty Department',
+                options: 'Department',
                 onchange: function () {
                     let stage = form.get_value('stage');
                     let department = form.get_value('department');
diff --git a/kalima/kalima/page/class_managment/class_managment.js b/kalima/kalima/page/class_managment/class_managment.js
index 71ca471..ba18e1c 100644
--- a/kalima/kalima/page/class_managment/class_managment.js
+++ b/kalima/kalima/page/class_managment/class_managment.js
@@ -465,7 +465,8 @@ function createFormDialogNew(templateName) {
                     fields: [
                         { fieldname: 'student_code', fieldtype: 'Data', in_list_view: 1, label: 'Student Code' },
                         { fieldname: 'student_name', fieldtype: 'Link', options: 'Student', in_list_view: 1, label: 'Student Name' },
-                        { fieldname: 'department', fieldtype: 'Link', options: 'Faculty Department', label: 'Department' },
+                        // { fieldname: 'department', fieldtype: 'Link', options: 'Faculty Department', label: 'Department' },
+                        { fieldname: 'department', fieldtype: 'Link', options: 'Department', label: 'Department' },
                         {
                             fieldname: 'score', fieldtype: 'Float', in_list_view: 1,
                             label: 'Score',
@@ -640,7 +641,8 @@ function createFormDialogNew(templateName) {
                     fieldtype: "Link",
                     in_list_view: 1,
                     label: "Department",
-                    options: "Faculty Department",
+                    // options: "Faculty Department",
+                    options: "Department",
                     reqd: 1,
                     default: current_class.department, 
                     hidden:1
diff --git a/kalima/kalima/page/student_portal/student_portal.js b/kalima/kalima/page/student_portal/student_portal.js
index 5f62ba2..4f08a02 100644
--- a/kalima/kalima/page/student_portal/student_portal.js
+++ b/kalima/kalima/page/student_portal/student_portal.js
@@ -1,4 +1,4 @@
-var selected_student = "حامد حامد حامد حامد" ;
+var selected_student = "سعد صالح احمد محمد" ;
 var naming_maps = {};
 var student_classes = [];
 
@@ -14,7 +14,7 @@ frappe.pages['student-portal'].on_page_load = async function (wrapper) {
     var $container = $(wrapper).find('.layout-main-section');
     $container.html(main_template);
 
-    await get_current_user_student();
+    // await get_current_user_student();
     await get_classes();
     await content_manager();
 }
diff --git a/kalima/kalima/page/student_result_sheet_1/student_result_sheet_1.js b/kalima/kalima/page/student_result_sheet_1/student_result_sheet_1.js
index 845aac6..2d7ebec 100644
--- a/kalima/kalima/page/student_result_sheet_1/student_result_sheet_1.js
+++ b/kalima/kalima/page/student_result_sheet_1/student_result_sheet_1.js
@@ -13,7 +13,8 @@ frappe.pages['student-result-sheet-1'].on_page_load = function(wrapper) {
 				fieldtype: 'Link',
 				fieldname: 'department',
 				label: 'Department',
-				options: 'Faculty Department', // Replace 'Doctype' with the actual doctype you want to link to
+				// options: 'Faculty Department', 
+				options: 'Department',
 				read_only: 0,
 			},
 			{

From eb42ae8afa442aff453900ff3aab971d710b96a0 Mon Sep 17 00:00:00 2001
From: Abdullah <asalih@creativeadvtech.com>
Date: Mon, 8 Jul 2024 15:35:12 +0300
Subject: [PATCH 3/5] Class Fixes

---
 kalima/hooks.py                               |    2 +-
 kalima/kalima/custom/employee.json            | 1025 +++++++++++++++++
 kalima/kalima/doctype/class/class.json        |   24 +-
 .../kalima/doctype/class_modules/__init__.py  |    0
 .../doctype/class_modules/class_modules.json  |   41 +
 .../doctype/class_modules/class_modules.py    |    9 +
 .../kalima/doctype/group_class/group_class.py |   68 +-
 .../student_enrolled_modules.json             |    6 +-
 .../doctype/teaching_module/__init__.py       |    0
 .../teaching_module/teaching_module.json      |   42 +
 .../teaching_module/teaching_module.py        |    9 +
 .../class_distribution_t.js                   |   22 +-
 kalima/public/js/employee.js                  |   14 +
 13 files changed, 1206 insertions(+), 56 deletions(-)
 create mode 100644 kalima/kalima/custom/employee.json
 create mode 100644 kalima/kalima/doctype/class_modules/__init__.py
 create mode 100644 kalima/kalima/doctype/class_modules/class_modules.json
 create mode 100644 kalima/kalima/doctype/class_modules/class_modules.py
 create mode 100644 kalima/kalima/doctype/teaching_module/__init__.py
 create mode 100644 kalima/kalima/doctype/teaching_module/teaching_module.json
 create mode 100644 kalima/kalima/doctype/teaching_module/teaching_module.py
 create mode 100644 kalima/public/js/employee.js

diff --git a/kalima/hooks.py b/kalima/hooks.py
index b2225e4..12b5a1c 100644
--- a/kalima/hooks.py
+++ b/kalima/hooks.py
@@ -46,7 +46,7 @@
 # page_js = {"page" : "public/js/file.js"}
 
 # include js in doctype views
-# doctype_js = {"doctype" : "public/js/doctype.js"}
+doctype_js = {"Employee" : "public/js/employee.js"}
 # doctype_list_js = {"doctype" : "public/js/doctype_list.js"}
 # doctype_tree_js = {"doctype" : "public/js/doctype_tree.js"}
 # doctype_calendar_js = {"doctype" : "public/js/doctype_calendar.js"}
diff --git a/kalima/kalima/custom/employee.json b/kalima/kalima/custom/employee.json
new file mode 100644
index 0000000..46986ae
--- /dev/null
+++ b/kalima/kalima/custom/employee.json
@@ -0,0 +1,1025 @@
+{
+ "custom_fields": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-08 14:28:19.386436",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_teaching_module",
+   "fieldtype": "Table",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 123,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_teaching",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Teaching Module",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-08 14:28:19.386436",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-custom_teaching_module",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Teaching Module",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-08 14:28:19.132017",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_teaching",
+   "fieldtype": "Tab Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 122,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "connections_tab",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Teaching",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-08 14:28:19.132017",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-custom_teaching",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.423392",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": "department.payroll_cost_center",
+   "fetch_if_empty": 1,
+   "fieldname": "payroll_cost_center",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "salary_cb",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Payroll Cost Center",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.423392",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-payroll_cost_center",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Cost Center",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.419401",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "salary_cb",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "salary_mode",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": null,
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.419401",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-salary_cb",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.415230",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "shift_request_approver",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "column_break_45",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Shift Request Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.415230",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-shift_request_approver",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "User",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.411136",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_45",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "leave_approver",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": null,
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.411136",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-column_break_45",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.407125",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "leave_approver",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "expense_approver",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Leave Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.407125",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-leave_approver",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "User",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.403218",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "expense_approver",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "approvers_section",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Expense Approver",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.403218",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-expense_approver",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "User",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.399277",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "approvers_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "default_shift",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Approvers",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.399277",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-approvers_section",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.395386",
+   "default": null,
+   "depends_on": "eval:doc.health_insurance_provider",
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "health_insurance_no",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "health_insurance_provider",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Health Insurance No",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.395386",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-health_insurance_no",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.391527",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "health_insurance_provider",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "health_insurance_section",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Health Insurance Provider",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.391527",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-health_insurance_provider",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Employee Health Insurance",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.387736",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "health_insurance_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "health_details",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Health Insurance",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.387736",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-health_insurance_section",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.383937",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "default_shift",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "holiday_list",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Default Shift",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.383937",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-default_shift",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Shift Type",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.380017",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "grade",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "branch",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Grade",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.380017",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-grade",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Employee Grade",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.376087",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "job_applicant",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "employment_details",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Job Applicant",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.376087",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-job_applicant",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Job Applicant",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-06-01 13:15:47.372260",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Employee",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "employment_type",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 0,
+   "ignore_user_permissions": 1,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "department",
+   "is_system_generated": 1,
+   "is_virtual": 0,
+   "label": "Employment Type",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-06-01 13:15:47.372260",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-employment_type",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Employment Type",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  }
+ ],
+ "custom_perms": [],
+ "doctype": "Employee",
+ "links": [],
+ "property_setters": [
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "creation": "2024-07-08 14:28:18.977070",
+   "default_value": null,
+   "doc_type": "Employee",
+   "docstatus": 0,
+   "doctype_or_field": "DocType",
+   "field_name": null,
+   "idx": 0,
+   "is_system_generated": 0,
+   "modified": "2024-07-08 14:28:18.977070",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Employee-main-field_order",
+   "owner": "Administrator",
+   "property": "field_order",
+   "property_type": "Data",
+   "row_name": null,
+   "value": "[\"basic_details_tab\", \"basic_information\", \"employee\", \"naming_series\", \"first_name\", \"middle_name\", \"last_name\", \"employee_name\", \"column_break_9\", \"gender\", \"date_of_birth\", \"salutation\", \"column_break1\", \"date_of_joining\", \"image\", \"status\", \"erpnext_user\", \"user_id\", \"create_user\", \"create_user_permission\", \"company_details_section\", \"company\", \"department\", \"employment_type\", \"employee_number\", \"column_break_25\", \"designation\", \"reports_to\", \"column_break_18\", \"branch\", \"grade\", \"employment_details\", \"job_applicant\", \"scheduled_confirmation_date\", \"column_break_32\", \"final_confirmation_date\", \"contract_end_date\", \"col_break_22\", \"notice_number_of_days\", \"date_of_retirement\", \"contact_details\", \"cell_number\", \"column_break_40\", \"personal_email\", \"company_email\", \"column_break4\", \"prefered_contact_email\", \"prefered_email\", \"unsubscribed\", \"address_section\", \"current_address\", \"current_accommodation_type\", \"column_break_46\", \"permanent_address\", \"permanent_accommodation_type\", \"emergency_contact_details\", \"person_to_be_contacted\", \"column_break_55\", \"emergency_phone_number\", \"column_break_19\", \"relation\", \"attendance_and_leave_details\", \"attendance_device_id\", \"column_break_44\", \"holiday_list\", \"default_shift\", \"approvers_section\", \"expense_approver\", \"leave_approver\", \"column_break_45\", \"shift_request_approver\", \"salary_information\", \"ctc\", \"salary_currency\", \"salary_mode\", \"salary_cb\", \"payroll_cost_center\", \"bank_details_section\", \"bank_name\", \"column_break_heye\", \"bank_ac_no\", \"iban\", \"personal_details\", \"marital_status\", \"family_background\", \"column_break6\", \"blood_group\", \"health_details\", \"health_insurance_section\", \"health_insurance_provider\", \"health_insurance_no\", \"passport_details_section\", \"passport_number\", \"valid_upto\", \"column_break_73\", \"date_of_issue\", \"place_of_issue\", \"profile_tab\", \"bio\", \"educational_qualification\", \"education\", \"previous_work_experience\", \"external_work_history\", \"history_in_company\", \"internal_work_history\", \"exit\", \"resignation_letter_date\", \"relieving_date\", \"exit_interview_details\", \"held_on\", \"new_workplace\", \"column_break_99\", \"leave_encashed\", \"encashment_date\", \"feedback_section\", \"reason_for_leaving\", \"column_break_104\", \"feedback\", \"lft\", \"rgt\", \"old_parent\", \"connections_tab\", \"teaching_tab\", \"teaching_module\"]"
+  }
+ ],
+ "sync_on_migrate": 1
+}
\ No newline at end of file
diff --git a/kalima/kalima/doctype/class/class.json b/kalima/kalima/doctype/class/class.json
index f2b9bfe..1e4a44e 100644
--- a/kalima/kalima/doctype/class/class.json
+++ b/kalima/kalima/doctype/class/class.json
@@ -11,7 +11,6 @@
   "year",
   "stage",
   "semester",
-  "module",
   "department",
   "column_break_tadi",
   "capacity",
@@ -24,7 +23,9 @@
   "section_break_ueai",
   "teachers",
   "column_break_hpag",
-  "student_list"
+  "student_list",
+  "section_break_jhbz",
+  "class_modules"
  ],
  "fields": [
   {
@@ -58,13 +59,6 @@
    "reqd": 1,
    "unique": 1
   },
-  {
-   "fieldname": "module",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Module",
-   "options": "Department Module"
-  },
   {
    "fieldname": "capacity",
    "fieldtype": "Int",
@@ -142,11 +136,21 @@
    "fieldtype": "Table",
    "label": "Student List",
    "options": "Class Students"
+  },
+  {
+   "fieldname": "section_break_jhbz",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "class_modules",
+   "fieldtype": "Table",
+   "label": "Class Modules",
+   "options": "Class Modules"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-07 13:32:35.881782",
+ "modified": "2024-07-08 15:04:32.398477",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Class",
diff --git a/kalima/kalima/doctype/class_modules/__init__.py b/kalima/kalima/doctype/class_modules/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kalima/kalima/doctype/class_modules/class_modules.json b/kalima/kalima/doctype/class_modules/class_modules.json
new file mode 100644
index 0000000..030f73c
--- /dev/null
+++ b/kalima/kalima/doctype/class_modules/class_modules.json
@@ -0,0 +1,41 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-07-08 14:20:56.688048",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "module",
+  "teacher"
+ ],
+ "fields": [
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Module",
+   "options": "Presented Module",
+   "reqd": 1
+  },
+  {
+   "fieldname": "teacher",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Teacher",
+   "options": "Employee"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-07-08 15:05:02.582823",
+ "modified_by": "Administrator",
+ "module": "Kalima",
+ "name": "Class Modules",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/kalima/kalima/doctype/class_modules/class_modules.py b/kalima/kalima/doctype/class_modules/class_modules.py
new file mode 100644
index 0000000..2a50d05
--- /dev/null
+++ b/kalima/kalima/doctype/class_modules/class_modules.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, e2next and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class ClassModules(Document):
+	pass
diff --git a/kalima/kalima/doctype/group_class/group_class.py b/kalima/kalima/doctype/group_class/group_class.py
index 96a4c14..52a8cdd 100644
--- a/kalima/kalima/doctype/group_class/group_class.py
+++ b/kalima/kalima/doctype/group_class/group_class.py
@@ -65,39 +65,47 @@ def fetch_students(selected_modules, department):
 @frappe.whitelist()
 def create_classes(group_title,year,stage,semester,department,group_class_modules,students):
     group_class_modules = json.loads(str(group_class_modules))
-    for module in group_class_modules:
+    print(group_class_modules)
+    
+    # for module in group_class_modules:
         # Convert the group_class_doc to a dictionary
         # group_class_doc = json.loads(str(group_class_doc))
-        students = json.loads(str(students))
+    students = json.loads(str(students))
 
-        create_class(group_title,
-                     module,
-                     year,
-                     stage,
-                     semester,
-                     department,
-                     students)
+    create_class(group_title,
+                    group_class_modules,
+                    year,
+                    stage,
+                    semester,
+                    department,
+                    students)
 
     return "Classes created successfully."
 
-def create_class(group_title,module,year,stage,semester,department,students):
-
-	new_class = frappe.get_doc({"doctype":"Class", 
-								"title": group_title + " - " + module, 
-								"stage":stage,
-								"semester": semester,
-								"module": module, 
-								"year": year, 
-								"department": department,
-								})
-	for std in students:
-		new_class.append("student_list", {"student": std})
-  
-		stud = frappe.get_doc("Student",std)
-		stud.append("enrolled_modules",{
-			"module":module,
-			"status":"Ongoing",
-		})
-		stud.save()
-
-	new_class.save()
\ No newline at end of file
+def create_class(group_title,group_class_modules,year,stage,semester,department,students):
+
+    new_class = frappe.get_doc({"doctype":"Class", 
+                                "title": group_title , 
+                                "stage":stage,
+                                "semester": semester,
+                                "year": year, 
+                                "department": department,
+                                })
+    for std in students:
+        new_class.append("student_list", {"student": std})
+        stud = frappe.get_doc("Student",std)
+        
+        for mod in group_class_modules:
+            mody = frappe.db.get_value("Presented Module",mod,"name")
+            
+            if(mody!=None):
+                new_class.append("class_modules", {"module": mody})
+            
+            stud.append("enrolled_modules",{
+                "module":mod,
+                "status":"Ongoing",
+            })
+            
+        stud.save()
+
+    new_class.save()
diff --git a/kalima/kalima/doctype/student_enrolled_modules/student_enrolled_modules.json b/kalima/kalima/doctype/student_enrolled_modules/student_enrolled_modules.json
index 35d4df5..3dfa904 100644
--- a/kalima/kalima/doctype/student_enrolled_modules/student_enrolled_modules.json
+++ b/kalima/kalima/doctype/student_enrolled_modules/student_enrolled_modules.json
@@ -18,7 +18,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Module",
-   "options": "Department Module"
+   "options": "Presented Module"
   },
   {
    "fieldname": "status",
@@ -42,17 +42,15 @@
    "label": "Semester"
   },
   {
-   "fetch_from": "module.template",
    "fieldname": "template",
    "fieldtype": "Data",
-   "in_list_view": 1,
    "label": "Template"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-05-28 11:28:17.726971",
+ "modified": "2024-07-08 15:31:03.412558",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Student Enrolled Modules",
diff --git a/kalima/kalima/doctype/teaching_module/__init__.py b/kalima/kalima/doctype/teaching_module/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kalima/kalima/doctype/teaching_module/teaching_module.json b/kalima/kalima/doctype/teaching_module/teaching_module.json
new file mode 100644
index 0000000..cf6cb8b
--- /dev/null
+++ b/kalima/kalima/doctype/teaching_module/teaching_module.json
@@ -0,0 +1,42 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-07-08 14:27:22.351447",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "department",
+  "module"
+ ],
+ "fields": [
+  {
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Department",
+   "options": "Department",
+   "reqd": 1
+  },
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Module",
+   "options": "Presented Module",
+   "reqd": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-07-08 14:28:06.036208",
+ "modified_by": "Administrator",
+ "module": "Kalima",
+ "name": "Teaching Module",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/kalima/kalima/doctype/teaching_module/teaching_module.py b/kalima/kalima/doctype/teaching_module/teaching_module.py
new file mode 100644
index 0000000..df8577d
--- /dev/null
+++ b/kalima/kalima/doctype/teaching_module/teaching_module.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2024, e2next and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class TeachingModule(Document):
+	pass
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.js b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
index c12be86..0405bcd 100644
--- a/kalima/kalima/page/class_distribution_t/class_distribution_t.js
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
@@ -294,19 +294,19 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
 				if (r.message) {
 					frappe.msgprint(__('Classes have been successfully generated.'));+
 
-					form.set_value('group_title', "");
-                    form.set_value('department', "");
-                    form.set_value('stage', "");
-                    form.set_value('semester', "");
-                    form.set_value('year', "");
+					// form.set_value('group_title', "");
+                    // form.set_value('department', "");
+                    // form.set_value('stage', "");
+                    // form.set_value('semester', "");
+                    // form.set_value('year', "");
 
-					  // Clear form fields
-						$('input[type="text"], input[type="checkbox"], select').val('');
-						$('input[type="checkbox"]').prop('checked', false);
+					//   // Clear form fields
+					// 	$('input[type="text"], input[type="checkbox"], select').val('');
+					// 	$('input[type="checkbox"]').prop('checked', false);
 
-						// Clear the student and module lists
-						$('#student-list').html('');
-						$('#module-list').html('');
+					// 	// Clear the student and module lists
+					// 	$('#student-list').html('');
+					// 	$('#module-list').html('');
 				}
 			}
 		});
diff --git a/kalima/public/js/employee.js b/kalima/public/js/employee.js
new file mode 100644
index 0000000..f83ca57
--- /dev/null
+++ b/kalima/public/js/employee.js
@@ -0,0 +1,14 @@
+frappe.ui.form.on('Employee', {
+    onload: function(frm) {
+        frm.fields_dict['custom_teaching_module'].grid.get_field('module').get_query = function(doc, cdt, cdn) {
+            var row = locals[cdt][cdn];
+            return {
+                filters: {
+                    'department': row.department
+                }
+            };
+        };
+    },
+
+});
+

From ecac7006da67435abaf522edb02586ad4073133c Mon Sep 17 00:00:00 2001
From: Abdullah <asalih@creativeadvtech.com>
Date: Mon, 8 Jul 2024 15:55:23 +0300
Subject: [PATCH 4/5] divisions

---
 .../kalima/doctype/group_class/group_class.py | 95 ++++++++++---------
 .../class_distribution_t.js                   | 35 ++++---
 2 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/kalima/kalima/doctype/group_class/group_class.py b/kalima/kalima/doctype/group_class/group_class.py
index 52a8cdd..c3946ff 100644
--- a/kalima/kalima/doctype/group_class/group_class.py
+++ b/kalima/kalima/doctype/group_class/group_class.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2024, e2next and contributors
 # For license information, please see license.txt
-
+import random
 import frappe
 from frappe.model.document import Document
 import json
@@ -63,49 +63,58 @@ def fetch_students(selected_modules, department):
     return students
 
 @frappe.whitelist()
-def create_classes(group_title,year,stage,semester,department,group_class_modules,students):
-    group_class_modules = json.loads(str(group_class_modules))
-    print(group_class_modules)
-    
-    # for module in group_class_modules:
-        # Convert the group_class_doc to a dictionary
-        # group_class_doc = json.loads(str(group_class_doc))
-    students = json.loads(str(students))
-
-    create_class(group_title,
-                    group_class_modules,
-                    year,
-                    stage,
-                    semester,
-                    department,
-                    students)
-
+def create_classes(group_title, year, stage, semester, department, group_class_modules, students, divisions):
+    group_class_modules = json.loads(group_class_modules)
+    students = json.loads(students)
+    create_class(group_title, group_class_modules, year, stage, semester, department, students, divisions)
     return "Classes created successfully."
 
-def create_class(group_title,group_class_modules,year,stage,semester,department,students):
-
-    new_class = frappe.get_doc({"doctype":"Class", 
-                                "title": group_title , 
-                                "stage":stage,
-                                "semester": semester,
-                                "year": year, 
-                                "department": department,
-                                })
-    for std in students:
-        new_class.append("student_list", {"student": std})
-        stud = frappe.get_doc("Student",std)
+def create_class(group_title, group_class_modules, year, stage, semester, department, students, divisions):
+    divisions = int(divisions)
+    # Shuffle the students list to randomize the distribution
+    random.shuffle(students)
+    
+    # Calculate the number of students per division
+    students_per_division = len(students) // divisions
+    # In case there are leftover students, calculate the remainder
+    remainder = len(students) % divisions
+
+    # Iterate over the number of divisions and create classes
+    for i in range(divisions):
+        # Calculate the start and end index for the current division
+        start_index = i * students_per_division
+        end_index = start_index + students_per_division
+        if i == divisions - 1:  # Add the remainder to the last division
+            end_index += remainder
         
-        for mod in group_class_modules:
-            mody = frappe.db.get_value("Presented Module",mod,"name")
-            
-            if(mody!=None):
-                new_class.append("class_modules", {"module": mody})
-            
-            stud.append("enrolled_modules",{
-                "module":mod,
-                "status":"Ongoing",
-            })
+        # Get the students for the current division
+        current_students = students[start_index:end_index]
+        
+        # Create a new class for the current division
+        new_class = frappe.get_doc({
+            "doctype": "Class",
+            "title": f"{group_title} Group {i+1}",
+            "stage": stage,
+            "semester": semester,
+            "year": year,
+            "department": department,
+        })
+        
+        for std in current_students:
+            new_class.append("student_list", {"student": std})
+            stud = frappe.get_doc("Student", std)
             
-        stud.save()
-
-    new_class.save()
+            for mod in group_class_modules:
+                mody = frappe.db.get_value("Presented Module", mod, "name")
+                
+                if mody is not None:
+                    new_class.append("class_modules", {"module": mody})
+                
+                stud.append("enrolled_modules", {
+                    "module": mod,
+                    "status": "Ongoing",
+                })
+                
+            stud.save()
+        
+        new_class.save()
\ No newline at end of file
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.js b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
index 0405bcd..2b096db 100644
--- a/kalima/kalima/page/class_distribution_t/class_distribution_t.js
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
@@ -60,6 +60,11 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
                 fieldname: 'semester',
                 label: 'Semester',
                 options: 'Fall Semester\nSprint Semester\nShort Semester\nAnnual',
+            },
+            {
+                fieldtype: 'Int',
+                fieldname: 'divisions',
+                label: 'Divisions',
             },
 			{
                 fieldtype: 'Section Break',
@@ -93,11 +98,12 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
 					let stage = form.get_value('stage');
                     let semester = form.get_value('semester');
                     let year = form.get_value('year');
+                    let divisions = form.get_value('divisions');
 					generate_classes(group_title,
 						year,
 						stage,
 						semester,
-						department,);
+						department,divisions);
                 }
             }, {
                 fieldtype: 'Column Break',
@@ -260,7 +266,7 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
 		year,
 		stage,
 		semester,
-		department,) {
+		department,divisions) {
 		const selected_modules = [];
 		const selected_students = [];
 		// const department = frm.doc.department;
@@ -288,25 +294,26 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
 				semester: semester,
 				department: department,
 				group_class_modules: selected_modules,
-				students: selected_students
+				students: selected_students,
+                divisions:divisions
 			},
 			callback: function (r) {
 				if (r.message) {
 					frappe.msgprint(__('Classes have been successfully generated.'));+
 
-					// form.set_value('group_title', "");
-                    // form.set_value('department', "");
-                    // form.set_value('stage', "");
-                    // form.set_value('semester', "");
-                    // form.set_value('year', "");
+					form.set_value('group_title', "");
+                    form.set_value('department', "");
+                    form.set_value('stage', "");
+                    form.set_value('semester', "");
+                    form.set_value('year', "");
 
-					//   // Clear form fields
-					// 	$('input[type="text"], input[type="checkbox"], select').val('');
-					// 	$('input[type="checkbox"]').prop('checked', false);
+					  // Clear form fields
+						$('input[type="text"], input[type="checkbox"], select').val('');
+						$('input[type="checkbox"]').prop('checked', false);
 
-					// 	// Clear the student and module lists
-					// 	$('#student-list').html('');
-					// 	$('#module-list').html('');
+						// Clear the student and module lists
+						$('#student-list').html('');
+						$('#module-list').html('');
 				}
 			}
 		});

From cbbbe37f15b92a57122edd5a4b8b263949941b53 Mon Sep 17 00:00:00 2001
From: Abdullah <asalih@creativeadvtech.com>
Date: Tue, 9 Jul 2024 12:53:03 +0300
Subject: [PATCH 5/5] Fixes part 2

---
 kalima/kalima/custom/department.json          | 754 +++++++++++++++---
 .../doctype/book_category/book_category.json  |  11 +-
 .../kalima/doctype/group_class/group_class.py |  10 +-
 .../class_distribution_t.js                   |  23 +-
 4 files changed, 648 insertions(+), 150 deletions(-)

diff --git a/kalima/kalima/custom/department.json b/kalima/kalima/custom/department.json
index 45ca86e..9db54b4 100644
--- a/kalima/kalima/custom/department.json
+++ b/kalima/kalima/custom/department.json
@@ -11,7 +11,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:02:12.481791",
+   "creation": "2024-07-09 12:49:43.594360",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -19,29 +19,29 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_abbreviation_title",
-   "fieldtype": "Data",
+   "fieldname": "custom_academic_system_type",
+   "fieldtype": "Heading",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 33,
+   "idx": 23,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_code",
+   "insert_after": "custom_phd",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Abbreviation Title",
+   "label": "Academic System Type",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:02:12.481791",
+   "modified": "2024-07-09 12:49:43.594360",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_abbreviation_title",
+   "name": "Department-custom_academic_system_type",
    "no_copy": 0,
    "non_negative": 0,
    "options": null,
@@ -58,7 +58,7 @@
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -73,7 +73,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:02:12.334663",
+   "creation": "2024-07-09 12:49:43.452847",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -81,29 +81,29 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_code",
-   "fieldtype": "Data",
+   "fieldname": "custom_entrance_type",
+   "fieldtype": "Heading",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 32,
+   "idx": 27,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_column_break_bxnzq",
+   "insert_after": "custom_annual",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Code",
+   "label": "Entrance Type",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:02:12.334663",
+   "modified": "2024-07-09 12:49:43.452847",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_code",
+   "name": "Department-custom_entrance_type",
    "no_copy": 0,
    "non_negative": 0,
    "options": null,
@@ -120,7 +120,7 @@
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -135,7 +135,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:02:12.209765",
+   "creation": "2024-07-09 12:49:05.254815",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -143,29 +143,29 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_column_break_bxnzq",
-   "fieldtype": "Column Break",
+   "fieldname": "custom_study_level",
+   "fieldtype": "Heading",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 31,
+   "idx": 20,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_arabic_title",
+   "insert_after": "custom_academic_semester",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "",
+   "label": "Study Level",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:02:12.209765",
+   "modified": "2024-07-09 12:49:05.254815",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_column_break_bxnzq",
+   "name": "Department-custom_study_level",
    "no_copy": 0,
    "non_negative": 0,
    "options": null,
@@ -197,7 +197,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:01:35.976723",
+   "creation": "2024-07-09 12:48:26.701912",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -205,8 +205,8 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_arabic_title",
-   "fieldtype": "Data",
+   "fieldname": "custom_evening",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
@@ -218,19 +218,19 @@
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_english_title",
+   "insert_after": "custom_morning",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Arabic Title",
+   "label": "Evening",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:01:35.976723",
+   "modified": "2024-07-09 12:48:26.701912",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_arabic_title",
+   "name": "Department-custom_evening",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "Morning\nEvening",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -244,7 +244,7 @@
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -259,7 +259,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:01:35.764112",
+   "creation": "2024-07-09 12:48:26.521169",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -267,32 +267,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_english_title",
-   "fieldtype": "Data",
+   "fieldname": "custom_morning",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 29,
+   "idx": 28,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_section_break_rsosl",
+   "insert_after": "custom_entrance_type",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "English Title",
+   "label": "Morning",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:01:35.764112",
+   "modified": "2024-07-09 12:48:26.521169",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_english_title",
+   "name": "Department-custom_morning",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "Morning\nEvening",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -306,7 +306,7 @@
    "search_index": 0,
    "show_dashboard": 0,
    "sort_options": 0,
-   "translatable": 1,
+   "translatable": 0,
    "unique": 0,
    "width": null
   },
@@ -321,7 +321,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:01:35.581077",
+   "creation": "2024-07-09 12:48:26.321437",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -329,32 +329,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_section_break_rsosl",
-   "fieldtype": "Section Break",
+   "fieldname": "custom_annual",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 28,
+   "idx": 27,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_total_of_required_credits",
+   "insert_after": "custom_bologna",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "",
+   "label": "Annual",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:01:35.581077",
+   "modified": "2024-07-09 12:48:26.321437",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_section_break_rsosl",
+   "name": "Department-custom_annual",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "Coursat\nBologna\nAnnual",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -383,7 +383,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:00:17.783018",
+   "creation": "2024-07-09 12:48:26.152261",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -391,32 +391,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_total_of_required_credits",
-   "fieldtype": "Int",
+   "fieldname": "custom_bologna",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 27,
+   "idx": 26,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_department",
+   "insert_after": "custom_coursat",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Total of Required Credits",
+   "label": "Bologna",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:00:17.783018",
+   "modified": "2024-07-09 12:48:26.152261",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_total_of_required_credits",
+   "name": "Department-custom_bologna",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "Coursat\nBologna\nAnnual",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -445,7 +445,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:00:17.634700",
+   "creation": "2024-07-09 12:48:25.923246",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -453,32 +453,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_department",
-   "fieldtype": "Link",
+   "fieldname": "custom_coursat",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 26,
+   "idx": 24,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_faculty",
+   "insert_after": "custom_academic_system_type",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Department",
+   "label": "Coursat",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:00:17.634700",
+   "modified": "2024-07-09 12:48:25.923246",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_department",
+   "name": "Department-custom_coursat",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Faculty Department",
+   "options": "Coursat\nBologna\nAnnual",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -507,7 +507,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 14:00:17.481028",
+   "creation": "2024-07-09 12:48:25.679014",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -515,32 +515,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_faculty",
-   "fieldtype": "Link",
+   "fieldname": "custom_phd",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 25,
+   "idx": 23,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_column_break_wpctr",
+   "insert_after": "custom_master",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Faculty",
+   "label": "Phd",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 14:00:17.481028",
+   "modified": "2024-07-09 12:48:25.679014",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_faculty",
+   "name": "Department-custom_phd",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Faculty",
+   "options": "Bachelor\nMaster\nPhd",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -569,7 +569,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 13:56:19.888257",
+   "creation": "2024-07-09 12:48:25.513368",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -577,32 +577,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_column_break_wpctr",
-   "fieldtype": "Column Break",
+   "fieldname": "custom_master",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 24,
+   "idx": 22,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_max_available_semester",
+   "insert_after": "custom_bachelor",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "",
+   "label": "Master",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 13:56:19.888257",
+   "modified": "2024-07-09 12:48:25.513368",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_column_break_wpctr",
+   "name": "Department-custom_master",
    "no_copy": 0,
    "non_negative": 0,
-   "options": null,
+   "options": "Bachelor\nMaster\nPhd",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -631,7 +631,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 13:56:19.726653",
+   "creation": "2024-07-09 12:48:25.291642",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -639,32 +639,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_max_available_semester",
-   "fieldtype": "Int",
+   "fieldname": "custom_bachelor",
+   "fieldtype": "Check",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 23,
+   "idx": 21,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_entrance_type",
+   "insert_after": "custom_study_level",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Max Available Semester",
+   "label": "Bachelor",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 13:56:19.726653",
+   "modified": "2024-07-09 12:48:25.291642",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_max_available_semester",
+   "name": "Department-custom_bachelor",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Morning\nEvening",
+   "options": "Bachelor\nMaster\nPhd",
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -693,7 +693,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 13:56:01.518087",
+   "creation": "2024-07-04 14:02:12.481791",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -701,32 +701,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_entrance_type",
-   "fieldtype": "Select",
+   "fieldname": "custom_abbreviation_title",
+   "fieldtype": "Data",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 22,
+   "idx": 41,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_academic_system_type",
+   "insert_after": "custom_code",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Entrance Type",
+   "label": "Abbreviation Title",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 13:56:01.518087",
+   "modified": "2024-07-04 14:02:12.481791",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_entrance_type",
+   "name": "Department-custom_abbreviation_title",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Morning\nEvening",
+   "options": null,
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -755,7 +755,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 13:55:44.919335",
+   "creation": "2024-07-04 14:02:12.334663",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -763,32 +763,32 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_academic_system_type",
-   "fieldtype": "Select",
+   "fieldname": "custom_code",
+   "fieldtype": "Data",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 21,
+   "idx": 40,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_study_level",
+   "insert_after": "custom_column_break_bxnzq",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Academic System Type",
+   "label": "Code",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 13:55:44.919335",
+   "modified": "2024-07-04 14:02:12.334663",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_academic_system_type",
+   "name": "Department-custom_code",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Coursat\nBologna\nAnnual",
+   "options": null,
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -817,7 +817,7 @@
    "collapsible": 0,
    "collapsible_depends_on": null,
    "columns": 0,
-   "creation": "2024-07-04 13:55:44.774128",
+   "creation": "2024-07-04 14:02:12.209765",
    "default": null,
    "depends_on": null,
    "description": null,
@@ -825,32 +825,94 @@
    "dt": "Department",
    "fetch_from": null,
    "fetch_if_empty": 0,
-   "fieldname": "custom_study_level",
-   "fieldtype": "Select",
+   "fieldname": "custom_column_break_bxnzq",
+   "fieldtype": "Column Break",
    "hidden": 0,
    "hide_border": 0,
    "hide_days": 0,
    "hide_seconds": 0,
-   "idx": 20,
+   "idx": 39,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
    "in_preview": 0,
    "in_standard_filter": 0,
-   "insert_after": "custom_academic_semester",
+   "insert_after": "custom_arabic_title",
    "is_system_generated": 0,
    "is_virtual": 0,
-   "label": "Study Level",
+   "label": "",
    "length": 0,
    "mandatory_depends_on": null,
-   "modified": "2024-07-04 13:55:44.774128",
+   "modified": "2024-07-04 14:02:12.209765",
    "modified_by": "Administrator",
    "module": null,
-   "name": "Department-custom_study_level",
+   "name": "Department-custom_column_break_bxnzq",
    "no_copy": 0,
    "non_negative": 0,
-   "options": "Bachelor\nMaster\nPhd",
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.976723",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_arabic_title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 38,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_english_title",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Arabic Title",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.976723",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_arabic_title",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
    "owner": "Administrator",
    "permlevel": 0,
    "precision": "",
@@ -868,6 +930,440 @@
    "unique": 0,
    "width": null
   },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.764112",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_english_title",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 37,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_section_break_rsosl",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "English Title",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.764112",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_english_title",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 1,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:01:35.581077",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_section_break_rsosl",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 35,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_max_available_semester",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:01:35.581077",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_section_break_rsosl",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.783018",
+   "default": null,
+   "depends_on": "eval:doc.custom_bologna == 1",
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_total_of_required_credits",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 34,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_department",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Total of Required Credits",
+   "length": 0,
+   "mandatory_depends_on": "eval:doc.custom_bologna == 1",
+   "modified": "2024-07-04 14:00:17.783018",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_total_of_required_credits",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.634700",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_department",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 33,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_faculty",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Department",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:00:17.634700",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_department",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Faculty Department",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 14:00:17.481028",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_faculty",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 32,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_column_break_wpctr",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Faculty",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 14:00:17.481028",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_faculty",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Faculty",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:56:19.888257",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_column_break_wpctr",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 31,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_evening",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:56:19.888257",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_column_break_wpctr",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": null,
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2024-07-04 13:56:19.726653",
+   "default": null,
+   "depends_on": "eval:doc.custom_bologna == 1",
+   "description": null,
+   "docstatus": 0,
+   "dt": "Department",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "custom_max_available_semester",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 35,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "custom_total_of_required_credits",
+   "is_system_generated": 0,
+   "is_virtual": 0,
+   "label": "Max Available Semester",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2024-07-04 13:56:19.726653",
+   "modified_by": "Administrator",
+   "module": null,
+   "name": "Department-custom_max_available_semester",
+   "no_copy": 0,
+   "non_negative": 0,
+   "options": "Morning\nEvening",
+   "owner": "Administrator",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "show_dashboard": 0,
+   "sort_options": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
   {
    "_assign": null,
    "_comments": null,
@@ -1498,7 +1994,7 @@
    "_comments": null,
    "_liked_by": null,
    "_user_tags": null,
-   "creation": "2024-07-07 14:53:35.424420",
+   "creation": "2024-07-09 12:50:34.323599",
    "default_value": null,
    "doc_type": "Department",
    "docstatus": 0,
@@ -1506,7 +2002,7 @@
    "field_name": null,
    "idx": 0,
    "is_system_generated": 0,
-   "modified": "2024-07-07 14:53:35.424420",
+   "modified": "2024-07-09 12:50:34.323599",
    "modified_by": "Administrator",
    "module": null,
    "name": "Department-main-field_order",
@@ -1514,7 +2010,7 @@
    "property": "field_order",
    "property_type": "Data",
    "row_name": null,
-   "value": "[\"department_name\", \"parent_department\", \"column_break_3\", \"company\", \"is_group\", \"disabled\", \"section_break_4\", \"payroll_cost_center\", \"column_break_9\", \"leave_block_list\", \"approvers\", \"shift_request_approver\", \"leave_approvers\", \"expense_approvers\", \"lft\", \"rgt\", \"old_parent\", \"custom_section_break_ygczg\", \"custom_academic_semester\", \"custom_study_level\", \"custom_academic_system_type\", \"custom_entrance_type\", \"custom_max_available_semester\", \"custom_column_break_wpctr\", \"custom_faculty\", \"custom_department\", \"custom_total_of_required_credits\", \"custom_section_break_rsosl\", \"custom_english_title\", \"custom_arabic_title\", \"custom_column_break_bxnzq\", \"custom_code\", \"custom_abbreviation_title\"]"
+   "value": "[\"department_name\", \"parent_department\", \"column_break_3\", \"company\", \"is_group\", \"disabled\", \"section_break_4\", \"payroll_cost_center\", \"column_break_9\", \"leave_block_list\", \"approvers\", \"shift_request_approver\", \"leave_approvers\", \"expense_approvers\", \"lft\", \"rgt\", \"old_parent\", \"custom_section_break_ygczg\", \"custom_academic_semester\", \"custom_study_level\", \"custom_bachelor\", \"custom_master\", \"custom_phd\", \"custom_academic_system_type\", \"custom_coursat\", \"custom_bologna\", \"custom_annual\", \"custom_entrance_type\", \"custom_morning\", \"custom_evening\", \"custom_column_break_wpctr\", \"custom_faculty\", \"custom_department\", \"custom_total_of_required_credits\", \"custom_max_available_semester\", \"custom_section_break_rsosl\", \"custom_english_title\", \"custom_arabic_title\", \"custom_column_break_bxnzq\", \"custom_code\", \"custom_abbreviation_title\"]"
   }
  ],
  "sync_on_migrate": 1
diff --git a/kalima/kalima/doctype/book_category/book_category.json b/kalima/kalima/doctype/book_category/book_category.json
index b5d16a6..3187874 100644
--- a/kalima/kalima/doctype/book_category/book_category.json
+++ b/kalima/kalima/doctype/book_category/book_category.json
@@ -8,7 +8,6 @@
  "field_order": [
   "code",
   "title",
-  "parent1",
   "lft",
   "rgt",
   "is_group",
@@ -31,13 +30,6 @@
    "reqd": 1,
    "unique": 1
   },
-  {
-   "fieldname": "parent1",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Parent",
-   "options": "Book Category"
-  },
   {
    "fieldname": "lft",
    "fieldtype": "Int",
@@ -55,6 +47,7 @@
    "read_only": 1
   },
   {
+   "default": "0",
    "fieldname": "is_group",
    "fieldtype": "Check",
    "label": "Is Group"
@@ -76,7 +69,7 @@
  "index_web_pages_for_search": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-07-06 14:44:44.742867",
+ "modified": "2024-07-09 12:00:02.221932",
  "modified_by": "Administrator",
  "module": "Kalima",
  "name": "Book Category",
diff --git a/kalima/kalima/doctype/group_class/group_class.py b/kalima/kalima/doctype/group_class/group_class.py
index c3946ff..9f8454a 100644
--- a/kalima/kalima/doctype/group_class/group_class.py
+++ b/kalima/kalima/doctype/group_class/group_class.py
@@ -10,7 +10,7 @@ class GroupClass(Document):
 
 
 @frappe.whitelist()
-def fetch_students(selected_modules, department):
+def fetch_students(selected_modules, stage, department, semester, study_system, year):
     if not selected_modules or not department:
         frappe.throw("Please select at least one module and ensure department is selected.")
 
@@ -36,9 +36,13 @@ def fetch_students(selected_modules, department):
     base_query = """
         SELECT student.name, student.full_name_in_arabic
         FROM `tabStudent` AS student
-        WHERE student.final_selected_course = %s
+        WHERE student.final_selected_course = %s 
+        and  student.stage = %s 
+        and  student.semester = %s 
+        and  student.study_system = %s 
+        and  student.year = %s 
     """
-    query_params = [department]
+    query_params = [department,stage, semester, study_system, year]
 
     if prerequisites_modules:
         # Convert prerequisites_modules to a tuple for SQL query
diff --git a/kalima/kalima/page/class_distribution_t/class_distribution_t.js b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
index 2b096db..00eefac 100644
--- a/kalima/kalima/page/class_distribution_t/class_distribution_t.js
+++ b/kalima/kalima/page/class_distribution_t/class_distribution_t.js
@@ -51,8 +51,8 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
             },
             {
                 fieldtype: 'Select',
-                fieldname: 'time',
-                label: 'Time',
+                fieldname: 'study_system',
+                label: 'Study System',
                 options: 'Morning\nEvening',
             },
             {
@@ -62,9 +62,10 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
                 options: 'Fall Semester\nSprint Semester\nShort Semester\nAnnual',
             },
             {
-                fieldtype: 'Int',
+                fieldtype: 'Select',
                 fieldname: 'divisions',
                 label: 'Divisions',
+                options:"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20"
             },
 			{
                 fieldtype: 'Section Break',
@@ -78,10 +79,10 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
                     let stage = form.get_value('stage');
                     let department = form.get_value('department');
                     let semester = form.get_value('semester');
-                    let time = form.get_value('time');
+                    let study_system = form.get_value('study_system');
                     let year = form.get_value('year');
-                    let faculty = form.get_value('faculty');
-                    fetch_students(stage, department, semester, time, year, faculty);
+                    // let faculty = form.get_value('faculty');
+                    fetch_students(stage, department, semester, study_system, year);
                 }
             },  {
                 fieldtype: 'Column Break',
@@ -127,9 +128,9 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
     let moduleListContainer = $('<div id="module-list"></div>').appendTo(page.body);
 
     // Function to fetch and display students
-    function fetch_students() {
+    function fetch_students(stage, department, semester, study_system, year) {
         const selected_modules = [];
-        const department = form.get_value('department');
+        // const department = form.get_value('department');
 
         // Get selected modules from moduleListContainer
         moduleListContainer.find('input[type="checkbox"]:checked').each(function () {
@@ -145,7 +146,11 @@ frappe.pages['class-distribution-t'].on_page_load = function (wrapper) {
             method: "kalima.kalima.doctype.group_class.group_class.fetch_students",
             args: {
                 selected_modules: JSON.stringify(selected_modules),
-                department: department
+                stage: stage,
+                department: department,
+                semester: semester,
+                study_system: study_system,
+                year: year,
             },
             callback: function (r) {
                 if (r.message) {