diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py index e70f1a2a3..f7640f9f5 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/employee_other_request.py @@ -558,10 +558,18 @@ class EmployeeOtherRequestController(http.Controller): 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_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( - 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 + # next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( + # 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 + 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 = { 'links': { 'prev': prev_url, diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py index 74413a823..52d84e07f 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/loan.py @@ -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'])]) elif done: loans = http.request.env['hr.loan.salary.advance'].search( - [('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset, - limit=limit) - count = http.request.env['hr.loan.salary.advance'].search_count( - [('employee_id', '!=', employee.id), 'in', ['pay','closed','refused']]) + [('employee_id', '!=', employee.id), ('state', 'in', ['pay','closed','refused'])], order='date desc', offset=offset,limit=limit) + count = http.request.env['hr.loan.salary.advance'].search_count([('employee_id', '!=', employee.id),('state', 'in', ['pay','closed','refused'])]) else: 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)]) @@ -77,8 +75,16 @@ class LoanController(http.Controller): value['lines'] = lines li.append(value) 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 - prev_url = "/rest_api/v2/loans?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False + params = [] + 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, }, 'count': count, 'results':{'loan_types': types, 'employee_loans': li }} diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py index 75b9c17f9..2c4248759 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/official_mission.py @@ -392,10 +392,18 @@ class HrOfficialMissionController(http.Controller): data_list.append(self._get_mission_return_data(mis)) 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_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( - 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 + # next_url = "/rest_api/v2/employee_other_request?approvel=%s&done=%s&page=%s" % ( + # 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 + 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 = { 'links': { 'prev': prev_url, diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py index 0f6cb8207..a49581597 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/overtime.py @@ -139,8 +139,16 @@ class OverTimeController(http.Controller): value['employees'] = emps over.append(value) 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 - prev_url = "/rest_api/v2/overtimes?approvel=%s&done=%s&page=%s" % (approvel,done, prev) if prev else False + params = [] + 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, }, 'count': count, 'results': {'overtimes': over,}} diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py index 32d6c43cf..e6527e2e6 100644 --- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py +++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/permission.py @@ -74,9 +74,18 @@ class PermissionController(http.Controller): "attachment": self.get_attchment(per), } 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) - 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 + # 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 + 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, 'results': {'permission_types': permission_types, 'permissions': emp, 'groups': ['group_division_manager', 'group_hr_user']}} return http_helper.response(message="Data Found", data=data)