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 #256 from expsa/fix_api_web 

fix is approve overtime
This commit is contained in:
AbuzarExp 2024-07-17 16:04:41 +03:00 committed by GitHub
parent 078d71dcc8 74eebd7954
commit 173e1490fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py
View File

@ -76,7 +76,7 @@ class OverTimeController(http.Controller):
for s in overtime:
value = {
"id": s.id,
"transfer_type": http_helper.get_lable_selection(s,'transfer_type',s.transfer_type),#s.transfer_type,
"transfer_type": s.transfer_type,
"request_date": str(s.request_date),
"date_from": str(s.date_from),
"date_to": str(s.date_to),
@ -204,7 +204,7 @@ class OverTimeController(http.Controller):
if s:
value = {
"id": s.id,
"transfer_type": http_helper.get_lable_selection(s,'transfer_type',s.transfer_type),#s.transfer_type,
"transfer_type": s.transfer_type,
"request_date": str(s.request_date),
"date_from": str(s.date_from),
"date_to": str(s.date_to),
@ -314,7 +314,7 @@ class OverTimeController(http.Controller):
self.get_overtime_line(s.employee_id, s, t)
value = {
"id": s.id,
"transfer_type": http_helper.get_lable_selection(s,'transfer_type',s.transfer_type),# s.transfer_type,
"transfer_type": s.transfer_type,
"request_date": str(s.request_date),
"date_from": str(s.date_from),
"overtime_plase":s.overtime_plase, #http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),# s.overtime_plase,
@ -462,7 +462,7 @@ class OverTimeController(http.Controller):
if s:
value = {
"id": s.id,
"transfer_type": http_helper.get_lable_selection(s,'transfer_type',s.transfer_type),#s.transfer_type,
"transfer_type": s.transfer_type,
"request_date": str(s.request_date),
"date_from": str(s.date_from),
"date_to": str(s.date_to),