Commit 3d133efd authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

tofixed

See merge request !1151
parents c474f0f2 2eea89aa
...@@ -2098,7 +2098,7 @@ export default class TableSubHolding extends Component { ...@@ -2098,7 +2098,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(2)} value={String(tableMeta.rowData[37]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(1)}
/> />
} }
/> />
...@@ -2121,7 +2121,7 @@ export default class TableSubHolding extends Component { ...@@ -2121,7 +2121,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(2)} value={String(tableMeta.rowData[38]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(1)}
/> />
} }
/> />
...@@ -2144,7 +2144,7 @@ export default class TableSubHolding extends Component { ...@@ -2144,7 +2144,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(2)} value={String(tableMeta.rowData[39]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(1)}
/> />
} }
/> />
...@@ -2167,7 +2167,7 @@ export default class TableSubHolding extends Component { ...@@ -2167,7 +2167,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(2)} value={String(tableMeta.rowData[40]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(1)}
/> />
} }
/> />
...@@ -2192,7 +2192,7 @@ export default class TableSubHolding extends Component { ...@@ -2192,7 +2192,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(2)} value={String(tableMeta.rowData[41]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(1)}
/> />
} }
/> />
...@@ -2215,7 +2215,7 @@ export default class TableSubHolding extends Component { ...@@ -2215,7 +2215,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(2)} value={String(tableMeta.rowData[42]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(1)}
/> />
} }
/> />
...@@ -2238,7 +2238,7 @@ export default class TableSubHolding extends Component { ...@@ -2238,7 +2238,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(2)} value={String(tableMeta.rowData[43]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(1)}
/> />
} }
/> />
...@@ -2261,7 +2261,7 @@ export default class TableSubHolding extends Component { ...@@ -2261,7 +2261,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(2)} value={String(tableMeta.rowData[44]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(1)}
/> />
} }
/> />
...@@ -2286,7 +2286,7 @@ export default class TableSubHolding extends Component { ...@@ -2286,7 +2286,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(2)} value={String(tableMeta.rowData[45]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(1)}
/> />
} }
/> />
...@@ -2309,7 +2309,7 @@ export default class TableSubHolding extends Component { ...@@ -2309,7 +2309,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(2)} value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)}
/> />
} }
/> />
...@@ -2332,7 +2332,7 @@ export default class TableSubHolding extends Component { ...@@ -2332,7 +2332,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[47]) === "" ? "" : Number(tableMeta.rowData[47]).toFixed(2)} value={String(tableMeta.rowData[47]) === "" ? "" : Number(tableMeta.rowData[47]).toFixed(1)}
/> />
} }
/> />
...@@ -2355,7 +2355,7 @@ export default class TableSubHolding extends Component { ...@@ -2355,7 +2355,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[48]) === "" ? "" : Number(tableMeta.rowData[48]).toFixed(2)} value={String(tableMeta.rowData[48]) === "" ? "" : Number(tableMeta.rowData[48]).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]) === "" ? "" : Number(tableMeta.rowData[35]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[36]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[37]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[38]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[39]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[40]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[41]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[42]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[43]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[44]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[45]).toFixed(2)} 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]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(2)} value={String(tableMeta.rowData[46]) === "" ? "" : Number(tableMeta.rowData[46]).toFixed(1)}
/> />
} }
/> />
...@@ -8470,7 +8470,7 @@ export default class TableSubHolding extends Component { ...@@ -8470,7 +8470,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]).toFixed(2)} value={Number(tableMeta.rowData[8]).toFixed(1)}
/> />
} }
/> />
...@@ -8493,7 +8493,7 @@ export default class TableSubHolding extends Component { ...@@ -8493,7 +8493,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(2)} value={Number(tableMeta.rowData[9]).toFixed(1)}
/> />
} }
/> />
...@@ -8516,7 +8516,7 @@ export default class TableSubHolding extends Component { ...@@ -8516,7 +8516,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[10]).toFixed(2)} value={Number(tableMeta.rowData[10]).toFixed(1)}
/> />
} }
/> />
...@@ -8539,7 +8539,7 @@ export default class TableSubHolding extends Component { ...@@ -8539,7 +8539,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]).toFixed(2)} value={Number(tableMeta.rowData[11]).toFixed(1)}
/> />
} }
/> />
...@@ -8564,7 +8564,7 @@ export default class TableSubHolding extends Component { ...@@ -8564,7 +8564,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]).toFixed(2)} value={Number(tableMeta.rowData[12]).toFixed(1)}
/> />
} }
/> />
...@@ -8587,7 +8587,7 @@ export default class TableSubHolding extends Component { ...@@ -8587,7 +8587,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(2)} value={Number(tableMeta.rowData[13]).toFixed(1)}
/> />
} }
/> />
...@@ -8610,7 +8610,7 @@ export default class TableSubHolding extends Component { ...@@ -8610,7 +8610,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]).toFixed(2)} value={Number(tableMeta.rowData[14]).toFixed(1)}
/> />
} }
/> />
...@@ -8633,7 +8633,7 @@ export default class TableSubHolding extends Component { ...@@ -8633,7 +8633,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(2)} value={Number(tableMeta.rowData[15]).toFixed(1)}
/> />
} }
/> />
...@@ -8658,7 +8658,7 @@ export default class TableSubHolding extends Component { ...@@ -8658,7 +8658,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]).toFixed(2)} value={Number(tableMeta.rowData[16]).toFixed(1)}
/> />
} }
/> />
...@@ -8681,7 +8681,7 @@ export default class TableSubHolding extends Component { ...@@ -8681,7 +8681,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(2)} value={Number(tableMeta.rowData[17]).toFixed(1)}
/> />
} }
/> />
...@@ -8704,7 +8704,7 @@ export default class TableSubHolding extends Component { ...@@ -8704,7 +8704,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]).toFixed(2)} value={Number(tableMeta.rowData[18]).toFixed(1)}
/> />
} }
/> />
...@@ -8727,7 +8727,7 @@ export default class TableSubHolding extends Component { ...@@ -8727,7 +8727,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[19]).toFixed(2)} value={Number(tableMeta.rowData[19]).toFixed(1)}
/> />
} }
/> />
...@@ -8820,7 +8820,7 @@ export default class TableSubHolding extends Component { ...@@ -8820,7 +8820,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[22]) === "" ? "" : Number(tableMeta.rowData[22]).toFixed(2)} value={String(tableMeta.rowData[22]) === "" ? "" : Number(tableMeta.rowData[22]).toFixed(1)}
/> />
} }
/> />
...@@ -8843,7 +8843,7 @@ export default class TableSubHolding extends Component { ...@@ -8843,7 +8843,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[23]) === "" ? "" : Number(tableMeta.rowData[23]).toFixed(2)} value={String(tableMeta.rowData[23]) === "" ? "" : Number(tableMeta.rowData[23]).toFixed(1)}
/> />
} }
/> />
...@@ -8866,7 +8866,7 @@ export default class TableSubHolding extends Component { ...@@ -8866,7 +8866,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[24]) === "" ? "" : Number(tableMeta.rowData[24]).toFixed(2)} value={String(tableMeta.rowData[24]) === "" ? "" : Number(tableMeta.rowData[24]).toFixed(1)}
/> />
} }
/> />
...@@ -8889,7 +8889,7 @@ export default class TableSubHolding extends Component { ...@@ -8889,7 +8889,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[25]) === "" ? "" : Number(tableMeta.rowData[25]).toFixed(2)} value={String(tableMeta.rowData[25]) === "" ? "" : Number(tableMeta.rowData[25]).toFixed(1)}
/> />
} }
/> />
...@@ -8914,7 +8914,7 @@ export default class TableSubHolding extends Component { ...@@ -8914,7 +8914,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(2)} value={String(tableMeta.rowData[26]) === "" ? "" : Number(tableMeta.rowData[26]).toFixed(1)}
/> />
} }
/> />
...@@ -8937,7 +8937,7 @@ export default class TableSubHolding extends Component { ...@@ -8937,7 +8937,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(2)} value={String(tableMeta.rowData[27]) === "" ? "" : Number(tableMeta.rowData[27]).toFixed(1)}
/> />
} }
/> />
...@@ -8960,7 +8960,7 @@ export default class TableSubHolding extends Component { ...@@ -8960,7 +8960,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(2)} value={String(tableMeta.rowData[28]) === "" ? "" : Number(tableMeta.rowData[28]).toFixed(1)}
/> />
} }
/> />
...@@ -8983,7 +8983,7 @@ export default class TableSubHolding extends Component { ...@@ -8983,7 +8983,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(2)} value={String(tableMeta.rowData[29]) === "" ? "" : Number(tableMeta.rowData[29]).toFixed(1)}
/> />
} }
/> />
...@@ -9008,7 +9008,7 @@ export default class TableSubHolding extends Component { ...@@ -9008,7 +9008,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(2)} value={String(tableMeta.rowData[30]) === "" ? "" : Number(tableMeta.rowData[30]).toFixed(1)}
/> />
} }
/> />
...@@ -9031,7 +9031,7 @@ export default class TableSubHolding extends Component { ...@@ -9031,7 +9031,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(2)} value={String(tableMeta.rowData[31]) === "" ? "" : Number(tableMeta.rowData[31]).toFixed(1)}
/> />
} }
/> />
...@@ -9054,7 +9054,7 @@ export default class TableSubHolding extends Component { ...@@ -9054,7 +9054,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(2)} value={String(tableMeta.rowData[32]) === "" ? "" : Number(tableMeta.rowData[32]).toFixed(1)}
/> />
} }
/> />
...@@ -9077,7 +9077,7 @@ export default class TableSubHolding extends Component { ...@@ -9077,7 +9077,7 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(2)} value={String(tableMeta.rowData[33]) === "" ? "" : Number(tableMeta.rowData[33]).toFixed(1)}
/> />
} }
/> />
...@@ -4487,8 +4487,8 @@ export default class TableSummaryTriputra extends Component { ...@@ -4487,8 +4487,8 @@ export default class TableSummaryTriputra extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
suffix={'%'} suffix={'%'}
// value={tableMeta.rowData[7]} value={tableMeta.rowData[7]}
value={Number(tableMeta.rowData[7]).toFixed(2)} // value={Number(tableMeta.rowData[7]).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