devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3856 from expsa/kchy_dev_odex25_mobile 

Fix bug
This commit is contained in:
kchyounes19 2025-07-13 10:12:29 +01:00 committed by GitHub
parent 51f9ed6f80 56944f2a85
commit 9f76226d33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odex25_mobile/odex_mobile/controllers/authentication.py
View File

@ -213,5 +213,6 @@ class AuthenticationController(http.Controller):
dic['token'] = token dic['token'] = token
dic['is_approve'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) 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() http_helper.cleanup()
return http_helper.response(data=dic, message=_("User log in successfully")) return http_helper.response(data=dic, message=_("User log in successfully"))

1
odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py
View File

@ -258,6 +258,7 @@ class AuthenticationController(http.Controller):
dic['token'] = token dic['token'] = token
dic['is_approve'] = 'group_division_manager' in dic.get('groups',[]) or 'group_hr_user' in dic.get('groups', []) 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 dic['has_two_periods'] = not employee.resource_calendar_id.is_full_day if employee.resource_calendar_id else False
http_helper.cleanup() http_helper.cleanup()
end_time_pc = time.perf_counter() end_time_pc = time.perf_counter()

1
odex25_mobile/odex_mobile/models/res_users.py
View File

@ -69,6 +69,7 @@ class Users(models.Model):
d["employe_id"] = employee.id if employee and employee.id else None d["employe_id"] = employee.id if employee and employee.id else None
d["attendance_status"] = attendance_status if attendance_status 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_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 d['has_two_periods'] = not employee.resource_calendar_id.is_full_day if employee.resource_calendar_id else False
res.append(d) res.append(d)