Fix bug hiding assigned public shifts

magfest · Nov 6, 2024 · 8c66450 · 8c66450
1 parent 64d50ca
commit 8c66450
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/uber/site_sections/staffing.py b/uber/site_sections/staffing.py
@@ -247,7 +247,7 @@ def shifts(self, session, view='', start='', all=''):
                 event_dates.append(day.strftime('%Y-%m-%d'))
             day += timedelta(days=1)
 
-        default_filters = []
+        default_filters = [{'id': 'public_assigned', 'title': "Assigned Shifts (Public)"}]
         for department in volunteer.assigned_depts:
             default_filters.append({
                 'id': department.id,
@@ -321,9 +321,13 @@ def get_assigned_jobs(self, session, **params):
 
         for shift in volunteer.shifts:
             job = shift.job
+            if job.is_public and job.department_id not in set(volunteer.assigned_depts_ids):
+                resource_id = "public_assigned"
+            else:
+                resource_id = job.department_id
             event_list.append({
                 'id': shift.id,
-                'resourceIds': [job.department_id],
+                'resourceIds': [resource_id],
                 'allDay': False,
                 'start': job.start_time_local.isoformat(),
                 'end': job.end_time_local.isoformat(),