Merge branch 'didam' into 'master'

push gadang

See merge request !670

src/container/BudgetTahunan.js

@@ -252,12 +252,13 @@ export default class BudgetTahunan extends Component {
                         dataTableRevision.push([
                             item.report_id,
                             item.report_name === 'CAT' ? 'Corporate Annual Target' : item.report_name,
-                            ""
+                            "",
+                            item.number
                         ])
                       }
                     })
                     // // console.log(dataTableRevision);
-                    this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data }, ()=> {
+                    this.setState({ dataTable, loading: false, dataTableRevision: dataTableRevision.sort((a,b) => a.number - b.number), dataForRevision: response.data.data }, ()=> {
                         document.body.style.overflow = 'unset';
                     })
                 }
@@ -953,6 +954,9 @@ export default class BudgetTahunan extends Component {
                         )
                     }
                 }
+            }, {
+                name: "",
+                options: { display: false }
             }
         ]
 
@@ -973,17 +977,49 @@ export default class BudgetTahunan extends Component {
             let detailRevisiCheck = this.state.detailRevisiCheck
             let payload = {
                 report_id: value[0],
-                remarks: value[2]
+                remarks: value[2],
+                number: value[3]
             }
-
-            let indexId = detailRevisiCheck.findIndex((val) => val.report_id == value[0])
+            let indexDataRevisi = this.state.dataTableRevision.findIndex((val) => val[3] == value[3])
+            let indexId = detailRevisiCheck.sort((a,b) => a.number - b.number).findIndex((val) => val.number == value[3])
+            // console.log(indexId)
             if (indexId == -1) {
+                this.state.dataTableRevision.map((item,index) => {
+                    if (index > indexDataRevisi) {
+                        let indexIds = detailRevisiCheck.findIndex((val) => val.number == item[3])
+                        if (indexIds == -1) {
+                            let payload2 = {
+                                report_id: item[0],
+                                remarks: item[2],
+                                number: item[3]
+                            }
+                            detailRevisiCheck.push(payload2)
+                        }
+                    }
+                })
                 detailRevisiCheck.push(payload)
             } else {
-                detailRevisiCheck.splice(indexId, 1)
+                
+                let x = 0
+                detailRevisiCheck.sort((a,b) => a.number - b.number).map((item,index) => {
+                    if (item.number < value[3]) {
+                        x += 1
+                    }
+                })
+                if (x < 1) {
+                    this.state.dataTableRevision.map((item,index) => {
+                        if (index > indexDataRevisi) {
+                            let indexIdz = detailRevisiCheck.findIndex((val) => val.number == item[3])
+                            if (indexIdz !== -1) {
+                                detailRevisiCheck.splice(indexIdz, 1)
+                            }
+                        }
+                    })
+                    detailRevisiCheck.splice(indexId, 1)
+                }
             }
-            this.setState({ detailRevisiCheck })
-            // // console.log(detailRevisiCheck)
+            this.setState({ detailRevisiCheck: detailRevisiCheck.sort((a,b) => a.number - b.number) })
+            // console.log(detailRevisiCheck)
         }
 
         const options = {