From 2fd03fccb60ae15d0adc7bfa81871e78c838646d Mon Sep 17 00:00:00 2001
From: ardhi <ardhi.irfan.syabani@gmail.com>
Date: Tue, 7 Mar 2023 16:38:11 +0700
Subject: [PATCH 1/2] fix multiple image in report k3

---
 src/views/Report/k3/DialogForm.js | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/views/Report/k3/DialogForm.js b/src/views/Report/k3/DialogForm.js
index b6e5d2d..95640d7 100644
--- a/src/views/Report/k3/DialogForm.js
+++ b/src/views/Report/k3/DialogForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
-import { Col, Row, Button, Form, FormGroup, Label, Input } from 'reactstrap';
-import { Image } from 'antd';
+import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
+import { Image, Col, Row } from 'antd';
 import 'antd/dist/antd.css';
 import { BASE_SIMPRO_LUMEN_IMAGE } from '../../../const/ApiConst.js';
 export default class DialogForm extends Component {
@@ -43,12 +43,25 @@ export default class DialogForm extends Component {
   }
 
   renderForm = () => {
+    const { dataImage } = this.props;
     return(
-      <div style={{width:"100%",display:'flex',justifyContent:'center',textAlign:'center'}}>
-          <Image
-            width={200}
-            src={`${BASE_SIMPRO_LUMEN_IMAGE}/${this.state.url}`}
-          />
+      <div style={{justifyContent:'center'}}>
+        <Row gutter={[16, 16]}>
+          <Image.PreviewGroup>
+          {
+            dataImage && dataImage.length > 0 && dataImage.map((item, idx) => 
+              <Col span={8}>
+                <Image
+                  style={{width: 150, height: 200}}
+                  src={`${BASE_SIMPRO_LUMEN_IMAGE}/${item.image}`}
+                />
+              </Col>
+            )
+          }
+          </Image.PreviewGroup>
+
+          { !dataImage || (dataImage && dataImage.length < 1) && <div style={{textAlign: 'center', color: 'red', flex: 1, padding: 20}}>No image available</div> }
+        </Row>
       </div>
     )
   }
@@ -63,7 +76,7 @@ export default class DialogForm extends Component {
         : null}
         </ModalBody>
         <ModalFooter>
-          <Button color="secondary" onClick={() => this.handleCancel()}>Close</Button>
+          
         </ModalFooter>
       </Modal>
     )

From 4ba92aba2f89d9de7b4664517559534d43388a53 Mon Sep 17 00:00:00 2001
From: ardhi <ardhi.irfan.syabani@gmail.com>
Date: Tue, 14 Mar 2023 11:48:02 +0700
Subject: [PATCH 2/2] fix dashboard BOD (add year in endpoint api)

---
 src/views/Dashboard/DashboardBOD.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Dashboard/DashboardBOD.js b/src/views/Dashboard/DashboardBOD.js
index 13ca274..4e1122e 100644
--- a/src/views/Dashboard/DashboardBOD.js
+++ b/src/views/Dashboard/DashboardBOD.js
@@ -61,7 +61,7 @@ const DashboardBOD = () => {
 
 	// project expenditure
 	const getCompanyCashFlow = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-company-cashflow`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-company-cashflow/${moment().format('YYYY')}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project Expenditure.";
 
@@ -250,7 +250,7 @@ const DashboardBOD = () => {
 	}
 
 	const getTotalProjectValuePerDivision = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-value-per-division`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-value-per-division/${moment().format('YYYY')}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project Value by Division";