diff --git a/asset/views.py b/asset/views.py index db04d1387..aab411599 100644 --- a/asset/views.py +++ b/asset/views.py @@ -101,7 +101,7 @@ def asset_update(request, asset_id): asset_under = "asset_category" instance = Asset.objects.get(id=asset_id) asset_form = AssetForm(instance=instance) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() context = { "asset_form": asset_form, "asset_under": asset_under, @@ -159,7 +159,7 @@ def asset_delete(request, asset_id): # if the asset deleted is from the filterd list of asset asset_under = "asset_filter" assets = Asset.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_filtered = AssetFilter(request.GET, queryset=assets) asset_list = asset_filtered.qs paginator = Paginator(asset_list, 20) @@ -234,7 +234,7 @@ def asset_list(request, cat_id): asset_category = AssetCategory.objects.get(id=cat_id) assets_in_category = Asset.objects.filter(asset_category_id=asset_category) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_filtered = AssetFilter(request.GET, queryset=assets_in_category) asset_list = asset_filtered.qs # Change 20 to the desired number of items per page @@ -291,7 +291,7 @@ def asset_category_update(request, asset_id): Rendered HTML template. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_category = AssetCategory.objects.get(id=asset_id) asset_category_form = AssetCategoryForm(instance=asset_category) context = {"asset_category_update_form": asset_category_form, "pg": previous_data} @@ -344,7 +344,7 @@ def filter_pagination_asset_category(request): if search is None: search = "" - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_category_queryset = AssetCategory.objects.all().filter( asset_category_name__icontains=search ) @@ -642,7 +642,7 @@ def filter_pagination_asset_request_allocation(request): requested_employee_id__employee_first_name__icontains=asset_request_alloaction_search ) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() assets_filtered = CustomAssetFilter(request.GET, queryset=assets) asset_request_filtered = AssetRequestFilter( request.GET, queryset=asset_requests_queryset @@ -895,7 +895,7 @@ def asset_batch_view(request): """ asset_batchs = AssetLot.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_batch_numbers_search_paginator = Paginator(asset_batchs, 20) page_number = request.GET.get("page") asset_batch_numbers = asset_batch_numbers_search_paginator.get_page(page_number) @@ -986,7 +986,7 @@ def asset_batch_number_search(request): asset_batchs = AssetLot.objects.all().filter( lot_number__icontains=asset_batch_number_search ) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() asset_batch_numbers_search_paginator = Paginator(asset_batchs, 20) page_number = request.GET.get("page") asset_batch_numbers = asset_batch_numbers_search_paginator.get_page(page_number) diff --git a/attendance/views/search.py b/attendance/views/search.py index 873b1724a..9df274c30 100644 --- a/attendance/views/search.py +++ b/attendance/views/search.py @@ -35,7 +35,7 @@ def attendance_search(request): """ This method is used to search attendance by employee """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() field = request.GET.get("field") minot = strtime_seconds("00:30") condition = AttendanceValidationCondition.objects.first() @@ -104,7 +104,7 @@ def attendance_overtime_search(request): This method is used to search attendance overtime account by employee. """ field = request.GET.get("field") - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() accounts = AttendanceOverTimeFilter(request.GET).qs form = AttendanceOverTimeForm() @@ -141,7 +141,7 @@ def attendance_activity_search(request): """ This method is used to search attendance activity """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() field = request.GET.get("field") attendance_activities = AttendanceActivityFilter( request.GET, @@ -181,7 +181,7 @@ def late_come_early_out_search(request): Also include filter and pagination. """ field = request.GET.get("field") - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() reports = LateComeEarlyOutFilter( request.GET, @@ -221,7 +221,7 @@ def filter_own_attendance(request): """ attendances = Attendance.objects.filter(employee_id=request.user.employee_get) attendances = AttendanceFilters(request.GET, queryset=attendances).qs - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() data_dict = parse_qs(previous_data) keys_to_remove = [key for key, value in data_dict.items() if value == ["unknown"]] @@ -243,7 +243,7 @@ def own_attendance_sort(request): This method is used to sort out attendances """ attendances = Attendance.objects.filter(employee_id=request.user.employee_get) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() attendances = sortby(request, attendances, "orderby") return render( request, @@ -279,7 +279,7 @@ def search_attendance_requests(request): employee_id__employee_user_id=request.user ) attendances = AttendanceFilters(request.GET, attendances).qs - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() data_dict = parse_qs(previous_data) get_key_instances(Attendance, data_dict) diff --git a/attendance/views/views.py b/attendance/views/views.py index 3174bad2a..652f147c3 100644 --- a/attendance/views/views.py +++ b/attendance/views/views.py @@ -163,7 +163,7 @@ def attendance_view(request): """ This method is used to view attendances. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() form = AttendanceForm() condition = AttendanceValidationCondition.objects.first() minot = strtime_seconds("00:30") @@ -370,7 +370,7 @@ def attendance_overtime_view(request): """ This method is used to view attendance account or overtime account. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() accounts = AttendanceOverTime.objects.all() accounts = filtersubordinates( request, accounts, "attendance.view_attendanceovertime" @@ -447,7 +447,7 @@ def attendance_activity_view(request): This method will render a template to view all attendance activities """ attendance_activities = AttendanceActivity.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() filter_obj = AttendanceActivityFilter() return render( request, diff --git a/base/views.py b/base/views.py index 0a68003a6..75248e574 100644 --- a/base/views.py +++ b/base/views.py @@ -317,7 +317,7 @@ def group_assign_view(request): if request.GET.get("search") is not None: search = request.GET.get("search") groups = Group.objects.filter(name__icontains=search) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() return render( request, "base/auth/group_assign_view.html", @@ -881,7 +881,7 @@ def rotating_work_type_assign_view(request): This method renders template to view rotating work type objects """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() rwork_type_assign = RotatingWorkTypeAssignFilter(request.GET).qs if request.GET.get("is_active") is None: rwork_type_assign = rwork_type_assign.filter(is_active=True) @@ -1395,7 +1395,7 @@ def rotating_shift_assign_view(request): """ This method renders all instance of rotating shift assign to a template """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() rshift_assign = RotatingShiftAssignFilters(request.GET).qs if request.GET.get("is_active") is None: rshift_assign = rshift_assign.filter(is_active=True) @@ -1613,7 +1613,7 @@ def employee_permission_search(request, codename=None, uid=None): employees = Employee.objects.filter( employee_first_name__icontains=search ) | Employee.objects.filter(employee_last_name__icontains=search) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() return render( request, "base/auth/permission_view.html", @@ -1680,7 +1680,7 @@ def work_type_request_search(request): This method is used to search work type request. """ employee = Employee.objects.filter(employee_user_id=request.user).first() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() f = WorkTypeRequestFilter(request.GET) work_typ_requests = filtersubordinates(request, f.qs, "base.add_worktyperequest") if set(WorkTypeRequest.objects.filter(employee_id=employee)).issubset(set(f.qs)): @@ -2101,7 +2101,7 @@ def shift_request_search(request): This method is used search shift request by employee and also used to filter shift request. """ employee = Employee.objects.filter(employee_user_id=request.user).first() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() f = ShiftRequestFilter(request.GET) shift_requests = filtersubordinates(request, f.qs, "base.add_shiftrequest") if set(ShiftRequest.objects.filter(employee_id=employee)).issubset(set(f.qs)): diff --git a/employee/views.py b/employee/views.py index a632d263e..1563babd7 100755 --- a/employee/views.py +++ b/employee/views.py @@ -195,7 +195,7 @@ def employee_view(request): This method is used to render template for view all employee """ view_type = request.GET.get("view") - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() employees = Employee.objects.filter(is_active=True) page_number = request.GET.get("page") filter_obj = EmployeeFilter(queryset=employees) @@ -546,7 +546,7 @@ def employee_filter_view(request): """ This method is used to filter employee. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() employees = filtersubordinatesemployeemodel( request, Employee.objects.all(), "employee.view_employee" ) @@ -577,7 +577,7 @@ def employee_card(request): """ This method renders card template to view all employees. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() search = request.GET.get("search") if isinstance(search, type(None)): search = "" @@ -616,7 +616,7 @@ def employee_list(request): """ This method renders template to view all employees """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() search = request.GET.get("search") if isinstance(search, type(None)): search = "" @@ -778,7 +778,7 @@ def employee_search(request): """ search = request.GET["search"] view = request.GET["view"] - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() employees = EmployeeFilter(request.GET).qs if search == "": employees = employees.filter(is_active=True) diff --git a/leave/views.py b/leave/views.py index 37c905f07..6e5f7e73e 100644 --- a/leave/views.py +++ b/leave/views.py @@ -75,7 +75,7 @@ def leave_type_view(request): queryset = LeaveType.objects.all() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() leave_type_filter = LeaveTypeFilter() return render( request, @@ -101,7 +101,7 @@ def leave_type_filter(request): page_number = request.GET.get("page") leave_type_filter = LeaveTypeFilter(request.GET, queryset).qs page_obj = paginator_qry(leave_type_filter, page_number) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() data_dict = parse_qs(previous_data) get_key_instances(LeaveType, data_dict) return render( @@ -244,7 +244,7 @@ def leave_request_view(request): requests = queryset.filter(status="requested").count() approved_requests = queryset.filter(status="approved").count() rejected_requests = queryset.filter(status="cancelled").count() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() return render( request, "leave/request-view.html", @@ -272,7 +272,7 @@ def leave_request_filter(request): Returns: GET : return leave request view template """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() queryset = LeaveRequest.objects.all() queryset = filtersubordinates(request, queryset, "leave.view_leaverequest") leave_request_filter = LeaveRequestFilter(request.GET, queryset).qs @@ -542,7 +542,7 @@ def leave_assign_view(request): """ queryset = AvailableLeave.objects.all() queryset = filtersubordinates(request, queryset, "leave.view_availableleave") - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) assigned_leave_filter = AssignedLeaveFilter() @@ -573,7 +573,7 @@ def leave_assign_filter(request): queryset = AvailableLeave.objects.all() queryset = filtersubordinates(request, queryset, "leave.view_availableleave") assigned_leave_filter = AssignedLeaveFilter(request.GET, queryset).qs - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(assigned_leave_filter, page_number) data_dict = parse_qs(previous_data) @@ -750,7 +750,7 @@ def holiday_view(request): GET : return holiday view template """ queryset = Holiday.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) holiday_filter = HolidayFilter() @@ -775,7 +775,7 @@ def holiday_filter(request): GET : return holiday view template """ queryset = Holiday.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() holiday_filter = HolidayFilter(request.GET, queryset).qs page_number = request.GET.get("page") page_obj = paginator_qry(holiday_filter, page_number) @@ -881,7 +881,7 @@ def company_leave_view(request): GET : return company leave view template """ queryset = CompanyLeave.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) company_leave_filter = CompanyLeaveFilter() @@ -912,7 +912,7 @@ def company_leave_filter(request): GET : return company leave view template """ queryset = CompanyLeave.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") company_leave_filter = CompanyLeaveFilter(request.GET, queryset).qs page_obj = paginator_qry(company_leave_filter, page_number) @@ -1251,7 +1251,7 @@ def user_leave_view(request): try: employee = request.user.employee_get queryset = employee.available_leave.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) assigned_leave_filter = AssignedLeaveFilter() @@ -1288,7 +1288,7 @@ def user_leave_filter(request): try: employee = request.user.employee_get queryset = employee.available_leave.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") assigned_leave_filter = AssignedLeaveFilter(request.GET, queryset).qs data_dict = parse_qs(previous_data) @@ -1318,7 +1318,7 @@ def user_request_view(request): try: user = request.user.employee_get queryset = user.leaverequest_set.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) user_request_filter = UserLeaveRequestFilter() @@ -1351,7 +1351,7 @@ def user_request_filter(request): try: user = request.user.employee_get queryset = user.leaverequest_set.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") user_request_filter = UserLeaveRequestFilter(request.GET, queryset).qs page_obj = paginator_qry(user_request_filter, page_number) diff --git a/onboarding/views.py b/onboarding/views.py index 449177ce2..68c25087a 100644 --- a/onboarding/views.py +++ b/onboarding/views.py @@ -395,7 +395,7 @@ def candidates_view(request): """ queryset = Candidate.objects.filter(hired=True, start_onboard=False) candidate_filter_obj = CandidateFilter() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(queryset, page_number) return render( @@ -412,7 +412,7 @@ def candidates_view(request): @login_required @permission_required(perm="recruitment.view_candidate") def hired_candidate_view(request): - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() candidates = Candidate.objects.filter(hired=True) if request.GET.get("is_active") is None: candidates = candidates.filter(is_active=True) @@ -441,7 +441,7 @@ def candidate_filter(request): """ queryset = Candidate.objects.filter(hired=True, start_onboard=False) candidate_filter_obj = CandidateFilter(request.GET, queryset).qs - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() page_number = request.GET.get("page") page_obj = paginator_qry(candidate_filter_obj, page_number) return render( @@ -945,7 +945,7 @@ def candidate_stage_update(request, candidate_id, recruitment_id): }, ) return JsonResponse( - {"message": "Candidate onboarding stage updated", "type": "success"} + {"message": _("Candidate onboarding stage updated"), "type": "success"} ) diff --git a/payroll/views/component_views.py b/payroll/views/component_views.py index 309071ce6..10f1eacaf 100644 --- a/payroll/views/component_views.py +++ b/payroll/views/component_views.py @@ -245,7 +245,7 @@ def filter_allowance(request): """ Filter and retrieve a list of allowances based on the provided query parameters. """ - query_string = request.environ["QUERY_STRING"] + query_string = request.GET.urlencode() allowances = AllowanceFilter(request.GET).qs list_view = "payroll/allowance/list_allowance.html" card_view = "payroll/allowance/card_allowance.html" @@ -364,7 +364,7 @@ def filter_deduction(request): """ This method is used search the deduction """ - query_string = request.environ["QUERY_STRING"] + query_string = request.GET.urlencode() deductions = DeductionFilter(request.GET).qs list_view = "payroll/deduction/list_deduction.html" card_view = "payroll/deduction/card_deduction.html" @@ -604,7 +604,7 @@ def filter_payslip(request): """ Filter and retrieve a list of payslips based on the provided query parameters. """ - query_string = request.environ["QUERY_STRING"] + query_string = request.GET.urlencode() if request.user.has_perm("payroll.view_payslip"): payslips = PayslipFilter(request.GET).qs else: diff --git a/payroll/views/tax_views.py b/payroll/views/tax_views.py index 511bf2a4c..41b8aab69 100644 --- a/payroll/views/tax_views.py +++ b/payroll/views/tax_views.py @@ -122,7 +122,7 @@ def filing_status_delete(request, filing_status_id): def filing_status_search(request): search = request.GET.get("search") status = FilingStatus.objects.filter(filing_status__icontains = search) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() data_dict = parse_qs(previous_data) get_key_instances(FilingStatus, data_dict) context = { diff --git a/payroll/views/views.py b/payroll/views/views.py index c443e169d..0c806075d 100644 --- a/payroll/views/views.py +++ b/payroll/views/views.py @@ -161,7 +161,7 @@ def contract_filter(request): Renders the contract list template with the filtered contracts. """ - query_string = request.environ["QUERY_STRING"] + query_string = request.GET.urlencode() contracts_filter = ContractFilter(request.GET) template = "payroll/contract/contract_list.html" contracts = contracts_filter.qs diff --git a/pms/views.py b/pms/views.py index ed842192e..f1443a1a8 100644 --- a/pms/views.py +++ b/pms/views.py @@ -202,7 +202,7 @@ def objective_filter_pagination(request, objective_own, objective_all): Returns: All the filtered and paginated object will return. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() initial_data = {"archive": False} # set initial value of archive filter to False if request.GET.get("status") != "Closed": objective_own = objective_own.exclude(status="Closed") @@ -888,7 +888,7 @@ def filter_pagination_feedback( it will return the filtered and searched object. """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() initial_data = {"archive": False} # set initial value of archive filter to False feedback_filter_own = FeedbackFilter( request.GET or initial_data, queryset=self_feedback diff --git a/recruitment/views/actions.py b/recruitment/views/actions.py index 4682847f7..44fccc391 100644 --- a/recruitment/views/actions.py +++ b/recruitment/views/actions.py @@ -261,7 +261,7 @@ def remove_stage_manager(request, mid, sid): stage_obj.stage_managers.remove(manager) messages.success(request, _("Stage manager removed successfully.")) stages = Stage.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() return render( request, "stage/stage_component.html", @@ -299,7 +299,7 @@ def remove_recruitment_manager(request, mid, rid): redirect="", ) recruitment_queryset = Recruitment.objects.all() - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() return render( request, "recruitment/recruitment_component.html", diff --git a/recruitment/views/search.py b/recruitment/views/search.py index 641b03abf..26cdc473f 100644 --- a/recruitment/views/search.py +++ b/recruitment/views/search.py @@ -27,7 +27,7 @@ def recruitment_search(request): This method is used to search recruitment """ filter_obj = RecruitmentFilter(request.GET) - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() recruitment_obj = sortby(request, filter_obj.qs, "orderby") data_dict = parse_qs(previous_data) get_key_instances(Recruitment, data_dict) @@ -50,7 +50,7 @@ def stage_search(request): This method is used to search stage """ stages = StageFilter(request.GET).qs - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() stages = sortby(request, stages, "orderby") data_dict = parse_qs(previous_data) get_key_instances(Stage, data_dict) @@ -71,7 +71,7 @@ def candidate_search(request): """ This method is used to search candidate model and return matching objects """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() search = request.GET.get("search") if search is None: search = "" @@ -119,7 +119,7 @@ def candidate_filter_view(request): templete = "candidate/candidate_card.html" if request.GET.get('view') == 'list': templete = "candidate/candidate_list.html" - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() filter_obj = CandidateFilter( request.GET, queryset=Candidate.objects.filter(is_active=True) ) @@ -139,7 +139,7 @@ def filter_survey(request): """ This method is used to filter/search the recruitment surveys """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() filter_obj = SurveyFilter(request.GET) questions = filter_obj.qs data_dict = parse_qs(previous_data) diff --git a/recruitment/views/views.py b/recruitment/views/views.py index 5825f11ae..bc7f38a59 100644 --- a/recruitment/views/views.py +++ b/recruitment/views/views.py @@ -734,7 +734,7 @@ def candidate_view(request): This method render all candidate to the template """ view_type = request.GET.get('view') - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() candidates = Candidate.objects.filter(is_active=True) filter_obj = CandidateFilter(queryset=candidates) return render( @@ -755,7 +755,7 @@ def candidate_view_list(request): """ This method renders all candidate on candidate_list.html template """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() candidates = Candidate.objects.all() if request.GET.get("is_active") is None: candidates = candidates.filter(is_active=True) @@ -776,7 +776,7 @@ def candidate_view_card(request): """ This method renders all candidate on candidate_card.html template """ - previous_data = request.environ["QUERY_STRING"] + previous_data = request.GET.urlencode() candidates = Candidate.objects.all() if request.GET.get("is_active") is None: candidates = candidates.filter(is_active=True)