Skip to content

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

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

parents 414c6f5f 2724d562
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 12 deletions
src/container/BudgetTahunan/CashFlow.js
View file @ be2ce6e7
...@@ -292,6 +292,9 @@ export default class CashFlow extends Component { ...@@ -292,6 +292,9 @@ export default class CashFlow extends Component {
let res = await fetch( let res = await fetch(
this.props.submissionID == null ? resNull : resReal this.props.submissionID == null ? resNull : resReal
) )
console.log(this.props.submissionID);
console.log(resReal)
console.log(resNull)
res = await res.blob() res = await res.blob()
if (res.size > 0) { if (res.size > 0) {
let url = window.URL.createObjectURL(res); let url = window.URL.createObjectURL(res);
...@@ -432,9 +435,11 @@ export default class CashFlow extends Component { ...@@ -432,9 +435,11 @@ export default class CashFlow extends Component {
let totalPrio = 0 let totalPrio = 0
let optPrio = "" let optPrio = ""
let prio = false let prio = false
let optPrev = ""
anjay2.map((item, index) => { anjay2.map((item, index) => {
if (Array.isArray(item)) { if (Array.isArray(item)) {
prio = true prio = true
optPrev = opt
item.map((items, indexs) => { item.map((items, indexs) => {
if (items == "+") { if (items == "+") {
optPrio = "tambah" optPrio = "tambah"
...@@ -476,7 +481,17 @@ export default class CashFlow extends Component { ...@@ -476,7 +481,17 @@ export default class CashFlow extends Component {
if (item == "+") { if (item == "+") {
opt = "tambah" opt = "tambah"
if (prio) { if (prio) {
total = Number(Number(totalPrio) + Number(total)) if (optPrev == "tambah") {
total = Number(total) + Number(totalPrio)
} else if (optPrev == "kurang") {
total = Number(total) - Number(totalPrio)
} else if (optPrev == "kali") {
total = Number(total) * Number(totalPrio)
} else if (optPrev == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
} else {
total += Number(totalPrio)
}
prio = false prio = false
totalPrio = 0 totalPrio = 0
optPrio = "" optPrio = ""
...@@ -484,7 +499,17 @@ export default class CashFlow extends Component { ...@@ -484,7 +499,17 @@ export default class CashFlow extends Component {
} else if (item == "-") { } else if (item == "-") {
opt = "kurang" opt = "kurang"
if (prio) { if (prio) {
total = Number(Number(totalPrio) + Number(total)) if (optPrev == "tambah") {
total = Number(total) + Number(totalPrio)
} else if (optPrev == "kurang") {
total = Number(total) - Number(totalPrio)
} else if (optPrev == "kali") {
total = Number(total) * Number(totalPrio)
} else if (optPrev == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
} else {
total += Number(totalPrio)
}
prio = false prio = false
totalPrio = 0 totalPrio = 0
optPrio = "" optPrio = ""
...@@ -492,7 +517,17 @@ export default class CashFlow extends Component { ...@@ -492,7 +517,17 @@ export default class CashFlow extends Component {
} else if (item == "*") { } else if (item == "*") {
opt = "kali" opt = "kali"
if (prio) { if (prio) {
total = Number(Number(totalPrio) + Number(total)) if (optPrev == "tambah") {
total = Number(total) + Number(totalPrio)
} else if (optPrev == "kurang") {
total = Number(total) - Number(totalPrio)
} else if (optPrev == "kali") {
total = Number(total) * Number(totalPrio)
} else if (optPrev == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
} else {
total += Number(totalPrio)
}
prio = false prio = false
totalPrio = 0 totalPrio = 0
optPrio = "" optPrio = ""
...@@ -500,7 +535,17 @@ export default class CashFlow extends Component { ...@@ -500,7 +535,17 @@ export default class CashFlow extends Component {
} else if (item == "/") { } else if (item == "/") {
opt = "bagi" opt = "bagi"
if (prio) { if (prio) {
total = Number(Number(totalPrio) + Number(total)) if (optPrev == "tambah") {
total = Number(total) + Number(totalPrio)
} else if (optPrev == "kurang") {
total = Number(total) - Number(totalPrio)
} else if (optPrev == "kali") {
total = Number(total) * Number(totalPrio)
} else if (optPrev == "bagi") {
total = Number(total) / Number(totalPrio) == NaN ? 0 : Number(total) / Number(totalPrio)
} else {
total += Number(totalPrio)
}
prio = false prio = false
totalPrio = 0 totalPrio = 0
optPrio = "" optPrio = ""
...@@ -519,6 +564,11 @@ export default class CashFlow extends Component { ...@@ -519,6 +564,11 @@ export default class CashFlow extends Component {
} }
} }
} }
// if (String(tableMeta.rowData[5]).toLocaleUpperCase() == "4.0 CASH FLOW MOVEMENT" && column == 7) {
// console.log(item)
// console.log(totalPrio)
// console.log(total)
// }
}) })
total = R.equals(total, NaN) ? "0.0" : total total = R.equals(total, NaN) ? "0.0" : total
...@@ -527,7 +577,7 @@ export default class CashFlow extends Component { ...@@ -527,7 +577,7 @@ export default class CashFlow extends Component {
// // console.log(tableMeta.rowData[5]) // // console.log(tableMeta.rowData[5])
// if (tableMeta.rowData[5] == "1.5 Other non-current assets") { // if (tableMeta.rowData[5] == "1.5 Other non-current assets") {
// if (forecast !== undefined) { // if (forecast !== undefined) {
// if (String(tableMeta.rowData[5]) == "Depreciation & amortisation") { // if (String(tableMeta.rowData[5]).toLocaleUpperCase() == "4.0 CASH FLOW MOVEMENT" && column == 7) {
// console.log(splitFormula) // console.log(splitFormula)
// console.log(baru) // console.log(baru)
// console.log(anjay) // console.log(anjay)
......
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