Merge branch 'didam' into 'master'

apdet banyak

See merge request !852

src/container/MonthlyReport/CashFlowMR.js

@@ -427,7 +427,7 @@ export default class CashFlowMR 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.month.month_value} {this.props.periode} (rev.{this.props.revision})</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ width: '50%' }}>

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -81,8 +81,10 @@ export default class CorporateAnnualTargetMR extends Component {
 
     handleGetFor(type) {
         this.setState({get_for: type}, () => {
-            this.getLatestUpdate()
             this.getItemHierarki()
+            this.getLatestUpdate()
+            this.getKPIType()
+            this.getMaxAch()
         })
     }
 
@@ -128,7 +130,8 @@ export default class CorporateAnnualTargetMR extends Component {
             "periode": "2021",
             "company_id": this.props.company.company_id,
             "monthly_report_id": this.props.monthlyReportId,
-            "months": this.props.month.month_id
+            "months": this.props.month.month_id,
+            "get_for": this.state.get_for
         }
         
         api.create().getHierarkiMontlyReportCAT(payload).then(response => {
@@ -937,12 +940,12 @@ export default class CorporateAnnualTargetMR extends Component {
                                             control={
                                                 <NumberFormat
                                                     thousandSeparator={true}
-                                                    style={{ color: "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'center', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     value={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={false}
+                                                    disabled={this.state.get_for == 'view'}
                                                     decimalScale={1}
                                                     onBlur={(event) => {
                                                         // updateValue(event.target.value)
@@ -1130,11 +1133,11 @@ export default class CorporateAnnualTargetMR extends Component {
                                             <ThemeProvider theme={theme}>
                                                 <Input
                                                     disableUnderline={true}
-                                                    style={{ color: "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 75, backgroundColor: 'transparent' }}
+                                                    style={{ color: this.state.get_for == 'view'? "black" : "#5198ea", fontSize: 12, textAlign: 'left', borderColor: 'transparent', margin: 0, width: 75, backgroundColor: 'transparent' }}
                                                     type="text"
                                                     placeholder=""
                                                     defaultValue={value}
-                                                    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 : 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)}
                                                     onBlur={(event) => {
                                                         // updateValue(event.target.value)
                                                         handleChange(event.target.value, tableMeta)
@@ -1189,7 +1192,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                     </div>
                                     <div style={{ width: '50%' }}>
                                         <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
-                                            <a data-tip={'Download Template'} data-for="template">
+                                            {this.state.get_for == 'edit' && <a data-tip={'Download Template'} data-for="template">
                                                 <button
                                                     style={{
                                                         backgroundColor: 'transparent',
@@ -1201,9 +1204,9 @@ export default class CorporateAnnualTargetMR extends Component {
                                                 >
                                                     <img src={Images.template} />
                                                 </button>
-                                            </a>
+                                            </a>}
                                             <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
-                                            <a data-tip={'Upload'} data-for="upload">
+                                            {this.state.get_for == 'edit' && <a data-tip={'Upload'} data-for="upload">
                                                 <button
                                                     style={{
                                                         backgroundColor: 'transparent',
@@ -1215,7 +1218,7 @@ export default class CorporateAnnualTargetMR extends Component {
                                                 >
                                                     <img src={Images.upload} />
                                                 </button>
-                                            </a>
+                                            </a>}
                                             <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
                                             <a data-tip={'Download'} data-for="download">
                                                 <button