update report analysis hr

src/views/SimproV2/CreatedProyek/ReportAnalysis.js

@@ -61,12 +61,16 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
   ]
 
   const columnActivityToHr = [
-    {title: "Activity", dataIndex: "join_third_name", key: "join_third_name"},
-    {title: "Human Resource", dataIndex: "join_second_name", key: "join_second_name"},
-    {title: "Report Date", dataIndex: "report_date", key: "report_date"},
-    {title: "Volume Actual", dataIndex: "qty", key: "qty"},
-    {title: "Volume Planned", dataIndex: "join_first_qty_planning", key: "join_first_qty_planning"},
-    {title: "Description", dataIndex: "description", key: "description"},
+    {title: "Activity", dataIndex: "join_second_name", key: "join_second_name"},
+    {title: "Gantt", dataIndex: "join_fourth_name_version", key: "join_fourth_name_version"},
+    {title: "Assign HR", dataIndex: "join_first_name", key: "join_first_name"},
+    {title: "Material Plan", dataIndex: "join_third_qty_planning", key: "join_third_qty_planning",
+    render: (text, record) =>
+          <>
+            {text ? text : 0}
+          </>
+    },
+    {title: "Progress (%)", dataIndex: "join_second_persentase_progress", key: "persentase_progress"},
     {
         title: 'Action',
         dataIndex: '',
@@ -159,11 +163,6 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
         }
       ],
       joins: [
-        {
-          name: "assign_material_to_activity",
-          column_join: "assign_material_id",
-          column_results: ["qty_planning"]
-        },
         {
           name: "m_users",
           column_join: "user_id",
@@ -173,14 +172,28 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) =>
           name: "m_activity",
           column_join: "activity_id",
           column_results: ["name", "persentase_progress"]
-        }
+        },
+        {
+          name1: "m_activity",
+          name: "assign_material_to_activity",
+          column_join: "id",
+          column_self:"activity_id",
+          column_results: ["qty_planning"]
+        },
+        {
+          name1: "m_activity",
+          name: "m_version_gantt",
+          column_join: "version_gantt_id",
+          column_self:"id",
+          column_results: ["name_version"]
+        },
       ],
       orders: { columns: ["id"], ascending: false },
       paging: { start: 0, length: -1 },
     };
 
     const result = await axios
-      .post(`${BASE_SIMPRO_LUMEN}/report-activity-material/search`, payload, HEADER)
+      .post(`${BASE_SIMPRO_LUMEN}/user-to-activity/search-analysis`, payload, HEADER)
       .then((res) => res)
       .catch((error) => error.response);