Merge branch 'deni-' into 'master'

mgrb

See merge request !635

src/api/index.js

@@ -212,6 +212,7 @@ const create = (type = "") => {
   const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
   const getDashboardUser = () => api.get('transaction/get_dashboard_sub_co')
   const getDashboardMB = (body) => api.get('transaction/get_dashboard_table')
+  const getReportHierarkiFR = (body) => api.post('transaction/db_ratio/get_report_hierarki', body)
 
   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)
@@ -437,7 +438,8 @@ const create = (type = "") => {
     getHierarkiMontlyReport,
     getDetailReportCF,
     getReportHierarkiPL,
-    getMonthlyReportID
+    getMonthlyReportID,
+    getReportHierarkiFR
   }
 }
 

src/container/Laporan/SubHolding.js

@@ -584,8 +584,10 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 4) {
+            let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/db_ratio/export_master_budget?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.lastRevision}`
+            console.log(url);
             let res = await fetch(
-                `https://tia.eksad.com/tia-reporting-dev/public/transaction/db_report_detail/export_master_budget?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.lastRevision}`
+                `https://tia.eksad.com/tia-reporting-dev/public/transaction/db_ratio/export_master_budget?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=${this.state.report.value}&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.lastRevision}`
             )
             res = await res.blob()
             this.setState({ loading: false })
@@ -605,7 +607,7 @@ export default class SubHolding extends Component {
 
     render() {
         const loadingComponent = (
-            <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
+            <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
                     // css={override}
                     size={20}

src/container/MonthlyReport.js

@@ -603,6 +603,7 @@ export default class MonthlyReport extends Component {
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
                         monthlyReportId={this.state.monthlyReportId}
+                        month={this.state.month}
                         // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visibleBS: false, visibleMonthlyReport: true })}
                     // getReport={this.getCompanyActive.bind(this)}

src/container/MonthlyReport/BalanceSheetMR.js

@@ -51,7 +51,8 @@ export default class BalanceSheetMR extends Component {
             "revision": Number(this.props.revision),
             "periode": this.props.periode,
             "company_id": this.props.company.company_id,
-            "monthly_report_id": this.props.monthlyReportId
+            "monthly_report_id": this.props.monthlyReportId,
+            "month": this.props.month.month_id
         }
         api.create().getHierarkiMontlyReport(payload).then(response => {
             console.log(response);