Required Modifications

academia/academia/doctype/academic_program/academic_program.json

@@ -7,12 +7,13 @@
  "engine": "InnoDB",
  "field_order": [
   "program_name",
+  "program_name_english",
   "faculty",
   "faculty_department",
   "column_break_fnia",
   "program_abbreviation",
-  "program_degree",
-  "starrting_year_of_program",
+  "academic_degree",
+  "date_of_starting_the_program",
   "section_break_ljrb",
   "courses",
   "column_break_cash",
@@ -27,7 +28,7 @@
    "fieldname": "program_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Program Name",
+   "label": "Program Name ",
    "reqd": 1,
    "translatable": 1,
    "unique": 1
@@ -56,23 +57,10 @@
    "fieldname": "program_abbreviation",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Program Abbreviation",
+   "label": "Abbr",
    "reqd": 1,
    "unique": 1
   },
-  {
-   "fieldname": "program_degree",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Program Degree",
-   "options": "\nPost-Secondary Diploma\nBachelor's Degree\nPostgraduate Diploma\nMaster Degree\nPHD Degree",
-   "reqd": 1
-  },
-  {
-   "fieldname": "starrting_year_of_program",
-   "fieldtype": "Date",
-   "label": "Starrting Year of Program"
-  },
   {
    "fieldname": "section_break_ljrb",
    "fieldtype": "Section Break"
@@ -124,6 +112,28 @@
    "fieldtype": "Data",
    "label": "Minimum Course Average to Start Research ",
    "mandatory_depends_on": "eval:doc.research_or_thesis === 1 && doc.courses === 1 ;"
+  },
+  {
+   "fieldname": "program_name_english",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Program Name (English)",
+   "reqd": 1,
+   "translatable": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "academic_degree",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Academic Degree",
+   "options": "\nPost-Secondary Diploma\nBachelor's Degree\nPostgraduate Diploma\nMaster Degree\nPHD Degree",
+   "reqd": 1
+  },
+  {
+   "fieldname": "date_of_starting_the_program",
+   "fieldtype": "Date",
+   "label": "Date of Starting the Program"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -133,7 +143,7 @@
    "link_fieldname": "program_name"
   }
  ],
- "modified": "2024-07-22 02:51:20.294747",
+ "modified": "2024-07-29 23:15:41.010511",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Academic Program",

academia/academia/doctype/academic_program/academic_program.py

@@ -14,16 +14,17 @@ class AcademicProgram(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		academic_degree: DF.Literal["", "Post-Secondary Diploma", "Bachelor's Degree", "Postgraduate Diploma", "Master Degree", "PHD Degree"]
 		courses: DF.Check
+		date_of_starting_the_program: DF.Date | None
 		faculty: DF.Link
 		faculty_department: DF.Link
 		maximum_research_period: DF.Int
 		minimum_course_average_to_start_research: DF.Data | None
 		minimum_research_period: DF.Int
 		program_abbreviation: DF.Data
-		program_degree: DF.Literal["", "Post-Secondary Diploma", "Bachelor's Degree", "Postgraduate Diploma", "Master Degree", "PHD Degree"]
 		program_name: DF.Data
+		program_name_english: DF.Data
 		research_or_thesis: DF.Check
-		starrting_year_of_program: DF.Date | None
 	# end: auto-generated types
 	pass

academia/academia/doctype/academic_term/academic_term.json

@@ -1,7 +1,7 @@
 {
  "actions": [],
  "allow_rename": 1,
- "autoname": "field:term_name",
+ "autoname": "format:{term_name} - {academic_year}",
  "creation": "2024-04-23 21:32:12.966215",
  "doctype": "DocType",
  "engine": "InnoDB",
@@ -10,14 +10,19 @@
   "faculty",
   "disabled",
   "academic_year",
-  "auto_created"
+  "auto_created",
+  "column_break_obzq",
+  "study_start",
+  "study_end",
+  "exam_start",
+  "exam_end"
  ],
  "fields": [
   {
    "fieldname": "term_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Term Name",
+   "label": "Academic Term Name",
    "reqd": 1,
    "unique": 1
   },
@@ -47,15 +52,39 @@
    "fieldname": "auto_created",
    "fieldtype": "Check",
    "label": "Auto Created"
+  },
+  {
+   "fieldname": "column_break_obzq",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "study_start",
+   "fieldtype": "Date",
+   "label": "Study Start Date"
+  },
+  {
+   "fieldname": "study_end",
+   "fieldtype": "Date",
+   "label": "Study End Date"
+  },
+  {
+   "fieldname": "exam_start",
+   "fieldtype": "Date",
+   "label": "Exam Start Date"
+  },
+  {
+   "fieldname": "exam_end",
+   "fieldtype": "Date",
+   "label": "Exam End Date"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-14 01:28:59.524534",
+ "modified": "2024-07-29 23:06:05.475327",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Academic Term",
- "naming_rule": "By fieldname",
+ "naming_rule": "Expression",
  "owner": "Administrator",
  "permissions": [
   {

academia/academia/doctype/academic_term/academic_term.py

@@ -17,7 +17,11 @@ class AcademicTerm(Document):
 		academic_year: DF.Link
 		auto_created: DF.Check
 		disabled: DF.Check
+		exam_end: DF.Date | None
+		exam_start: DF.Date | None
 		faculty: DF.Link
+		study_end: DF.Date | None
+		study_start: DF.Date | None
 		term_name: DF.Data
 	# end: auto-generated types
 	pass

academia/academia/doctype/faculty/faculty.json

@@ -10,6 +10,7 @@
  "field_order": [
   "company",
   "faculty_name",
+  "faculty_name_english",
   "abbr",
   "is_research_center",
   "is_group",
@@ -43,7 +44,7 @@
    "fieldname": "faculty_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Faculty",
+   "label": "Faculty Name",
    "reqd": 1,
    "unique": 1
   },
@@ -210,6 +211,14 @@
    "fieldname": "is_research_center",
    "fieldtype": "Check",
    "label": "Is Research Center"
+  },
+  {
+   "fieldname": "faculty_name_english",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Faculty Name (English)",
+   "reqd": 1,
+   "unique": 1
   }
  ],
  "image_field": "faculty_logo",
@@ -224,7 +233,7 @@
    "link_fieldname": "faculty"
   }
  ],
