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 #231 from expsa/dev_odex25_mobile 

Dev odex25 mobile
This commit is contained in:
AbuzarExp 2024-07-16 16:41:27 +03:00 committed by GitHub
parent 240d526422 ca0be3c830
commit 0326efce69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class OverTimeController(http.Controller):
"state": validator.get_state_name(s, s.state),
"reason": s.reason,
"reason_msg": s.reason or "",
"overtime_plase": http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),# s.overtime_plase,
"overtime_plase":s.overtime_plase,# http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#
}
if approvel:
value.update({
@ -210,7 +210,7 @@ class OverTimeController(http.Controller):
"state_name": s.state,
"state": validator.get_state_name(s, s.state),
"reason": s.reason,
"overtime_plase": http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#s.overtime_plase,
"overtime_plase":s.overtime_plase,# http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#
}
li = []
if s.line_ids_over_time:
@ -288,7 +288,7 @@ class OverTimeController(http.Controller):
"date_from": body["date_from"],
"date_to": body["date_to"],
"reason": body["reason"],
"overtime_plase": http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#s.overtime_plase,
"overtime_plase":s.overtime_plase,# http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#
}
if approvel:
@ -312,7 +312,7 @@ class OverTimeController(http.Controller):
"transfer_type": http_helper.get_lable_selection(s,'transfer_type',s.transfer_type),# s.transfer_type,
"request_date": str(s.request_date),
"date_from": str(s.date_from),
"overtime_plase":http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),# s.overtime_plase,
"overtime_plase":s.overtime_plase, #http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),# s.overtime_plase,
"date_to": str(s.date_to),
"state_name": s.state,
"state": validator.get_state_name(s, s.state),
@ -462,7 +462,7 @@ class OverTimeController(http.Controller):
"state_name": s.state,
"state": validator.get_state_name(s, s.state),
"reason": s.reason,
"overtime_plase": http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#s.overtime_plase,
"overtime_plase":s.overtime_plase,# http_helper.get_lable_selection(s,'overtime_plase',s.overtime_plase),#
}
if approvel:
value.update({