Skip to content

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

Merge branch 'GGMAC' into 'master' 

update lg perubahan mba sab

See merge request !1261
parents 02949518 8316ebee
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ 4752199b
...@@ -692,7 +692,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -692,7 +692,7 @@ export default class CorporateAnnualTargetMR extends Component {
if (actual == target) { if (actual == target) {
totalAch = (actual / target) totalAch = (actual / target)
} else { } else {
totalAch = 1 - (actual / target) totalAch = 2 - (actual / target)
} }
} }
// if (item[5] == "Striping Ratio (SR) YTD") { // if (item[5] == "Striping Ratio (SR) YTD") {
...@@ -716,11 +716,11 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -716,11 +716,11 @@ export default class CorporateAnnualTargetMR extends Component {
totalAch = 0 totalAch = 0
} }
} else { } else {
if (actual <= target) { // if (actual <= target) {
totalAch = (actual / target) totalAch = (actual / target)
} else { // } else {
totalAch = 1 - (actual / target) // totalAch = 1 - (actual / target)
} // }
} }
} }
totalAch = String(totalAch) == 'NaN' || String(totalAch) == 'Infinity' || String(totalAch) == '-Infinity' ? 0 : totalAch totalAch = String(totalAch) == 'NaN' || String(totalAch) == 'Infinity' || String(totalAch) == '-Infinity' ? 0 : totalAch
...@@ -1289,7 +1289,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1289,7 +1289,7 @@ export default class CorporateAnnualTargetMR extends Component {
if (actual == target) { if (actual == target) {
total = (actual / target) total = (actual / target)
} else { } else {
total = 1 - (actual / target) total = 2 - (actual / target)
} }
} }
} else { } else {
...@@ -1308,11 +1308,11 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1308,11 +1308,11 @@ export default class CorporateAnnualTargetMR extends Component {
total = 0 total = 0
} }
} else { } else {
if (actual <= target) { // if (actual <= target) {
total = (actual / target) total = (actual / target)
} else { // } else {
total = 1 - (actual / target) // total = 1 - (actual / target)
} // }
} }
} }
total = String(total) == 'NaN' || String(total) == 'Infinity' || String(total) == '-Infinity' ? 0 : total total = String(total) == 'NaN' || String(total) == 'Infinity' || String(total) == '-Infinity' ? 0 : total
......
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