Merge branch 'staging' of https://git.oslog.id/ordo/adw-frontend

src/views/Dashboard/DashboardBOD.js

@@ -666,8 +666,8 @@ const DashboardBOD = () => {
 											label: "",
 											// data: [50, 120, 72, 60],
 											data: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.total).filter(value => value !== 0) : [],
-											borderColor: ["#023E8A", "#C851B7", "#FD7034", "#3A0CA3", "#A36A16"],
+											borderColor: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.color) : [],
-											backgroundColor: ["#023E8A", "#C851B7", "#FD7034", "#3A0CA3", "#A36A16"],
+											backgroundColor: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.color) : [],
 											borderWidth: 2,
 											borderSkipped: false
 										},

src/views/Dashboard/DashboardProject.js

@@ -1018,7 +1018,7 @@ const DashboardProject = () => {
             </Col>
           </Row>
           <Row>
-            <Col span={8}>
+            <Col span={24}>
               <div
                 style={{
                   border: "solid",
@@ -1143,7 +1143,7 @@ const DashboardProject = () => {
                 </div>
               </div>
             </Col>
-            <Col span={16}>
+            {/* <Col span={16}>
               <div
                 style={{
                   border: "solid",
@@ -1366,7 +1366,7 @@ const DashboardProject = () => {
                   </div>
                 </div>
               </div>
-            </Col>
+            </Col> */}
           </Row>
           <div
             style={{
@@ -1553,7 +1553,7 @@ const DashboardProject = () => {
                 </Row>
               </Col>
             </Row>
-            <Row>
+            {/* <Row>
               <Col span={24}>
                 <div
                   style={{
@@ -1565,12 +1565,12 @@ const DashboardProject = () => {
                     marginBottom: 5,
                     marginRight: 2,
                   }}
-                >
+                > */}
                   {/* <div style={{color: '#000000', textAlign: 'center', marginBottom: 10, fontWeight: 'bold', fontSize: 12}}>Health By Schedule</div>
                                 <div style={{backgroundColor: '#52AC0B', color: '#FFFFFF', padding: 5, borderRadius: 10, marginBottom: 10}}>
                                     <div style={{textAlign: 'center', fontWeight: 500, fontSize: 12}}>On Budget</div>
                                 </div> */}
-                  <Row>
+                  {/* <Row>
                     <Col span={12}>Total Invoice</Col>
                     <Col span={12} style={{ textAlign: "right" }}>
                       {isReadyIntegrationInvoice ? (
@@ -1626,7 +1626,7 @@ const DashboardProject = () => {
                   </Row>
                 </div>
               </Col>
-            </Row>
+            </Row> */}
             <Row>
               <Col span={24}>
                 <div

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);