Skip to content

T
Tia-dev
Commit 41ebe947 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

benerin issue

See merge request !775
parents 21dc0650 a2f602d2
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 29 deletions
src/container/MonthlyReport/ProfitLossMR.js
View file @ 41ebe947
...@@ -63,6 +63,7 @@ export default class ProfitLossMR extends Component { ...@@ -63,6 +63,7 @@ export default class ProfitLossMR extends Component {
maxValue: 0, maxValue: 0,
updateBy: '-' updateBy: '-'
} }
this.fileHandler = this.fileHandler.bind(this);
} }
componentDidMount() { componentDidMount() {
...@@ -122,7 +123,18 @@ export default class ProfitLossMR extends Component { ...@@ -122,7 +123,18 @@ export default class ProfitLossMR extends Component {
this.setState({ this.setState({
updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
}) })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) {
setTimeout(() => {
localStorage.removeItem(Constant.TOKEN)
window.location.reload();
}, 1000);
} }
})
}
} else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
} }
}) })
} }
...@@ -251,7 +263,7 @@ export default class ProfitLossMR extends Component { ...@@ -251,7 +263,7 @@ export default class ProfitLossMR extends Component {
} }
backToMonthlyReport(type) { backToMonthlyReport(type) {
// console.log(this.state.dataTable); // this.setState({ loading: true })
let data = [] let data = []
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
...@@ -275,7 +287,7 @@ export default class ProfitLossMR extends Component { ...@@ -275,7 +287,7 @@ export default class ProfitLossMR extends Component {
}) })
}) })
let payload = { let payload = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -294,10 +306,7 @@ export default class ProfitLossMR extends Component { ...@@ -294,10 +306,7 @@ export default class ProfitLossMR extends Component {
}) })
} }
} else { } else {
this.setState({ loading: false }, () => { this.setState({ loading: false })
this.getSubmission()
document.body.style.overflow = 'unset';
})
} }
}) })
} }
...@@ -306,7 +315,7 @@ export default class ProfitLossMR extends Component { ...@@ -306,7 +315,7 @@ export default class ProfitLossMR extends Component {
console.log(event); console.log(event);
let fileObj = event let fileObj = event
ExcelRenderer(fileObj, (err, resp) => { ExcelRenderer(fileObj, (err, resp) => {
console.log(resp) // console.log(resp)
if (err) { if (err) {
// console.log(err); // console.log(err);
} }
...@@ -363,12 +372,18 @@ export default class ProfitLossMR extends Component { ...@@ -363,12 +372,18 @@ export default class ProfitLossMR extends Component {
item.actual, item.actual,
item.ytd_actual, item.ytd_actual,
item.actual_previous_month, item.actual_previous_month,
item.amount_act_vs_previous_month, 0,
item.percent_act_vs_previous_month, 0,
item.amount_act_vs_mb, 0,
item.percent_act_vs_mb, 0,
item.amount_act_vs_rb, 0,
item.percent_act_vs_rb, 0,
// item.amount_act_vs_previous_month,
// item.percent_act_vs_previous_month,
// item.amount_act_vs_mb,
// item.percent_act_vs_mb,
// item.amount_act_vs_rb,
// item.percent_act_vs_rb,
item.mtd_vs_previous_month, item.mtd_vs_previous_month,
item.mtd_vs_mb, item.mtd_vs_mb,
item.mtd_vs_rb, item.mtd_vs_rb,
...@@ -415,22 +430,23 @@ export default class ProfitLossMR extends Component { ...@@ -415,22 +430,23 @@ export default class ProfitLossMR extends Component {
}) })
}) })
let body = { let body = {
submission_id: this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
company_id: this.props.company.company_id, "company_id": this.props.company.company_id,
periode: this.props.periode, "periode": this.props.periode,
report_id: this.props.report_id, "report_id": this.props.report_id,
months: this.props.month.month_id, "months": this.props.month.month_id,
status: type, "status": type,
profit_loss: data "profit_loss": data
} }
// console.log(data); console.log(data);
api.create('UPLOAD').uploadMonthlyReportPL(body).then(response => { api.create('UPLOAD').uploadMonthlyReportPL(body).then(response => {
// console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.ok) { if (response.ok) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.props.onClickClose() this.props.saveToMonthlyReport()
this.props.getReport() // this.props.onClickClose()
// this.props.getReport()
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
...@@ -1839,7 +1855,7 @@ export default class ProfitLossMR extends Component { ...@@ -1839,7 +1855,7 @@ export default class ProfitLossMR extends Component {
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : null :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.backToMonthlyReport('draft') this.backToMonthlyReport('draft')
}) })
} }
...@@ -1856,7 +1872,7 @@ export default class ProfitLossMR extends Component { ...@@ -1856,7 +1872,7 @@ export default class ProfitLossMR extends Component {
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.backToMonthlyReport('submitted') this.backToMonthlyReport('submitted')
})} })}
style={{ style={{
...@@ -1957,7 +1973,7 @@ export default class ProfitLossMR extends Component { ...@@ -1957,7 +1973,7 @@ export default class ProfitLossMR extends Component {
this.state.saveDraft === true ? this.state.saveDraft === true ?
null : null :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.uploadProfitLossMR('draft') this.uploadProfitLossMR('draft')
}) })
} }
...@@ -1974,7 +1990,7 @@ export default class ProfitLossMR extends Component { ...@@ -1974,7 +1990,7 @@ export default class ProfitLossMR extends Component {
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1, loading: true }, () => {
this.uploadProfitLossMR('submitted') this.uploadProfitLossMR('submitted')
})} })}
style={{ style={{
...@@ -2023,7 +2039,7 @@ export default class ProfitLossMR extends Component { ...@@ -2023,7 +2039,7 @@ export default class ProfitLossMR extends Component {
this.setState({ uploadStatus: 'idle', percentage: '0' }) this.setState({ uploadStatus: 'idle', percentage: '0' })
}} }}
onUpload={() => { onUpload={() => {
this.state.judul === "MONTHLY REPORT - PROFIT LOSS" ? 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.checkUpload() :
this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
}} }}
......
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