From d479dee6eae60d20fa9a75120801a7a0985c3e30 Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 19 Sep 2024 10:32:49 +0530 Subject: [PATCH] [UPDT] ACCESSIBILITY: Add accessibility to diff app --- accessibility/accessibility.py | 1 - accessibility/filters.py | 9 +++++---- accessibility/models.py | 3 ++- .../templates/accessibility/accessibility.html | 10 +++++----- accessibility/urls.py | 2 +- accessibility/views.py | 9 +++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/accessibility/accessibility.py b/accessibility/accessibility.py index 870f65ffc..c6d9854f2 100644 --- a/accessibility/accessibility.py +++ b/accessibility/accessibility.py @@ -4,7 +4,6 @@ accessibility/accessibility.py from django.utils.translation import gettext_lazy as _ - ACCESSBILITY_FEATURE = [ ("employee_view", _("Default Employee View")), ("employee_detailed_view", _("Default Employee Detailed View")), diff --git a/accessibility/filters.py b/accessibility/filters.py index 57f001a43..ed8d4ae9e 100644 --- a/accessibility/filters.py +++ b/accessibility/filters.py @@ -3,13 +3,15 @@ accessibility/filters.py """ from functools import reduce -from django.utils.translation import gettext as _ + +import django_filters from django.db.models import Q from django.template.loader import render_to_string -import django_filters +from django.utils.translation import gettext as _ + +from employee.models import Employee from horilla.filters import HorillaFilterSet from horilla.horilla_middlewares import _thread_locals -from employee.models import Employee def _filter_form_structured(self): @@ -95,7 +97,6 @@ class AccessibilityFilter(HorillaFilterSet): else: or_conditions.append(Q(**{f"{field}__in": [field_value]})) - if or_conditions: queryset = queryset.filter(reduce(lambda x, y: x | y, or_conditions)) diff --git a/accessibility/models.py b/accessibility/models.py index f9cc132fc..69a674bfa 100644 --- a/accessibility/models.py +++ b/accessibility/models.py @@ -3,8 +3,9 @@ accessibility/models.py """ from django.db import models -from horilla.models import HorillaModel + from accessibility.accessibility import ACCESSBILITY_FEATURE +from horilla.models import HorillaModel class DefaultAccessibility(HorillaModel): diff --git a/accessibility/templates/accessibility/accessibility.html b/accessibility/templates/accessibility/accessibility.html index 4ddcbd909..7c2950fb8 100644 --- a/accessibility/templates/accessibility/accessibility.html +++ b/accessibility/templates/accessibility/accessibility.html @@ -11,7 +11,7 @@ - +
@@ -89,7 +89,7 @@ if (response.hasOwnProperty(key)) { let values = response[key]; let field = document.querySelector(`#{{accessibility}}_body [name="${key}"]`); - + if (field) { // Handle select fields if (field.tagName === 'SELECT') { @@ -110,7 +110,7 @@ select = $("#accessibilityContainer #{{accessibility}}_body").find("select") select.parent().find('span').remove() select.select2() - + } }); @@ -124,7 +124,7 @@
-{% endblock settings %} \ No newline at end of file +{% endblock settings %} diff --git a/accessibility/urls.py b/accessibility/urls.py index c86ba9086..6af44ff5f 100644 --- a/accessibility/urls.py +++ b/accessibility/urls.py @@ -3,8 +3,8 @@ accessibility/urls.py """ from django.urls import path -from accessibility import views as accessibility +from accessibility import views as accessibility urlpatterns = [ path( diff --git a/accessibility/views.py b/accessibility/views.py index 6d3b82b52..7569fdd12 100644 --- a/accessibility/views.py +++ b/accessibility/views.py @@ -4,14 +4,15 @@ employee/accessibility.py Employee accessibility related methods and functionalites """ -from django.shortcuts import render from django.contrib import messages -from django.utils.translation import gettext_lazy as _ from django.http import HttpResponse, JsonResponse -from horilla.decorators import login_required, permission_required +from django.shortcuts import render +from django.utils.translation import gettext_lazy as _ + +from accessibility.accessibility import ACCESSBILITY_FEATURE from accessibility.filters import AccessibilityFilter from accessibility.models import DefaultAccessibility -from accessibility.accessibility import ACCESSBILITY_FEATURE +from horilla.decorators import login_required, permission_required @login_required