diff --git a/employee/forms.py b/employee/forms.py index ee4700b73..48b39a49a 100644 --- a/employee/forms.py +++ b/employee/forms.py @@ -300,25 +300,8 @@ class EmployeeWorkInformationForm(ModelForm): """ model = EmployeeWorkInformation - 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",) + fields = "__all__" + exclude = ("employee_id", "additional_info", "experience") widgets = { "date_joining": DateInput(attrs={"type": "date"}), diff --git a/employee/models.py b/employee/models.py index 83fd48a10..eaf1ed2ce 100644 --- a/employee/models.py +++ b/employee/models.py @@ -123,6 +123,11 @@ class Employee(models.Model): url = self.employee_profile.url return url + def get_employee_dob(self) -> any: + if self.dob: + return self.dob.strftime("%d %b") + return None + def get_full_name(self): """ Method will return employee full name diff --git a/employee/templates/tabs/personal_tab.html b/employee/templates/tabs/personal_tab.html index 9d46ddca8..30fab7553 100644 --- a/employee/templates/tabs/personal_tab.html +++ b/employee/templates/tabs/personal_tab.html @@ -15,7 +15,7 @@ {% trans "Date of Birth" %} {{employee.dob|default:_("None")}} + class="oh-profile__info-value dateformat_changer">{{employee.get_employee_dob|default:_("None")}}