Skip to content

T
Tia-dev
Commit c8bb3146 authored by r.kurnia's avatar r.kurnia
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

parents 1c3af381 f35c51ea
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 38 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ c8bb3146
...@@ -620,18 +620,18 @@ export default class CorporateAnnualTarget extends Component { ...@@ -620,18 +620,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": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]), "january": i[13].value != undefined? 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]), "february": i[14].value != undefined? 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]), "march": i[15].value != undefined? 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]), "april": i[16].value != undefined? 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]), "may": i[17].value != undefined? 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]), "june": i[18].value != undefined? 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]), "july": i[19].value != undefined? 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]), "august": i[20].value != undefined? 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]), "september": i[21].value != undefined? 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]), "october": i[22].value != undefined? 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]), "november": i[23].value != undefined? 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]), "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_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_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)), "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 { ...@@ -848,18 +848,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": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]), "january": i[13].value != undefined? 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]), "february": i[14].value != undefined? 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]), "march": i[15].value != undefined? 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]), "april": i[16].value != undefined? 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]), "may": i[17].value != undefined? 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]), "june": i[18].value != undefined? 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]), "july": i[19].value != undefined? 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]), "august": i[20].value != undefined? 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]), "september": i[21].value != undefined? 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]), "october": i[22].value != undefined? 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]), "november": i[23].value != undefined? 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]), "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_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_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)), "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 { ...@@ -1313,9 +1313,9 @@ export default class CorporateAnnualTarget extends Component {
// } // }
// } else { // } else {
if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) { if (dataTable2[tableMeta.rowIndex][tableMeta.columnIndex].value == undefined) {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total.toFixed(1)
} else { } 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 @ c8bb3146
...@@ -67,7 +67,7 @@ export default class CreateReportItems extends Component { ...@@ -67,7 +67,7 @@ export default class CreateReportItems extends Component {
messageAlert: '', messageAlert: '',
kpiType: ['HIG', 'HIB'], kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'], maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'LAST'], formulaYtd: ['SUM', 'AVG', 'LAST', 'FORMULA'],
kpiTypeValue: null, kpiTypeValue: null,
maxAchValue: null, maxAchValue: null,
formulaYTDValue: null, formulaYTDValue: null,
......
src/container/MasterData/formReportItems/EditReportItems.js
View file @ c8bb3146
...@@ -69,7 +69,7 @@ export default class EditReportItems extends Component { ...@@ -69,7 +69,7 @@ export default class EditReportItems extends Component {
messageAlert: '', messageAlert: '',
kpiType: ['HIG', 'HIB'], kpiType: ['HIG', 'HIB'],
maxAch: ['50%', '100%', 'Unlimited'], maxAch: ['50%', '100%', 'Unlimited'],
formulaYtd: ['SUM', 'AVG', 'LAST'], formulaYtd: ['SUM', 'AVG', 'LAST', 'FORMULA'],
kpiTypeValue: null, kpiTypeValue: null,
maxAchValue: null, maxAchValue: null,
formulaYTDValue: null formulaYTDValue: null
......
src/container/RollingOutlook/BalanceSheetRO.js
View file @ c8bb3146
...@@ -707,16 +707,17 @@ export default class BalanceSheetRO extends Component { ...@@ -707,16 +707,17 @@ export default class BalanceSheetRO extends Component {
return a return a
} }
const handleTotal = (val, tableMeta) => { const handleTotal = (tableMeta) => {
let total = 0 let total = 0
tableMeta.rowData.map((item,index) => { tableMeta.rowData.map((item,index) => {
if (index >= 7 && index <= 18) { if (index == 18) {
if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "profit (loss) mtd") { total = isNaN(item) ? Number(item.value) : Number(item)
total += Number(item.value) // if (String(tableMeta.rowData[5]).toLocaleLowerCase() == "profit (loss) mtd") {
} else { // total = Number(item.value)
total += Number(item) // } else {
} // total = Number(item)
// }
} }
}) })
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = total
...@@ -2318,7 +2319,7 @@ export default class BalanceSheetRO extends Component { ...@@ -2318,7 +2319,7 @@ export default class BalanceSheetRO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTotal(val, tableMeta)).toFixed(1)} value={Number(handleTotal(tableMeta)).toFixed(1)}
/> />
</span> </span>
} }
......
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ c8bb3146
...@@ -530,7 +530,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -530,7 +530,7 @@ export default class CorporateAnnualTargetRO extends Component {
item.formula, item.formula,
item.level, item.level,
item.item_report, item.item_report,
item.weight, Number(String(item.weight).substr(0,String(item.weight).length-1)),
item.uom, item.uom,
item.kpi == "" || item.kpi == null ? null : { value: item.kpi }, item.kpi == "" || item.kpi == null ? null : { value: item.kpi },
item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) }, item.max_ach == "" || item.max_ach == null ? null : { value: titleCase(item.max_ach) },
...@@ -558,7 +558,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -558,7 +558,7 @@ export default class CorporateAnnualTargetRO extends Component {
console.log(dataTable) console.log(dataTable)
this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => { this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => {
this.state.dataTable.map(item => { this.state.dataTable.map(item => {
if (item[26].length > 0) { if (item[27].length > 0) {
console.log('masuk') console.log('masuk')
this.setState({ buttonError: true, errorPreview: true, editable: true }) this.setState({ buttonError: true, errorPreview: true, editable: true })
} }
......
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