diff --git a/odex25_mobile/odex_mobile/controllers/authentication.py b/odex25_mobile/odex_mobile/controllers/authentication.py index 9ea662ba3..af8b4f2a3 100644 --- a/odex25_mobile/odex_mobile/controllers/authentication.py +++ b/odex25_mobile/odex_mobile/controllers/authentication.py @@ -213,5 +213,6 @@ class AuthenticationController(http.Controller): dic['token'] = token dic['is_approve'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) + dic['is_done'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) http_helper.cleanup() return http_helper.response(data=dic, message=_("User log in successfully")) diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py index dee86da93..23ee2d277 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py @@ -258,6 +258,7 @@ class AuthenticationController(http.Controller): dic['token'] = token dic['is_approve'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) + dic['is_done'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) dic['has_two_periods'] = not employee.resource_calendar_id.is_full_day if employee.resource_calendar_id else False http_helper.cleanup() end_time_pc = time.perf_counter() diff --git a/odex25_mobile/odex_mobile/models/res_users.py b/odex25_mobile/odex_mobile/models/res_users.py index 93a283459..ad63826d7 100644 --- a/odex25_mobile/odex_mobile/models/res_users.py +++ b/odex25_mobile/odex_mobile/models/res_users.py @@ -69,6 +69,7 @@ class Users(models.Model): d["employe_id"] = employee.id if employee and employee.id else None d["attendance_status"] = attendance_status if attendance_status else None d['is_approve'] = 'group_division_manager' in d.get('groups',[]) or 'group_hr_user' in d.get('groups', []) + d['is_done'] = 'group_division_manager' in d.get('groups',[]) or 'group_hr_user' in d.get('groups', []) d['has_two_periods'] = not employee.resource_calendar_id.is_full_day if employee.resource_calendar_id else False res.append(d)