Merge branch 'faisal' into 'master'

update cat

See merge request !902

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -1296,14 +1296,14 @@ export default class CorporateAnnualTargetMR extends Component {
                                     <div style={{ flex: 1, textAlign: 'right' }}>
                                         <FormControlLabel
                                             style={{ margin: 0 }}
-                                            value={value}
+                                            value={Number(value).toFixed(1)}
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
                                                     style={{ color: this.state.get_for == 'view'? "black" : handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta)? "#5198ea" : 'black', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
-                                                    value={ tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)) : Number(value).toFixed(1)}
+                                                    value={ tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6? Number(handleValueFormula(value, tableMeta, tableMeta.columnIndex)).toFixed(1) : Number(value).toFixed(1)}
                                                     // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
                                                     disabled={this.state.get_for == 'view'? true : !handleAction(tableMeta.rowData[2], tableMeta.rowData[0], tableMeta)}
                                                     decimalScale={1}
@@ -1336,7 +1336,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                     null :
                                     <FormControlLabel
                                         style={{ margin: 0 }}
-                                        value={value}
+                                        value={Number(value).toFixed(1)}
                                         control={
                                             <NumberFormat
                                                 thousandSeparator={true}
@@ -1381,14 +1381,14 @@ export default class CorporateAnnualTargetMR extends Component {
                                     :
                                     <FormControlLabel
                                         style={{ margin: 0 }}
-                                        value={value}
+                                        value={Number(value).toFixed(1)}
                                         control={
                                             <NumberFormat
                                                 thousandSeparator={true}
                                                 style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                 type="text"
                                                 placeholder=""
-                                                value={handleAchiement(tableMeta)}
+                                                value={handleAchiement(tableMeta).toFixed(1)}
                                                 decimalScale={1}
                                                 disabled={true}
                                             />
@@ -1426,7 +1426,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                     :
                                     <FormControlLabel
                                         style={{ margin: 0 }}
-                                        value={value}
+                                        value={Number(value).toFixed(1)}
                                         control={
                                             <NumberFormat
                                                 thousandSeparator={true}
@@ -1479,7 +1479,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                             style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                             type="text"
                                             placeholder=""
-                                            value={handleTotal(tableMeta)}
+                                            value={handleTotal(tableMeta).toFixed(1)}
                                             decimalScale={2}
                                             disabled={true}
                                         />