Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Fix rooling outlook

See merge request !2413

src/container/RollingOutlook/RollingOutlook.js

@@ -748,7 +748,7 @@ export default class RollingOutlook extends Component {
                             if (response.data.data.is_approver === true) {
                                 this.setState({ isApprover: true, checkApprover: true, isApproverFinance: response.data.data.is_finance, isApproverCAT: response.data.data.is_cat, })
                             } else {
-                                this.setState({ isApprover: this.state.lastStatus === 'SUBMITTED' ? true : false, checkApprover: false, isApproverFinance: false, isApproverCAT: false, })
+                                this.setState({ checkApprover: false, isApproverFinance: false, isApproverCAT: false, })
                             }
 
                         })
@@ -890,6 +890,7 @@ export default class RollingOutlook extends Component {
             status: status,
             tableKey
         }, () => {
+            const _isApprover = this.getLastStatus() === 'SUBMITTED'
             if (item === 'Balance Sheet') {
                 this.setState({
                     visibleRollingOutlook: false,
@@ -898,6 +899,7 @@ export default class RollingOutlook extends Component {
                     visibleCAT: false,
                     visibleTP: false,
                     visibleCF: false,
+                    isApprover:  _isApprover
                 })
             } else if (item === 'Profit Loss') {
                 this.setState({
@@ -907,6 +909,7 @@ export default class RollingOutlook extends Component {
                     visibleCAT: false,
                     visibleTP: false,
                     visibleCF: false,
+                    isApprover:  _isApprover
                 })
             } else if (item === 'Cash Flow') {
                 this.setState({
@@ -916,6 +919,7 @@ export default class RollingOutlook extends Component {
                     visibleCAT: false,
                     visibleTP: false,
                     visibleCF: true,
+                    isApprover:  _isApprover
                 })
             } else if (item === 'Tax Planning') {
                 this.setState({
@@ -934,6 +938,7 @@ export default class RollingOutlook extends Component {
                     visibleCAT: true,
                     visibleTP: false,
                     visibleCF: false,
+                    isApprover:  _isApprover
                 })
             }
         })
@@ -2722,7 +2727,7 @@ export default class RollingOutlook extends Component {
                         quarter={this.state.quarter.value}
                         isApprover={this.state.isApprover}
                         prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
-                        PLBSFAMSubmitted={this.state.lastStatus == 'APPROVED' ? true : false}
+                        PLBSFAMSubmitted={this.getLastStatus() === 'APPROVED' ? true : false}
                     />
                 )}