From d02e47d77e8bba706956813ba98f59d2bc941730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 3 Jul 2025 14:55:34 +0800 Subject: [PATCH 1/2] 1 --- yuthon_hr_attendance/controllers/applet_attendance.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index 83ffcc585..e61a86bd5 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -82,8 +82,7 @@ class AppletAttendance(Controller): '缺卡'] else f'

{check_in_str}

' check_out_html = f'

{check_out_str}

' if check_out_status in ['迟到', '早退', '缺卡'] else f'

{check_out_str}

' - if not self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude, - address_id.longitude, card_rice): + if not self.is_within_radius_geopy(kw['att_latitude'], kw['att_longitude'], address_id.latitude, address_id.longitude, card_rice): message = "超出范围,不允许打卡" state = "no" state_result = "超出范围" From 69bb2b218a7ba808bde5980e122bde0823877a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 3 Jul 2025 14:56:03 +0800 Subject: [PATCH 2/2] 1 --- yuthon_hr_attendance/controllers/applet_attendance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_hr_attendance/controllers/applet_attendance.py b/yuthon_hr_attendance/controllers/applet_attendance.py index e61a86bd5..c29c11e14 100644 --- a/yuthon_hr_attendance/controllers/applet_attendance.py +++ b/yuthon_hr_attendance/controllers/applet_attendance.py @@ -94,7 +94,7 @@ class AppletAttendance(Controller): data = { 'location': '%s' % address_id.address_name, 'user_id': user_id.id, - 'class': [f"{attendance_id.shift_name}{start_time_str}-{end_time_str}"], + 'class': f"{attendance_id.shift_name}{start_time_str}-{end_time_str}", 'state_result': state_result, 'check_in': check_in_html, 'check_in_status': check_in_status,