From 2f8b80bdd1e652b1cc6d2a00d7a52f3b62a8bfef Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 14 Jan 2025 12:13:27 +0530 Subject: [PATCH] [UPDT] EMPLOYEE: Work info,bank info forms added with as_p function --- employee/forms.py | 62 ++++-- .../employee/update_form/bank_details.html | 68 +------ .../employee/update_form/bank_info_as_p.html | 65 +++++++ .../employee/update_form/work_details.html | 183 +----------------- 4 files changed, 116 insertions(+), 262 deletions(-) create mode 100644 employee/templates/employee/update_form/bank_info_as_p.html diff --git a/employee/forms.py b/employee/forms.py index 08a11559c..9f851c9a5 100644 --- a/employee/forms.py +++ b/employee/forms.py @@ -266,16 +266,32 @@ class EmployeeWorkInformationForm(ModelForm): Form for EmployeeWorkInformation model """ - employees = Employee.objects.filter(employee_work_info=None) - employee_id = forms.ModelChoiceField(queryset=employees) - class Meta: """ Meta class to add the additional info """ model = EmployeeWorkInformation - fields = "__all__" + fields = ( + "department_id", + "job_position_id", + "job_role_id", + "shift_id", + "work_type_id", + "employee_type_id", + "reporting_manager_id", + "company_id", + "location", + "email", + "mobile", + "date_joining", + "contract_end_date", + "tags", + "basic_salary", + "salary_hour", + ) + exclude = ("employee_id",) + widgets = { "date_joining": DateInput(attrs={"type": "date"}), "contract_end_date": DateInput(attrs={"type": "date"}), @@ -344,6 +360,10 @@ class EmployeeWorkInformationForm(ModelForm): del self.errors["employee_id"] return cleaned_data + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string("employee/create_form/personal_info_as_p.html", context) + class EmployeeWorkInformationUpdateForm(ModelForm): """ @@ -364,6 +384,10 @@ class EmployeeWorkInformationUpdateForm(ModelForm): "contract_end_date": DateInput(attrs={"type": "date"}), } + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string("employee/create_form/personal_info_as_p.html", context) + class EmployeeBankDetailsForm(ModelForm): """ @@ -378,11 +402,18 @@ class EmployeeBankDetailsForm(ModelForm): """ model = EmployeeBankDetails - fields = "__all__" - exclude = [ - "employee_id", - "is_active", - ] + fields = ( + "bank_name", + "account_number", + "branch", + "any_other_code1", + "address", + "country", + "state", + "city", + "any_other_code2", + ) + exclude = ["employee_id", "is_active", "additional_info"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -390,6 +421,10 @@ class EmployeeBankDetailsForm(ModelForm): for visible in self.visible_fields(): visible.field.widget.attrs["class"] = "oh-input w-100" + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string("employee/update_form/bank_info_as_p.html", context) + class EmployeeBankDetailsUpdateForm(ModelForm): """ @@ -403,10 +438,7 @@ class EmployeeBankDetailsUpdateForm(ModelForm): model = EmployeeBankDetails fields = "__all__" - exclude = [ - "employee_id", - "is_active", - ] + exclude = ["employee_id", "is_active", "additional_info"] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -415,6 +447,10 @@ class EmployeeBankDetailsUpdateForm(ModelForm): for field in self.fields: self.fields[field].widget.attrs["placeholder"] = self.fields[field].label + def as_p(self, *args, **kwargs): + context = {"form": self} + return render_to_string("employee/update_form/bank_info_as_p.html", context) + excel_columns = [ ("badge_id", trans("Badge ID")), diff --git a/employee/templates/employee/update_form/bank_details.html b/employee/templates/employee/update_form/bank_details.html index 925fe1555..faf3af49f 100644 --- a/employee/templates/employee/update_form/bank_details.html +++ b/employee/templates/employee/update_form/bank_details.html @@ -7,73 +7,7 @@ {% csrf_token %} -
-
-
- - {{bank_form.bank_name}} -
-
-
-
- - {{bank_form.account_number}} - {{bank_form.account_number.errors}} -
-
-
-
-
-
- - {{bank_form.branch}} -
-
-
-
- - {{bank_form.any_other_code1}} -
-
-
-
-
-
- - {{bank_form.address}} -
-
-
-
-
- - -
-
-
- - -
-
-
-
-
-
- - {{bank_form.city}} -
-
-
-
- - {{bank_form.any_other_code2}} -
-
-
+ {{bank_form.as_p}}