Merge branch 'master' into 'herman'

Master

See merge request !894

.env_dev

@@ -2,3 +2,6 @@
 
 REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-dev
 REACT_APP_URL_MAIN_FE=/tia-web-dev
+
+"cpy_file_build_windows" : "robocopy E:\tia-web\src\tia-dev\src E:\tia-web\src /e",
+"cpy_sya_bundar": "public, build, package, packaglock, src to src"
\ No newline at end of file

package.json

@@ -6,10 +6,15 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@date-io/moment": "^2.8.0",
+    "@devexpress/dx-react-chart": "^2.7.3",
+    "@devexpress/dx-react-chart-material-ui": "^2.7.3",
+    "@devexpress/dx-react-core": "^2.7.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@material-ui/pickers": "^3.2.10",
+    "@nivo/bar": "^0.67.0",
+    "@nivo/core": "^0.67.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

src/api/index.js

@@ -24,7 +24,7 @@ const create = (type = "") => {
           'Content-Type': 'application/json',
         },
         // 60 second timeout...
-        timeout: 60000
+        timeout: 180000
       })
       break;
     case 'UPLOAD':
@@ -38,7 +38,7 @@ const create = (type = "") => {
           'Content-Type': 'application/json',
         },
         // 40 second timeout...
-        timeout: 100000
+        timeout: 180000
       })
       break;
     default:
