enhance history approval

src/container/BudgetTahunan/BudgetTahunan.js

@@ -119,7 +119,10 @@ export default class BudgetTahunan extends Component {
             approverIDCAT: null,
             picCAT: null,
             btnApproveCAT: false,
-            lastStatusCat: null
+            lastStatusCat: null,
+            rowData: [],
+            dataTableHistoryCAT: [],
+            visibleTableHistoryCAT: false,
         }
         this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
@@ -402,6 +405,7 @@ export default class BudgetTahunan extends Component {
                         loading: false, dataTable: resultDataTableFinance, dataTableCAT: resultDataTableCAT,
                         rowDataFinance,
                         rowDataCAT,
+                        rowData: listData,
                         dataTableRevision: dataTableRevision,
                         dataForRevision: rowDataTableFinance,
                         dataTableRevisionCAT: dataTableRevisionCAT,
@@ -2159,32 +2163,44 @@ export default class BudgetTahunan extends Component {
     }
 
     historyApproval() {
-        let body = {
-            "company_id": this.state.company.company_id,
-            "periode": this.state.periode.periode
-        }
-        api.create().historyApproval(body).then(response => {
-            // // // console.log(response);
-            if (response.data.data.length > 0) {
-                let dataTableHistory = response.data.data.map(item => {
-                    let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
-                    let status_approv = ''
-                    if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
-                        status_approv = `${String(item.status_approval).substr(0, indexC)}${String(item.status_approval).substr(indexC + 1, String(item.status_approval).length)}`
+        const uniqueTypeIds =
+            this.state.rowData?.length
+                ? [...new Set(this.state.rowData.map(item => item.master_report_type_id))]
+                : [1, 2];
+
+        uniqueTypeIds.forEach((master_report_type_id) => {
+            let body = {
+                "company_id": this.state.company.company_id,
+                "periode": this.state.periode.periode,
+                master_report_type_id
+            }
+            api.create().historyApproval(body).then(response => {
+                // // // console.log(response);
+                if (response.data.data.length > 0) {
+                    const dataTable = response.data.data.forEach(item => {
+                        let indexC = String(item.status_approval).toLocaleUpperCase().indexOf('C')
+                        let status_approv = ''
+                        if (String(item.status_approval).toLocaleUpperCase().includes('CC')) {
+                            status_approv = `${String(item.status_approval).substr(0, indexC)}${String(item.status_approval).substr(indexC + 1, String(item.status_approval).length)}`
+                        } else {
+                            status_approv = String(item.status_approval)
+                        }
+                        return [
+                            item.pic,
+                            status_approv,
+                            item.remarks,
+                            item.item_revision,
+                            item.history_approval_date
+                        ]
+                    })
+                    if (master_report_type_id === 2) {
+                        this.setState({ dataTableHistoryCAT: dataTable, visibleTableHistoryCAT: true })
                     } else {
-                        status_approv = String(item.status_approval)
+                        this.setState({ dataTableHistory: dataTable, visibleTableHistory: true })
                     }
-                    return [
-                        item.pic,
-                        status_approv,
-                        item.remarks,
-                        item.item_revision,
-                        item.history_approval_date
-                    ]
-                })
-                this.setState({ dataTableHistory, visibleTableHistory: true })
-            }
-        })
+                }
+            })
+        });
     }
 
     async setHeaderTokenSuperadmin(type) {
@@ -2953,7 +2969,6 @@ export default class BudgetTahunan extends Component {
 
     renderBtnSubmit = (master_report_type_id) => {
         const obj = this.getSubmissionObj(master_report_type_id)
-        console.log(this.state.isAdmin, obj.lastStatus, this.state.isSubmit, this.state.checkApprover, obj.btnApprove, obj.submitter);
         return (
             this.state.isAdmin && obj.lastStatus == 'APPROVED' ?
                 <div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>