Merge branch 'rifka' into 'master'

home if else approver

See merge request !1364

src/container/HomePage.js

@@ -558,6 +558,10 @@ class HomePage extends Component {
         let rawData = []
         api.create().getDashboard().then((response) => {
             console.log(response);
+            console.log(this.state.isApproverMB);
+            console.log(this.state.isApproverMR);
+            console.log(this.state.isApproverRO);
+            console.log(this.state.isApproverOL);
             if (String(response.data.status).toLocaleLowerCase() == 'success') {
                 let data = response.data.data
                 data.map((item, index) => {
@@ -569,26 +573,39 @@ class HomePage extends Component {
                         } else if (String(item.type_report).toLocaleLowerCase().includes("monthly")) {
                             listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
                             rawData.push(item)
-                        } else if (String(item.type_report).toLocaleLowerCase().includes("outlook")) {
+                        } else if (String(item.type_report).toLocaleLowerCase().includes("rolling")) {
+                            listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
+                            rawData.push(item)
+                        } else if (String(item.type_report).toLocaleLowerCase().includes("pa")) {
                             listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
                             rawData.push(item)
                         } 
-                    } else if (this.state.isApproverMB) {
+                    } else {
+                        if (this.state.isApproverMB) {
                             if (String(item.type_report).toLocaleLowerCase().includes("master")) {
                                 listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} - ${item.periode}`, item.revision, item.status, statusConvert])
                                 rawData.push(item)
                             }
-                    } else if (this.state.isApproverMR) {
+                        } 
+                        if (this.state.isApproverMR) {
                             if (String(item.type_report).toLocaleLowerCase().includes("monthly")) {
                                 listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
                                 rawData.push(item)
                             }
-                    } else if (this.state.isApproverRO || this.state.isApproverOL) {
-                        if (String(item.type_report).toLocaleLowerCase().includes("outlook")) {
+                        } 
+                        if (this.state.isApproverRO) {
+                            if (String(item.type_report).toLocaleLowerCase().includes("rolling")) {
+                                listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
+                                rawData.push(item)
+                            }
+                        }
+                        if (this.state.isApproverOL) {
+                            if (String(item.type_report).toLocaleLowerCase().includes("pa")) {
                                 listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
                                 rawData.push(item)
                             }
                         }
+                    }
                 })
                 this.setState({ listDashboard, rawData })
             }