Skip to content

T
Tia-dev
Commit 29418ea4 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 9c1bdffb 87ff1323
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
src/container/Laporan/SubHolding.js
View file @ 29418ea4
...@@ -2052,18 +2052,18 @@ export default class SubHolding extends Component { ...@@ -2052,18 +2052,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) {
...@@ -2076,18 +2076,18 @@ export default class SubHolding extends Component { ...@@ -2076,18 +2076,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 @ 29418ea4
...@@ -8338,7 +8338,7 @@ export default class TableSubHolding extends Component { ...@@ -8338,7 +8338,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)}
/> />
} }
/> />
...@@ -8381,7 +8381,7 @@ export default class TableSubHolding extends Component { ...@@ -8381,7 +8381,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)}
/> />
} }
/> />
...@@ -8424,7 +8424,7 @@ export default class TableSubHolding extends Component { ...@@ -8424,7 +8424,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)}
/> />
} }
/> />
...@@ -8467,7 +8467,7 @@ export default class TableSubHolding extends Component { ...@@ -8467,7 +8467,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)}
/> />
} }
/> />
...@@ -8512,7 +8512,7 @@ export default class TableSubHolding extends Component { ...@@ -8512,7 +8512,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)}
/> />
} }
/> />
...@@ -8555,7 +8555,7 @@ export default class TableSubHolding extends Component { ...@@ -8555,7 +8555,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)}
/> />
} }
/> />
...@@ -8598,7 +8598,7 @@ export default class TableSubHolding extends Component { ...@@ -8598,7 +8598,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)}
/> />
} }
/> />
...@@ -8641,7 +8641,7 @@ export default class TableSubHolding extends Component { ...@@ -8641,7 +8641,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)}
/> />
} }
/> />
...@@ -8686,7 +8686,7 @@ export default class TableSubHolding extends Component { ...@@ -8686,7 +8686,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)}
/> />
} }
/> />
...@@ -8729,7 +8729,7 @@ export default class TableSubHolding extends Component { ...@@ -8729,7 +8729,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)}
/> />
} }
/> />
...@@ -8772,7 +8772,7 @@ export default class TableSubHolding extends Component { ...@@ -8772,7 +8772,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)}
/> />
} }
/> />
...@@ -8815,7 +8815,7 @@ export default class TableSubHolding extends Component { ...@@ -8815,7 +8815,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)}
/> />
} }
/> />
...@@ -8976,7 +8976,7 @@ export default class TableSubHolding extends Component { ...@@ -8976,7 +8976,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)}
/> />
} }
/> />
...@@ -9019,7 +9019,7 @@ export default class TableSubHolding extends Component { ...@@ -9019,7 +9019,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)}
/> />
} }
/> />
...@@ -9062,7 +9062,7 @@ export default class TableSubHolding extends Component { ...@@ -9062,7 +9062,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)}
/> />
} }
/> />
...@@ -9105,7 +9105,7 @@ export default class TableSubHolding extends Component { ...@@ -9105,7 +9105,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)}
/> />
} }
/> />
...@@ -9150,7 +9150,7 @@ export default class TableSubHolding extends Component { ...@@ -9150,7 +9150,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)}
/> />
} }
/> />
...@@ -9193,7 +9193,7 @@ export default class TableSubHolding extends Component { ...@@ -9193,7 +9193,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)}
/> />
} }
/> />
...@@ -9236,7 +9236,7 @@ export default class TableSubHolding extends Component { ...@@ -9236,7 +9236,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)}
/> />
} }
/> />
...@@ -9279,7 +9279,7 @@ export default class TableSubHolding extends Component { ...@@ -9279,7 +9279,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)}
/> />
} }
/> />
...@@ -9324,7 +9324,7 @@ export default class TableSubHolding extends Component { ...@@ -9324,7 +9324,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)}
/> />
} }
/> />
...@@ -9367,7 +9367,7 @@ export default class TableSubHolding extends Component { ...@@ -9367,7 +9367,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)}
/> />
} }
/> />
...@@ -9410,7 +9410,7 @@ export default class TableSubHolding extends Component { ...@@ -9410,7 +9410,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)}
/> />
} }
/> />
...@@ -9453,7 +9453,7 @@ export default class TableSubHolding extends Component { ...@@ -9453,7 +9453,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