Skip to content

T
Tia-dev
Commit 1b6def5d authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'didam' into 'master' 

apdet

See merge request !908
parents 3caa93ad 30c9ef8e
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 1b6def5d
...@@ -509,10 +509,7 @@ export default class BalanceSheetMR extends Component { ...@@ -509,10 +509,7 @@ export default class BalanceSheetMR extends Component {
} else if ( i[18] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) { } else if ( i[18] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) {
console.log('msk 2'); console.log('msk 2');
err = true err = true
} else if ( i[19] === "" && (Number(i[16]) < this.state.minValue || Number(i[16]) > this.state.maxValue)) { }
console.log('msk 3');
err = true
}
} }
if (String(i[5]) == "Control (should be nil)") { if (String(i[5]) == "Control (should be nil)") {
...@@ -2305,30 +2302,30 @@ export default class BalanceSheetMR extends Component { ...@@ -2305,30 +2302,30 @@ export default class BalanceSheetMR extends Component {
style={{ margin: 0 }} style={{ margin: 0 }}
// value={value} // value={value}
control={ control={
tableMeta.rowData[19] === "" && (Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue) ? // tableMeta.rowData[19] === "" && (Number(tableMeta.rowData[16]) < this.state.minValue || Number(tableMeta.rowData[16]) > this.state.maxValue) ?
<LightTooltip title={"MTD Explanation vs RB is Reqiured"} arrow> // <LightTooltip title={"MTD Explanation vs RB is Reqiured"} arrow>
<Input // <Input
disableUnderline={true} // disableUnderline={true}
style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
multiline={true} // multiline={true}
placeholder="" // placeholder=""
// disabled={false} // // disabled={false}
disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} // disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
defaultValue={tableMeta.rowData[19]} // defaultValue={tableMeta.rowData[19]}
inputProps={{ // inputProps={{
style: { // style: {
color: "#5198ea", // color: "#5198ea",
textAlign: 'left', // textAlign: 'left',
backgroundColor: '#ffac99' // backgroundColor: '#ffac99'
} // }
}} // }}
onBlur={(event) => { // onBlur={(event) => {
handleText(event.target.value, tableMeta, 19) // handleText(event.target.value, tableMeta, 19)
}} // }}
/> // />
</LightTooltip> // </LightTooltip>
: // :
// tableMeta.rowData[0] === 7 ? // tableMeta.rowData[0] === 7 ?
// (Number(handleValueFormula(tableMeta, 19)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 19)).toFixed(1) <= Number(this.state.maxValue)) ? // (Number(handleValueFormula(tableMeta, 19)).toFixed(1) >= Number(this.state.minValue) && Number(handleValueFormula(tableMeta, 19)).toFixed(1) <= Number(this.state.maxValue)) ?
// <NumberFormat // <NumberFormat
......
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