Skip to content

T
Tia-dev
Commit 79e955ef authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

hilang - di mr home

See merge request !992
parents 1586536a 3d297bc0
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
src/container/HomePage.js
View file @ 79e955ef
...@@ -318,8 +318,13 @@ class HomePage extends Component { ...@@ -318,8 +318,13 @@ class HomePage extends Component {
data.map((item, index) => { data.map((item, index) => {
let statusConvert = item.status == 'approval_review'? 'Waiting For Review' : item.status == 'approval_proccess'? 'Waiting For Approval' : titleCase(item.status) 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 (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]) listDashboard.push([index + 1, item.approval_id, item.company_name, `${item.type_report} - ${item.periode}`, item.revision, item.status, statusConvert])
rawData.push(item) 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) { } else if (this.state.isApproverMB) {
if (String(item.type_report).toLocaleLowerCase().includes("master")){ 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]) 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 { ...@@ -327,7 +332,7 @@ class HomePage extends Component {
} }
} else if (this.state.isApproverMR) { } else if (this.state.isApproverMR) {
if (String(item.type_report).toLocaleLowerCase().includes("monthly")){ 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) rawData.push(item)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment