From 52b37080ceb106e655d5e3e53d7993c8aab62d91 Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 2 Apr 2024 10:03:17 +0530 Subject: [PATCH] [UPDT] BASE: Updated shit request empty page html by addng condition to load the quick filter --- base/forms.py | 7 +- .../shift_request/shift_request_view.html | 166 ++++++++++-------- .../work_type_request/htmx/requests.html | 43 +++-- .../work_type_request_view.html | 54 +++--- 4 files changed, 143 insertions(+), 127 deletions(-) diff --git a/base/forms.py b/base/forms.py index f94429da6..bea643a0a 100644 --- a/base/forms.py +++ b/base/forms.py @@ -535,7 +535,12 @@ class RotatingWorkTypeAssignForm(ModelForm): model = RotatingWorkTypeAssign fields = "__all__" - exclude = ("next_change_date", "current_work_type", "next_work_type") + exclude = [ + "next_change_date", + "current_work_type", + "next_work_type", + "is_active", + ] widgets = { "start_date": DateInput(attrs={"type": "date"}), "is_active": HiddenInput(), diff --git a/base/templates/shift_request/shift_request_view.html b/base/templates/shift_request/shift_request_view.html index 65dad0f09..6379f03e5 100644 --- a/base/templates/shift_request/shift_request_view.html +++ b/base/templates/shift_request/shift_request_view.html @@ -1,17 +1,20 @@ -{% extends "index.html" %} -{% block content %} -{% load i18n %} -{% load basefilters %} -{% load attendancefilters %} +{% extends "index.html" %} {% block content %} {% load i18n %} +{% load basefilters %} {% load attendancefilters %} {% include 'shift_request/shift_request_nav.html' %} -