Merge branch 'GGMAC' into 'master'

siap

See merge request !1338

src/container/RollingOutlook.js

@@ -252,12 +252,24 @@ export default class RollingOutlook extends Component {
             "report_type": "Rolling Outlook",
             "quartal": this.state.quarter.value
         }
+        let dataHardcode = []
         api.create().getRollingOutlookReport(payload).then(response => {
             console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
                     let dataTable = response.data.data.map((item, index) => {
-                        return [
+                        if (item.report_name =='CAT') {
+                            dataHardcode.push([
+                                item.number,
+                                'Cash Flow',
+                                item.revision,
+                                this.state.isSubmit === false ? "CLOSED" : item.current_status,
+                                999,
+                                Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
+                                item.revision
+                            ])
+                        }
+                        dataHardcode.push([
                             item.number,
                             item.report_name,
                             item.revision,
@@ -265,7 +277,16 @@ export default class RollingOutlook extends Component {
                             item.report_id,
                             Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
                             item.revision
-                        ]
+                        ])
+                        // return [
+                        //     item.number,
+                        //     item.report_name,
+                        //     item.revision,
+                        //     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.revision
+                        // ]
                     })
                     let dataTableRevision = response.data.data.map((item, index) => {
                         return [
@@ -275,7 +296,7 @@ export default class RollingOutlook extends Component {
                         ]
                     })
                     // console.log(dataTable);
-                    this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data })
+                    this.setState({ dataTable: dataHardcode, loading: false, dataTableRevision, dataForRevision: response.data.data })
                 }
             } else {
                 this.setState({ loading: false })