Skip to content

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

Merge branch 'GGMAC' into 'master' 

update a lot

See merge request !1440
parents 387a6e47 ccb4dae4
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 5cbaf397
......@@ -620,18 +620,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": stateFR ? i[0] == 3 ? String(i[14]) : String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": stateFR ? i[0] == 3 ? String(i[15]) : String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": stateFR ? i[0] == 3 ? String(i[16]) : String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": stateFR ? i[0] == 3 ? String(i[17]) : String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": stateFR ? i[0] == 3 ? String(i[18]) : String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": stateFR ? i[0] == 3 ? String(i[19]) : String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": stateFR ? i[0] == 3 ? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": stateFR ? i[0] == 3 ? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": stateFR ? i[0] == 3 ? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": stateFR ? i[0] == 3 ? String(i[23]) : String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": stateFR ? i[0] == 3 ? String(i[24]) : String(Number(i[24].value).toFixed(1)) : String(i[24]),
"january": i[13].value != undefined? String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": i[14].value != undefined? String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": i[15].value != undefined? String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": i[16].value != undefined? String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": i[17].value != undefined? String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": i[18].value != undefined? String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": i[19].value != undefined? String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": i[20].value != undefined? String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": i[21].value != undefined? String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": i[22].value != undefined? String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": i[23].value != undefined? String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": i[24].value != undefined? String(Number(i[24].value).toFixed(1)) : String(i[24]),
"total_current_year": String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
"total_next_year": String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
"total_more_year": String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
......@@ -848,18 +848,18 @@ export default class CorporateAnnualTarget extends Component {
"max_ach": i[10] == null ? "" : i[10].value,
"formula": i[11] == null ? "" : i[11].value,
"total_actual_before": String(i[12]) == "" ? "0.0" : String(i[12]),
"january": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": stateFR ? i[0] == 3 ? String(i[14]) : String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": i[6] === stateFR ? i[0] == 3 ? String(i[15]) : String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": i[6] === stateFR ? i[0] == 3 ? String(i[16]) : String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": i[6] === stateFR ? i[0] == 3 ? String(i[17]) : String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": i[6] === stateFR ? i[0] == 3 ? String(i[18]) : String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": i[6] === stateFR ? i[0] == 3 ? String(i[19]) : String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": i[6] === stateFR ? i[0] == 3 ? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": i[6] === stateFR ? i[0] == 3 ? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": i[6] === stateFR ? i[0] == 3 ? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": i[6] === stateFR ? i[0] == 3 ? String(i[23]) : String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": i[6] === stateFR ? i[0] == 3 ? String(i[24]) : String(Number(i[24].value).toFixed(1)) : String(i[24]),
"january": i[13].value != undefined? String(Number(i[13].value).toFixed(1)) : String(i[13]),
"february": i[14].value != undefined? String(Number(i[14].value).toFixed(1)) : String(i[14]),
"march": i[15].value != undefined? String(Number(i[15].value).toFixed(1)) : String(i[15]),
"april": i[16].value != undefined? String(Number(i[16].value).toFixed(1)) : String(i[16]),
"may": i[17].value != undefined? String(Number(i[17].value).toFixed(1)) : String(i[17]),
"june": i[18].value != undefined? String(Number(i[18].value).toFixed(1)) : String(i[18]),
"july": i[19].value != undefined? String(Number(i[19].value).toFixed(1)) : String(i[19]),
"august": i[20].value != undefined? String(Number(i[20].value).toFixed(1)) : String(i[20]),
"september": i[21].value != undefined? String(Number(i[21].value).toFixed(1)) : String(i[21]),
"october": i[22].value != undefined? String(Number(i[22].value).toFixed(1)) : String(i[22]),
"november": i[23].value != undefined? String(Number(i[23].value).toFixed(1)) : String(i[23]),
"december": i[24].value != undefined? String(Number(i[24].value).toFixed(1)) : String(i[24]),
"total_current_year": i[6] === String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
"total_next_year": i[6] === String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
"total_more_year": i[6] === String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
......@@ -1313,9 +1313,9 @@ export default class CorporateAnnualTarget extends Component {
// }
// } else {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total.toFixed(1)
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = total
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value = total.toFixed(1)
}
// }
......
src/container/MasterData/formReportItems/CreateReportItems.js
View file @ 5cbaf397
......@@ -67,7 +67,7 @@ export default class CreateReportItems extends Component {
messageAlert: '',
kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'LAST'],
formulaYtd: ['SUM', 'AVG', 'LAST', 'FORMULA'],
kpiTypeValue: null,
maxAchValue: null,
formulaYTDValue: null,
......
src/container/MasterData/formReportItems/EditReportItems.js
View file @ 5cbaf397
......@@ -69,7 +69,7 @@ export default class EditReportItems extends Component {
messageAlert: '',
kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'LAST'],
formulaYtd: ['SUM', 'AVG', 'LAST', 'FORMULA'],
kpiTypeValue: null,
maxAchValue: null,
formulaYTDValue: null
......
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