Merge branch 'faisal' into 'master'

progressreport!

See merge request !1511

src/container/Home.js

@@ -567,7 +567,7 @@ export default function MiniDrawer() {
               }
             </div>
           ))}
-          <Link to={`${url}/progress-reports`}>
+          {/* <Link to={`${url}/progress-reports`}>
             <div style={{ paddingLeft: 5 }} className={selectedIndex === 'progress-reports' ? "active" : ""}>
               <a data-tip={'progress-reports'} data-for={'progress-reports'}>
                 <ListItem button key={'progress-reports'} onClick={() => selectIndex('progress-reports')}>
@@ -577,7 +577,7 @@ export default function MiniDrawer() {
               </a>
               {!open && (<ReactTooltip border={true} id={'Progress Report'} place="bottom" type="light" effect="solid" />)}
             </div>
-          </Link>
+          </Link> */}
         </List>
         {open && setting.length > 0 &&
           <div style={{ marginLeft: 20 }}>

src/container/ProgressReport.js → src/container/Progress/ProgressReport.js

 import React, { Component } from 'react';
 import { Typography, MuiThemeProvider, createMuiTheme, Paper, TextField } from '@material-ui/core';
 import MUIDataTable from "mui-datatables";
-import Images from '../assets/Images';
+import Images from '../../assets/Images';
 import DonutChart from 'react-d3-donut';
-import Constant from '../library/Constant';
-import api from '../api';
+import Constant from '../../library/Constant';
+import api from '../../api';
 import { Link } from 'react-router-dom';
 import { PropagateLoader } from 'react-spinners';
-import { titleCase } from '../library/Utils';
+import { titleCase } from '../../library/Utils';
 import { format } from 'date-fns';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import ReactSpeedometer from 'react-d3-speedometer';
+import TableProgressReport from './TableProgressReport'
 
-var ct = require("../library/CustomTable");
+var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
 
 class ReportProgress extends Component {
@@ -156,6 +157,12 @@ class ReportProgress extends Component {
     }
 
     render() {
+
+        const dataTable = [
+            ['Tax Planning', '2', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03'],
+            ['CAT', '1', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03' ],
+            ['Profit Loss', '0', 'ABA: Anugerah Buminusantara Abadi', '2021-05-03']
+        ]
         const loadingComponent = (
             <div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
                 <PropagateLoader
@@ -166,6 +173,7 @@ class ReportProgress extends Component {
                 />
             </div>
         );
+
         return (
             <div style={{ flex: 1, backgroundColor: '#f8f8f8', minHeight: this.props.height }}>
                 <div>
@@ -274,21 +282,20 @@ class ReportProgress extends Component {
                                     )}
                                 </div> */}
                                 {this.state.loading && loadingComponent}
-                                {/* {this.state.previewTable && (
-                                    <TableSubHolding
+                                {/* {this.state.previewTable && ( */}
+                                    <TableProgressReport
                                         width={this.props.width}
                                         height={this.props.height}
                                         open={this.props.open}
-                                        month={this.state.month.month_value}
-                                        approvedMB={this.state.approveMB}
-                                        approveMonthly={this.state.approveMonthly}
+                                        // month={this.state.month.month_value}
                                         type={this.state.report ? this.state.report.value : 1}
-                                        dataTable={this.state.dataTable}
+                                        dataTable={dataTable}
+                                        // dataTable={this.state.dataTable}
                                         periode={this.state.periode ? this.state.periode.periode : null}
                                         quarter={this.state.quarter.name}
                                         company={this.state.company}
                                     />
-                                )} */}
+                                {/* )} */}
                             </div>
                         </Paper>
                     </div>

src/router/homeRoutes.js

@@ -20,7 +20,7 @@ import OutlookPA from '../container/OutlookPA';
 import SubHolding from '../container/Laporan/SubHolding';
 import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra';
 import MasterDataCAT from '../container/MasterData/MasterDataCAT/MasterDataCAT'
-import ProgressReport from '../container/ProgressReport'
+import ProgressReport from '../container/Progress/ProgressReport'
 
 const routes = [
   {