diff --git a/base/middleware.py b/base/middleware.py index 70c394f03..6b70acce9 100644 --- a/base/middleware.py +++ b/base/middleware.py @@ -64,6 +64,7 @@ class CompanyMiddleware: "pms", "base", "helpdesk", + "offboarding", ] app_models = [ model diff --git a/offboarding/decorators.py b/offboarding/decorators.py index a68e43156..2cf959c57 100644 --- a/offboarding/decorators.py +++ b/offboarding/decorators.py @@ -84,7 +84,7 @@ def offboarding_or_stage_manager_can_enter(function, perm): @decorator_with_arguments -def check_feature_endabled(function, feature_name): +def check_feature_enabled(function, feature_name): def _function(request, *args, **kwargs): general_setting = OffboardingGeneralSetting.objects.first() enabled = getattr(general_setting, feature_name, False) diff --git a/offboarding/models.py b/offboarding/models.py index 18b7977dd..fdd823f4f 100644 --- a/offboarding/models.py +++ b/offboarding/models.py @@ -4,6 +4,7 @@ from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver from base import thread_local_middleware +from base.horilla_company_manager import HorillaCompanyManager from base.models import Company from employee.models import Employee from horilla_audit.models import HorillaAuditInfo, HorillaAuditLog @@ -29,6 +30,7 @@ class Offboarding(models.Model): company_id = models.ForeignKey( Company, on_delete=models.CASCADE, null=True, editable=False ) + objects = HorillaCompanyManager() def __str__(self): return self.title @@ -124,7 +126,9 @@ class OffboardingEmployee(models.Model): notice_period_starts = models.DateField(null=True) notice_period_ends = models.DateField(null=True, blank=True) created_at = models.DateTimeField(auto_now_add=True) - + objects = HorillaCompanyManager( + related_company_field="employee_id__employee_work_info__company_id" + ) def __str__(self) -> str: return self.employee_id.get_full_name() @@ -154,6 +158,9 @@ class ResignationLetter(models.Model): ) created_at = models.DateTimeField(auto_now_add=True) is_active = models.BooleanField(default=True) + objects = HorillaCompanyManager( + related_company_field="employee_id__employee_work_info__company_id" + ) def save(self, *args, **kwargs): super().save(*args, **kwargs) diff --git a/offboarding/urls.py b/offboarding/urls.py index 7278ef665..abd25969f 100644 --- a/offboarding/urls.py +++ b/offboarding/urls.py @@ -50,6 +50,11 @@ urlpatterns = [ views.request_view, name="resignation-request-view", ), + path( + "resignation-requests-single-view//", + views.request_single_view, + name="resignation-request-single-view", + ), path( "create-resignation-request", views.create_resignation_request,