diff --git a/onboarding/views.py b/onboarding/views.py index b0cc74671..f7fedccdc 100644 --- a/onboarding/views.py +++ b/onboarding/views.py @@ -1544,12 +1544,12 @@ def task_report(request): """ This method is used to show the task report. """ - stage_id = request.GET.get("stage_id") employee_id = request.GET.get("employee_id") if not employee_id: employee_id = request.user.employee_get.id my_tasks = OnboardingTask.objects.filter( employee_id__id=employee_id, + candidates__is_active = True, candidates__recruitment_id__closed=False, ).distinct() tasks = [] diff --git a/recruitment/models.py b/recruitment/models.py index c50e1007c..92e433cce 100644 --- a/recruitment/models.py +++ b/recruitment/models.py @@ -325,17 +325,7 @@ class Candidate(models.Model): ], ) sequence = models.IntegerField(null=True, default=0) - offerletter_status = models.CharField( - max_length=20, - choices=[ - ("not_sent", "Not sent"), - ("waiting", "Waiting Confirmation"), - ("accepted", "Accepted / Confirmed"), - ("rejected", "Rejected / Canceled"), - ], - default="not_sent", - editable = False, - ) + probation_end = models.DateField(null=True, editable=False) offer_letter_status = models.CharField( max_length=10, diff --git a/recruitment/templates/dashboard/dashboard.html b/recruitment/templates/dashboard/dashboard.html index fd6b9a4c1..3caeb5804 100644 --- a/recruitment/templates/dashboard/dashboard.html +++ b/recruitment/templates/dashboard/dashboard.html @@ -1,7 +1,7 @@ {% extends 'index.html' %} {% block content %} {% load mathfilters static recruitmentfilters i18n %}