Skip to content

T
Tia-dev
Commit 715636a5 authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

fix history

See merge request !2426
parents d5c5dc37 dc995bf8
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 35 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ 715636a5
...@@ -2184,8 +2184,9 @@ export default class BudgetTahunan extends Component { ...@@ -2184,8 +2184,9 @@ export default class BudgetTahunan extends Component {
master_report_type_id master_report_type_id
} }
api.create().historyApproval(body).then(response => { api.create().historyApproval(body).then(response => {
let dataTable = []
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
const dataTable = response.data.data.map(item => { dataTable = response.data.data.map(item => {
let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C') let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
let status_approv = '' let status_approv = ''
if (String(item.status_approval).toLocaleUpperCase().includes('CC')) { if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
...@@ -2201,12 +2202,12 @@ export default class BudgetTahunan extends Component { ...@@ -2201,12 +2202,12 @@ export default class BudgetTahunan extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
}
if (master_report_type_id === 2) { if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else { } else {
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
} }
}
}) })
}); });
} }
......
src/container/MonthlyReport/MonthlyReport.js
View file @ 715636a5
...@@ -753,7 +753,7 @@ export default class MonthlyReport extends Component { ...@@ -753,7 +753,7 @@ export default class MonthlyReport extends Component {
"months": this.state.month.month_id, "months": this.state.month.month_id,
"is_approver": this.state.isAdmin && _lastStatus === 'WAITING FOR APPROVAL' ? false : this.state.isApprover "is_approver": this.state.isAdmin && _lastStatus === 'WAITING FOR APPROVAL' ? false : this.state.isApprover
} }
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
api.create().getMonthlyReportID(payload).then(response => { api.create().getMonthlyReportID(payload).then(response => {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
...@@ -891,9 +891,10 @@ export default class MonthlyReport extends Component { ...@@ -891,9 +891,10 @@ export default class MonthlyReport extends Component {
} }
api.create().historyApprovalMonthly(body).then(response => { api.create().historyApprovalMonthly(body).then(response => {
console.log(response); console.log(response);
let dataTable = []
if (response.data.data) { if (response.data.data) {
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
let dataTable = response.data.data.map(item => { dataTable = response.data.data.map(item => {
let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C') let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
let status_approv = '' let status_approv = ''
if (String(item.status_approval).toLocaleUpperCase().includes('CC')) { if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
...@@ -909,13 +910,13 @@ export default class MonthlyReport extends Component { ...@@ -909,13 +910,13 @@ export default class MonthlyReport extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
}
}
if (master_report_type_id === 2) { if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else { } else {
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
} }
}
}
}) })
}) })
} }
...@@ -2707,7 +2708,7 @@ export default class MonthlyReport extends Component { ...@@ -2707,7 +2708,7 @@ export default class MonthlyReport extends Component {
// if (this.state.isApprover === true) { // if (this.state.isApprover === true) {
// this.getCompanySubmitted() // this.getCompanySubmitted()
// } else { // } else {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
if (this.state.listCompany == null) { if (this.state.listCompany == null) {
this.getCompanySubmitted() this.getCompanySubmitted()
} else { } else {
...@@ -2727,7 +2728,7 @@ export default class MonthlyReport extends Component { ...@@ -2727,7 +2728,7 @@ export default class MonthlyReport extends Component {
// if (this.state.isApprover === true) { // if (this.state.isApprover === true) {
// this.getCompanySubmitted() // this.getCompanySubmitted()
// } else { // } else {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
if (this.state.listCompany == null) { if (this.state.listCompany == null) {
this.getCompanySubmitted() this.getCompanySubmitted()
} else { } else {
......
src/container/OutlookPA/OutlookPA.js
View file @ 715636a5
...@@ -741,8 +741,9 @@ export default class OutlookPA extends Component { ...@@ -741,8 +741,9 @@ export default class OutlookPA extends Component {
} }
api.create().historyApprovalOLPA(body).then(response => { api.create().historyApprovalOLPA(body).then(response => {
// console.log(response); // console.log(response);
let dataTable = []
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
const dataTable = response.data.data.map(item => { dataTable = response.data.data.map(item => {
return [ return [
item.pic, item.pic,
item.status_approval, item.status_approval,
...@@ -752,12 +753,12 @@ export default class OutlookPA extends Component { ...@@ -752,12 +753,12 @@ export default class OutlookPA extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
}
if (master_report_type_id === 2) { if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else { } else {
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
} }
}
}) })
}) })
} }
...@@ -1793,7 +1794,7 @@ export default class OutlookPA extends Component { ...@@ -1793,7 +1794,7 @@ export default class OutlookPA extends Component {
{...this.state.listPeriode} {...this.state.listPeriode}
id="periode" id="periode"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
if (this.state.listCompany == null) { if (this.state.listCompany == null) {
console.log('yak') console.log('yak')
this.getCompanySubmitted() this.getCompanySubmitted()
...@@ -1858,7 +1859,7 @@ export default class OutlookPA extends Component { ...@@ -1858,7 +1859,7 @@ export default class OutlookPA extends Component {
id="company" id="company"
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.intent === 'Home' ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
this.getRevision() this.getRevision()
this.getCurrency(newInputValue.company_id) this.getCurrency(newInputValue.company_id)
})} })}
......
src/container/RollingOutlook/RollingOutlook.js
View file @ 715636a5
...@@ -781,8 +781,9 @@ export default class RollingOutlook extends Component { ...@@ -781,8 +781,9 @@ export default class RollingOutlook extends Component {
} }
api.create().historyApprovalRO(body).then(response => { api.create().historyApprovalRO(body).then(response => {
console.log(response); console.log(response);
let dataTable = []
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
let dataTable = response.data.data.map(item => { dataTable = response.data.data.map(item => {
return [ return [
item.pic, item.pic,
item.status_approval, item.status_approval,
...@@ -791,12 +792,12 @@ export default class RollingOutlook extends Component { ...@@ -791,12 +792,12 @@ export default class RollingOutlook extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
}
if (master_report_type_id === 2) { if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else { } else {
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
} }
}
}) })
}) })
} }
...@@ -1796,7 +1797,7 @@ export default class RollingOutlook extends Component { ...@@ -1796,7 +1797,7 @@ export default class RollingOutlook extends Component {
{...this.state.listPeriode} {...this.state.listPeriode}
id="periode" id="periode"
onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
if (this.state.listCompany == null) { if (this.state.listCompany == null) {
this.getCompanySubmitted() this.getCompanySubmitted()
} else { } else {
...@@ -1839,7 +1840,7 @@ export default class RollingOutlook extends Component { ...@@ -1839,7 +1840,7 @@ export default class RollingOutlook extends Component {
id="company" id="company"
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.intent === 'Home' ? true : false}
onChange={(event, newInputValue) => this.setState({ quarter: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ quarter: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
if (this.state.listCompany == null) { if (this.state.listCompany == null) {
this.getCompanySubmitted() this.getCompanySubmitted()
} else { } else {
...@@ -1875,7 +1876,7 @@ export default class RollingOutlook extends Component { ...@@ -1875,7 +1876,7 @@ export default class RollingOutlook extends Component {
id="company" id="company"
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.intent === 'Home' ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false, visibleTableHistoryCAT: false })
this.getRevision() this.getRevision()
this.getCurrency(newInputValue.company_id) this.getCurrency(newInputValue.company_id)
})} })}
......
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