@@ -176,6 +176,7 @@ const create = (type = "") => {
   const getDetailParameter = (id) => api.get(`setting/get_setting_by_id/${id}`)
   const getAllGroup = () => api.get('/setting_group/get_all_setting_group')
   const getParameterByGroup = (groupID) => api.get(`/setting_type/get_all_setting_type_by_group/${groupID}`)
+  const getParameterByGroupName = (groupName) => api.post(`/setting/get_all_setting_by_group_name`, groupName)
   const createParameter = (body) => api.post('setting/create_setting', body)
   const updateParameter = (body) => api.post('setting/update_setting', body)
   const checkUploadParameter = (body) => api.post('setting/check_import', body)
@@ -254,6 +255,7 @@ const create = (type = "") => {
 
   // Monthly
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
+  const getMonthlyOI = (body) => api.post('transaction/monthly_report_oi/get_operating_indicator_id', body)
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report/get_monthly_report_id', body)
   const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
   const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
@@ -530,7 +532,9 @@ const create = (type = "") => {
     getPerBSiMontlyReportLOCF,
     checkUploadMonthlyReportLOCF,
     uploadMonthlyReportLOCF,
-    validateSubmitReportOI
+    validateSubmitReportOI,
+    getMonthlyOI,
+    getParameterByGroupName  
   }
 }
 

src/container/BudgetTahunan.js

@@ -69,7 +69,8 @@ export default class BudgetTahunan extends Component {
             btnApprove: false,
             isAdmin: false,
             btncreate: false,
-            loadview: false
+            loadview: false,
+            permissionhandle: false
         }
         this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
@@ -166,10 +167,12 @@ export default class BudgetTahunan extends Component {
                 if (response.data.status === "success") {
                     // // console.log(response);
                     if (response.data.data.is_approver === true) {
-                        this.setState({ isApprover: true, checkApprover: true }, () =>
-                            this.getPeriode())
+                        this.setState({ isApprover: true, permissionhandle: true, checkApprover: true }, () =>
+                            {
+                                this.getPeriode()
+                            })
                     } else {
-                        this.setState({ isApprover: false, checkApprover: false }, () =>
+                        this.setState({ isApprover: false, permissionhandle: false, checkApprover: false }, () =>
                             this.getDetailUser())
                     }
                 } else {
@@ -489,7 +492,7 @@ export default class BudgetTahunan extends Component {
         let payload = {
             "company_id": this.state.company.company_id,
             "periode": this.state.periode.periode,
-            "is_approver": this.state.isApprover
+            "is_approver": this.state.permissionhandle? this.state.permissionhandle : this.state.isApprover
         }
         api.create().getSubmission(payload).then(response => {
             console.log(response)
@@ -504,11 +507,13 @@ export default class BudgetTahunan extends Component {
                         btnApprove: response.data.data.is_submit,
                         // loading: false
                     }, () => {
-                        // // console.log(this.state.lastStatus);
+                        // console.log(response.data.data.is_submit);
+                        // console.log(this.state.btnApprove)
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
                         api.create().checkApprover().then(response => {
-                            // // console.log(response);
+                            // console.log(this.state.btncreate);
+                            // console.log(this.state.btnedit)
                             if (this.state.btncreate === true && this.state.btnedit === true) {
                                 this.setState({ isApprover: false }, () => {
                                     if (response.data.data.is_approver === true) {
@@ -580,6 +585,7 @@ export default class BudgetTahunan extends Component {
         }
         let payload = {
             "company_id": this.state.company.company_id,
+            "periode": this.state.periode.periode,
             "min_periode": moment(this.state.minDateRevision).format('YYYY-MM-DD'),
             "max_periode": moment(this.state.maxDateRevision).format('YYYY-MM-DD')
         }
@@ -739,9 +745,10 @@ export default class BudgetTahunan extends Component {
         })
         // // console.log(JSON.stringify(data));
         api.create('UPLOAD').createSubmitReport(data).then(response => {
-            // // console.log(response);
+
             if (response.data) {
-                if (response.data.status === "success") {
+                if (response.ok) {
+                    if (response.data.status === 'success') {
                         this.getSubmission()
                     } else {
                         this.setState({ loading: false }, () => {
@@ -750,7 +757,13 @@ export default class BudgetTahunan extends Component {
                         })
                     }
                 } else {
-                this.setState({ loading: false }, () => {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false}, () => {
+                        this.getSubmission()
+                        document.body.style.overflow = 'unset';
+                    })    
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false }, () => {
                     this.getSubmission()
                     document.body.style.overflow = 'unset';
                 })

src/container/BudgetTahunan/BalanceSheet.js

@@ -442,7 +442,7 @@ export default class BalanceSheet extends Component {
                     })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/CashFlow.js

@@ -183,7 +183,7 @@ export default class CashFlow extends Component {
         // } else {
             api.create().getDetailReportCF(payload).then(response => {
                 let dataTable = []
-                // console.log(response)
+                console.log(response)
                 if (response.data) {
                     if (response.ok) {
                         if (response.data.status == 'success') {
@@ -278,7 +278,7 @@ export default class CashFlow extends Component {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                    this.setState({ alert: true, messageAlert: 'Connection Timeout, please check your Connection', tipeAlert: 'error', loading: false })
                 }
             })
         // }

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -195,7 +195,7 @@ export default class FixedAssetsMovement extends Component {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Connection Timeout, please check your Connection', tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -447,7 +447,7 @@ export default class FixedAssetsMovement extends Component {
             } else {
                 // this.setState({ loading: false })
                 // alert(response.problem)
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/ProfitLoss.js

@@ -205,7 +205,7 @@ export default class ProfitLoss extends Component {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Connection Timeout, please check your Connection', tipeAlert: 'error', loading: false })
             }
 
         })
@@ -447,7 +447,7 @@ export default class ProfitLoss extends Component {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+                this.setState({ alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error', loading: false })
             }
         })
     }

src/container/BudgetTahunan/TaxPlanning.js

@@ -230,7 +230,7 @@ export default class TaxPlanning extends Component {
                     })
                 }
             } else {
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                this.setState({ dataTable, loading: false, buttonError: true, editable: true, alert: true, messageAlert: 'Connection Timeout, please check your Connection', tipeAlert: 'error'})
             }
         })
     }
@@ -632,7 +632,7 @@ export default class TaxPlanning extends Component {
                     // alert(response.data.status)
                 }
             } else {
-                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: 'Error saving data. Please try again', tipeAlert: 'error' })
             }
         })
     }

src/container/DocumentManagement/AllDocument.js

@@ -123,7 +123,7 @@ export default class getAllDocument extends Component {
     openPopUp = async (index, val, type) =>{
         if (type === 'download') {
             let res = await fetch(
-                `${process.env.REACT_APP_URL_MAIN_BE}/public/document/download_document?documentName=`+this.state.docPath[val]+"&&fileType="+index[5]
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/document/download_document?documentName=`+this.state.docPath[val]+"&&fileType="+index[6]
             )
             res = await res.blob()
             // console.log(res)

src/container/DocumentManagement/CreateManagementDoc.js

@@ -302,6 +302,7 @@ export default class CreateManagementDoc extends Component {
                 })
             }
         }
+        this.props.handleLoading(0)
     }
 
     deleteFile(e) {

src/container/Home.js

@@ -217,6 +217,11 @@ export default function MiniDrawer() {
             label: 'CAT Dashboard',
             path: 'dashboard-cat',
           },
+          {
+            img: 'beranda',
+            label: 'Financial Dashboard',
+            path: 'dashboard-financial',
+          },
           {
             img: 'beranda',
             label: 'Summary of Triputra Group',

src/container/Laporan/DBTP.js

@@ -841,12 +841,12 @@ export default class DBTP extends Component {
                     {/* {this.state.visibleTP === true ? */}
                         <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                             <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                                <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Historical</Typography>
+                                <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Sub Holding Report</Typography>
                             </div>
                             <div style={{ padding: 20 }}>
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Historical</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Tax Planning - Monthly (Database)</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : 2021 </Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>

src/container/MonthlyReport/CashFlowMR.js

@@ -117,6 +117,23 @@ export default class CashFlowMR extends Component {
         })
     }
 
+    async downloadAllData() {
+        let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_cf/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        console.log(url);
+        let res = await fetch(
+            `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/monthly_report_cf/export_monthly_report?monthly_report_id=${this.props.monthlyReportId === null ? "" : this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
+        )
+        res = await res.blob()
+        this.setState({ loading: false })
+        if (res.size > 0) {
+            let url = window.URL.createObjectURL(res);
+            let a = document.createElement('a');
+            a.href = url;
+            a.download = 'Monthly Report Cash Flow.xlsx';
+            a.click();
+        }
+    }
+
     render() {
         let dataTable2 = this.state.dataTable
 
@@ -410,7 +427,7 @@ export default class CashFlowMR extends Component {
                             <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                 <div>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ width: '50%' }}>
@@ -426,7 +443,7 @@ export default class CashFlowMR extends Component {
                                                 onClick={() =>
                                                     this.setState({ loading: true }, () => {
                                                         setTimeout(() => {
-                                                            // this.downloadAllData()
+                                                            this.downloadAllData()
                                                         }, 100);
                                                     })}
                                             >
@@ -452,7 +469,7 @@ export default class CashFlowMR extends Component {
                             {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                 (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
                             <div className="grid grid-2x" style={{ marginTop: 20 }}>
-                                <div className="col-1">
+                                <div className="col-1" style={{ paddingLeft: 0 }}>
                                     <button
                                         type="button"
                                         onClick={() => this.setState({ loading: true }, () => {

src/container/SummaryTriputra/SummaryOfTriputra.js

@@ -26,7 +26,6 @@ export default class SummaryOfTriputra extends Component {
                 { value: 2, label: 'YTD Report' },
                 { value: 3, label: 'CPSM Report' },
                 { value: 4, label: 'Historical' },
-                { value: 5, label: 'Dashboard Financial' },
             ],
             report: null,
             loading: false,
@@ -233,6 +232,7 @@ export default class SummaryOfTriputra extends Component {
         if (this.state.report.value === 1) {
             api.create().getDetailReportMB(payload).then(response => {
                 // console.log(response);
+                // console.log(payload)
                 let dataTable = []
                 if (response.data) {
                     let res = response.data.data

src/router/homeRoutes.js

@@ -10,6 +10,7 @@ import UnitBisnis from '../container/MasterData/UnitBisnis'
 import Parameter from '../container/MasterData/Parameter/Parameter'
 import ReportItems from '../container/MasterData/ReportItems'
 import DashboardCAT from '../container/Laporan/DashboardCAT'
+import DashboardFinancial from '../container/Laporan/DashboardFinancial'
 import BudgetTahunan from '../container/BudgetTahunan';
 import RollingOutlook from '../container/RollingOutlook';
 import OperatingIndicator from '../container/OprIndicator/OperatingIndicator'
@@ -96,6 +97,10 @@ const routes = [
     path: "/home/summary-of-triputra",
     main: SummaryTriputra
   },
+  {
+    path: "/home/dashboard-financial",
+    main: DashboardFinancial
+  },
   {
     path: "*",
     main: screen404