Skip to content

T
Tia-dev
Commit 82626371 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'riri' into 'master' 

issue

See merge request !1246
parents 30c0b57a 1a0ff453
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 102 deletions
src/container/Laporan/TableSubHolding.js
View file @ 82626371
...@@ -9379,23 +9379,25 @@ export default class TableSubHolding extends Component { ...@@ -9379,23 +9379,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disabled={true} type="text"
suffix={'%'} placeholder=""
value={Number(tableMeta.rowData[53]).toFixed(1)} disabled={true}
/> suffix={'%'}
} value={Number(tableMeta.rowData[53]).toFixed(1)}
/> />
</div> }
/>
</div>
} }
</div> </div>
<div className="col-4"> <div className="col-4">
...@@ -9512,23 +9514,25 @@ export default class TableSubHolding extends Component { ...@@ -9512,23 +9514,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disabled={true} type="text"
suffix={'%'} placeholder=""
value={Number(tableMeta.rowData[57]).toFixed(1)} disabled={true}
/> suffix={'%'}
} value={Number(tableMeta.rowData[57]).toFixed(1)}
/> />
</div> }
/>
</div>
} }
</div> </div>
<div className="col-4"> <div className="col-4">
...@@ -9646,23 +9650,25 @@ export default class TableSubHolding extends Component { ...@@ -9646,23 +9650,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disabled={true} type="text"
suffix={'%'} placeholder=""
value={Number(tableMeta.rowData[61]).toFixed(1)} disabled={true}
/> suffix={'%'}
} value={Number(tableMeta.rowData[61]).toFixed(1)}
/> />
</div> }
/>
</div>
} }
</div> </div>
<div className="col-4"> <div className="col-4">
...@@ -9779,23 +9785,25 @@ export default class TableSubHolding extends Component { ...@@ -9779,23 +9785,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
disabled={true} type="text"
value={Number(tableMeta.rowData[65]).toFixed(1)} placeholder=""
suffix={'%'} disabled={true}
/> value={Number(tableMeta.rowData[65]).toFixed(1)}
} suffix={'%'}
/> />
</div> }
/>
</div>
} }
</div> </div>
<div className="col-4"> <div className="col-4">
...@@ -13065,23 +13073,25 @@ export default class TableSubHolding extends Component { ...@@ -13065,23 +13073,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 70, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 70, backgroundColor: 'transparent' }}
suffix={`%`} type="text"
disabled={true} placeholder=""
value={Number(tableMeta.rowData[9]).toFixed(1)} suffix={`%`}
/> disabled={true}
} value={Number(tableMeta.rowData[9]).toFixed(1)}
/> />
</div> }
/>
</div>
} }
</div> </div>
</div> </div>
...@@ -13114,23 +13124,25 @@ export default class TableSubHolding extends Component { ...@@ -13114,23 +13124,25 @@ export default class TableSubHolding extends Component {
null null
: tableMeta.rowData[0] === 1 ? : tableMeta.rowData[0] === 1 ?
null : null :
<div style={{ flex: 1 }}> String(tableMeta.rowData[5]).toLocaleLowerCase() === "control (should be nil)" ?
<FormControlLabel null :
style={{ margin: 0 }} <div style={{ flex: 1 }}>
value={value} <FormControlLabel
control={ style={{ margin: 0 }}
<NumberFormat value={value}
thousandSeparator={true} control={
style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} <NumberFormat
type="text" thousandSeparator={true}
placeholder="" style={{ color: this.props.approveMonthly ? '#000000de' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
suffix={'%'} type="text"
disabled={true} placeholder=""
value={Number(tableMeta.rowData[11]).toFixed(1)} suffix={'%'}
/> disabled={true}
} value={Number(tableMeta.rowData[11]).toFixed(1)}
/> />
</div> }
/>
</div>
} }
</div> </div>
<div className="col-3"> <div className="col-3">
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