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

fix next url

This commit is contained in:
younes 2025-06-29 13:44:01 +01:00
parent f4c2960683
commit 8ba0353f88
5 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py
View File

@ -558,10 +558,18 @@ class EmployeeOtherRequestController(http.Controller):
request_list = convert_dates_in_data(request_list) request_list = convert_dates_in_data(request_list)
params = []
if approvel:
params.append("approvel=%s" % approvel)
if done:
params.append("done=%s" % done)
next_page = validator.get_page_pagination_next(page, all_records) next_page = validator.get_page_pagination_next(page, all_records)
next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( # next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (
approvel,done, next_page) if next_page else False # approvel,done, next_page) if next_page else False
prev_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False # prev_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False
next_url = f"/rest_api/v2/employee_other_request?page={next_page}&{'&'.join(params)}" if next_page else False
prev_url = f"/rest_api/v2/employee_other_request?page={prev}&{'&'.join(params)}" if prev else False
data = { data = {
'links': { 'links': {
'prev': prev_url, 'prev': prev_url,

18
odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py
View File

@ -45,10 +45,8 @@ class LoanController(http.Controller):
count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused'])]) count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'not in', ['pay','closed','refused'])])
elif done: elif done:
loans = http.request.env['hr.loan.salary.advance'].search( loans = http.request.env['hr.loan.salary.advance'].search(
[('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset, [('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset,limit=limit)
limit=limit) count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'in', ['pay','closed','refused'])])
count = http.request.env['hr.loan.salary.advance'].search_count(
[('employee_id', '!=', employee.id), 'in', ['pay','closed','refused']])
else: else:
loans = http.request.env['hr.loan.salary.advance'].search([('employee_id', '=', employee.id)], order='date desc', offset=offset, limit=limit) loans = http.request.env['hr.loan.salary.advance'].search([('employee_id', '=', employee.id)], order='date desc', offset=offset, limit=limit)
count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '=', employee.id)]) count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '=', employee.id)])
@ -77,8 +75,16 @@ class LoanController(http.Controller):
value['lines'] = lines value['lines'] = lines
li.append(value) li.append(value)
next = validator.get_page_pagination_next(page, count) next = validator.get_page_pagination_next(page, count)
url = "/rest_api/v2/loans?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False params = []
prev_url = "/rest_api/v2/loans?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False if approvel:
params.append("approvel=%s" % approvel)
if done:
params.append("done=%s" % done)
# url = "/rest_api/v2/loans?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False
# prev_url = "/rest_api/v2/loans?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False
url = f"/rest_api/v2/loans?page={next}&{'&'.join(params)}" if next else False
prev_url = f"/rest_api/v2/loans?page={prev}&{'&'.join(params)}" if prev else False
data = {'links': {'prev': prev_url, 'next': url, }, data = {'links': {'prev': prev_url, 'next': url, },
'count': count, 'count': count,
'results':{'loan_types': types, 'employee_loans': li }} 'results':{'loan_types': types, 'employee_loans': li }}

14
odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py
View File

@ -392,10 +392,18 @@ class HrOfficialMissionController(http.Controller):
data_list.append(self._get_mission_return_data(mis)) data_list.append(self._get_mission_return_data(mis))
data_list = convert_dates_in_data(data_list) data_list = convert_dates_in_data(data_list)
params = []
if approvel:
params.append("approvel=%s" % approvel)
if done:
params.append("done=%s" % done)
next_page = validator.get_page_pagination_next(page, all_missions) next_page = validator.get_page_pagination_next(page, all_missions)
next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( # next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (
approvel,done, next_page) if next_page else False # approvel,done, next_page) if next_page else False
prev_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False # prev_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False
next_url = f"/rest_api/v2/hr_official_mission?page={next_page}&{'&'.join(params)}" if next_page else False
prev_url = f"/rest_api/v2/hr_official_mission?page={prev}&{'&'.join(params)}" if prev else False
data = { data = {
'links': { 'links': {
'prev': prev_url, 'prev': prev_url,

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

@ -139,8 +139,16 @@ class OverTimeController(http.Controller):
value['employees'] = emps value['employees'] = emps
over.append(value) over.append(value)
next = validator.get_page_pagination_next(page, count) next = validator.get_page_pagination_next(page, count)
url = "/rest_api/v2/overtimes?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False params = []
prev_url = "/rest_api/v2/overtimes?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False if approvel:
params.append("approvel=%s" % approvel)
if done:
params.append("done=%s" % done)
# url = "/rest_api/v2/overtimes?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False
# prev_url = "/rest_api/v2/overtimes?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False
url = f"/rest_api/v2/overtimes?page={next}&{'&'.join(params)}" if next else False
prev_url = f"/rest_api/v2/overtimes?page={prev}&{'&'.join(params)}" if prev else False
data = {'links': {'prev': prev_url, 'next': url, }, data = {'links': {'prev': prev_url, 'next': url, },
'count': count, 'count': count,
'results': {'overtimes': over,}} 'results': {'overtimes': over,}}

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

@ -74,9 +74,18 @@ class PermissionController(http.Controller):
"attachment": self.get_attchment(per), "attachment": self.get_attchment(per),
} }
emp.append(value) emp.append(value)
params = []
if approvel:
params.append("approvel=%s" % approvel)
if done:
params.append("done=%s" % done)
next = validator.get_page_pagination_next(page, count) next = validator.get_page_pagination_next(page, count)
url = "/rest_api/v2/permissions?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False # url = "/rest_api/v2/permissions?approvel=%s&done=%s&page=%s" % (approvel,done, next) if next else False
prev_url = "/rest_api/v2/permissions?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False # prev_url = "/rest_api/v2/permissions?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False
url = f"/rest_api/v2/permissions?page={next}&{'&'.join(params)}" if next else False
prev_url = f"/rest_api/v2/permissions?page={prev}&{'&'.join(params)}" if prev else False
data = {'links': {'prev': prev_url, 'next': url, }, 'count': count, data = {'links': {'prev': prev_url, 'next': url, }, 'count': count,
'results': {'permission_types': permission_types, 'permissions': emp, 'groups': ['group_division_manager', 'group_hr_user']}} 'results': {'permission_types': permission_types, 'permissions': emp, 'groups': ['group_division_manager', 'group_hr_user']}}
return http_helper.response(message="Data Found", data=data) return http_helper.response(message="Data Found", data=data)