Merge branch 'deni-dev(pc)' into 'master'

banyak dah

See merge request !324

src/api/index.js

@@ -167,6 +167,7 @@ const create = (type = "") => {
   const saveVisualisasiReport = (body) => api.post('item_report/save_visualization', body)
   const getReportParent = (body) => api.post('item_report/get_parent_item_report', body)
   const deleteReportItems = (id) => api.post(`item_report/delete_item_report/${id}`)
+  const getAllSettingByType = (body) => api.post('setting/get_all_setting_by_type', body)
 
   //PARAMETER
   const getAllParameter = () => api.get('/setting/get_all_setting')
@@ -331,7 +332,8 @@ const create = (type = "") => {
     getAllOperatingInd,
     getOperatingIndDetail,
     createOpetaingInd,
-    uploadMasterBudget
+    uploadMasterBudget,
+    getAllSettingByType
   }
 }
 

src/container/BudgetTahunan/BalanceSheet.js

@@ -2000,7 +2000,7 @@ export default class BalanceSheet extends Component {
                                     </div>
                                 </div>
 
-                                <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150), height: this.props.height - 400 }}>
+                                <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
                                     {!this.state.loading && <MuiThemeProvider theme={getMuiTheme()}>
                                         <MUIDataTable
                                             data={dataTable2}

src/container/MasterData/UnitBisnis.js

@@ -8,7 +8,7 @@ import MUIDataTable from "mui-datatables";
 import CreateUnitBisnis from "./formUnitBisnis/CreateUnitBisnis";
 import ReactTooltip from 'react-tooltip';
 import MuiAlert from '@material-ui/lab/Alert';
-import { TextField, InputBase, Snackbar, withStyles, LinearProgress } from "@material-ui/core";
+import { TextField, InputBase, Snackbar, withStyles, LinearProgress, Tooltip } from "@material-ui/core";
 import { ExcelRenderer } from 'react-excel-renderer';
 import api from "../../api";
 import { isThisSecond } from "date-fns";
@@ -18,6 +18,15 @@ import Constant from "../../library/Constant";
 import { css } from "@emotion/core";
 import PropagateLoader from "react-spinners/PropagateLoader"
 
+const LightTooltip = withStyles((theme) => ({
+    tooltip: {
+        backgroundColor: theme.palette.common.white,
+        color: 'rgba(0, 0, 0, 0.87)',
+        boxShadow: theme.shadows[1],
+        fontSize: 11,
+    },
+}))(Tooltip);
+
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
 const options = ct.customOptions();
@@ -118,12 +127,11 @@ export default class UnitBisnis extends Component {
                                         return (
                                             <div style={{ display: 'flex' }}>
                                                 {tableMeta.rowData[3] != null && check > -1 ?
-                                                    <a data-tip={tableMeta.rowData[3][check].message} data-for="unitbisnis">
+                                                    <LightTooltip title={tableMeta.rowData[3][check].message} arrow>
                                                         <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
-                                                    </a> :
+                                                    </LightTooltip> :
                                                     <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
                                                 }
-                                                <ReactTooltip border={true} id="unitbisnis" place="bottom" type="light" effect="solid" />
                                             </div >
                                         );
                                     }
@@ -143,12 +151,11 @@ export default class UnitBisnis extends Component {
                                         return (
                                             <div style={{ display: 'flex' }}>
                                                 {tableMeta.rowData[3] != null && check > -1 ?
-                                                    <a data-tip={tableMeta.rowData[3][check].message} data-for="startdate">
+                                                    <LightTooltip title={tableMeta.rowData[3][check].message} arrow>
                                                         <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
-                                                    </a> :
+                                                    </LightTooltip> :
                                                     <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
                                                 }
-                                                <ReactTooltip border={true} id="startdate" place="bottom" type="light" effect="solid" />
                                             </div >
                                         );
                                     }
@@ -168,12 +175,11 @@ export default class UnitBisnis extends Component {
                                         return (
                                             <div style={{ display: 'flex' }}>
                                                 {tableMeta.rowData[3] != null && check > -1 ?
-                                                    <a data-tip={tableMeta.rowData[3][check].message} data-for="enddate">
+                                                    <LightTooltip title={tableMeta.rowData[3][check].message} arrow>
                                                         <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
-                                                    </a> :
+                                                    </LightTooltip> :
                                                     <span style={{ color: check != null && check > -1 ? "red" : 'black' }}>{val === "" ? "Empty" : val}</span>
                                                 }
-                                                <ReactTooltip border={true} id="enddate" place="bottom" type="light" effect="solid" />
                                             </div >
                                         );
                                     }

src/library/CustomTable.js

@@ -138,7 +138,7 @@ exports.customTable = function () {
           color: "#555",
           padding: "10px 20px",
           height: "auto"
-,
+          ,
           marginTop: "10px"
         },
       },
@@ -362,6 +362,8 @@ exports.customTable3 = function () {
           overflow: "hidden",
         },
       },
+      responsiveScrollMaxHeight: {
+      },
       MuiToolbar: {
         root: {
           left: {
@@ -486,7 +488,7 @@ exports.customOptions = function () {
     selectableRows: 'none',
     filterType: 'multiselect',
     responsive: 'scroll',
-    viewColumns:true,
+    viewColumns: true,
     rowsPerPage: 5,
     rowsPerPageOptions: [5, 10, 20, 50],
     print: false,
@@ -519,12 +521,12 @@ exports.customOptionsFixedColumn = function () {
     filter: false,
     sort: false,
     responsive: 'scrollMaxHeight',
-    viewColumns:false,
-    overflowX: 'auto',
+    viewColumns: false,
+    // overflowX: 'auto',
     print: false,
     download: false,
     elevation: 5,
-    search:false,
+    search: false,
     pagination: false
   }
 }
@@ -535,7 +537,7 @@ exports.customOptionsManagementDocument = function () {
     selectableRows: 'none',
     filterType: 'multiselect',
     responsive: 'scroll',
-    viewColumns:true,
+    viewColumns: true,
     rowsPerPage: 10,
     rowsPerPageOptions: [10, 20, 30, 50],
     print: false,