Commit 94c78007 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

template

See merge request !827
parents ceb032c2 b2bb6c17
......@@ -51,7 +51,8 @@ export default class BalanceSheetMR extends Component {
minValue: 0,
maxValue: 0,
updateBy: '-',
notes: ""
notes: "",
judulColumn: null,
}
this.fileHandler = this.fileHandler.bind(this);
}
......@@ -281,7 +282,7 @@ export default class BalanceSheetMR extends Component {
months: this.props.month.month_id
}
console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
}
});
}
......@@ -2059,7 +2060,7 @@ export default class BalanceSheetMR extends Component {
this.setState({ uploadStatus: 'idle', percentage: '0' })
}}
onUpload={() => {
String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("BALANCE") && String(this.state.judul).includes("SHEET") ?
String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("BALANCE") && String(this.state.judul).includes("SHEET") ?
this.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}}
......
......@@ -87,7 +87,8 @@ export default class ProfitLossMR extends Component {
maxValue: 0,
updateBy: '-',
notesUpdate: '-',
bebas: false
bebas: false,
judulColumn: null
}
this.fileHandler = this.fileHandler.bind(this);
}
......@@ -376,7 +377,7 @@ export default class ProfitLossMR extends Component {
profit_loss: payload
}
console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[2] })
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
}
});
}
......@@ -2145,7 +2146,7 @@ export default class ProfitLossMR extends Component {
this.setState({ uploadStatus: 'idle', percentage: '0' })
}}
onUpload={() => {
String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("PROFIT") && String(this.state.judul).includes("LOSS") ?
String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("PROFIT") && String(this.state.judul).includes("LOSS") ?
this.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}}
......
......@@ -308,8 +308,8 @@ export default class TaxPlanningMR extends Component {
tax_planning: payload
}
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
console.log(this.state.judulColumn)
console.log(this.state.judul)
// console.log(this.state.judulColumn)
// console.log(this.state.judul)
}
});
}
......
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