Commit 09be5c13 authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'deni-dev(pc)' into 'master'

++

See merge request !508
parents f8eb34f4 1f2de160
...@@ -422,25 +422,25 @@ export default class BalanceSheet extends Component { ...@@ -422,25 +422,25 @@ export default class BalanceSheet extends Component {
this.state.dataTable.map(i => { this.state.dataTable.map(i => {
data.push({ data.push({
item_report_id: i[1], item_report_id: i[1],
total_actual_before: String(i[6]), total_actual_before: String(Number(i[6]).toFixed(1)),
january: i[0] === 3 && i[7] === "" ? "0" : String(i[7]), january: i[0] === 3 && i[7] === "" ? "0" : String(Number(i[7]).toFixed(1)),
february: i[0] === 3 && i[8] === "" ? "0" : String(i[8]), february: i[0] === 3 && i[8] === "" ? "0" : String(Number(i[8]).toFixed(1)),
march: i[0] === 3 && i[9] === "" ? "0" : String(i[9]), march: i[0] === 3 && i[9] === "" ? "0" : String(Number(i[9]).toFixed(1)),
april: i[0] === 3 && i[10] === "" ? "0" : String(i[10]), april: i[0] === 3 && i[10] === "" ? "0" : String(Number(i[10]).toFixed(1)),
may: i[0] === 3 && i[11] === "" ? "0" : String(i[11]), may: i[0] === 3 && i[11] === "" ? "0" : String(Number(i[11]).toFixed(1)),
june: i[0] === 3 && i[12] === "" ? "0" : String(i[12]), june: i[0] === 3 && i[12] === "" ? "0" : String(Number(i[12]).toFixed(1)),
july: i[0] === 3 && i[13] === "" ? "0" : String(i[13]), july: i[0] === 3 && i[13] === "" ? "0" : String(Number(i[13]).toFixed(1)),
august: i[0] === 3 && i[14] === "" ? "0" : String(i[14]), august: i[0] === 3 && i[14] === "" ? "0" : String(Number(i[14]).toFixed(1)),
september: i[0] === 3 && i[15] === "" ? "0" : String(i[15]), september: i[0] === 3 && i[15] === "" ? "0" : String(Number(i[15]).toFixed(1)),
october: i[0] === 3 && i[16] === "" ? "0" : String(i[16]), october: i[0] === 3 && i[16] === "" ? "0" : String(Number(i[16]).toFixed(1)),
november: i[0] === 3 && i[17] === "" ? "0" : String(i[17]), november: i[0] === 3 && i[17] === "" ? "0" : String(Number(i[17]).toFixed(1)),
december: i[0] === 3 && i[18] === "" ? "0" : String(i[18]), december: i[0] === 3 && i[18] === "" ? "0" : String(Number(i[18]).toFixed(1)),
total_current_year: i[0] === 3 && i[19] === "" ? "0" : String(i[19]), total_current_year: i[0] === 3 && i[19] === "" ? "0" : String(Number(i[19]).toFixed(1)),
total_next_year: i[0] === 3 && i[20] === "" ? "0" : String(i[20]), total_next_year: i[0] === 3 && i[20] === "" ? "0" : String(Number(i[20]).toFixed(1)),
total_more_year: i[0] === 3 && i[21] === "" ? "0" : String(i[21]), total_more_year: i[0] === 3 && i[21] === "" ? "0" : String(Number(i[21]).toFixed(1)),
}) })
}) })
// console.log(JSON.stringify(data)) console.log(JSON.stringify(data))
let payload = { let payload = {
"submission_id": this.props.submissionID, "submission_id": this.props.submissionID,
"company_id": this.props.company.company_id, "company_id": this.props.company.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