Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/container/HomePage.js

@@ -640,13 +640,20 @@ class HomePage extends Component {
                                             <div style={{ display: 'flex', overflowX: 'scroll', width: this.props.width * 0.9 }}>
                                                 {items.category.map((item, index) => {
                                                     return (
-                                                        <div style={{ padding: 10, backgroundColor: '#fff', borderRadius: 6, paddingBottom: 20, margin: 10, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', width: 250, marginRight: index == items.category.length - 1 ? 25 : 0, marginLeft: index == 0 ? 5 : 25 }}>
+                                                        <Link to={{
+                                                            pathname: `/home/cat-dashboard/`,
+                                                            state: {
+                                                                userType: 'user',
+                                                                rawData: { month: this.state.monthCAT.month_id, periode: this.state.periodeCAT.value, companyId: item.company_id }
+                                                            }
+                                                        }}>
+                                                            <div style={{ padding: 10, backgroundColor: '#fff', height: 350, borderRadius: 6, paddingBottom: 20, margin: 10, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', width: 250, marginRight: index == items.category.length - 1 ? 25 : 0, marginLeft: index == 0 ? 5 : 25 }}>
                                                                 {/* <span style={{ fontSize: '17px', color: this.state.selectIndex === index ? '#fff' : '#7e8085', maxWidth: 100 }}>{item.category_name}</span> */}
-                                                            <div style={{ fontSize: '17px', width: '100%' }}>
-                                                                <Typography style={{ textAlign: 'left', color: '#4b4b4b' }}>{titleCase(String(item.category_name).toLocaleLowerCase())}</Typography>
+                                                                <div style={{ fontSize: '17px', width: '100%', height: 25 }}>
+                                                                    <Typography style={{ textAlign: 'left', color: '#4b4b4b' }}>{item.category_name}</Typography>
                                                                 </div>
                                                                 {item.total_kpi != null &&
-                                                                <div style={{ width: '100%', display: 'flex', justifyContent: 'center', marginTop: String(item.category_name).toLocaleLowerCase().includes('internal') ? 0 : 25 }}>
+                                                                    <div style={{ width: '100%', display: 'flex', justifyContent: 'center', marginTop: 10 }}>
                                                                         <span style={{ textAlign: 'center', fontSize: '18px', color: "#fff" }}>{item.total_kpi}</span>
                                                                         {/* <span style={{ textAlign: 'center', fontSize: '11px', color: selectIndex === index ? "#fff" : '#4b4b4b' }}>KPIs</span> */}
                                                                     </div>}
@@ -688,6 +695,7 @@ class HomePage extends Component {
                                                                     }
                                                                 </div>
                                                             </div>
+                                                        </Link>
                                                     )
                                                 })}
                                             </div>
@@ -910,12 +918,12 @@ class HomePage extends Component {
                                                         pathname: `/home/cat-dashboard/`,
                                                         state: {
                                                             userType: 'user',
-                                                            rawData: {month: this.state.monthCAT.month_id, periode: this.state.periodeCAT.value, companyId: item.company_id}
+                                                            rawData: { month: this.state.monthCAT.month_id, periode: this.state.periodeCAT.value, companyId: item.company_id }
                                                         }
                                                     }}>
                                                         <div style={{ padding: 10, backgroundColor: '#fff', height: 350, borderRadius: 6, paddingBottom: 20, margin: 10, boxShadow: '0 1px 4px 0 rgba(0, 0, 0, 0.25)', width: 250, marginRight: index == items.category.length - 1 ? 25 : 0, marginLeft: index == 0 ? 5 : 25 }}>
                                                             {/* <span style={{ fontSize: '17px', color: this.state.selectIndex === index ? '#fff' : '#7e8085', maxWidth: 100 }}>{item.category_name}</span> */}
-                                                            <div style={{ fontSize: '17px', width: '100%', height: 25}}>
+                                                            <div style={{ fontSize: '17px', width: '100%', height: 25 }}>
                                                                 <Typography style={{ textAlign: 'left', color: '#4b4b4b' }}>{item.category_name}</Typography>
                                                             </div>
                                                             {item.total_kpi != null &&

src/container/Laporan/SubHolding.js

@@ -3062,10 +3062,17 @@ export default class SubHolding extends Component {
                 a.click();
             }
         } else if (this.state.report.value === 8) {
+<<<<<<< HEAD
             let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
             console.log(url);
             let res = await fetch(
                 `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+=======
+            let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+            console.log(url);
+            let res = await fetch(
+                `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
+>>>>>>> 4752199b2929e79f17c72bc4f983e9058f435870
             )
             res = await res.blob()
             this.setState({ loading: false })

src/container/MonthlyReport.js

@@ -625,10 +625,8 @@ export default class MonthlyReport extends Component {
                         // // console.log(this.state.lastStatus);
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
-                        // this.getCashFlow(type)
                         // this.getPL(type)
                         if (type != undefined) {
-                            // this.getCashFlow(type)
                             this.getPL(type)
                         } else {
                             this.setState({ loading: false })
@@ -722,6 +720,7 @@ export default class MonthlyReport extends Component {
             visibleBS: false,
             visiblePL: false,
             visibleCAT: false,
+            visibleCF: false,
             visibleFAM: false,
             visibleTP: false,
             visibleLOCF: false,

src/container/MonthlyReport/CashFlowMR.js

@@ -85,7 +85,7 @@ export default class CashFlowMR extends Component {
         // console.log(checkLastStatus)
         // console.log(checkApprover)
         // console.log(checkPrevRev)
-        this.setState({viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev})
+        this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
     }
 
     componentDidMount() {
@@ -717,7 +717,8 @@ export default class CashFlowMR extends Component {
                                         </div>
                                     </button>
                                 </div>
-                                {this.state.viewOnly && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                {this.state.viewOnly &&
+                                    <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                         <button
                                             type="button"
                                             // disabled={this.state.buttonError}
@@ -740,7 +741,8 @@ export default class CashFlowMR extends Component {
                                                 <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save & Complete</Typography>
                                             </div>
                                         </button>
-                                </div>}
+                                    </div>
+                                }
                             </div>
                         </div>
                     </Paper>