Merge branch 'didam' into 'master'

Didam

See merge request !918

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -169,7 +169,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                 item.description,
                                 item.corporate_annual_target.weight == ""? "0%" : item.corporate_annual_target.weight,
                                 parentTrue ? item.corporate_annual_target.uom : item.uom,
-                                parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : item.corporate_annual_target.kpi_type : item.kpi_type == "" ? null : item.kpi_type,
+                                parentTrue ? item.corporate_annual_target.jenis_kpi == "" ? null : item.corporate_annual_target.jenis_kpi : item.jenis_kpi == "" ? null : item.kpi_type,
                                 // parentTrue ? item.corporate_annual_target.kpi_type == "" ? null : { value: item.corporate_annual_target.kpi_type } : item.kpi_type == "" ? null : { value: item.kpi_type },
                                 parentTrue ? item.corporate_annual_target.max_ach == "" ? null : titleCase(item.corporate_annual_target.max_ach) : item.max_ach == "" ? null : titleCase(item.max_ach),
                                 // parentTrue ? item.corporate_annual_target.max_ach == "" ? null : { value: titleCase(item.corporate_annual_target.max_ach) } : item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
@@ -1186,7 +1186,23 @@ export default class CorporateAnnualTargetMR extends Component {
                             <div style={{ textAlign: 'center' }}>
                                 {tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    value
+                                    <FormControlLabel
+                                        style={{ margin: 0}}
+                                        value={value}
+                                        control={
+                                            <NumberFormat
+                                                thousandSeparator={true}
+                                                style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                type="text"
+                                                placeholder=""
+                                                suffix={"%"}
+                                                value={Number(value).toFixed(1)}
+                                                disabled={true}
+                                                // 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)}
+                                                decimalScale={1}
+                                            />
+                                        }
+                                    />
                                 }
                             </div>
                         )