Commit 18c65862 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

apdet

See merge request !1156
parents a30d7997 766a84e8
...@@ -3112,7 +3112,7 @@ export default class TableSubHolding extends Component { ...@@ -3112,7 +3112,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[23]) === "" ? "" : tableMeta.rowData[23] === "0.00" ? "" : Number(tableMeta.rowData[23]).toFixed(1)} value={String(tableMeta.rowData[23]) === "" ? "" : Number(tableMeta.rowData[23]).toFixed(1)}
/> />
} }
/> />
...@@ -3135,7 +3135,7 @@ export default class TableSubHolding extends Component { ...@@ -3135,7 +3135,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[24]) === "" ? "" : tableMeta.rowData[24] === "0.00" ? "" : Number(tableMeta.rowData[24]).toFixed(1)} value={String(tableMeta.rowData[24]) === "" ? "" : Number(tableMeta.rowData[24]).toFixed(1)}
/> />
} }
/> />
...@@ -3158,7 +3158,7 @@ export default class TableSubHolding extends Component { ...@@ -3158,7 +3158,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[25]) === "" ? "" : tableMeta.rowData[25] === "0.00" ? "" : Number(tableMeta.rowData[25]).toFixed(1)} value={String(tableMeta.rowData[25]) === "" ? "" : Number(tableMeta.rowData[25]).toFixed(1)}
/> />
} }
/> />
...@@ -3181,7 +3181,7 @@ export default class TableSubHolding extends Component { ...@@ -3181,7 +3181,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[26]) === "" ? "" : tableMeta.rowData[26] === "0.00" ? "" : Number(tableMeta.rowData[26]).toFixed(1)} value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(1)}
/> />
} }
/> />
...@@ -3206,7 +3206,7 @@ export default class TableSubHolding extends Component { ...@@ -3206,7 +3206,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[27]) === "" ? "" : tableMeta.rowData[27] === "0.00" ? "" : Number(tableMeta.rowData[27]).toFixed(1)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)}
/> />
} }
/> />
...@@ -3229,7 +3229,7 @@ export default class TableSubHolding extends Component { ...@@ -3229,7 +3229,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[28]) === "" ? "" : tableMeta.rowData[28] === "0.00" ? "" : Number(tableMeta.rowData[28]).toFixed(1)} value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(1)}
/> />
} }
/> />
...@@ -3252,7 +3252,7 @@ export default class TableSubHolding extends Component { ...@@ -3252,7 +3252,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[29]) === "" ? "" : tableMeta.rowData[29] === "0.00" ? "" : Number(tableMeta.rowData[29]).toFixed(1)} value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(1)}
/> />
} }
/> />
...@@ -3275,7 +3275,7 @@ export default class TableSubHolding extends Component { ...@@ -3275,7 +3275,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[30]) === "" ? "" : tableMeta.rowData[30] === "0.00" ? "" : Number(tableMeta.rowData[30]).toFixed(1)} value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(1)}
/> />
} }
/> />
...@@ -3300,7 +3300,7 @@ export default class TableSubHolding extends Component { ...@@ -3300,7 +3300,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[31]) === "" ? "" : tableMeta.rowData[31] === "0.00" ? "" : Number(tableMeta.rowData[31]).toFixed(1)} value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(1)}
/> />
} }
/> />
...@@ -3323,7 +3323,7 @@ export default class TableSubHolding extends Component { ...@@ -3323,7 +3323,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[32]) === "" ? "" : tableMeta.rowData[32] === "0.00" ? "" : Number(tableMeta.rowData[32]).toFixed(1)} value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(1)}
/> />
} }
/> />
...@@ -3346,7 +3346,7 @@ export default class TableSubHolding extends Component { ...@@ -3346,7 +3346,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[33]) === "" ? "" : tableMeta.rowData[33] === "0.00" ? "" : Number(tableMeta.rowData[33]).toFixed(1)} value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(1)}
/> />
} }
/> />
...@@ -3369,7 +3369,7 @@ export default class TableSubHolding extends Component { ...@@ -3369,7 +3369,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[34]) === "" ? "" : tableMeta.rowData[34] === "0.00" ? "" : Number(tableMeta.rowData[34]).toFixed(1)} value={String(tableMeta.rowData[34]) === "" ? "" : Number(tableMeta.rowData[34]).toFixed(1)}
/> />
} }
/> />
...@@ -3516,7 +3516,7 @@ export default class TableSubHolding extends Component { ...@@ -3516,7 +3516,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[35]) === "" ? "" : tableMeta.rowData[35] === "0.00" ? "" : Number(tableMeta.rowData[35]).toFixed(1)} value={String(tableMeta.rowData[35]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(1)}
/> />
} }
/> />
...@@ -3539,7 +3539,7 @@ export default class TableSubHolding extends Component { ...@@ -3539,7 +3539,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[36]) === "" ? "" : tableMeta.rowData[36] === "0.00" ? "" : Number(tableMeta.rowData[36]).toFixed(1)} value={String(tableMeta.rowData[36]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(1)}
/> />
} }
/> />
...@@ -3562,7 +3562,7 @@ export default class TableSubHolding extends Component { ...@@ -3562,7 +3562,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[37]) === "" ? "" : tableMeta.rowData[37] === "0.00" ? "" : Number(tableMeta.rowData[37]).toFixed(1)} value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(1)}
/> />
} }
/> />
...@@ -3585,7 +3585,7 @@ export default class TableSubHolding extends Component { ...@@ -3585,7 +3585,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[38]) === "" ? "" : tableMeta.rowData[38] === "0.00" ? "" : Number(tableMeta.rowData[38]).toFixed(1)} value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(1)}
/> />
} }
/> />
...@@ -3610,7 +3610,7 @@ export default class TableSubHolding extends Component { ...@@ -3610,7 +3610,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[39]) === "" ? "" : tableMeta.rowData[39] === "0.00" ? "" : Number(tableMeta.rowData[39]).toFixed(1)} value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(1)}
/> />
} }
/> />
...@@ -3633,7 +3633,7 @@ export default class TableSubHolding extends Component { ...@@ -3633,7 +3633,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[40]) === "" ? "" : tableMeta.rowData[40] === "0.00" ? "" : Number(tableMeta.rowData[40]).toFixed(1)} value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(1)}
/> />
} }
/> />
...@@ -3656,7 +3656,7 @@ export default class TableSubHolding extends Component { ...@@ -3656,7 +3656,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[41]) === "" ? "" : tableMeta.rowData[41] === "0.00" ? "" : Number(tableMeta.rowData[41]).toFixed(1)} value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(1)}
/> />
} }
/> />
...@@ -3679,7 +3679,7 @@ export default class TableSubHolding extends Component { ...@@ -3679,7 +3679,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[42]) === "" ? "" : tableMeta.rowData[42] === "0.00" ? "" : Number(tableMeta.rowData[42]).toFixed(1)} value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(1)}
/> />
} }
/> />
...@@ -3704,7 +3704,7 @@ export default class TableSubHolding extends Component { ...@@ -3704,7 +3704,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[43]) === "" ? "" : tableMeta.rowData[43] === "0.00" ? "" : Number(tableMeta.rowData[43]).toFixed(1)} value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(1)}
/> />
} }
/> />
...@@ -3727,7 +3727,7 @@ export default class TableSubHolding extends Component { ...@@ -3727,7 +3727,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[44]) === "" ? "" : tableMeta.rowData[44] === "0.00" ? "" : Number(tableMeta.rowData[44]).toFixed(1)} value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(1)}
/> />
} }
/> />
...@@ -3750,7 +3750,7 @@ export default class TableSubHolding extends Component { ...@@ -3750,7 +3750,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[45]) === "" ? "" : tableMeta.rowData[45] === "0.00" ? "" : Number(tableMeta.rowData[45]).toFixed(1)} value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(1)}
/> />
} }
/> />
...@@ -3773,7 +3773,7 @@ export default class TableSubHolding extends Component { ...@@ -3773,7 +3773,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[46]) === "" ? "" : tableMeta.rowData[46] === "0.00" ? "" : Number(tableMeta.rowData[46]).toFixed(1)} value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)}
/> />
} }
/> />
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