Skip to content

T
Tia-dev
Commit 997fb4ce authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

apdet NaN

See merge request !756
parents a29d37ef 6983c819
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 25 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 997fb4ce
...@@ -549,6 +549,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -549,6 +549,7 @@ export default class CorporateAnnualTarget extends Component {
} }
// console.log(indexCheck) // console.log(indexCheck)
// // // console.log(this.state.buttonError) // // // console.log(this.state.buttonError)
// console.log(dataTable)
this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, dataDelete, handleDataSalah }, () => { this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, dataDelete, handleDataSalah }, () => {
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
if (item[30].length > 0) { if (item[30].length > 0) {
...@@ -618,18 +619,18 @@ export default class CorporateAnnualTarget extends Component { ...@@ -618,18 +619,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach": i[10] == null ? "" : i[10].value, "max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value, "formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]), "total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": i[6] === 'ROIC' ? String(Number(i[13]).toFixed(1)) : stateFR ? String(Number(i[13].value).toFixed(1)) : String(i[13]), "january": i[6] === 'ROIC' ? String(Number(i[13]).toFixed(1)) : stateFR ? i[0] == 3? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": i[6] === 'ROIC' ? String(Number(i[14]).toFixed(1)) : stateFR ? String(Number(i[14].value).toFixed(1)) : String(i[14]), "february": i[6] === 'ROIC' ? String(Number(i[14]).toFixed(1)) : stateFR ? i[0] == 3? String(i[14]) : String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": i[6] === 'ROIC' ? String(Number(i[15]).toFixed(1)) : stateFR ? String(Number(i[15].value).toFixed(1)) : String(i[15]), "march": i[6] === 'ROIC' ? String(Number(i[15]).toFixed(1)) : stateFR ? i[0] == 3? String(i[15]) : String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": i[6] === 'ROIC' ? String(Number(i[16]).toFixed(1)) : stateFR ? String(Number(i[16].value).toFixed(1)) : String(i[16]), "april": i[6] === 'ROIC' ? String(Number(i[16]).toFixed(1)) : stateFR ? i[0] == 3? String(i[16]) : String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": i[6] === 'ROIC' ? String(Number(i[17]).toFixed(1)) : stateFR ? String(Number(i[17].value).toFixed(1)) : String(i[17]), "may": i[6] === 'ROIC' ? String(Number(i[17]).toFixed(1)) : stateFR ? i[0] == 3? String(i[17]) : String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": i[6] === 'ROIC' ? String(Number(i[18]).toFixed(1)) : stateFR ? String(Number(i[18].value).toFixed(1)) : String(i[18]), "june": i[6] === 'ROIC' ? String(Number(i[18]).toFixed(1)) : stateFR ? i[0] == 3? String(i[18]) : String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": i[6] === 'ROIC' ? String(Number(i[19]).toFixed(1)) : stateFR ? String(Number(i[19].value).toFixed(1)) : String(i[19]), "july": i[6] === 'ROIC' ? String(Number(i[19]).toFixed(1)) : stateFR ? i[0] == 3? String(i[19]) : String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": i[6] === 'ROIC' ? String(Number(i[20]).toFixed(1)) : stateFR ? String(Number(i[20].value).toFixed(1)) : String(i[20]), "august": i[6] === 'ROIC' ? String(Number(i[20]).toFixed(1)) : stateFR ? i[0] == 3? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": i[6] === 'ROIC' ? String(Number(i[21]).toFixed(1)) : stateFR ? String(Number(i[21].value).toFixed(1)) : String(i[21]), "september": i[6] === 'ROIC' ? String(Number(i[21]).toFixed(1)) : stateFR ? i[0] == 3? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": i[6] === 'ROIC' ? String(Number(i[22]).toFixed(1)) : stateFR ? String(Number(i[22].value).toFixed(1)) : String(i[22]), "october": i[6] === 'ROIC' ? String(Number(i[22]).toFixed(1)) : stateFR ? i[0] == 3? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": i[6] === 'ROIC' ? String(Number(i[23]).toFixed(1)) : stateFR ? String(Number(i[23].value).toFixed(1)) : String(i[23]), "november": i[6] === 'ROIC' ? String(Number(i[23]).toFixed(1)) : stateFR ? i[0] == 3? String(i[23]) : String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": i[6] === 'ROIC' ? String(Number(i[24]).toFixed(1)) : stateFR ? String(Number(i[24].value).toFixed(1)) : String(i[24]), "december": i[6] === 'ROIC' ? String(Number(i[24]).toFixed(1)) : stateFR ? i[0] == 3? String(i[24]) : String(Number(i[24].value).toFixed(1)) : String(i[24]),
"total_current_year": i[6] === 'ROIC' ? String(Number(i[25]).toFixed(1)) : String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)), "total_current_year": i[6] === 'ROIC' ? String(Number(i[25]).toFixed(1)) : String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
"total_next_year": i[6] === 'ROIC' ? String(Number(i[26]).toFixed(1)) : String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)), "total_next_year": i[6] === 'ROIC' ? String(Number(i[26]).toFixed(1)) : String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
"total_more_year": i[6] === 'ROIC' ? String(Number(i[27]).toFixed(1)) : String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)), "total_more_year": i[6] === 'ROIC' ? String(Number(i[27]).toFixed(1)) : String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
...@@ -646,7 +647,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -646,7 +647,7 @@ export default class CorporateAnnualTarget extends Component {
"status": type, "status": type,
"cat": data "cat": data
} }
// // console.log(data); // console.log(data);
// console.log(JSON.stringify(body)) // console.log(JSON.stringify(body))
api.create('UPLOAD').uploadMasterBudget(body).then(response => { api.create('UPLOAD').uploadMasterBudget(body).then(response => {
// // // console.log(response); // // // console.log(response);
...@@ -837,18 +838,18 @@ export default class CorporateAnnualTarget extends Component { ...@@ -837,18 +838,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach": i[10] == null ? "" : i[10].value, "max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value, "formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]), "total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": i[6] === 'ROIC' ? String(Number(i[13]).toFixed(1)) : stateFR ? String(Number(i[13].value).toFixed(1)) : String(i[13]), "january": i[6] === 'ROIC' ? String(Number(i[13]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": i[6] === 'ROIC' ? String(Number(i[14]).toFixed(1)) : stateFR ? String(Number(i[14].value).toFixed(1)) : String(i[14]), "february": i[6] === 'ROIC' ? String(Number(i[14]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[14]) : String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": i[6] === 'ROIC' ? String(Number(i[15]).toFixed(1)) : stateFR ? String(Number(i[15].value).toFixed(1)) : String(i[15]), "march": i[6] === 'ROIC' ? String(Number(i[15]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[15]) : String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": i[6] === 'ROIC' ? String(Number(i[16]).toFixed(1)) : stateFR ? String(Number(i[16].value).toFixed(1)) : String(i[16]), "april": i[6] === 'ROIC' ? String(Number(i[16]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[16]) : String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": i[6] === 'ROIC' ? String(Number(i[17]).toFixed(1)) : stateFR ? String(Number(i[17].value).toFixed(1)) : String(i[17]), "may": i[6] === 'ROIC' ? String(Number(i[17]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[17]) : String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": i[6] === 'ROIC' ? String(Number(i[18]).toFixed(1)) : stateFR ? String(Number(i[18].value).toFixed(1)) : String(i[18]), "june": i[6] === 'ROIC' ? String(Number(i[18]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[18]) : String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": i[6] === 'ROIC' ? String(Number(i[19]).toFixed(1)) : stateFR ? String(Number(i[19].value).toFixed(1)) : String(i[19]), "july": i[6] === 'ROIC' ? String(Number(i[19]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[19]) : String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": i[6] === 'ROIC' ? String(Number(i[20]).toFixed(1)) : stateFR ? String(Number(i[20].value).toFixed(1)) : String(i[20]), "august": i[6] === 'ROIC' ? String(Number(i[20]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": i[6] === 'ROIC' ? String(Number(i[21]).toFixed(1)) : stateFR ? String(Number(i[21].value).toFixed(1)) : String(i[21]), "september": i[6] === 'ROIC' ? String(Number(i[21]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": i[6] === 'ROIC' ? String(Number(i[22]).toFixed(1)) : stateFR ? String(Number(i[22].value).toFixed(1)) : String(i[22]), "october": i[6] === 'ROIC' ? String(Number(i[22]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": i[6] === 'ROIC' ? String(Number(i[23]).toFixed(1)) : stateFR ? String(Number(i[23].value).toFixed(1)) : String(i[23]), "november": i[6] === 'ROIC' ? String(Number(i[23]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[23]) : String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": i[6] === 'ROIC' ? String(Number(i[24]).toFixed(1)) : stateFR ? String(Number(i[24].value).toFixed(1)) : String(i[24]), "december": i[6] === 'ROIC' ? String(Number(i[24]).toFixed(1)) : stateFR ? i[0] == 3 ? String(i[24]) : String(Number(i[24].value).toFixed(1)) : String(i[24]),
"total_current_year": i[6] === 'ROIC' ? String(Number(i[25]).toFixed(1)) : String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)), "total_current_year": i[6] === 'ROIC' ? String(Number(i[25]).toFixed(1)) : String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
"total_next_year": i[6] === 'ROIC' ? String(Number(i[26]).toFixed(1)) : String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)), "total_next_year": i[6] === 'ROIC' ? String(Number(i[26]).toFixed(1)) : String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
"total_more_year": i[6] === 'ROIC' ? String(Number(i[27]).toFixed(1)) : String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)), "total_more_year": i[6] === 'ROIC' ? String(Number(i[27]).toFixed(1)) : String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
......
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