From 3cf4a1982b4e17d1e802e1a85cb1aa80bc15c7dd Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 22 Aug 2024 17:35:12 +0530 Subject: [PATCH] [UPDT] PAYROLL: Added hx request to load export form for contracts --- .../contract/contract_export_filter.html | 359 +++++++++--------- .../payroll/contract/contract_view.html | 43 +-- payroll/views/views.py | 18 +- 3 files changed, 202 insertions(+), 218 deletions(-) diff --git a/payroll/templates/payroll/contract/contract_export_filter.html b/payroll/templates/payroll/contract/contract_export_filter.html index f61d5e44b..67812bbad 100644 --- a/payroll/templates/payroll/contract/contract_export_filter.html +++ b/payroll/templates/payroll/contract/contract_export_filter.html @@ -1,175 +1,188 @@ {% load static %} {% load i18n %} -
-
-
{% trans "Excel columns" %}
-
-
-
-
- -
-
-
-
- {% for field in export_column.selected_fields %} -
-
- -
-
- {% endfor %} -
-
-
-
-
{% trans "Contract" %}
-
-
-
-
- - {{ export_filter.form.contract_start_date }} -
-
-
-
- - {{ export_filter.form.contract_end_date }} -
-
-
-
-
-
- - {{ export_filter.form.wage_type }} -
-
-
-
- - {{ export_filter.form.filing_status }} -
-
-
-
-
-
- - {{ export_filter.form.pay_frequency }} -
-
-
-
- - {{ export_filter.form.contract_status }} -
-
-
-
-
-
-
{% trans "Work Info" %}
-
-
-
-
- - {{ export_filter.form.employee_id__employee_work_info__company_id }} -
-
-
-
- - {{ export_filter.form.department }} -
-
-
-
-
-
- - {{ export_filter.form.job_position }} -
-
-
-
- - {{ export_filter.form.job_role }} -
-
-
-
-
-
- - {{ export_filter.form.shift }} -
-
-
-
- - {{ export_filter.form.work_type }} -
-
-
-
-
-
-
{% trans "Advanced" %}
-
-
-
-
- - {{ export_filter.form.contract_start_date_from }} -
-
-
-
- - {{ export_filter.form.contract_start_date_till }} -
-
-
-
-
-
- - {{ export_filter.form.contract_end_date_from }} -
-
-
-
- - {{ export_filter.form.contract_end_date_till }} -
-
-
-
-
-
- - {{ export_filter.form.basic_pay__lte }} -
-
-
-
- - {{ export_filter.form.basic_pay__gte }} -
-
-
-
-
+
+

+ {% trans "Export Contracts" %} +

+ +
+
+
+ {% csrf_token %} +
+
+
{% trans "Excel columns" %}
+
+
+
+
+ +
+
+
+
+ {% for field in export_column.selected_fields %} +
+
+ +
+
+ {% endfor %} +
+
+
+
+
{% trans "Contract" %}
+
+
+
+
+ + {{ export_filter.form.contract_start_date }} +
+
+
+
+ + {{ export_filter.form.contract_end_date }} +
+
+
+
+
+
+ + {{ export_filter.form.wage_type }} +
+
+
+
+ + {{ export_filter.form.filing_status }} +
+
+
+
+
+
+ + {{ export_filter.form.pay_frequency }} +
+
+
+
+ + {{ export_filter.form.contract_status }} +
+
+
+
+
+
+
{% trans "Work Info" %}
+
+
+
+
+ + {{ export_filter.form.employee_id__employee_work_info__company_id }} +
+
+
+
+ + {{ export_filter.form.department }} +
+
+
+
+
+
+ + {{ export_filter.form.job_position }} +
+
+
+
+ + {{ export_filter.form.job_role }} +
+
+
+
+
+
+ + {{ export_filter.form.shift }} +
+
+
+
+ + {{ export_filter.form.work_type }} +
+
+
+
+
+
+
{% trans "Advanced" %}
+
+
+
+
+ + {{ export_filter.form.contract_start_date_from }} +
+
+
+
+ + {{ export_filter.form.contract_start_date_till }} +
+
+
+
+
+
+ + {{ export_filter.form.contract_end_date_from }} +
+
+
+
+ + {{ export_filter.form.contract_end_date_till }} +
+
+
+
+
+
+ + {{ export_filter.form.basic_pay__lte }} +
+
+
+
+ + {{ export_filter.form.basic_pay__gte }} +
+
+
+
+
+
+ +
+ +
+
diff --git a/payroll/templates/payroll/contract/contract_view.html b/payroll/templates/payroll/contract/contract_view.html index 8a92f2fdc..7f02c7f3e 100644 --- a/payroll/templates/payroll/contract/contract_view.html +++ b/payroll/templates/payroll/contract/contract_view.html @@ -1,43 +1,4 @@ {% extends 'index.html' %} {% block content %} {% load static %} {% load i18n %} -
@@ -174,7 +135,9 @@ class="oh-dropdown__link" id="employee-contract-export" data-toggle="oh-modal-toggle" - data-target="#hxContractExport" + data-target="#objectCreateModal" + hx-target="#objectCreateModalTarget" + hx-get="{%url 'contract-export' %}" >{% trans "Export" %} diff --git a/payroll/views/views.py b/payroll/views/views.py index ba8d162a7..29518dfd8 100644 --- a/payroll/views/views.py +++ b/payroll/views/views.py @@ -286,17 +286,12 @@ def contract_view(request): else: template = "payroll/contract/contract_empty.html" - field = request.GET.get("field") contracts = paginator_qry(contracts, request.GET.get("page")) contract_ids_json = json.dumps([instance.id for instance in contracts.object_list]) filter_form = ContractFilter(request.GET) - export_filter = ContractFilter(request.GET) - export_column = ContractExportFieldForm() context = { "contracts": contracts, "f": filter_form, - "export_filter": export_filter, - "export_column": export_column, "contract_ids": contract_ids_json, "gp_fields": ContractReGroup.fields, } @@ -1267,6 +1262,19 @@ def slip_group_name_update(request): @login_required @permission_required("payroll.add_contract") def contract_export(request): + hx_request = request.META.get("HTTP_HX_REQUEST") + if hx_request: + export_filter = ContractFilter() + export_column = ContractExportFieldForm() + content = { + "export_filter": export_filter, + "export_column": export_column, + } + return render( + request, + "payroll/contract/contract_export_filter.html", + context=content, + ) return export_data( request=request, model=Contract,