Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1256

src/container/BudgetTahunan/CashFlow.js

@@ -3195,8 +3195,8 @@ export default class CashFlow extends Component {
                                         </div>
                                     </button>
                                 </div>
-                                {this.props.isApprover === true || dataTable2.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') ?
+                                {/* {this.props.isApprover === true || dataTable2.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="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                             <button
                                                 type="button"
@@ -3221,7 +3221,7 @@ export default class CashFlow extends Component {
                                                 </div>
                                             </button>
                                         </div>
-                                        : null}
+                                        {/* // : null} */}
                             </div>
                         </div>
                     </Paper>

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>