Commit 470a5d4e authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-' into 'master'

papalipapali

See merge request !611
parents 7df99554 6a9f9e77
......@@ -139,7 +139,7 @@ export default class BudgetTahunan extends Component {
} else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false })
}
//
//
})
} else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false, loading: false }, ()=> {
......@@ -200,14 +200,17 @@ export default class BudgetTahunan extends Component {
item.revision
]
})
let dataTableRevision = response.data.data.map((item, index) => {
return [
let dataTableRevision = []
response.data.data.map((item, index) => {
if (item.report_name !== 'Cash Flow') {
dataTableRevision.push([
item.report_id,
item.report_name === 'CAT' ? 'Corporate Annual Target' : item.report_name,
""
]
])
}
})
// console.log(dataTable);
// console.log(dataTableRevision);
this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data }, ()=> {
document.body.style.overflow = 'unset';
})
......@@ -807,7 +810,7 @@ export default class BudgetTahunan extends Component {
: null
}
>
{/* {this.state.isApprover == true ?
{/* {this.state.isApprover == true ?
(tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(this.state.lastRevision == 0 ? (tableMeta.rowData[5] ? '#5198ea' : 'GrayText') :
(tableMeta.rowData[3] !== 'submitted' ? '#5198ea' : 'GrayText'))} */}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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