Merge branch 'rifka' into 'master'

list md cat

See merge request !1217

src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js

@@ -177,9 +177,9 @@ export default class EditMasterDataCAT extends Component {
             dataSource[indexID].weight = e.target.value
             this.setState({getParent: dataSource}, () => {
                 console.log(this.state.getParent);
+                this.clearMessage()
             })
         }
-        console.log(e.target.value)
     }
 
     handleReportName(item) {
@@ -334,6 +334,13 @@ export default class EditMasterDataCAT extends Component {
         })
     }
 
+    clearMessage() {
+        this.setState({
+            errorFormula: false, msgErrorFormula: '',
+            errorWeight: false, msgErrorWeight: ''
+        })
+    }
+
     closeAlert() {
         this.setState({ alert: false })
     }

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -604,7 +604,7 @@ export default class MasterDataCAT extends Component {
                             return [
                                 index, 
                                 item.item_report_id, 
-                                item.report_name,
+                                item.item_report_name,
                                 item.company_name, 
                                 item.report_name,
                                 item.weight, 
@@ -877,60 +877,60 @@ export default class MasterDataCAT extends Component {
             }
         },
         {
-            name: "Item Report Name",
+            name: "Report Name",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[4]}</span>
                         </div >
                     );
                 }
             }
         },
         {
-            name: "Company Name",
+            name: "Item Report Name",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[2]}</span>
                         </div >
                     );
                 }
             }
         },
         {
-            name: "Report Name",
+            name: "Year",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[6]}</span>
                         </div >
                     );
                 }
             }
         },
         {
-            name: "Weight",
+            name: "Company Name",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[3]}</span>
                         </div >
                     );
                 }
             }
         },
         {
-            name: "Year",
+            name: "Weight",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[5]}</span>
                         </div >
                     );
                 }
@@ -942,7 +942,7 @@ export default class MasterDataCAT extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[7] === "Active" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{tableMeta.rowData[7]}</span>
                         </div >
                     );
                 }
@@ -955,13 +955,6 @@ export default class MasterDataCAT extends Component {
             }
         }
         ]
-        const data = [
-            ["", "1", "KPI", "TIA", "1", "Financial Perspective", "0", "-", "35%", "Formula", "Aktif"],
-            ["", "2", "KPI", "TIA", "2", "Trading Profit", "1", "Rp Bio", "35%", "Formula", "Aktif"],
-            ["", "3", "KPI", "TIA", "3", "Revenue", "1", "Rp Bio", "0%", "Formula", "Aktif"],
-            ["", "4", "KPI", "TIA", "4", "EBITDA", "1", "Rp Bio", "0%", "Formula", "Non Aktif"],
-            ["", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"],
-        ]
         const loadingComponent = (
             <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
                 <PropagateLoader