Skip to content

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

Merge branch 'riri' into 'master' 

Riri

See merge request !1320
parents d2987934 4d1cbaf5
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
src/container/OprIndicator/OperatingIndicator.js
View file @ b7d8dafd
...@@ -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 @ b7d8dafd
...@@ -1113,7 +1113,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1113,7 +1113,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1132,7 +1132,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1132,7 +1132,7 @@ export default class OperatingIndicatorRO extends Component {
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={ this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={ this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
...@@ -1206,7 +1206,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1206,7 +1206,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1225,7 +1225,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1225,7 +1225,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
...@@ -1299,7 +1299,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1299,7 +1299,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1318,7 +1318,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1318,7 +1318,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={this.props.quartal == 'q2' || this.props.quartal == 'q3' ? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
...@@ -1392,7 +1392,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1392,7 +1392,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1411,7 +1411,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1411,7 +1411,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
...@@ -1485,7 +1485,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1485,7 +1485,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1504,7 +1504,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1504,7 +1504,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
...@@ -1578,7 +1578,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1578,7 +1578,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleParent(tableMeta)).toFixed(1)) : Number(handleParent(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
/> />
...@@ -1597,7 +1597,7 @@ export default class OperatingIndicatorRO extends Component { ...@@ -1597,7 +1597,7 @@ export default class OperatingIndicatorRO extends Component {
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={this.props.quartal == 'q3'? (value === "0" ? "" : Number(value).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)} value={this.props.quartal == 'q3'? (value === "0" ? "" : Number(handleFormula(tableMeta)).toFixed(1)) : Number(handleFormula(tableMeta)).toFixed(1)}
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ b7d8dafd
...@@ -1334,7 +1334,7 @@ export default class ProfitLossROO extends Component { ...@@ -1334,7 +1334,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1372,7 +1372,7 @@ export default class ProfitLossROO extends Component { ...@@ -1372,7 +1372,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
...@@ -1432,7 +1432,7 @@ export default class ProfitLossROO extends Component { ...@@ -1432,7 +1432,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1470,7 +1470,7 @@ export default class ProfitLossROO extends Component { ...@@ -1470,7 +1470,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
...@@ -1530,7 +1530,7 @@ export default class ProfitLossROO extends Component { ...@@ -1530,7 +1530,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1568,7 +1568,7 @@ export default class ProfitLossROO extends Component { ...@@ -1568,7 +1568,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q2' || this.props.quarter == 'q3' ? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
...@@ -1628,7 +1628,7 @@ export default class ProfitLossROO extends Component { ...@@ -1628,7 +1628,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1666,7 +1666,7 @@ export default class ProfitLossROO extends Component { ...@@ -1666,7 +1666,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
...@@ -1726,7 +1726,7 @@ export default class ProfitLossROO extends Component { ...@@ -1726,7 +1726,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1764,7 +1764,7 @@ export default class ProfitLossROO extends Component { ...@@ -1764,7 +1764,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
...@@ -1824,7 +1824,7 @@ export default class ProfitLossROO extends Component { ...@@ -1824,7 +1824,7 @@ export default class ProfitLossROO extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleValue(val, tableMeta)).toFixed(1)) : Number(handleValue(val, tableMeta)).toFixed(1)}
/> />
</span> </span>
: :
...@@ -1862,7 +1862,7 @@ export default class ProfitLossROO extends Component { ...@@ -1862,7 +1862,7 @@ export default class ProfitLossROO extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(val).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)} value={this.props.quarter == 'q3'? (val === "0" ? "" : Number(handleFormula(val, tableMeta, 1)).toFixed(1)) : Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> />
} }
/> />
......
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