Merge branch 'rifka' into 'master'

hilang - di mr home

See merge request !992

src/container/HomePage.js

@@ -318,8 +318,13 @@ class HomePage extends Component {
                 data.map((item, index) => {
                     let statusConvert = item.status == 'approval_review'? 'Waiting For Review' : item.status == 'approval_proccess'? 'Waiting For Approval' : titleCase(item.status) 
                     if (this.state.isApproverMB && this.state.isApproverMR){
+                        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 (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.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])
@@ -327,7 +332,7 @@ class HomePage extends Component {
                         }
                     } else 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])
+                            listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} ${item.periode}`, item.revision, item.status, statusConvert])
                             rawData.push(item)
                         }
                     }