Skip to content

T
Tia-dev
Commit dc995bf8 authored by Hardiansyah's avatar Hardiansyah
Browse files
Options

fix history

parent 1419a73d
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 35 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ dc995bf8
...@@ -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,11 +2202,11 @@ export default class BudgetTahunan extends Component { ...@@ -2201,11 +2202,11 @@ export default class BudgetTahunan extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
if (master_report_type_id === 2) { }
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) if (master_report_type_id === 2) {
} else { this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) } else {
} this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
} }
}) })
}); });
......
src/container/MonthlyReport/MonthlyReport.js
View file @ dc995bf8
...@@ -753,15 +753,15 @@ export default class MonthlyReport extends Component { ...@@ -753,15 +753,15 @@ 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) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
const uniqueTypeIds = const uniqueTypeIds =
this.state.rowData?.length this.state.rowData?.length
? [...new Set(this.state.rowData.map(item => item.master_report_type_id))] ? [...new Set(this.state.rowData.map(item => item.master_report_type_id))]
: [1, 2]; : [1, 2];
this.setState({ this.setState({
submitter: response.data.data.submitter_finance, submitter: response.data.data.submitter_finance,
submitterCAT: response.data.data.submitter_cat, submitterCAT: response.data.data.submitter_cat,
...@@ -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) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else {
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
}
} }
} }
if (master_report_type_id === 2) {
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
} else {
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 @ dc995bf8
...@@ -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,11 +753,11 @@ export default class OutlookPA extends Component { ...@@ -752,11 +753,11 @@ export default class OutlookPA extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
if (master_report_type_id === 2) { }
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) if (master_report_type_id === 2) {
} else { this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) } else {
} 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 @ dc995bf8
...@@ -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,11 +792,11 @@ export default class RollingOutlook extends Component { ...@@ -791,11 +792,11 @@ export default class RollingOutlook extends Component {
item.history_approval_date item.history_approval_date
] ]
}) })
if (master_report_type_id === 2) { }
this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true }) if (master_report_type_id === 2) {
} else { this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
this.setState({ dataTableHistory: dataTable, visibleTableHistory: true }) } else {
} 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