Merge pull request #35 from mohaltheeb/develop

feat(core): Add a Course Type and Faculty Fields to Course Doctype
Sana-a-Uni · Apr 23, 2024 · f41643e · f41643e
2 parents 722d170 + 8e9fcb2
commit f41643e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/academia/academia/doctype/academic_program/academic_program.json b/academia/academia/doctype/academic_program/academic_program.json
@@ -77,28 +77,28 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:doc.program_degree == \"Master Degree\";\neval:doc.program_degree == \"PHD Degree\";",
+   "depends_on": "eval:doc.program_degree == \"Master Degree\" || doc.program_degree == \"PHD Degree\";",
    "fieldname": "courses",
    "fieldtype": "Check",
    "label": "Courses",
-   "mandatory_depends_on": "eval:doc.program_degree == \"Master Degree\";\neval:doc.program_degree == \"PHD Degree\";"
+   "mandatory_depends_on": "eval:doc.program_degree == \"Master Degree\" || doc.program_degree == \"PHD Degree\";"
   },
   {
    "fieldname": "column_break_cash",
    "fieldtype": "Column Break"
   },
   {
    "default": "0",
-   "depends_on": "eval:doc.program_degree == \"Master Degree\";\neval:doc.program_degree == \"PHD Degree\";",
+   "depends_on": "eval:doc.program_degree == \"Master Degree\" || doc.program_degree == \"PHD Degree\";",
    "fieldname": "research_or_thesis",
    "fieldtype": "Check",
    "label": "Research or Thesis",
-   "mandatory_depends_on": "eval:doc.program_degree == \"Master Degree\";\neval:doc.program_degree == \"PHD Degree\";"
+   "mandatory_depends_on": "eval:doc.program_degree == \"Master Degree\" || doc.program_degree == \"PHD Degree\";"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-23 22:03:51.061637",
+ "modified": "2024-04-23 22:51:28.866811",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Academic Program",

diff --git a/academia/academia/doctype/academic_term/academic_term.json b/academia/academia/doctype/academic_term/academic_term.json
@@ -51,7 +51,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-23 22:07:08.260080",
+ "modified": "2024-04-23 22:39:48.299949",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Academic Term",

diff --git a/academia/academia/doctype/course/course.json b/academia/academia/doctype/course/course.json
@@ -10,11 +10,14 @@
  "field_order": [
   "course_code",
   "course_name",
+  "course_type",
+  "faculty",
+  "course_image",
+  "column_break_uvaw",
   "languages",
   "pre_requisites",
   "co_requisites",
-  "course_image",
-  "column_break_uvaw",
+  "section_break_nxbw",
   "description",
   "course_details_tab",
   "table_rgxb"
@@ -77,12 +80,31 @@
    "fieldname": "table_rgxb",
    "fieldtype": "Table",
    "options": "Course Hours"
+  },
+  {
+   "fieldname": "course_type",
+   "fieldtype": "Select",
+   "label": "Course Type",
+   "options": "\nUniversity Requirement\nFaculty Requirement\nProgram Requirement",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_nxbw",
+   "fieldtype": "Section Break"
+  },
+  {
+   "depends_on": "eval:doc.course_type == \"Faculty Requirement\";",
+   "fieldname": "faculty",
+   "fieldtype": "Link",
+   "label": "Faculty",
+   "mandatory_depends_on": "eval:doc.course_type == \"Faculty Requirement\";",
+   "options": "Faculty"
   }
  ],
  "image_field": "course_image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-23 21:59:11.579385",
+ "modified": "2024-04-23 23:18:52.011457",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Course",

diff --git a/academia/academia/doctype/faculty/faculty.json b/academia/academia/doctype/faculty/faculty.json
@@ -186,7 +186,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Current Academic Term",
-   "options": "Academic Year"
+   "options": "Academic Term"
   },
   {
    "fieldname": "dashboard_tab",
@@ -203,11 +203,11 @@
    "link_fieldname": "faculty"
   },
   {
-   "link_doctype": "Academic Program",
+   "link_doctype": "Program Specification",
    "link_fieldname": "faculty"
   }
  ],
- "modified": "2024-02-02 01:19:17.053723",
+ "modified": "2024-04-23 22:37:43.120115",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Faculty",

diff --git a/academia/academia/doctype/program_specification/program_specification.json b/academia/academia/doctype/program_specification/program_specification.json
@@ -98,7 +98,7 @@
    "fieldname": "delivery_mode",
    "fieldtype": "Select",
    "label": "Delivery Mode",
-   "options": "\nOnline\nOffline"
+   "options": "\nOn Campus\nOnline"
   },
   {
    "fieldname": "section_break_46rv",
@@ -140,7 +140,7 @@
   {
    "fieldname": "effective_year",
    "fieldtype": "Link",
-   "label": "Effective Year",
+   "label": "Effective Academic Year",
    "options": "Academic Year"
   },
   {
@@ -174,7 +174,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-04-23 22:06:33.897860",
+ "modified": "2024-04-23 22:59:40.155060",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Program Specification",