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

src/container/MonthlyReport.js

@@ -632,7 +632,6 @@ export default class MonthlyReport extends Component {
                         } else {
                             this.setState({ loading: false })
                         }
-
                         // this.getFR(type)
                         // this.getReport()
                         // this.getReportAttachment()
@@ -1505,6 +1504,7 @@ export default class MonthlyReport extends Component {
                                     }
                                 }
                             })
+                            console.log(JSON.stringify(dataTable))
                             console.log(dataTable)
                             this.setState({ dbPL: dataTable }, () => {
                                 this.olahDataPL(this.state.dbPL, type)
@@ -2164,16 +2164,20 @@ export default class MonthlyReport extends Component {
                                         borderColor: 'transparent'
                                     }}
                                     onClick={() =>
+                                        this.state.periode.periode <= 2020?
+                                        this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
+                                        :
+                                        
                                         // {
-                                        tableMeta.rowData[5] ?
+                                        (tableMeta.rowData[5] ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                            : null
+                                            : null)
                                         // console.log(tableMeta.rowData)
                                         // }
 
                                     }
                                 >
-                                    <Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
+                                    <Typography style={{ color: this.state.periode.periode <= 2020 || tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
                                 </button>
                             </div >
                         );
@@ -2952,6 +2956,8 @@ export default class MonthlyReport extends Component {
                         onClickClose={() => this.setState({ visibleCAT: false, visibleMonthlyReport: true })}
                         isApprover={this.state.isApprover}
                         status={this.state.status}
+                        // status={'not-yet'}
+                        // lastStatus={'SUBMIT'}
                         lastStatus={this.state.lastStatus}
                         prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
                     />
@@ -3007,10 +3013,12 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         onClickClose={() => this.setState({ visibleCF: false, visibleMonthlyReport: true })}
                         status={this.state.status}
+                        // status={'not-yet'}
                         lastStatus={this.state.lastStatus}
                         isApprover={this.state.isApprover}
                         prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
                         PLBSFAMSubmitted={this.state.lastStatus == 'APPROVED'? true : false}
+                        // PLBSFAMSubmitted={false}
                         createCashFlow={this.createCashFlow.bind(this)}
                     />
                 )}

src/container/RollingOutlook/TaxPlanningRO.js

@@ -334,7 +334,7 @@ export default class TaxPlanning extends Component {
                     fcp: i[2] === 3 && i[10].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[10].fcp.value) : String(i[10].fcp),
                     tbf: i[3] === 3 && i[10].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[10].tbf.value) : String(i[10].tbf)
                 },
-                maret: {
+                march: {
                     tbc: i[1] === 3 && i[11].tbc === "" ? "0" : i[1] === 5 || i[1] === 6 || i[1] === 7 ? String(i[11].tbc.value) : String(i[11].tbc),
                     fcp: i[2] === 3 && i[11].fcp === "" ? "0" : i[2] === 5 || i[2] === 6 || i[2] === 7 ? String(i[11].fcp.value) : String(i[11].fcp),
                     tbf: i[3] === 3 && i[11].tbf === "" ? "0" : i[3] === 5 || i[3] === 6 || i[3] === 7 ? String(i[11].tbf.value) : String(i[11].tbf)