Merge branch 'GGMAC' into 'master'

handle q1 approve

See merge request !1451

src/container/RollingOutlook.js

@@ -265,7 +265,7 @@ export default class RollingOutlook extends Component {
                             item.number,
                             item.report_name,
                             item.revision,
-                            this.state.isSubmit === false ? "CLOSED" : item.current_status,
+                            this.state.quarter.value == 'q1' && !this.state.isApprovedMB? "CLOSED" : (this.state.quarter.value != 'q1' && !this.state.isApprovedRO ? "CLOSED" : (this.state.isSubmit === false ? "CLOSED" : item.current_status)),
                             item.report_id,
                             // Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
                             item.report_name === "Cash Flow" ? item.is_can_upload : (Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload),
@@ -540,7 +540,11 @@ export default class RollingOutlook extends Component {
                         lastStatus: response.data.data.last_status === null ? 'SUBMIT' : response.data.data.last_status,
                         loading: false,
                         lastRevision: response.data.data.last_revision,
-                        btnApprove: response.data.data.is_submit
+                        btnApprove: response.data.data.is_submit,
+                        isApprovedMB: response.data.data.is_approved_master_budget,
+                        isApprovedRO: response.data.data.is_approved_rolling_before,
+                        msgApproveMB: response.data.data.message_approval_master_budget,
+                        msgApproveRO: response.data.data.message_approval_rolling_outlook
                     }, () => {
                         console.log(this.state.lastStatus);
                         this.historyApproval()
@@ -1768,6 +1772,16 @@ export default class RollingOutlook extends Component {
                                             </div>
                                         )}
                                     </div>
+                                    {this.state.quarter != null && this.state.quarter.value == 'q1' && this.state.isApprovedMB === false && (
+                                        <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                            <span>{this.state.msgApproveMB}</span>
+                                        </div>
+                                    )}
+                                    {this.state.quarter != null && this.state.quarter.value != 'q1' && this.state.isApprovedRO === false && (
+                                        <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                            <span>{this.state.msgApproveRO}</span>
+                                        </div>
+                                    )}
                                     {this.state.checkApprover === true ?
                                         this.state.lastStatus === 'WAITING FOR REVIEW' ?
                                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
@@ -1775,7 +1789,16 @@ export default class RollingOutlook extends Component {
                                             </div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ?
                                                 <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
                                                     <span>{this.state.lastStatus}</span>
-                                                </div> : null
+                                                </div> : this.state.lastStatus === 'WAITING FOR APPROVAL' ?
+                                                    <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                        <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
+                                                    </div> : this.state.lastStatus === 'REVISION' ?
+                                                        <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                            <span>{this.state.textRevision}</span>
+                                                        </div> : this.state.lastStatus === 'APPROVED' ?
+                                                            <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
+                                                                <span>{`${this.state.lastStatus}`}</span>
+                                                            </div> : null
                                         :
                                         this.state.lastStatus === 'SUBMITTED' ?
                                             <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
@@ -2008,6 +2031,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}
                     />
                 )}