Merge pull request #30 from BakrAldubai/university-removing

University removing

academia/academia/doctype/academic_year/academic_year.json

@@ -12,7 +12,6 @@
   "disabled",
   "year_start_date",
   "year_end_date",
-  "universities",
   "auto_created"
  ],
  "fields": [
@@ -42,12 +41,6 @@
    "fieldtype": "Check",
    "label": "Auto Created"
   },
-  {
-   "fieldname": "universities",
-   "fieldtype": "Table",
-   "label": "Universities",
-   "options": "Academic Year University"
-  },
   {
    "fieldname": "year",
    "fieldtype": "Data",

academia/academia/doctype/faculty/faculty.json

@@ -9,13 +9,14 @@
  "engine": "InnoDB",
  "field_order": [
   "faculty_name",
-  "university",
   "abbr",
   "is_group",
   "parent_faculty",
   "column_break_lysp",
   "date_of_establishment",
   "default_holiday_list",
+  "current_academic_year",
+  "current_academic_term",
   "lft",
   "rgt",
   "old_parent",
@@ -32,7 +33,8 @@
   "fax",
   "website",
   "email",
-  "html_pseg"
+  "html_pseg",
+  "dashboard_tab"
  ],
  "fields": [
   {
@@ -43,12 +45,6 @@
    "reqd": 1,
    "unique": 1
   },
-  {
-   "fieldname": "university",
-   "fieldtype": "Link",
-   "label": "University",
-   "options": "University"
-  },
   {
    "fieldname": "abbr",
    "fieldtype": "Data",
@@ -177,12 +173,41 @@
   {
    "fieldname": "html_pseg",
    "fieldtype": "HTML"
+  },
+  {
+   "fieldname": "current_academic_year",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Current Academic Year",
+   "options": "Academic Year"
+  },
+  {
+   "fieldname": "current_academic_term",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Current Academic Term",
+   "options": "Academic Year"
+  },
+  {
+   "fieldname": "dashboard_tab",
+   "fieldtype": "Tab Break",
+   "label": "Dashboard",
+   "show_dashboard": 1
   }
  ],
  "image_field": "faculty_logo",
  "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2024-01-22 18:53:00.566376",
+ "links": [
+  {
+   "link_doctype": "Faculty Department",
+   "link_fieldname": "faculty"
+  },
+  {
+   "link_doctype": "Academic Program",
+   "link_fieldname": "faculty"
+  }
+ ],
+ "modified": "2024-02-02 01:19:17.053723",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Faculty",

academia/academia/doctype/faculty_department/faculty_department.json

@@ -11,7 +11,6 @@
   "faculty_department_name",
   "abbr",
   "faculty",
-  "university",
   "is_group",
   "parent_faculty",
   "column_break_lysp",
@@ -23,7 +22,8 @@
   "faculty_vision",
   "faculty_mission",
   "column_break_mmqb",
-  "faculty_goals"
+  "faculty_goals",
+  "dashboard_tab"
  ],
  "fields": [
   {
@@ -36,14 +36,6 @@
    "reqd": 1,
    "unique": 1
   },
-  {
-   "fetch_from": "faculty.university",
-   "fieldname": "university",
-   "fieldtype": "Link",
-   "label": "University",
-   "options": "University",
-   "read_only": 1
-  },
   {
    "fieldname": "abbr",
    "fieldtype": "Data",
@@ -128,12 +120,18 @@
    "label": "Faculty Department",
    "reqd": 1,
    "unique": 1
+  },
+  {
+   "fieldname": "dashboard_tab",
+   "fieldtype": "Tab Break",
+   "label": "Dashboard",
+   "show_dashboard": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-17 04:30:30.484307",
+ "modified": "2024-02-02 01:21:05.626176",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Faculty Department",

academia/academia/doctype/lecture/lecture.json

@@ -15,7 +15,6 @@
   "faculty_department",
   "column_break_hlmi",
   "status",
-  "university",
   "faculty",
   "course",
   "academic_program",
@@ -64,12 +63,6 @@
    "fieldname": "column_break_hlmi",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "university",
-   "fieldtype": "Link",
-   "label": "University",
-   "options": "University"
-  },
   {
    "fieldname": "faculty",
    "fieldtype": "Link",
@@ -184,7 +177,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-29 04:59:02.848369",
+ "modified": "2024-02-02 01:28:06.079658",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Lecture",

academia/academia/doctype/student_group/student_group.json

@@ -14,7 +14,6 @@
   "level",
   "column_break_zbwu",
   "academic_term",
-  "university",
   "faculty",
   "faculty_department",
   "batch",
@@ -37,14 +36,6 @@
    "options": "Academic Year",
    "reqd": 1
   },
-  {
-   "fieldname": "university",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "University",
-   "options": "University",
-   "reqd": 1
-  },
   {
    "fieldname": "group_based_on",
    "fieldtype": "Select",
@@ -174,7 +165,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-29 01:11:34.107336",
+ "modified": "2024-02-02 01:23:28.012008",
  "modified_by": "Administrator",
  "module": "Academia",
  "name": "Student Group",