!11829 添加功能

Merge pull request !11829 from 李鹏宇/dev_zhou

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -684,9 +684,9 @@ class AppletAttendance(Controller):
     def process_attendances(self, attendances, user_id):
         records = []
         for att in attendances:
-            is_weekend = not self.is_workday(att.current_data)
-
+            is_weekend = False
             if not att.shift_id:
+                is_weekend = not self.is_workday(att.current_data)
                 year = att.current_data.year
                 month = att.current_data.month
                 day = att.current_data.day
@@ -752,10 +752,12 @@ class AppletAttendance(Controller):
                 if att.workflow_id.res_model in ['hr.leave.batch', 'go.approval']:
                     has_leave_batch_workflow = True
 
+            is_rest_shift = getattr(att, 'shift_name', '') == '休息'
+
             if not check_in_status and not check_out_status:
                 color_select = 3
             else:
-                if has_leave_batch_workflow:
+                if has_leave_batch_workflow or is_rest_shift:
                     color_select = 1
                 else:
                     has_exception = (check_in_status in ['迟到', '早退', '缺卡', '旷工']) or (