Merge branch 'riri' into 'master'

rolling

See merge request !1305

src/container/MonthlyReport/OperatingIndicatorMR.js

@@ -81,8 +81,13 @@ export default class OperatingIndicatorMR extends Component {
     handleViewOnly() {
         let checkCreate = this.props.permission.create
         let checkEdit = this.props.permission.edit
+        let checkStatus = true
 
-        this.setState({viewOnly: checkCreate && checkEdit})
+        if (String(this.props.data.status).toLocaleUpperCase() === 'CLOSED') {
+            checkStatus = false
+        }
+
+        this.setState({viewOnly: checkCreate && checkEdit && checkStatus})
     }
 
     handleGetFor(type) {

src/container/OprIndicator/OperatingIndicator.js

@@ -333,7 +333,7 @@ export default class OperatingIndicator extends Component {
                                                             String(item[1]).toLocaleLowerCase().includes('dec') ? 12 : null
                 this.setState({
                     statusDetail: String(item[2]).toLocaleLowerCase(),
-                    dataDetail: { ...this.state.dataReport[index], periode: this.state.periode.periode, operatingIndID: this.state.operatingIndID, company: this.state.company },
+                    dataDetail: { ...this.state.dataReport[index], periode: this.state.periode.periode, operatingIndID: this.state.operatingIndID, company: this.state.company, status: item[2] },
                     visibleOperatingIndicator: false,
                     visibleDetailOpt: false,
                     visibleDetailMonthly: true,
@@ -348,7 +348,7 @@ export default class OperatingIndicator extends Component {
                             String(item[1]).toLocaleLowerCase().includes('q3') ? "q3" : null
                 this.setState({
                     statusDetail: String(item[2]).toLocaleLowerCase(),
-                    dataDetail: { ...this.state.dataReport[index], periode: this.state.periode.periode, operatingIndID: this.state.operatingIndID, company: this.state.company },
+                    dataDetail: { ...this.state.dataReport[index], periode: this.state.periode.periode, operatingIndID: this.state.operatingIndID, company: this.state.company, status: item[2] },
                     visibleOperatingIndicator: false,
                     visibleDetailOpt: false,
                     visibleDetailMonthly: false,

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -69,8 +69,15 @@ export default class OperatingIndicatorRO extends Component {
     handleViewOnly() {
         let checkCreate = this.props.permission.create
         let checkEdit = this.props.permission.edit
+        let checkStatus = true
 
-        this.setState({ viewOnly: checkCreate && checkEdit })
+        console.log(this.props.data.status);
+        if (String(this.props.data.status).toLocaleUpperCase() === 'CLOSED') {
+            checkStatus = false
+        }
+        console.log(checkStatus);
+
+        this.setState({ viewOnly: checkCreate && checkEdit && checkStatus})
     }
 
     handleGetFor(type) {
@@ -2120,7 +2127,7 @@ export default class OperatingIndicatorRO extends Component {
                                     </button>
                                 </div>
                                 {!this.state.emptyData && (this.props.permission.create || this.props.permission.edit) && <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 2 }}>
-                                    {this.state.get_for == 'view' && this.state.viewOnly && 
+                                    {this.state.get_for == 'view'  && 
                                         <button
                                             type="button"
                                             onClick={() => {
@@ -2354,7 +2361,7 @@ export default class OperatingIndicatorRO extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("ROLLING") && String(this.state.judul).includes("OUTLOOK") && String(this.state.judul).includes("OPERATING") && String(this.state.judul).includes("INDICATOR") ?
+                                    String(this.state.judulColumn).includes("TEMPLATE") && String(this.state.judulColumn).includes("UPLOAD") && String(this.state.judul).includes("ROLLING") && String(this.state.judul).includes("OUTLOOK")  && String(this.state.judul).includes(String(this.props.quartal).toLocaleUpperCase()) && String(this.state.judul).includes("OPERATING") && String(this.state.judul).includes("INDICATOR") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}