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 #4096 from expsa/younes_dev_odex25_mobile 

Younes dev odex25 mobile
This commit is contained in:
kchyounes19 2025-08-04 09:36:35 +01:00 committed by GitHub
parent f867b9c43e a7a37f97fd
commit a0c169f1a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py
View File

@ -389,8 +389,7 @@ class PermissionController(http.Controller):
success=False) success=False)
try: try:
permission_type_id = http.request.env['hr.personal.permission.type'].browse(int(body.get('permission_type_id'))) permission_type_id = http.request.env['hr.personal.permission.type'].browse(int(body.get('permission_type_id')))
permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'], permission_hours = self.permission_number_decrement(employee, body['date_from'], body['date_to'],permission_type_id)
permission_type_id)
return http_helper.response(message="Data Found", data={'balance': permission_hours, return http_helper.response(message="Data Found", data={'balance': permission_hours,
'permission_limit': permission_type_id.daily_hours}) 'permission_limit': permission_type_id.daily_hours})
@ -407,8 +406,7 @@ class PermissionController(http.Controller):
def permission_number_decrement(self, employee_id, permission_date_from, permission_date_to, permission_type_id): def permission_number_decrement(self, employee_id, permission_date_from, permission_date_to, permission_type_id):
if employee_id: if employee_id:
if not employee_id.first_hiring_date: if not employee_id.first_hiring_date:
raise Warning( raise Warning(_('You can not Request Permission The Employee have Not First Hiring Date'))
_('You can not Request Permission The Employee have Not First Hiring Date'))
if permission_date_to: if permission_date_to:
current_date = datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT) current_date = datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT)
current_month = current_date.month current_month = current_date.month
@ -432,12 +430,10 @@ class PermissionController(http.Controller):
all_perission += rec.duration all_perission += rec.duration
if rec.date_to and permission_date_to: if rec.date_to and permission_date_to:
permission_date1 = rec.date_to.date() if isinstance(rec.date_to,datetime) else datetime.strptime(str(rec.date_to), DEFAULT_SERVER_DATETIME_FORMAT).date() permission_date1 = rec.date_to.date() if isinstance(rec.date_to,datetime) else datetime.strptime(str(rec.date_to), DEFAULT_SERVER_DATETIME_FORMAT).date()
date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime( date_to_value1 = permission_date_to.date() if isinstance(permission_date_to, datetime) else datetime.strptime(permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date()
permission_date_to, DEFAULT_SERVER_DATETIME_FORMAT).date()
if permission_date1 == date_to_value1: if permission_date1 == date_to_value1:
raise Warning( raise Warning(_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day'))
_('Sorry You Have Used All Your Permission In This Day you have one permission per a Day'))
if number_of_per > all_perission: if number_of_per > all_perission:
return round(number_of_per - all_perission, 2) return round(number_of_per - all_perission, 2)