Merge branch 'staging' into dev-wahyun

src/views/SimproV2/CreatedProyek/ReportAnalysis.js

@@ -36,7 +36,10 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
   };
 
   const columns = [
-    {title: "Activity Name", dataIndex: "name", key: "name"}
+    {title: "Activity", dataIndex: "name", key: "name"},
+    {title: "Gantt", dataIndex: "name_version", key: "name_version"},
+    {title: "Assign HR", dataIndex: "user_name", key: "user_name"},
+    {title: "Progress (%)", dataIndex: "persentase_progress", key: "persentase_progress"},
   ]
 
   const columnActivityToHr = [
@@ -150,13 +153,19 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
           value: search,
           operator: "AND",
         },
+        {
+          name: "proyek_id",
+          logic_operator: "=",
+          value: projectId,
+          operator: "AND",
+        },
       ],
       orders: { columns: ["id"], ascending: false },
       paging: { start: 0, length: -1 },
     };
 
     const result = await axios
-      .post(`${BASE_SIMPRO_LUMEN}/activity/search`, payload, HEADER)
+      .post(`${BASE_SIMPRO_LUMEN}/activity/search-analysis`, payload, HEADER)
       .then((res) => res)
       .catch((error) => error.response);