Skip to content

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

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents cc178e9e 2a4fc862
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 53 deletions
src/container/RollingOutlook/CorporateAnnualTargetRO.js
View file @ 963e6004
...@@ -394,7 +394,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -394,7 +394,7 @@ export default class CorporateAnnualTargetRO extends Component {
"uom": String(i[7]), "uom": String(i[7]),
"kpi_type": i[8] == null ? "" : i[8].value, "kpi_type": i[8] == null ? "" : i[8].value,
"max_ach": i[9] == null ? "" : i[9].value, "max_ach": i[9] == null ? "" : i[9].value,
"formula": i[10] == null ? "" : i[10].value, "formula_ytd": i[10] == null ? "" : i[10].value,
"january": stateFR ? i[0] == 3 ? String(i[11]) : String(Number(i[11].value).toFixed(1)) : String(i[11]), "january": stateFR ? i[0] == 3 ? String(i[11]) : String(Number(i[11].value).toFixed(1)) : String(i[11]),
"february": stateFR ? i[0] == 3 ? String(i[12]) : String(Number(i[12].value).toFixed(1)) : String(i[12]), "february": stateFR ? i[0] == 3 ? String(i[12]) : String(Number(i[12].value).toFixed(1)) : String(i[12]),
"march": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]), "march": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
...@@ -607,7 +607,7 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -607,7 +607,7 @@ export default class CorporateAnnualTargetRO extends Component {
"uom": String(i[7]), "uom": String(i[7]),
"kpi_type": i[8] == null ? "" : i[8].value, "kpi_type": i[8] == null ? "" : i[8].value,
"max_ach": i[9] == null ? "" : i[9].value, "max_ach": i[9] == null ? "" : i[9].value,
"formula": i[10] == null ? "" : i[10].value, "formula_ytd": i[10] == null ? "" : i[10].value,
"january": stateFR ? i[0] == 3 ? String(i[11]) : String(Number(i[11].value).toFixed(1)) : String(i[11]), "january": stateFR ? i[0] == 3 ? String(i[11]) : String(Number(i[11].value).toFixed(1)) : String(i[11]),
"february": stateFR ? i[0] == 3 ? String(i[12]) : String(Number(i[12].value).toFixed(1)) : String(i[12]), "february": stateFR ? i[0] == 3 ? String(i[12]) : String(Number(i[12].value).toFixed(1)) : String(i[12]),
"march": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]), "march": stateFR ? i[0] == 3 ? String(i[13]) : String(Number(i[13].value).toFixed(1)) : String(i[13]),
...@@ -2437,62 +2437,38 @@ export default class CorporateAnnualTargetRO extends Component { ...@@ -2437,62 +2437,38 @@ export default class CorporateAnnualTargetRO 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" ?
<NumberFormat <Input
thousandSeparator={true} disableUnderline={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(value).toFixed(1)}
/>
:
(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" type="text"
placeholder="" placeholder=""
value={Number(value).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} defaultValue={value}
onBlur={(event) => {
// updateValue(event.target.value)
handleChange(event.target.value, tableMeta)
// console.log(tableMeta.rowData[0])
}}
/>
}
/> />
</div>
: :
<div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
value={value} // value={value}
control={ control={
<NumberFormat <ThemeProvider theme={theme}>
thousandSeparator={true} <Input
style={{ color: this.props.quarter == 'q1' ? "#5198ea" : '#555252', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} disableUnderline={true}
style={{ color: "#5198ea", 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={this.props.quarter == 'q1' ? false : true} disabled={this.props.quarter == 'q1' ? false : true}
decimalScale={1} defaultValue={value}
onBlur={(event) => { onBlur={(event) => {
// console.log(event.target.value)
// updateValue(event.target.value) // updateValue(event.target.value)
handleChange(event.target.value, tableMeta) handleChangeText(event.target.value, tableMeta)
// console.log(tableMeta.rowData[0]) // console.log(dataTable2)
}} }}
/> />
</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