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

825b54e0 · faisalhamdi · 70221812 · 5b5003aa · 825b54e0 · 825b54e0
Commit 825b54e0 authored Jan 29, 2021 by faisalhamdi
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 45 additions and 32 deletions

SubHolding.js src/container/Laporan/SubHolding.js +3 -0

TableSubHolding.js src/container/Laporan/TableSubHolding.js +42 -32

No files found.
--- a/src/container/Laporan/SubHolding.js
+++ b/src/container/Laporan/SubHolding.js
@@ -1555,6 +1555,9 @@ export default class SubHolding extends Component {
                                item.profit_loss.fy_last_year,
                                isNaN(persenFyLY) || persenFyLY == 'Infinity' || persenFyLY == '-Infinity'? (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? -0 : 0) : (item.profit_loss.fy_last_year == '' || item.profit_loss.fy_last_year == 0? persenFyLY * -100 : persenFyLY * 100),
                                isNaN(persenFyOLMB) || persenFyOLMB == 'Infinity' || persenFyOLMB == '-Infinity'? (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? -0 : 0) : (item.profit_loss.fy_percent_ach_ol_to_mb == '' || item.profit_loss.fy_percent_ach_ol_to_mb == 0? persenFyOLMB * -100 : persenFyOLMB * 100),
+                                item.profit_loss.forecast_next_year,
+                                item.profit_loss.forecast_more_year,
+                                item.profit_loss.notes,
                            ])
                            if (item.children !== null) {
                                if (item.children.length > 0) {

--- a/src/container/Laporan/TableSubHolding.js
+++ b/src/container/Laporan/TableSubHolding.js