Merge pull request #2258 from gtech-mulearn/dev

Dev Server
gtech-mulearn · Oct 20, 2024 · 3c49f5d · 3c49f5d
2 parents 4c47ecb + e9fd70e
commit 3c49f5d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/api/dashboard/lc/dash_lc_view.py b/api/dashboard/lc/dash_lc_view.py
@@ -877,11 +877,11 @@ def get(self, request, is_user=None):
             .select_related("circle", "circle__org", "circle__ig")
         )
         filters = Q()
-        if district_id := request.data.get("district_id"):
+        if district_id := request.query_params.get("district_id"):
             filters &= Q(circle__org__district_id=district_id)
-        if category := request.data.get("category"):
+        if category := request.query_params.get("category"):
             filters &= Q(circle__ig__category=category)
-        if ig := request.data.get("ig_id"):
+        if ig := request.query_params.get("ig_id"):
             filters &= Q(circle__ig_id=ig)
         try:
             user_id = JWTUtils.fetch_user_id(request)
@@ -1027,7 +1027,7 @@ def get(self, request, meet_id):
                     "muid": attendee[3],
                     "proof_of_work": CircleAttendeeReportSerializer(
                         CircleMeetAttendeeReport.objects.filter(
-                            attendee__user_id=user_id, meet_task__meet_id=meet_id
+                            attendee_id=attendee[0], meet_task__meet_id=meet_id
                         ),
                         many=True,
                     ).data,
@@ -1037,7 +1037,7 @@ def get(self, request, meet_id):
                     CircleMeetAttendees.objects.filter(
                         meet_id=meet_id, joined_at__isnull=False
                     )
-                    .select_related("user", "circle_meet_attendee_report_attendee")
+                    .select_related("user")
                     .values_list(
                         "id",
                         "user__full_name",