Cherry picking roster changes from staging to version-15

one_fm/fixtures/doctype_layout.json

@@ -803,13 +803,27 @@
     "parentfield": "fields",
     "parenttype": "DocType Layout"
    },
+   {
+    "fieldname": "custom_is_reliever",
+    "label": "Is Reliever",
+    "parent": "Employee",
+    "parentfield": "fields",
+    "parenttype": "DocType Layout"
+   },
    {
     "fieldname": "shift",
     "label": "Shift",
     "parent": "Employee",
     "parentfield": "fields",
     "parenttype": "DocType Layout"
    },
+   {
+    "fieldname": "custom_operations_role_allocation",
+    "label": "Operations Role Allocation",
+    "parent": "Employee",
+    "parentfield": "fields",
+    "parenttype": "DocType Layout"
+   },
    {
     "fieldname": "site",
     "label": "Site",
@@ -1497,7 +1511,7 @@
     "parenttype": "DocType Layout"
    }
   ],
-  "modified": "2023-12-03 14:06:06.531161",
+  "modified": "2024-12-17 08:49:40.169020",
   "name": "Employee",
   "route": "app/employee/"
  }

one_fm/hooks.py

@@ -622,7 +622,8 @@
 		"10 4 * * *": [ #“At 04:10.”
 			'one_fm.utils.check_grp_operator_submission_four',
 			'one_fm.operations.doctype.post_scheduler_checker.post_scheduler_checker.schedule_roster_checker',
-			'one_fm.operations.doctype.roster_day_off_checker.roster_day_off_checker.generate_checker'
+			'one_fm.operations.doctype.roster_day_off_checker.roster_day_off_checker.generate_checker',
+            'one_fm.operations.doctype.default_shift_checker.default_shift_checker.create_default_shift_checker'
 		],
 		"30 4 * * *": [
 			'one_fm.utils.check_grp_operator_submission_four_half'
@@ -727,7 +728,10 @@
 		"0 * * * *":[ # Creates the missing checkin record per shift, runs every hour
 			"one_fm.one_fm.doctype.missing_checkin.missing_checkin.create_missing_checkin_record",
 			"one_fm.api.tasks.notify_approver_about_pending_shift_request"
-		]
+		],
+        "0 0 15 * *": [
+            "one_fm.one_fm.page.roster.roster.create_employee_schedule"
+        ]
 	}
 }
 

one_fm/one_fm/doctype/onefm_general_setting/onefm_general_setting.json

@@ -12,6 +12,8 @@
   "is_production",
   "enable_scheduler_event_emails",
   "enable_face_recognition_endpoint",
+  "roster_settings_section",
+  "default_shift_checker_threshold",
   "section_break_2",
   "zenquote_keyword_category",
   "zenquotes_api_key",
@@ -154,11 +156,25 @@
    "fieldname": "enable_face_recognition_endpoint",
    "fieldtype": "Check",
    "label": "Enable Face Recognition Endpoint"
+  },
+  {
+   "bold": 1,
+   "fieldname": "roster_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Roster Settings"
+  },
+  {
+   "description": "Any Employee assigned outside their default shift allocation up to the number of times set here will be reported in the daily Default Shift Checker.",
+   "fieldname": "default_shift_checker_threshold",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Default Shift Checker Threshold",
+   "reqd": 1
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2024-06-26 14:37:58.165247",
+ "modified": "2024-12-20 10:40:26.759927",
  "modified_by": "Administrator",
  "module": "One Fm",
  "name": "ONEFM General Setting",

one_fm/one_fm/doctype/roster_employee_actions/roster_employee_actions.json

@@ -18,6 +18,7 @@
   "column_break_yxhnr",
   "site_supervisor",
   "site_supervisor_name",
+  "site_supervisor_user",
   "section_break_h7sd9",
   "employees_not_rostered"
  ],
@@ -71,6 +72,7 @@
   {
    "fieldname": "employees_not_rostered",
    "fieldtype": "Table",
+   "ignore_user_permissions": 1,
    "label": "Employees Not Rostered",
    "options": "Employees Not Rostered"
   },
@@ -114,11 +116,20 @@
    "in_standard_filter": 1,
    "label": "Site Supervisor",
    "options": "Employee"
+  },
+  {
+   "fetch_from": "site_supervisor.user_id",
+   "fetch_if_empty": 1,
+   "fieldname": "site_supervisor_user",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Site Supervisor User",
+   "options": "User"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-14 15:53:59.124311",
+ "modified": "2024-12-25 10:57:14.741275",
  "modified_by": "Administrator",
  "module": "one_fm",
  "name": "Roster Employee Actions",

one_fm/one_fm/doctype/roster_post_actions/roster_post_actions.json

@@ -16,6 +16,7 @@
   "action_type",
   "site_supervisor",
   "site_supervisor_name",
+  "site_supervisor_user",
   "section_break_12",
   "operations_roles_not_filled"
  ],
@@ -105,11 +106,20 @@
   {
    "fieldname": "section_break_12",
    "fieldtype": "Section Break"
+  },
+  {
+   "fetch_from": "site_supervisor.user_id",
+   "fetch_if_empty": 1,
+   "fieldname": "site_supervisor_user",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Site Supervisor User",
+   "options": "User"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-05-08 01:13:52.146240",
+ "modified": "2024-12-25 10:42:25.120191",
  "modified_by": "Administrator",
  "module": "one_fm",
  "name": "Roster Post Actions",

one_fm/one_fm/page/roster/roster.html

@@ -41,7 +41,7 @@
     <div class="ml-3 mr-3 bg-white">
         <div class="container-fluid">
             <div class="d-flex justify-content-center align-items-center">
-                <nav class="nav nav-pills flex-column flex-sm-row mt-5">
+                <nav class="nav nav-pills flex-column flex-sm-row mt-2">
                     <a class="flex-sm-fill text-sm-center nav-link active bg-primary rosterviewclick">Staff View</a>
                     <a class="flex-sm-fill text-sm-center nav-link postviewclick">Post View</a>
                 </nav>
@@ -53,43 +53,48 @@
                 </nav>
             </div>
         </div>
-        <div class="container-fluid borderradius8 mt-5 pl30 pr30 bg-white">
+        <div class="container-fluid borderradius8 mt-2 pl30 pr30 bg-white">
             <div class="d-flex justify-content-between align-items-center pl30 pr30">
                 <div class="listoffilter" style="width: 100%;">
                     <div class="row">
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringprojectselect"
                                 name="rosteringprojectselect">
                                 <option value="">Select Project</option>
                             </select>
                         </div>
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringsiteselect" name="rosteringsiteselect">
                                 <option value="">Select Site</option>
                             </select>
                         </div>
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringshiftselect"
                                 name="rosteringshiftselect">
                                 <option value="">Select Shift</option>
                             </select>
                         </div>
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringdepartmentselect"
                                 name="rosteringdepartmentselect">
                                 <option value="">Select Department</option>
                             </select>
                         </div>
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringpostselect" name="rosteringpostselect">
                                 <option value="">Select Operations Role</option>
                             </select>
                         </div>
-                        <div class="col-sm-12 col-md-2 custompageselecttype mb20">
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
                             <select class="form-control select2plg" id="rosteringdesignationselect" name="rosteringdesignationselect">
                                 <option value="">Select Designation</option>
                             </select>
                         </div>
+                        <div class="col-sm-12 col-md-3 custompageselecttype mb20">
+                            <select class="form-control select2plg" id="rosteringrelieverselect" name="rosteringrelieverselect">
+                                <option value="">Filter Relievers</option>
+                            </select>
+                        </div>
                     </div>
                 </div>
             </div>