diff --git a/base/views.py b/base/views.py index a496ff664..098784531 100644 --- a/base/views.py +++ b/base/views.py @@ -416,7 +416,7 @@ def home(request): "completed_field_count": "0", }, ) - announcements = Announcement.objects.all().order_by("-created_on") + announcements = Announcement.objects.filter(expire_date__gte = datetime.today()).order_by("-created_on") announcement_list = announcements.filter(employees=request.user.employee_get) announcement_list = announcement_list | announcements.filter(employees__isnull=True) if request.user.has_perm("base.view_announcement"): diff --git a/employee/views.py b/employee/views.py index e4ea229f6..067e96b53 100755 --- a/employee/views.py +++ b/employee/views.py @@ -2919,7 +2919,7 @@ def dashboard_employee_tiles(request): data["total_employees"] = Employee.objects.filter(is_active=True).count() # filtering newbies data["newbies_today"] = Candidate.objects.filter( - joining_date__range=[date.today(), date.today() + timedelta(days=1)] + joining_date__range=[date.today(), date.today() + timedelta(days=1)],is_active=True ).count() try: data[ @@ -2938,7 +2938,7 @@ def dashboard_employee_tiles(request): joining_date__range=[ date.today() - timedelta(days=date.today().weekday()), date.today() + timedelta(days=6 - date.today().weekday()), - ] + ],is_active=True, hired=True ).count() try: data[ diff --git a/onboarding/views.py b/onboarding/views.py index 69f00b4df..6b3859120 100644 --- a/onboarding/views.py +++ b/onboarding/views.py @@ -531,14 +531,17 @@ def candidates_view(request): GET : return candidate view template """ queryset = Candidate.objects.filter( + is_active=True, hired=True, recruitment_id__closed=False, ) - candidate_filter_obj = CandidateFilter() + candidate_filter_obj = CandidateFilter(request.GET, queryset) previous_data = request.GET.urlencode() page_number = request.GET.get("page") - page_obj = paginator_qry(queryset, page_number) + page_obj = paginator_qry(candidate_filter_obj.qs, page_number) mail_templates = RecruitmentMailTemplate.objects.all() + data_dict = parse_qs(previous_data) + get_key_instances(Candidate, data_dict) return render( request, "onboarding/candidates_view.html", @@ -549,6 +552,7 @@ def candidates_view(request): "gp_fields": CandidateReGroup.fields, "mail_templates": mail_templates, "hired_candidates": queryset, + "filter_dict": data_dict }, ) @@ -587,6 +591,7 @@ def candidate_filter(request): GET : return candidate view template """ queryset = Candidate.objects.filter( + is_active=True, hired=True, recruitment_id__closed=False, ) diff --git a/templates/dashboard.html b/templates/dashboard.html index 8d2e99178..0aded4475 100755 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -114,7 +114,7 @@ class="oh-card-dashboard oh-card-dashboard oh-card-dashboard--warning tile" >
@@ -682,21 +682,18 @@
-
+
{% if not announcement %} - -
-
-
{% trans "No Announcements to show." %}
- Page not found. 404. -
+
+
+ Page not found. 404. +
{% trans "No Announcements to show." %}
+
- {% else %} - {% for i in announcement %}
{% if i.expire_date|date:"Y-m-d" >= current_date or i.expire_date == None %} @@ -722,7 +719,6 @@ {% endif %}
{% endfor %} - {% endif %}