Merge branch 'faisal' into 'master'

weight!

See merge request !1341

src/container/RollingOutlook/CatRevision.js

@@ -140,7 +140,7 @@ export default class CatRevision extends Component {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
                             if (indexIDzz === -1) {
                                 let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
-
+                                let weight = String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)
                                 dataTable.push([
                                     item.type_report_id,
                                     item.id,
@@ -148,7 +148,7 @@ export default class CatRevision extends Component {
                                     item.formula,
                                     item.level,
                                     item.description,
-                                    item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(Number(String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)).toFixed(1)) + '%'),
+                                    item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(weight).toFixed(1),
                                     parentTrue ? item.corporate_annual_target.uom : item.uom,
                                     parentTrue ? item.corporate_annual_target.kpi == "" ? null : { value: item.corporate_annual_target.kpi } : item.kpi_type == "" ? null : { value: item.kpi_type },
                                     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) },
@@ -200,7 +200,7 @@ export default class CatRevision extends Component {
                                 item.formula,
                                 item.level,
                                 item.description,
-                                item.type_report_id == 1 ? `${Number(item.weight) * 100}%` : (String(Number(String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1)).toFixed(1)) + '%'),
+                                item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
                                 item.corporate_annual_target.uom,
                                 item.kpi_type == "" ? null : { value: item.kpi_type },
                                 item.max_ach == "" ? null : { value: titleCase(item.max_ach) },
@@ -1197,13 +1197,13 @@ export default class CatRevision extends Component {
                                         control={
                                             <NumberFormat
                                                 thousandSeparator={true}
-                                                suffix="%"
+                                                suffix={"%"}
                                                 style={{ color: 'black', fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                 type="text"
                                                 placeholder=""
-                                                value={value}
+                                                value={Number(value).toFixed(1)}
                                                 disabled={true}
-                                                maxLength={4}
+                                                decimalScale={1}
                                             />
                                         }
                                     />
@@ -2667,7 +2667,7 @@ export default class CatRevision extends Component {
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>
@@ -2888,7 +2888,7 @@ export default class CatRevision extends Component {
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision})</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }} />