Merge branch 'riri' into 'master'

tambahan

See merge request !781

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -74,6 +74,7 @@ export default class OperatingIndicatorMR extends Component {
         // this.getItemHierarki()
         this.getSettingControl()
         this.getLatestUpdate()
+        console.log(this.props.permission.create);
     }
 
     getSettingControl() {
@@ -852,7 +853,7 @@ export default class OperatingIndicatorMR extends Component {
                                                                     style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                     type="text"
                                                                     placeholder=""
-                                                                    disabled={false}
+                                                                    disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
                                                                     value={Number(tableMeta.rowData[10]).toFixed(1)}
                                                                     onBlur={(event) => {
                                                                         handleChange(event.target.value, tableMeta)
@@ -1119,7 +1120,7 @@ export default class OperatingIndicatorMR extends Component {
                                                                     style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                     type="text"
                                                                     placeholder=""
-                                                                    disabled={false}
+                                                                    disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
                                                                     value={Number(tableMeta.rowData[15]).toFixed(1)}
                                                                     onBlur={(event) => {
                                                                         handleChange(event.target.value, tableMeta)
@@ -1175,7 +1176,7 @@ export default class OperatingIndicatorMR extends Component {
                                                                 style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
                                                                 type="text"
                                                                 placeholder=""
-                                                                disabled={false}
+                                                                disabled={!this.props.permission.create || !this.props.permission.edit || !this.props.isSubmit}
                                                                 value={Number(tableMeta.rowData[16]).toFixed(1)}
                                                                 onBlur={(event) => {
                                                                     handleChange(event.target.value, tableMeta)
@@ -1573,7 +1574,7 @@ export default class OperatingIndicatorMR extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MONTHLY REPORT - MONTHLY REPORT"  ?
+                                    String(this.state.judul).includes("MONTHLY") && String(this.state.judul).includes("REPORT") && String(this.state.judul).includes("OPERATING") && String(this.state.judul).includes("INDICATOR") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/OprIndicator/OperatingIndicator.js

@@ -62,7 +62,7 @@ export default class OperatingIndicator extends Component {
             menu: "operating indicator"
         }
         api.create().getPermission(payload).then(response => {
-            // console.log(response)
+            console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
@@ -321,7 +321,7 @@ export default class OperatingIndicator extends Component {
                     visibleDetailRolling: false,
                     months: id === 22 ? 1 : 23 ? 2 : 24 ? 3 : 25 ? 4 : 27 ? 5 : 28 ? 6 : 29 ? 7 : 31 ? 8 : 32 ? 9 : 33 ? 10 : 35 ? 11 : 36 ? 12 : 0
                     
-                }, () => console.log(this.state.dataDetail))
+                })
                 
             } else {
                 this.setState({