From 2ba76ec189ee18f05971d4a49af22060a9eac6b8 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 22 Feb 2024 23:00:43 +0530 Subject: [PATCH] [UPDT] BASE : Settings page reordering and bug fixes --- .../employee_account_block_unblock.html | 2 +- .../base/department/department_view.html | 2 +- .../pagination_settings.html | 24 ++++++---- .../base/employee_type/type_view.html | 2 +- base/templates/base/general_settings.html | 27 ++++++++--- .../base/mail_server/mail_server_view.html | 2 +- .../rotating_shift/rotating_shift_view.html | 2 +- .../rotating_work_type_view.html | 2 +- base/templates/base/shift/shift_view.html | 2 +- .../base/work_type/work_type_view.html | 2 +- base/urls.py | 1 - base/views.py | 47 ++++++++----------- 12 files changed, 62 insertions(+), 53 deletions(-) diff --git a/base/templates/base/audit_tag/employee_account_block_unblock.html b/base/templates/base/audit_tag/employee_account_block_unblock.html index a69d35bad..b9b3bfa17 100644 --- a/base/templates/base/audit_tag/employee_account_block_unblock.html +++ b/base/templates/base/audit_tag/employee_account_block_unblock.html @@ -6,7 +6,7 @@
{% csrf_token %}
- +
diff --git a/base/templates/base/department/department_view.html b/base/templates/base/department/department_view.html index 51a35d8e2..982f8c55d 100644 --- a/base/templates/base/department/department_view.html +++ b/base/templates/base/department/department_view.html @@ -5,7 +5,7 @@
{% trans "Department" %}
{% if perms.base.change_department or perms.base.delete_department %} -
+
{% trans "Actions" %}
{% endif %}
diff --git a/base/templates/base/dynamic_pagination/pagination_settings.html b/base/templates/base/dynamic_pagination/pagination_settings.html index 369e52693..8285184ef 100644 --- a/base/templates/base/dynamic_pagination/pagination_settings.html +++ b/base/templates/base/dynamic_pagination/pagination_settings.html @@ -1,17 +1,23 @@ -{% extends 'settings.html' %} {% block settings %}{% load i18n %} +{% load i18n %} {% csrf_token %}
-

{% trans "Default records per page" %}

+

{% trans "Default Records Per Page" %}

