Skip to content

T
Tia-dev
Commit 19b938e9 authored by Faisal Hamdi's avatar Faisal Hamdi
Browse files
Options

Merge branch 'faisal' into 'master' 

issue catro!

See merge request !1353
parents a4be9e12 ae9c4ef4
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 68 deletions
src/container/RollingOutlook/CatRevision.js
View file @ 19b938e9
...@@ -1228,53 +1228,6 @@ export default class CatRevision extends Component { ...@@ -1228,53 +1228,6 @@ export default class CatRevision extends Component {
{value} {value}
</div> </div>
</div> </div>
// <div style={{ textAlign: 'center' }}>
// {tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
// null :
// <FormControlLabel
// style={{ margin: 0 }}
// // value={value}
// control={
// // !handleAction(tableMeta.rowData[2], tableMeta.rowData[0]) ?
// <Input
// disableUnderline={true}
// style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', marginTop: -10 }}
// type="text"
// placeholder=""
// defaultValue={value}
// color={"#5198ea"}
// disabled={true}
// onBlur={(event) => {
// // // // // console.log(event.target.value)
// // updateValue(event.target.value)
// // handleChangeText(event.target.value, tableMeta)
// // // // // console.log(dataTable2)
// }}
// />
// // />
// // />
// // :
// // <ThemeProvider theme={theme}>
// // <Input
// // disableUnderline={true}
// // style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', marginBottom: -5 }}
// // type="text"
// // placeholder=""
// // defaultValue={value}
// // color={"#5198ea"}
// // // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false ? false : !handleAction(tableMeta.rowData[2]))}
// // onBlur={(event) => {
// // // // // // console.log(event.target.value)
// // // updateValue(event.target.value)
// // handleChangeText(event.target.value, tableMeta)
// // // // // // console.log(dataTable2)
// // }}
// // />
// // </ThemeProvider>
// }
// />
// }
// </div>
) )
} }
} }
...@@ -2537,37 +2490,86 @@ export default class CatRevision extends Component { ...@@ -2537,37 +2490,86 @@ export default class CatRevision extends Component {
{tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ? {tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null : null :
this.state.get_for == "view" ? this.state.get_for == "view" ?
<Input <NumberFormat
disableUnderline={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'center', 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=""
disabled={true} disabled={true}
defaultValue={value} value={Number(value).toFixed(1)}
/> />
: :
tableMeta.rowData[5] === 'ROIC' ?
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={value}
control={ control={
<ThemeProvider theme={theme}> <NumberFormat
<Input thousandSeparator={true}
disableUnderline={true} style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
style={{ fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', marginBottom: -5 }}
type="text" type="text"
placeholder="" placeholder=""
value={Number(value).toFixed(1)}
disabled={true}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
// // // // console.log(tableMeta.rowData[0])
}}
/>
}
/> :
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
null
:
(handleReturnFormula(tableMeta.rowData[2], tableMeta) ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
// value={Number(handleValueFormula(value, tableMeta, 4)).toFixed(1)}
value={Number(value).toFixed(1)}
disabled={true}
decimalScale={1}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
// // // // console.log(tableMeta.rowData[0])
}}
/>
}
/>
</div>
:
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ color: this.props.quarter == 'q1' ? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
value={Number(value).toFixed(1)}
disabled={this.props.quarter == 'q1' ? false : true} disabled={this.props.quarter == 'q1' ? false : true}
disable={true} decimalScale={1}
defaultValue={value}
onBlur={(event) => { onBlur={(event) => {
// // // // console.log(event.target.value) // updateValue(event.target.value)
handleChangeText(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
// // // // console.log(dataTable2) // // // // console.log(tableMeta.rowData[0])
}} }}
/> />
</ThemeProvider>
} }
/> />
</div>
)
} }
</div> </div>
) )
......
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