[#1089] Fix approval names on "waiting on" column

backend/api/v1/v1_data/serializers.py

@@ -516,13 +516,14 @@ def get_created(self, instance: PendingDataBatch):
     def get_approver(self, instance: PendingDataBatch):
         user: SystemUser = self.context.get("user")
         data = {}
-        approval = (instance.batch_approval.filter(
-            status__in=[
-                DataApprovalStatus.pending, DataApprovalStatus.rejected
-            ],
-        ).order_by("-level__level").first())
+        approval = instance.batch_approval.filter(
+            level__level=user.user_access.administration.level.level - 1
+            if user.user_access.administration.level.level > 1 else 1,
+        ).order_by("-level__level").first()
+        rejected: PendingDataApproval = instance.batch_approval.filter(
+            status=DataApprovalStatus.rejected
+        ).first()
         if approval:
-
             data["id"] = approval.user.pk
             data["name"] = approval.user.get_full_name()
             data["status"] = approval.status
@@ -532,9 +533,10 @@ def get_approver(self, instance: PendingDataBatch):
                 data["allow_approve"] = True
             else:
                 data["allow_approve"] = False
-            rejected: PendingDataApproval = instance.batch_approval.filter(
-                status=DataApprovalStatus.rejected).first()
             if rejected:
+                data["name"] = instance.batch_approval.filter(
+                    level__level=approval.level.level + 1
+                ).first().user.get_full_name()
                 data["rejected"] = {
                     "name":
                     rejected.user.get_full_name(),
@@ -551,7 +553,12 @@ def get_approver(self, instance: PendingDataBatch):
             data["status_text"] = DataApprovalStatus.FieldStr.get(
                 approval.status)
             data["allow_approve"] = True
-
+        final_approved = instance.batch_approval.filter(
+            status=DataApprovalStatus.approved,
+            level__level=1
+        ).count()
+        if final_approved:
+            data["name"] = "-"
         return data
 
     class Meta:

backend/api/v1/v1_data/views.py

@@ -805,7 +805,10 @@ def list_pending_batch(request, version):
         "total_page": ceil(queryset.count() / page_size),
         "batch": ListPendingDataBatchSerializer(
             instance=values, context={
-                'user': user, },
+                'user': user,
+                'approved': approved,
+                'subordinate': subordinate,
+            },
             many=True).data,
     }
     return Response(data, status=status.HTTP_200_OK)

frontend/src/pages/approvals/Approvals.jsx

@@ -60,6 +60,13 @@ const Approvals = () => {
     return items;
   }, [text, user]);
 
+  const finalApproval = useMemo(() => {
+    if (user.role.id === 2 && approvalTab === "approved") {
+      return true;
+    }
+    return false;
+  }, [user, approvalTab]);
+
   useEffect(() => {
     setRole(user?.role?.id);
   }, [user]);
@@ -128,7 +135,11 @@ const Approvals = () => {
             <Table
               dataSource={batches}
               onChange={handleChange}
-              columns={columns}
+              columns={
+                finalApproval
+                  ? columns.filter((c) => c.key !== "waiting_on")
+                  : columns
+              }
               loading={loading}
               pagination={{
                 current: currentPage,