- "modified": "2024-05-31 00:33:17.795561",
+ "modified": "2024-07-29 22:40:28.872241",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Faculty",
@@ -249,5 +258,5 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "abbr"
+ "title_field": "faculty_name"
 }

academia/academia/doctype/faculty/faculty.py

@@ -26,6 +26,7 @@ class Faculty(Document):
 		faculty_logo: DF.AttachImage | None
 		faculty_mission: DF.TextEditor | None
 		faculty_name: DF.Data
+		faculty_name_english: DF.Data
 		faculty_vision: DF.TextEditor | None
 		fax: DF.Data | None
 		is_group: DF.Check

academia/academia/doctype/lesson/lesson.json

@@ -44,13 +44,13 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.is_multy_group == 0;",
+   "depends_on": "eval:doc.is_multi_group == 0;",
    "fieldname": "level",
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Level",
-   "options": "Level",
-   "reqd": 1
+   "mandatory_depends_on": "eval:doc.is_multi_group == 0;",
+   "options": "Level"
   },
   {
    "fieldname": "column_break_jdfp",
@@ -65,13 +65,13 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.is_multy_group == 0;",
+   "depends_on": "eval:doc.is_multi_group == 0;",
    "fieldname": "program",
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Program",
-   "options": "Program Specification",
-   "reqd": 1
+   "mandatory_depends_on": "eval:doc.is_multi_group == 0;",
+   "options": "Academic Program"
   },
   {
    "fieldname": "section_break_stfq",
@@ -103,10 +103,11 @@
    "reqd": 1
   },
   {
-   "depends_on": "eval:doc.is_multy_group == 0;",
+   "depends_on": "eval:doc.is_multi_group == 0;",
    "fieldname": "group",
    "fieldtype": "Link",
    "label": "Group",
+   "mandatory_depends_on": "eval:doc.is_multi_group == 0;",
    "options": "Student Group"
   },
   {
@@ -179,9 +180,10 @@
    "fieldtype": "Section Break"
   },
   {
-   "depends_on": "eval:doc.is_multy_group == 1;",
+   "depends_on": "eval:doc.is_multi_group == 1;",
    "fieldname": "table_hfgk",
    "fieldtype": "Table",
+   "mandatory_depends_on": "eval:doc.is_multi_group == 1;",
    "options": "Multi Lesson Template"
   },
   {
@@ -202,12 +204,12 @@
    "default": "0",
    "fieldname": "is_multi_group",
    "fieldtype": "Check",
-   "label": "is Multi Group"
+   "label": "Is Multi Group"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-06 18:25:14.445970",
+ "modified": "2024-07-30 01:41:12.252880",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Lesson",

academia/academia/doctype/lesson/lesson.py

@@ -26,8 +26,8 @@ class Lesson(Document):
 		instructor: DF.Link
 		is_multi_group: DF.Check
 		lesson_type: DF.Literal["", "Ordinary Lesson", "Compensatory Lesson"]
-		level: DF.Link
-		program: DF.Link
+		level: DF.Link | None
+		program: DF.Link | None
 		room: DF.Link
 		schedule_template: DF.ReadOnly | None
 		schedule_template_version: DF.Link