Skip to content

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

Merge branch 'riri' into 'master' 

ro

See merge request !1311
parents a9f6e342 2cddeacb
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 130 deletions
src/container/OprIndicator/OperatingIndicator.js
View file @ cb404c2e
...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component { ...@@ -508,10 +508,10 @@ export default class OperatingIndicator extends Component {
borderColor: 'transparent' borderColor: 'transparent'
}} }}
onClick={() => onClick={() =>
tableMeta.rowData[4] ? // tableMeta.rowData[4] ?
this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2]) this.clickDetail(tableMeta.rowData, tableMeta.rowData[1], tableMeta.rowData[3], tableMeta.rowData[2])
: // :
null // null
} }
> >
<Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography> <Typography style={{ color: tableMeta.rowData[4] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>
......
src/container/RollingOutlook/OperatingIndicatorRO.js
View file @ cb404c2e
...@@ -810,47 +810,47 @@ export default class OperatingIndicatorRO extends Component { ...@@ -810,47 +810,47 @@ export default class OperatingIndicatorRO extends Component {
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
/> />
: :
// tableMeta.rowData[0] == 2 ? tableMeta.rowData[0] == 2 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleParent(tableMeta)).toFixed(1)} value={ value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// /> />
// } }
// /> />
// </div> </div>
// : :
// (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ? (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleFormula(tableMeta)).toFixed(1)} value={ value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// onBlur={(event) => { onBlur={(event) => {
// handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// }} }}
// /> />
// } }
// /> />
// </div> </div>
// : :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -873,7 +873,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -873,7 +873,7 @@ export default class OperatingIndicatorRO extends Component {
} }
/> />
</div> </div>
// ) )
} }
</div> </div>
) )
...@@ -906,47 +906,47 @@ export default class OperatingIndicatorRO extends Component { ...@@ -906,47 +906,47 @@ export default class OperatingIndicatorRO extends Component {
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
/> />
: :
// tableMeta.rowData[0] == 2 ? tableMeta.rowData[0] == 2 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleParent(tableMeta)).toFixed(1)} value={ value === "0" ? "" :Number(handleParent(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// /> />
// } }
// /> />
// </div> </div>
// : :
// (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ? (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleFormula(tableMeta)).toFixed(1)} value={ value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// onBlur={(event) => { onBlur={(event) => {
// handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// }} }}
// /> />
// } }
// /> />
// </div> </div>
// : :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -969,7 +969,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -969,7 +969,7 @@ export default class OperatingIndicatorRO extends Component {
} }
/> />
</div> </div>
// ) )
} }
</div> </div>
) )
...@@ -1001,47 +1001,47 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1001,47 +1001,47 @@ export default class OperatingIndicatorRO extends Component {
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
/> />
: :
// tableMeta.rowData[0] == 2 ? tableMeta.rowData[0] == 2 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleParent(tableMeta)).toFixed(1)} value={ value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// /> />
// } }
// /> />
// </div> </div>
// : :
// (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ? (tableMeta.rowData[0] == 5 || tableMeta.rowData[0] == 6 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} value={value}
// control={ control={
// <NumberFormat <NumberFormat
// thousandSeparator={true} thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text" type="text"
// placeholder="" placeholder=""
// value={Number(handleFormula(tableMeta)).toFixed(1)} value={value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)}
// disabled={true} disabled={true}
// decimalScale={1} decimalScale={1}
// onBlur={(event) => { onBlur={(event) => {
// handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// }} }}
// /> />
// } }
// /> />
// </div> </div>
// : :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
...@@ -1064,7 +1064,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1064,7 +1064,7 @@ export default class OperatingIndicatorRO extends Component {
} }
/> />
</div> </div>
// ) )
} }
</div> </div>
) )
...@@ -2137,7 +2137,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -2137,7 +2137,7 @@ export default class OperatingIndicatorRO extends Component {
</button> </button>
</div> </div>
{!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}> {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
{this.state.get_for == 'view' && this.state.viewOnly && {this.state.get_for == 'view' &&
<button <button
type="button" type="button"
onClick={() => { onClick={() => {
......
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