update alert

src/container/MasterData/Parameter/CreateParameter.js

@@ -82,7 +82,12 @@ export default class CreateParameter extends Component {
                     getSettingGroupID: data.setting_group_id,
                     getCompanyID: data.company_id,
                     settingType: data.setting_type,
-                }, () => this.getAllGroup(), this.getPerusahaan(), this.getParameterByGroup(data.setting_group_id))
+                }, () => {
+                    this.getAllGroup()
+                    this.getPerusahaan()
+                    this.getParameterByGroup(data.setting_group_id)
+                    console.log(this.state.tempData)
+                })
             } else {
                 alert(response.data.message)
             }
@@ -338,7 +343,7 @@ export default class CreateParameter extends Component {
             //     this.setState({ errorDeskripsi: true, msgErrorDeskripsi: 'Deskripsi tidak boleh kosong' })
             // } else if (R.isEmpty(this.state.tempData.value)) {
             //     this.setState({ errorValue: true, msgErrorValue: 'Value tidak boleh kosong' })
-        } else if (!R.isNil(this.state.tempData.max_value) && R.isNil(this.state.tempData.min_value)) {
+        } else if ((!R.isNil(this.state.tempData.max_value) && R.isNil(this.state.tempData.min_value)) || (!R.isNil(this.state.tempData.max_value) && R.isEmpty(this.state.tempData.min_value))) {
             this.setState({ errorMinValue: true, msgErrorMinValue: 'Min Value tidak boleh kosong' })
         } else if (R.isNil(this.state.tempData.start_date)) {
             this.setState({ errorStartDate: true, msgErrorStartDate: 'Start Date tidak boleh kosong' })

src/container/MasterData/Parameter/Parameter.js

@@ -48,6 +48,7 @@ export default class Parameter extends Component {
                     let data = response.data.data
                     let listData = data.map((item, index) => {
                         return [
+                            item.setting_id,
                             item.setting_id,
                             item.setting_group,
                             item.setting_type,
@@ -559,13 +560,24 @@ export default class Parameter extends Component {
                     );
                 }
             }
-        }, {
+        },  {
+            name: "ID",
+            options: {
+                customBodyRender: (val, tableMeta) => {
+                    return (
+                        <div style={{ display: 'flex' }}>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                        </div >
+                    );
+                }
+            }
+        },{
             name: "Group",
             options: {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -576,7 +588,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -587,7 +599,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -598,7 +610,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -609,7 +621,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -620,7 +632,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -631,7 +643,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -642,7 +654,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }
@@ -653,7 +665,7 @@ export default class Parameter extends Component {
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
-                            <span style={{ color: tableMeta.rowData[9] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
+                            <span style={{ color: tableMeta.rowData[10] === "Aktif" ? "#656565" : 'rgba(0, 0, 0, 0.25)' }}>{val}</span>
                         </div >
                     );
                 }

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -6,13 +6,14 @@ import Images from '../../../assets/Images';
 import UploadFile from "../../../library/Upload";
 import MUIDataTable from "mui-datatables";
 import { render } from '@testing-library/react';
-import { TextField, InputBase } from "@material-ui/core";
 import { ExcelRenderer } from 'react-excel-renderer';
 import CreatePerusahaan from "./CreatePerusahaan";
 import EditPerusahaan from "./EditPerusahaan"
 import VisualPerusahaan from "./VisualPerusahaan";
 import api from "../../../api";
 import ReactTooltip from 'react-tooltip';
+import MuiAlert from '@material-ui/lab/Alert';
+import { TextField, InputBase, Snackbar, withStyles } from "@material-ui/core";
 import PopUpFailedSave from '../../../library/PopUpFailedSave';
 
 var ct = require("../../../library/CustomTable");
@@ -20,6 +21,9 @@ const getMuiTheme = () => createMuiTheme(ct.customTable());
 const options = ct.customOptions();
 const options2 = ct.customOptions2();
 
+const Alert = withStyles({
+})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
+
 export default class Perusahaan extends Component {
     constructor(props) {
         super(props)
@@ -35,7 +39,10 @@ export default class Perusahaan extends Component {
             cols: null,
             rows: null,
             dataLoaded: false,
-            popupError: false
+            popupError: false,
+            alert: false,
+            tipeAlert: '',
+            messageAlert: ''
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
@@ -236,15 +243,19 @@ export default class Perusahaan extends Component {
     getData() {
         api.create().getPerusahaan().then((response) => {
             console.log(response)
-            if (response.data.status == 'success') {
-                let data = response.data.data
-                let listData = data.sort((a, b) => a.company_id - b.company_id).map((item, index) => {
-                    return [index, item.company_id, item.company_name, item.parent_name, item.business_unit_name, item.total_report, item.status]
-                })
-                this.setState({ dataTable: listData, listData: response.data.data })
+            if (response.data) {
+                if (response.data.status == 'success') {
+                    let data = response.data.data
+                    let listData = data.sort((a, b) => a.company_id - b.company_id).map((item, index) => {
+                        return [index, item.company_id, item.company_name, item.parent_name, item.business_unit_name, item.total_report, item.status]
+                    })
+                    this.setState({ dataTable: listData, listData: response.data.data })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                }
             } else {
-                alert(response.data.message)
-            }
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', dataTable: [] })
+            }            
         })
     }
 
@@ -268,15 +279,18 @@ export default class Perusahaan extends Component {
             "keyword": e
         }
         api.create().searchPerusahaan(body).then(response => {
-            // console.log(response.data);
-            if (response.data.status == 'success') {
-                let data = response.data.data
-                let listData = data.map((item, index) => {
-                    return [index, item.company_id, item.company_name, item.parent_name, item.business_unit_name, item.total_report, item.status]
-                })
-                this.setState({ dataTable: listData, listData: response.data.data })
+            if (response.data) {
+                if (response.data.status == 'success') {
+                    let data = response.data.data
+                    let listData = data.map((item, index) => {
+                        return [index, item.company_id, item.company_name, item.parent_name, item.business_unit_name, item.total_report, item.status]
+                    })
+                    this.setState({ dataTable: listData, listData: response.data.data })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                }
             } else {
-                alert(response.data.message)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -284,11 +298,15 @@ export default class Perusahaan extends Component {
     updatePerusahaan = (payload) => {
         this.setState({ visibleEdit: false })
         api.create().updatePerusahaan(payload).then(response => {
-            if (response.data.status == 'success') {
-                alert(response.data.message)
-                this.getData()
+            if (response.data) {
+                if (response.data.status == 'success') {
+                    this.getData()
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                }
             } else {
-                alert(response.data.message)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -296,11 +314,15 @@ export default class Perusahaan extends Component {
     createPerusahaan = (payload) => {
         this.setState({ visibleCreate: false })
         api.create().createPerusahaan(payload).then(response => {
-            if (response.data.status == 'success') {
-                alert(response.data.message)
-                this.getData()
+            if (response.data) {
+                if (response.data.status == 'success') {
+                    this.getData()
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                }
             } else {
-                alert(response.data.message)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -338,11 +360,23 @@ export default class Perusahaan extends Component {
     uploadPerusahaan() {
         api.create().uploadPerusahaan(this.state.payload).then(response => {
             console.log(response)
-            this.getData()
-            this.setState({ visiblePerusahaan: true })
+            if (response.data) {
+                if (response.data.status == "success") {
+                    this.getData()    
+                    this.setState({ visiblePerusahaan: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })                
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
         })
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     render() {
         const columns = [{
             name: "Action",
@@ -443,6 +477,11 @@ export default class Perusahaan extends Component {
             <div style={{ height: this.props.height }}>
                 {/* <Row> */}
                 <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+                <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
+                    <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
+                        {this.state.messageAlert}
+                    </Alert>
+                </Snackbar>
                 {this.state.visiblePerusahaan === true ?
                     <div>
                         <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>

src/router/homeRoutes.js

@@ -10,6 +10,7 @@ import UnitBisnis from '../container/MasterData/UnitBisnis'
 import Parameter from '../container/MasterData/Parameter/Parameter'
 import ReportItems from '../container/MasterData/ReportItems'
 import DashboardCAT from '../container/Laporan/DashboardCAT'
+import BudgetTahunan from '../container/BudgetTahunan';
 
 const routes = [
   {
@@ -30,7 +31,7 @@ const routes = [
   },
   {
     path: "/home/master-budget",
-    main: BalanceSheet
+    main: BudgetTahunan
   },
   {
     path: "/home/profile",