Skip to content

T
Tia-dev
Commit a1545e65 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

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

parents f4a5a1a0 a4d59990
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 94 deletions
src/container/Laporan/SubHolding.js
View file @ a1545e65
...@@ -1760,7 +1760,19 @@ export default class SubHolding extends Component { ...@@ -1760,7 +1760,19 @@ export default class SubHolding extends Component {
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula,
item.cash_flow.olpa_january,
item.cash_flow.olpa_february,
item.cash_flow.olpa_march,
item.cash_flow.olpa_april,
item.cash_flow.olpa_may,
item.cash_flow.olpa_june,
item.cash_flow.olpa_july,
item.cash_flow.olpa_august,
item.cash_flow.olpa_september,
item.cash_flow.olpa_october,
item.cash_flow.olpa_november,
item.cash_flow.olpa_december,
]) ])
} }
if (item.children !== null) { if (item.children !== null) {
...@@ -1798,7 +1810,19 @@ export default class SubHolding extends Component { ...@@ -1798,7 +1810,19 @@ export default class SubHolding extends Component {
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong, item.condition_if_wrong,
item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula,
item.cash_flow.olpa_january,
item.cash_flow.olpa_february,
item.cash_flow.olpa_march,
item.cash_flow.olpa_april,
item.cash_flow.olpa_may,
item.cash_flow.olpa_june,
item.cash_flow.olpa_july,
item.cash_flow.olpa_august,
item.cash_flow.olpa_september,
item.cash_flow.olpa_october,
item.cash_flow.olpa_november,
item.cash_flow.olpa_december,
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -1825,6 +1849,7 @@ export default class SubHolding extends Component { ...@@ -1825,6 +1849,7 @@ export default class SubHolding extends Component {
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
} }
console.log(dataTable);
}) })
}) })
} else { } else {
...@@ -2631,6 +2656,43 @@ export default class SubHolding extends Component { ...@@ -2631,6 +2656,43 @@ export default class SubHolding extends Component {
items.cash_flow.october, items.cash_flow.october,
items.cash_flow.november, items.cash_flow.november,
items.cash_flow.december, items.cash_flow.december,
items.cash_flow.q1_january,
items.cash_flow.q1_february,
items.cash_flow.q1_march,
items.cash_flow.q1_april,
items.cash_flow.q1_may,
items.cash_flow.q1_june,
items.cash_flow.q1_july,
items.cash_flow.q1_august,
items.cash_flow.q1_september,
items.cash_flow.q1_october,
items.cash_flow.q1_november,
items.cash_flow.q1_december,
items.cash_flow.q2_january,
items.cash_flow.q2_february,
items.cash_flow.q2_march,
items.cash_flow.q2_april,
items.cash_flow.q2_may,
items.cash_flow.q2_june,
items.cash_flow.q2_july,
items.cash_flow.q2_august,
items.cash_flow.q2_september,
items.cash_flow.q2_october,
items.cash_flow.q2_november,
items.cash_flow.q2_december,
items.cash_flow.q3_january,
items.cash_flow.q3_february,
items.cash_flow.q3_march,
items.cash_flow.q3_april,
items.cash_flow.q3_may,
items.cash_flow.q3_june,
items.cash_flow.q3_july,
items.cash_flow.q3_august,
items.cash_flow.q3_september,
items.cash_flow.q3_october,
items.cash_flow.q3_november,
items.cash_flow.q3_december,
]) ])
} }
if (items.children !== null) { if (items.children !== null) {
...@@ -2655,6 +2717,42 @@ export default class SubHolding extends Component { ...@@ -2655,6 +2717,42 @@ export default class SubHolding extends Component {
item.cash_flow.october, item.cash_flow.october,
item.cash_flow.november, item.cash_flow.november,
item.cash_flow.december, item.cash_flow.december,
item.cash_flow.q1_january,
item.cash_flow.q1_february,
item.cash_flow.q1_march,
item.cash_flow.q1_april,
item.cash_flow.q1_may,
item.cash_flow.q1_june,
item.cash_flow.q1_july,
item.cash_flow.q1_august,
item.cash_flow.q1_september,
item.cash_flow.q1_october,
item.cash_flow.q1_november,
item.cash_flow.q1_december,
item.cash_flow.q2_january,
item.cash_flow.q2_february,
item.cash_flow.q2_march,
item.cash_flow.q2_april,
item.cash_flow.q2_may,
item.cash_flow.q2_june,
item.cash_flow.q2_july,
item.cash_flow.q2_august,
item.cash_flow.q2_september,
item.cash_flow.q2_october,
item.cash_flow.q2_november,
item.cash_flow.q2_december,
item.cash_flow.q3_january,
item.cash_flow.q3_february,
item.cash_flow.q3_march,
item.cash_flow.q3_april,
item.cash_flow.q3_may,
item.cash_flow.q3_june,
item.cash_flow.q3_july,
item.cash_flow.q3_august,
item.cash_flow.q3_september,
item.cash_flow.q3_october,
item.cash_flow.q3_november,
item.cash_flow.q3_december,
]) ])
if (item.children !== null) { if (item.children !== null) {
......
src/container/Laporan/TableSubHolding.js
View file @ a1545e65
This diff is collapsed.
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