From 0af7c858c792bdba700591c4609d1d0978455871 Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 9 Oct 2023 16:13:10 +0530 Subject: [PATCH] [ADD] LEAVE: Common form on leave request section --- leave/forms.py | 17 ++++++ leave/templates/leave/leave_request_form.html | 47 +-------------- .../templates/leave/request_update_form.html | 51 +---------------- leave/templates/leave/request_view.html | 57 ++++++++++++------- 4 files changed, 55 insertions(+), 117 deletions(-) diff --git a/leave/forms.py b/leave/forms.py index 23e29f368..1c9924e71 100644 --- a/leave/forms.py +++ b/leave/forms.py @@ -4,6 +4,7 @@ from django.forms import ModelForm from django.forms.widgets import TextInput from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ +from django.template.loader import render_to_string from employee.models import Employee from .models import LeaveType, LeaveRequest, AvailableLeave, Holiday, CompanyLeave from .methods import ( @@ -252,6 +253,14 @@ class LeaveRequestCreationForm(ModelForm): return cleaned_data + def as_p(self, *args, **kwargs): + """ + Render the form fields as HTML table rows with Bootstrap styling. + """ + context = {"form": self} + table_html = render_to_string("attendance_form.html", context) + return table_html + class Meta: model = LeaveRequest fields = [ @@ -335,6 +344,14 @@ class LeaveRequestUpdationForm(ModelForm): return cleaned_data + def as_p(self, *args, **kwargs): + """ + Render the form fields as HTML table rows with Bootstrap styling. + """ + context = {"form": self} + table_html = render_to_string("attendance_form.html", context) + return table_html + class Meta: model = LeaveRequest fields = [ diff --git a/leave/templates/leave/leave_request_form.html b/leave/templates/leave/leave_request_form.html index 71e46638b..75aa2f53d 100644 --- a/leave/templates/leave/leave_request_form.html +++ b/leave/templates/leave/leave_request_form.html @@ -13,48 +13,5 @@ {% endif %}
-
- - {{form.leave_type_id}} - {{form.leave_type_id.errors}} -
-
- - {{form.employee_id}} - {{form.employee_id.errors}} -
-
- - {{form.start_date}} - {{form.start_date.errors}} -
-
- - {{form.start_date_breakdown}} - {{form.start_date_breakdown.errors}} -
-
- - {{form.end_date}} - {{form.end_date.errors}} -
-
- - {{form.end_date_breakdown}} - {{form.end_date_breakdown.errors}} -
-
- - {{form.description}} - {{form.description.errors}} -
-
- - {{form.attachment}} - {{form.attachment.errors}} -
-
- - \ No newline at end of file + {{form.as_p}} + \ No newline at end of file diff --git a/leave/templates/leave/request_update_form.html b/leave/templates/leave/request_update_form.html index 9ea5f2dd1..5a7f6e5fb 100644 --- a/leave/templates/leave/request_update_form.html +++ b/leave/templates/leave/request_update_form.html @@ -16,54 +16,5 @@
{% csrf_token %} -
- - {{form.leave_type_id}} - {{form.leave_type_id.errors}} -
-
- - {{form.employee_id}} - {{form.employee_id.errors}} -
-
- - {{form.start_date}} - {{form.start_date.errors}} -
-
- - {{form.start_date_breakdown}} - {{form.start_date_breakdown.errors}} -
-
- - {{form.end_date}} - {{form.end_date.errors}} -
-
- - {{form.end_date_breakdown}} - {{form.end_date_breakdown.errors}} -
-
- - {{form.description}} - {{form.description.errors}} - -
-
- - {{form.attachment}} - {{form.attachment.errors}} -
-
- - {{form.status}} - {{form.status.errors}} -
-
- + {{form.as_p}} \ No newline at end of file diff --git a/leave/templates/leave/request_view.html b/leave/templates/leave/request_view.html index e62e61d81..a56ea857c 100644 --- a/leave/templates/leave/request_view.html +++ b/leave/templates/leave/request_view.html @@ -129,34 +129,47 @@
-