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

fix some bug
This commit is contained in:
AbuzarExp 2024-07-11 18:18:50 +03:00 committed by GitHub
parent 41c69bebad a058380eff
commit 3bba4af0e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
View File

@ -86,7 +86,7 @@ class LeaveController(http.Controller):
status = http.request.env['hr.holidays.status'].search([('id', 'in', my_leave)])
domain = [('state', '!=', 'draft')]
alternative_employees = http.request.env['hr.employee'].search_read(
[('state', '=', 'open'), ('id', '!=', employee.id)], ['name'])
[('state', '=', 'open')], ['name'])
if approvel:
holidays = http.request.env['hr.holidays'].search(
[('state', 'in', ['confirm','validate','approved']), ('employee_id', '!=', employee.id), ('type', '=', 'remove')],
@ -225,12 +225,14 @@ class LeaveController(http.Controller):
holidays = http.request.env['hr.holidays'].sudo().create(vals)
if 'attachment' in body and body['attachment']:
attach = http.request.env['ir.attachment'].sudo().create({
'name': body['attachment'].filename,
'datas': base64.b64encode(body['attachment'].read()),
'store_fname': body['attachment'].filename,
'res_model': 'hr.holidays',
'res_id': holidays.id,
})
'name': body['attachment'].filename,
'datas': base64.b64encode(body['attachment'].read()),
'store_fname': body['attachment'].filename,
'res_model': 'hr.holidays',
'res_id': holidays.id,
'att_holiday_ids': holidays.id,
})
holidays.attach_ids = [(4,attach.id)]
if holidays:
# holidays.confirm()
holidays.number_of_days_temp = holidays._get_number_of_days(body['start_date'], body['end_date'],
@ -243,10 +245,12 @@ class LeaveController(http.Controller):
message = validator.get_server_error(e, user)
return http_helper.errcode(code=403, message=message)
@http.route(['/rest_api/v2/leaves/<string:id>'], type='http', auth='none', csrf=False, methods=['PUT'])
@http.route(['/rest_api/v2/leaves/<int:id>'], type='http', auth='none', csrf=False, methods=['PUT'])
def edit_leaves(self, id, approvel=None, **kw):
http_method, body, headers, token = http_helper.parse_request()
result = validator.verify_token(token)
# import pdb
# pdb.set_trace()
if not result['status']:
return http_helper.errcode(code=result['code'], message=result['message'])
user = validator.verify(token)
@ -265,7 +269,10 @@ class LeaveController(http.Controller):
"You Have issue in your employee profile. please check with one of your team admins"),
success=False)
try:
holidays = http.request.env['hr.holidays'].search([('id', '=', id)])
holidays = http.request.env['hr.holidays'].search([('id', '=', int(id))])
print(holidays, id)
if holidays:
days = holidays._get_number_of_days(body['start_date'], body['end_date'], employee)
vals = {
@ -299,10 +306,17 @@ class LeaveController(http.Controller):
'store_fname': body['attachment'].filename,
'res_model': 'hr.holidays',
'res_id': holidays.id,
'att_holiday_ids': holidays.id,
})
holidays.attach_ids = [(4,attach.id)]
data = self.get_return_data(holidays, approvel)
return http_helper.response(message=_("Leave Updated Successfully"), data={'leaves': [data]})
else:
return http_helper.response(code=400,
message=_(
"You Have issue in your employee profile. please check with one of your team admins"),
success=False)
except Exception as e:
_logger.error(str(e))
message = validator.get_server_error(e, user)