push dulu

src/api/index.js

@@ -210,6 +210,7 @@ const create = (type = "") => {
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getDashboard = (body) => api.get('transaction/get_dashboard')
   const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
+  const getDashboardUser = () => api.get('transaction/get_dashboard_sub_co')
 
   const getOpetratingIndID = (body) => api.post('transaction/operating_indicator/get_operating_indicator_id', body)
   const getSubmitOI = (body) => api.post('transaction/operating_indicator/get_latest_periode_submit', body)
@@ -421,7 +422,8 @@ const create = (type = "") => {
     checkApproverOLPA,
     getLastPeriodeOI,
     getSubmitOI,
-    getLastPeriodOI
+    getLastPeriodOI,
+    getDashboardUser
   }
 }
 

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -512,10 +512,15 @@ export default class FixedAssetsMovement extends Component {
                     } else {
                         // console.log(item)
                         let indexID = dataTable2.findIndex((val) => val[22] == item)
-                        // console.log(dataTable2[indexID][tableMeta.columnIndex])
+                        // console.log(dataTable2[indexID])
                         if (indexID !== -1) {
                             let valuezz = dataTable2[indexID][tableMeta.columnIndex].value == undefined ? dataTable2[indexID][tableMeta.columnIndex] : dataTable2[indexID][tableMeta.columnIndex].value
                             anjay.push(valuezz == "" ? 0 : valuezz)
+                        } else {
+                            if (item === '(-1)') {
+                                anjay.push(-1)
+                            }
+                            // console.log(item);
                         }
                     }
                 }

src/container/HomePage.js

@@ -22,6 +22,8 @@ class HomePage extends Component {
                 { nama: 'Dharma Group', status: 'overdue' },
                 { nama: 'Daya Group', status: 'open' },
             ],
+            listSubcoMB: [],
+            valueSubmit: 0,
             isApprover: true
         }
     }
@@ -47,6 +49,7 @@ class HomePage extends Component {
         //     }
         // })
         this.getApprMat()
+        this.getListUserSubco()
     }
 
     componentDidUpdate() {
@@ -56,6 +59,26 @@ class HomePage extends Component {
         }
     }
 
+    getListUserSubco() {
+        api.create().getDashboardUser().then(response => {
+            console.log(response);
+            let valueSubmit = 0
+            if (response.data) {
+                if (response.data.status === "success") {
+                    response.data.data.map((item, index) => {
+                        if (item.is_submit === true) {
+                            valueSubmit += 1
+                        }
+                    })
+                    this.setState({
+                        listSubcoMB: response.data.data,
+                        valueSubmit
+                    })
+                }
+            }
+        })
+    }
+
     getDashboard() {
         let listDashboard = []
         api.create().getDashboard().then((response) => {
@@ -74,14 +97,14 @@ class HomePage extends Component {
         api.create().getAM().then((response) => {
             console.log(response);
             let actAM = response.data.data.map((item, index) => {
-                if(String(item.status).toLocaleLowerCase() == 'active'){
+                if (String(item.status).toLocaleLowerCase() == 'active') {
                     return item
 
                 }
             })
             let userId = localStorage.getItem(Constant.USER)
             let indexId = actAM.findIndex((val) => val.user_id == userId)
-            if (indexId === -1){
+            if (indexId === -1) {
                 this.setState({ isApprover: false })
             }
             console.log(actAM)
@@ -188,7 +211,7 @@ class HomePage extends Component {
                                     />
                                 </MuiThemeProvider>
                             </div>
-                            <div style={{ marginTop: 20 }}>
+                            {/* <div style={{ marginTop: 20 }}>
                                 <Typography style={{ color: '#656565', fontSize: '16px', fontWeight: 'bold' }}>Status Laporan</Typography>
                                 <div style={{ marginTop: 10, display: 'flex' }}>
                                     <div style={{ width: 280, height: 400, padding: 20, backgroundColor: 'white', borderRadius: 6, border: 'solid 1px #c4c4c4', marginRight: 25 }}>
@@ -315,7 +338,7 @@ class HomePage extends Component {
                                         </div>
                                     </div>
                                 </div>
-                            </div>
+                            </div> */}
                         </div>
                     </div>
                     :
@@ -329,16 +352,33 @@ class HomePage extends Component {
                             </div>
                         </div>
                         <div style={{ flex: 1, padding: 20, width: '100%' }}>
-                            <Paper style={{ width: 400, padding: 20, borderRadius: 10 }}>
-                                <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>Master Budget - Oct 2020 (1/4)</Typography>
-                                {this.state.listMasterBudget.map((item, index) => {
+                            <Paper style={{ width: 450, padding: 20, borderRadius: 10 }}>
+                                <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>{`Master Budget ${this.state.valueSubmit}/${this.state.listSubcoMB.length}`}</Typography>
+                                {this.state.listSubcoMB.map((item, index) => {
                                     return (
                                         <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 10, paddingLeft: 10 }}>
                                             <div style={{ display: 'flex' }}>
-                                                <img src={item.status === "overdue" ? Images.dotOverdue : item.status === "open" ? Images.dotOpen : Images.dotDone} />
-                                                <Typography style={{ marginLeft: 10, color: '#5198ea', fontSize: 13 }}>{item.nama}</Typography>
+                                                <img src={item.is_submit === true ? Images.dotDone : item.is_overdue === true ? Images.dotOverdue : Images.dotOpen} />
+                                                <Link to={{
+                                                    pathname: `/home/master-budget/`,
+                                                    state: {
+                                                        userType: 'user',
+                                                        rawData: item
+                                                    }
+                                                }}>
+                                                    <button
+                                                        style={{
+                                                            backgroundColor: 'transparent',
+                                                            cursor: 'pointer',
+                                                            borderColor: 'transparent',
+                                                            margin: 5,
+                                                            outline: 'none'
+                                                        }}>
+                                                        <Typography style={{ marginLeft: 10, color: '#5198ea', fontSize: 13 }}>{item.company_name}</Typography>
+                                                    </button>
+                                                </Link>
                                             </div>
-                                            {item.status === 'overdue' && (
+                                            {item.is_overdue && (
                                                 <div style={{ backgroundColor: '#f65a4c', paddingRight: 5, paddingLeft: 5, borderRadius: 5, alignSelf: 'center' }}>
                                                     <Typography style={{ fontSize: 11, color: '#fff' }}>Overdue</Typography>
                                                 </div>