diff --git a/employee/filters.py b/employee/filters.py index 1a015ea00..f680f9646 100644 --- a/employee/filters.py +++ b/employee/filters.py @@ -63,6 +63,33 @@ class EmployeeFilter(FilterSet): (False, "No"), ], ) + + is_from_onboarding = django_filters.ChoiceFilter( + field_name="is_from_onboarding", + label="Is From Onboarding", + choices=[ + (True, "Yes"), + (False, "No"), + ], + ) + is_directly_converted = django_filters.ChoiceFilter( + field_name="is_directly_converted", + label="Is Directly Converted", + choices=[ + (True, "Yes"), + (False, "No"), + ], + ) + probation_from = django_filters.DateFilter( + field_name="candidate_get__probation_end", + lookup_expr="gte", + widget=forms.DateInput(attrs={"type": "date"}), + ) + probation_till = django_filters.DateFilter( + field_name="candidate_get__probation_end", + lookup_expr="lte", + widget=forms.DateInput(attrs={"type": "date"}), + ) working_today = django_filters.BooleanFilter( label="Working", method="get_working_today" ) diff --git a/employee/forms.py b/employee/forms.py index cfcc7981a..e5f75f7aa 100644 --- a/employee/forms.py +++ b/employee/forms.py @@ -161,6 +161,8 @@ class EmployeeForm(ModelForm): exclude = ( "employee_user_id", "additional_info", + "is_from_onboarding", + "is_directly_converted", ) widgets = { "dob": TextInput(attrs={"type": "date", "id": "dob"}), diff --git a/employee/models.py b/employee/models.py index caa234e3b..2d4868083 100644 --- a/employee/models.py +++ b/employee/models.py @@ -104,6 +104,8 @@ class Employee(models.Model): emergency_contact_relation = models.CharField(max_length=20, null=True, blank=True) is_active = models.BooleanField(default=True) additional_info = models.JSONField(null=True, blank=True) + is_from_onboarding = models.BooleanField(default=False, null=True, blank=True) + is_directly_converted = models.BooleanField(default=False, null=True, blank=True) objects = HorillaCompanyManager( related_company_field="employee_work_info__company_id" ) diff --git a/employee/templates/employee_filters.html b/employee/templates/employee_filters.html index 31f15cdce..26f417fe9 100644 --- a/employee/templates/employee_filters.html +++ b/employee/templates/employee_filters.html @@ -91,10 +91,18 @@ {{f.form.employee_user_id__groups}} +
+ + {{f.form.probation_from}} +
{{f.form.is_active}}
+
+ + {{f.form.is_directly_converted}} +
@@ -102,6 +110,14 @@ {{f.form.employee_user_id__user_permissions}}
+
+ + {{f.form.probation_till}} +
+
+ + {{f.form.is_from_onboarding}} +
diff --git a/employee/views.py b/employee/views.py index a364983d2..70e9b53f4 100755 --- a/employee/views.py +++ b/employee/views.py @@ -2317,6 +2317,8 @@ def employee_export(_): field_names.remove("employee_user_id") field_names.remove("employee_profile") field_names.remove("additional_info") + field_names.remove("is_from_onboarding") + field_names.remove("is_directly_converted") field_names.remove("is_active") # Get the existing employee data and convert it to a DataFrame