Skip to content

T
Tia-dev
Commit 87ff1323 authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

blank ratio

See merge request !1063
parents 6ed80e3d 16387840
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
src/container/Laporan/SubHolding.js
View file @ 87ff1323
...@@ -2051,18 +2051,18 @@ export default class SubHolding extends Component { ...@@ -2051,18 +2051,18 @@ export default class SubHolding extends Component {
// console.log(indexIDzz) // console.log(indexIDzz)
if (indexIDzz != -1) { if (indexIDzz != -1) {
dataTable2.push([...dataTable[indexIDzz], dataTable2.push([...dataTable[indexIDzz],
Number(items.ratio.monthly_january).toFixed(2), String(items.ratio.monthly_january) == "" ? "" : Number(items.ratio.monthly_january).toFixed(2),
Number(items.ratio.monthly_february).toFixed(2), String(items.ratio.monthly_february) == "" ? "" : Number(items.ratio.monthly_february).toFixed(2),
Number(items.ratio.monthly_march).toFixed(2), String(items.ratio.monthly_march) == "" ? "" : Number(items.ratio.monthly_march).toFixed(2),
Number(items.ratio.monthly_april).toFixed(2), String(items.ratio.monthly_april) == "" ? "" : Number(items.ratio.monthly_april).toFixed(2),
Number(items.ratio.monthly_may).toFixed(2), String(items.ratio.monthly_may) == "" ? "" : Number(items.ratio.monthly_may).toFixed(2),
Number(items.ratio.monthly_june).toFixed(2), String(items.ratio.monthly_june) == "" ? "" : Number(items.ratio.monthly_june).toFixed(2),
Number(items.ratio.monthly_july).toFixed(2), String(items.ratio.monthly_july) == "" ? "" : Number(items.ratio.monthly_july).toFixed(2),
Number(items.ratio.monthly_august).toFixed(2), String(items.ratio.monthly_august) == "" ? "" : Number(items.ratio.monthly_august).toFixed(2),
Number(items.ratio.monthly_september).toFixed(2), String(items.ratio.monthly_september) == "" ? "" : Number(items.ratio.monthly_september).toFixed(2),
Number(items.ratio.monthly_october).toFixed(2), String(items.ratio.monthly_october) == "" ? "" : Number(items.ratio.monthly_october).toFixed(2),
Number(items.ratio.monthly_november).toFixed(2), String(items.ratio.monthly_november) == "" ? "" : Number(items.ratio.monthly_november).toFixed(2),
Number(items.ratio.monthly_december).toFixed(2), String(items.ratio.monthly_december) == "" ? "" : Number(items.ratio.monthly_december).toFixed(2),
]) ])
} }
if (items.children !== null) { if (items.children !== null) {
...@@ -2075,18 +2075,18 @@ export default class SubHolding extends Component { ...@@ -2075,18 +2075,18 @@ export default class SubHolding extends Component {
} }
dataTable2.push([...dataTable[indexID], dataTable2.push([...dataTable[indexID],
Number(item.ratio.monthly_january).toFixed(2), String(item.ratio.monthly_january) == "" ? "" : Number(item.ratio.monthly_january).toFixed(2),
Number(item.ratio.monthly_february).toFixed(2), String(item.ratio.monthly_february) == "" ? "" : Number(item.ratio.monthly_february).toFixed(2),
Number(item.ratio.monthly_march).toFixed(2), String(item.ratio.monthly_march) == "" ? "" : Number(item.ratio.monthly_march).toFixed(2),
Number(item.ratio.monthly_april).toFixed(2), String(item.ratio.monthly_april) == "" ? "" : Number(item.ratio.monthly_april).toFixed(2),
Number(item.ratio.monthly_may).toFixed(2), String(item.ratio.monthly_may) == "" ? "" : Number(item.ratio.monthly_may).toFixed(2),
Number(item.ratio.monthly_june).toFixed(2), String(item.ratio.monthly_june) == "" ? "" : Number(item.ratio.monthly_june).toFixed(2),
Number(item.ratio.monthly_july).toFixed(2), String(item.ratio.monthly_july) == "" ? "" : Number(item.ratio.monthly_july).toFixed(2),
Number(item.ratio.monthly_august).toFixed(2), String(item.ratio.monthly_august) == "" ? "" : Number(item.ratio.monthly_august).toFixed(2),
Number(item.ratio.monthly_september).toFixed(2), String(item.ratio.monthly_september) == "" ? "" : Number(item.ratio.monthly_september).toFixed(2),
Number(item.ratio.monthly_october).toFixed(2), String(item.ratio.monthly_october) == "" ? "" : Number(item.ratio.monthly_october).toFixed(2),
Number(item.ratio.monthly_november).toFixed(2), String(item.ratio.monthly_november) == "" ? "" : Number(item.ratio.monthly_november).toFixed(2),
Number(item.ratio.monthly_december).toFixed(2), String(item.ratio.monthly_december) == "" ? "" : Number(item.ratio.monthly_december).toFixed(2),
]) ])
if (item.children !== null) { if (item.children !== null) {
......
src/container/Laporan/TableSubHolding.js
View file @ 87ff1323
...@@ -8353,7 +8353,7 @@ export default class TableSubHolding extends Component { ...@@ -8353,7 +8353,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[22]).toFixed(2)} value={String(tableMeta.rowData[22]) === "" ? "" : Number(tableMeta.rowData[22]).toFixed(2)}
/> />
} }
/> />
...@@ -8396,7 +8396,7 @@ export default class TableSubHolding extends Component { ...@@ -8396,7 +8396,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[23]).toFixed(2)} value={String(tableMeta.rowData[23]) === "" ? "" : Number(tableMeta.rowData[23]).toFixed(2)}
/> />
} }
/> />
...@@ -8439,7 +8439,7 @@ export default class TableSubHolding extends Component { ...@@ -8439,7 +8439,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[24]).toFixed(2)} value={String(tableMeta.rowData[24]) === "" ? "" : Number(tableMeta.rowData[24]).toFixed(2)}
/> />
} }
/> />
...@@ -8482,7 +8482,7 @@ export default class TableSubHolding extends Component { ...@@ -8482,7 +8482,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[25]).toFixed(2)} value={String(tableMeta.rowData[25]) === "" ? "" : Number(tableMeta.rowData[25]).toFixed(2)}
/> />
} }
/> />
...@@ -8527,7 +8527,7 @@ export default class TableSubHolding extends Component { ...@@ -8527,7 +8527,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[26]).toFixed(2)} value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(2)}
/> />
} }
/> />
...@@ -8570,7 +8570,7 @@ export default class TableSubHolding extends Component { ...@@ -8570,7 +8570,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[27]).toFixed(2)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(2)}
/> />
} }
/> />
...@@ -8613,7 +8613,7 @@ export default class TableSubHolding extends Component { ...@@ -8613,7 +8613,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[28]).toFixed(2)} value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(2)}
/> />
} }
/> />
...@@ -8656,7 +8656,7 @@ export default class TableSubHolding extends Component { ...@@ -8656,7 +8656,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[29]).toFixed(2)} value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(2)}
/> />
} }
/> />
...@@ -8701,7 +8701,7 @@ export default class TableSubHolding extends Component { ...@@ -8701,7 +8701,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[30]).toFixed(2)} value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(2)}
/> />
} }
/> />
...@@ -8744,7 +8744,7 @@ export default class TableSubHolding extends Component { ...@@ -8744,7 +8744,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[31]).toFixed(2)} value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(2)}
/> />
} }
/> />
...@@ -8787,7 +8787,7 @@ export default class TableSubHolding extends Component { ...@@ -8787,7 +8787,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[32]).toFixed(2)} value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(2)}
/> />
} }
/> />
...@@ -8830,7 +8830,7 @@ export default class TableSubHolding extends Component { ...@@ -8830,7 +8830,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[33]).toFixed(2)} value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(2)}
/> />
} }
/> />
...@@ -8991,7 +8991,7 @@ export default class TableSubHolding extends Component { ...@@ -8991,7 +8991,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[34]).toFixed(2)} value={String(tableMeta.rowData[34]) === "" ? "" : Number(tableMeta.rowData[34]).toFixed(2)}
/> />
} }
/> />
...@@ -9034,7 +9034,7 @@ export default class TableSubHolding extends Component { ...@@ -9034,7 +9034,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[35]).toFixed(2)} value={String(tableMeta.rowData[35]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(2)}
/> />
} }
/> />
...@@ -9077,7 +9077,7 @@ export default class TableSubHolding extends Component { ...@@ -9077,7 +9077,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[36]).toFixed(2)} value={String(tableMeta.rowData[36]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(2)}
/> />
} }
/> />
...@@ -9120,7 +9120,7 @@ export default class TableSubHolding extends Component { ...@@ -9120,7 +9120,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[37]).toFixed(2)} value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(2)}
/> />
} }
/> />
...@@ -9165,7 +9165,7 @@ export default class TableSubHolding extends Component { ...@@ -9165,7 +9165,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[38]).toFixed(2)} value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(2)}
/> />
} }
/> />
...@@ -9208,7 +9208,7 @@ export default class TableSubHolding extends Component { ...@@ -9208,7 +9208,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[39]).toFixed(2)} value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(2)}
/> />
} }
/> />
...@@ -9251,7 +9251,7 @@ export default class TableSubHolding extends Component { ...@@ -9251,7 +9251,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[40]).toFixed(2)} value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(2)}
/> />
} }
/> />
...@@ -9294,7 +9294,7 @@ export default class TableSubHolding extends Component { ...@@ -9294,7 +9294,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[41]).toFixed(2)} value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(2)}
/> />
} }
/> />
...@@ -9339,7 +9339,7 @@ export default class TableSubHolding extends Component { ...@@ -9339,7 +9339,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[42]).toFixed(2)} value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(2)}
/> />
} }
/> />
...@@ -9382,7 +9382,7 @@ export default class TableSubHolding extends Component { ...@@ -9382,7 +9382,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[43]).toFixed(2)} value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(2)}
/> />
} }
/> />
...@@ -9425,7 +9425,7 @@ export default class TableSubHolding extends Component { ...@@ -9425,7 +9425,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[44]).toFixed(2)} value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(2)}
/> />
} }
/> />
...@@ -9468,7 +9468,7 @@ export default class TableSubHolding extends Component { ...@@ -9468,7 +9468,7 @@ export default class TableSubHolding extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={0.0} // value={0.0}
value={Number(tableMeta.rowData[45]).toFixed(2)} value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(2)}
/> />
} }
/> />
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