- {{form}} - + {% trans "Save Changes" %} +
-{% endblock settings %} + diff --git a/base/templates/base/employee_type/type_view.html b/base/templates/base/employee_type/type_view.html index 90b819b22..985b3925d 100644 --- a/base/templates/base/employee_type/type_view.html +++ b/base/templates/base/employee_type/type_view.html @@ -4,7 +4,7 @@
{% trans "Employee Type" %}
-
+
{% trans "Actions" %}
diff --git a/base/templates/base/general_settings.html b/base/templates/base/general_settings.html index 1f03a2aac..cc0405dc4 100644 --- a/base/templates/base/general_settings.html +++ b/base/templates/base/general_settings.html @@ -1,26 +1,39 @@ {% extends 'settings.html' %} {% block settings %}{% load i18n %} {% if perms.recruitment.change_recruitmentgeneralsetting %} -{% include "recruitment/settings/settings.html" %} + {% include "recruitment/settings/settings.html" %} {% endif %} + {% if perms.offboarding.change_offboardinggeneralsetting %} -{% include "offboarding/settings/settings.html" %} + {% include "offboarding/settings/settings.html" %} {% endif %} + {% if perms.attendance.change_attendancegeneralsetting %} -{% include "attendance/settings/settings.html" %} + {% include "attendance/settings/settings.html" %} {% endif %} + {% if perms.payroll.change_payrollgeneralsetting %} -{% include "payroll/settings/settings.html" %} + {% include "payroll/settings/settings.html" %} {% endif %} + {% if perms.employee.change_employeegeneralsetting %} -{% include "settings/settings.html" %} + {% include "settings/settings.html" %} {% endif %} + {% if perms.base.change_announcementexpire %} -{% include "announcement/expiry_day.html" %} + {% include "announcement/expiry_day.html" %} {% endif %} + {% if perms.payroll.change_encashmentgeneralsetting %} -{% include "settings/encashment_settings.html" %} + {% include "settings/encashment_settings.html" %} {% endif %} + {% include "base/audit_tag/history_tracking_fields.html" %} {% include "base/audit_tag/employee_account_block_unblock.html" %} + +{% if perms.payroll.view_payrollsettings %} + {% include "payroll/settings/payroll_settings.html" %} +{% endif %} + +{% include "base/dynamic_pagination/pagination_settings.html" %} {% endblock settings %} \ No newline at end of file diff --git a/base/templates/base/mail_server/mail_server_view.html b/base/templates/base/mail_server/mail_server_view.html index fefb5141b..9d5cc54f6 100644 --- a/base/templates/base/mail_server/mail_server_view.html +++ b/base/templates/base/mail_server/mail_server_view.html @@ -23,7 +23,7 @@
{{ server.company_id }}
- +
diff --git a/base/templates/base/rotating_shift/rotating_shift_view.html b/base/templates/base/rotating_shift/rotating_shift_view.html index 9dce501f7..74576a2ce 100644 --- a/base/templates/base/rotating_shift/rotating_shift_view.html +++ b/base/templates/base/rotating_shift/rotating_shift_view.html @@ -6,7 +6,7 @@
{% trans "Title" %}
{% trans "Shift 1" %}
{% trans "Shift 2" %}
-
+
{% trans "Actions" %}
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_view.html b/base/templates/base/rotating_work_type/rotating_work_type_view.html index 42ac1eeaa..f0df20e43 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_view.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_view.html @@ -7,7 +7,7 @@
{% trans "Work Type 1" %}
{% trans "Work Type 2" %}
{% if perms.base.change_rotatingworktype or perms.base.delete_rotatingworktype %} -
+
{% trans "Actions" %}
{% endif %}
diff --git a/base/templates/base/shift/shift_view.html b/base/templates/base/shift/shift_view.html index 82bb7b38a..c8dcbaecd 100644 --- a/base/templates/base/shift/shift_view.html +++ b/base/templates/base/shift/shift_view.html @@ -10,7 +10,7 @@
{% trans "Full Time" %}
{% trans "Grace Time" %}
{% if perms.base.change_employeeshift or perms.base.delete_employeeshift %} -
+
{% trans "Actions" %}
{% endif %} diff --git a/base/templates/base/work_type/work_type_view.html b/base/templates/base/work_type/work_type_view.html index 84a4a0b42..46ff5e1ac 100644 --- a/base/templates/base/work_type/work_type_view.html +++ b/base/templates/base/work_type/work_type_view.html @@ -5,7 +5,7 @@
{% trans "Work Type" %}
{% if perms.base.change_worktype or perms.base.delete_worktype %} -
+
{% trans "Actions" %}
{% endif %}
diff --git a/base/urls.py b/base/urls.py index 60e818b6c..d07c7f4d8 100644 --- a/base/urls.py +++ b/base/urls.py @@ -579,7 +579,6 @@ urlpatterns = [ views.delete_notification, name="delete-notifications", ), - path("settings/currency/", views.settings, name="currency-settings"), path("settings/general-settings/", views.general_settings, name="general-settings"), path("settings/date-settings/", views.date_settings, name="date-settings"), path("settings/save-date/", views.save_date_format, name="save_date_format"), diff --git a/base/views.py b/base/views.py index 82d9cf7b5..d923d9867 100644 --- a/base/views.py +++ b/base/views.py @@ -3829,22 +3829,6 @@ def all_notifications(request): ) -@login_required -@permission_required("payroll.view_payrollsettings") -def settings(request): - """ - This method is used to render settings template - """ - instance = PayrollSettings.objects.first() - form = PayrollSettingsForm(instance=instance) - if request.method == "POST": - form = PayrollSettingsForm(request.POST, instance=instance) - if form.is_valid(): - form.save() - messages.success(request, _("Payroll settings updated.")) - return render(request, "payroll/settings/payroll_settings.html", {"form": form}) - - @login_required def general_settings(request): """ @@ -3867,6 +3851,13 @@ def general_settings(request): ] } history_fields_form = HistoryTrackingFieldsForm(initial=history_fields_form_initial) + currency_instance = PayrollSettings.objects.first() + currency_form = PayrollSettingsForm(instance=currency_instance) + if DynamicPagination.objects.filter(user_id=request.user).exists(): + pagination = DynamicPagination.objects.filter(user_id=request.user).first() + pagination_form = DynamicPaginationForm(instance=pagination) + else: + pagination_form = DynamicPaginationForm() if request.method == "POST": form = AnnouncementExpireForm(request.POST, instance=instance) if form.is_valid(): @@ -3878,6 +3869,8 @@ def general_settings(request): "base/general_settings.html", { "form": form, + "currency_form": currency_form, + "pagination_form":pagination_form, "encashment_form": encashment_form, "history_fields_form": history_fields_form, "enabled_block_unblock": enabled_block_unblock, @@ -4372,7 +4365,7 @@ def ticket_type_update(request, t_type_id): def ticket_type_delete(request, t_type_id): TicketType.objects.get(id=t_type_id).delete() messages.success(request, _("Ticket type has been deleted successfully!")) - return HttpResponse("") + return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) @login_required @@ -5042,24 +5035,22 @@ def delete_worktyperequest_comment(request, comment_id): def pagination_settings_view(request): if DynamicPagination.objects.filter(user_id=request.user).exists(): pagination = DynamicPagination.objects.filter(user_id=request.user).first() - form = DynamicPaginationForm(instance=pagination) + pagination_form = DynamicPaginationForm(instance=pagination) if request.method == "POST": - form = DynamicPaginationForm(request.POST, instance=pagination) - if form.is_valid(): - form.save() + pagination_form = DynamicPaginationForm(request.POST, instance=pagination) + if pagination_form.is_valid(): + pagination_form.save() messages.success(request, _("Default pagination updated.")) else: - form = DynamicPaginationForm() + pagination_form = DynamicPaginationForm() if request.method == "POST": - form = DynamicPaginationForm( + pagination_form = DynamicPaginationForm( request.POST, ) - if form.is_valid(): - form.save() + if pagination_form.is_valid(): + pagination_form.save() messages.success(request, _("Default pagination updated.")) - return render( - request, "base/dynamic_pagination/pagination_settings.html", {"form": form} - ) + return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) @login_required