[UPDT] DASHBOARD: Fixed dashboard tile calculation and empty page for announcement

2024-03-25 16:16:45 +05:30
parent 90c44a0ffa
commit ed7e4bb72f
4 changed files with 17 additions and 16 deletions
--- 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"):