Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/container/BudgetTahunan/BalanceSheet.js

@@ -1967,7 +1967,7 @@ export default class BalanceSheet extends Component {
                                 </MuiThemeProvider>
                             </div>
                         </div>
-                        <div className="grid grid-2x">
+                        <div className="grid grid-2x" style={{ marginTop: 20}}>
                             <div className="col-1">
                                 <button
                                     className="button"

src/container/Home.js

@@ -372,6 +372,14 @@ export default function MiniDrawer() {
     })
   }
 
+  if (sessionStorage.getItem('reloaded') != null) {
+    console.log('page was reloaded');
+  } else {
+    localStorage.removeItem(Constant.TOKEN)
+    window.location.reload();
+  }
+  sessionStorage.setItem('reloaded', 'yes');
+
   const logout = () => {
     localStorage.removeItem(Constant.TOKEN)
     window.location.reload();

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -483,6 +483,8 @@ export default class Perusahaan extends Component {
         const columns = [{
             name: "Action",
             options: {
+                filter: false,
+                sort: false,
                 customBodyRender: (val, tableMeta) => {
                     return (
                         <div style={{ display: 'flex' }}>
@@ -578,9 +580,9 @@ export default class Perusahaan extends Component {
                 {this.state.visiblePerusahaan === true ?
                     this.state.load && (
                         <div>
-                            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -118 }}>
+                            <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -181 }}>
                                 <label style={{ color: 'white', fontSize: 16, alignSelf: 'center', width: '20%', }}>Master Data - Company</label>
-                                <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
+                                {/* <div style={{ color: 'white', width: '50%', height: 37, display: 'flex', backgroundColor: 'white', borderWidth: 2, alignItems: 'center', borderRadius: 6, paddingLeft: 5, paddingRight: 5, alignSelf: 'center' }}>
                                     <img src={Images.searchBlack} style={{ marginRight: 10 }} />
                                     <InputBase
                                         style={{ width: '100%' }}
@@ -589,7 +591,7 @@ export default class Perusahaan extends Component {
                                         onChange={(e) => this.handleInputChange(e.target.value)}
                                         inputProps={{ 'aria-label': 'naked' }}
                                     />
-                                </div>
+                                </div> */}
                                 <div style={{ width: '30%', justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                     <a data-tip={'Download Template'} data-for="template">
                                         <button

src/container/MasterData/formReportItems/CreateReportItems.js

@@ -205,7 +205,7 @@ export default class CreateReportItems extends Component {
         api.create().getInputType().then((response) => {
             // console.log(response.data)
             if(response.data) {
-                if (response.pk) {
+                if (response.ok) {
                     if (response.data.status === 'success') {
                         let data = response.data.data
                         let inputData = data.map((item) => {

src/library/CustomTable.js

@@ -344,6 +344,123 @@ exports.customTable2 = function () {
   }
 }
 
+exports.customTable3 = function () {
+  return {
+    typography: {
+      useNextVariants: true,
+    },
+    overrides: {
+      MUIDataTable: {
+        root: {
+          backgroundColor: secondColor,
+        },
+        paper: {
+          boxShadow: "0 0 30px 0 rgba(154,161,171,.15)",
+          border: "1px rgba(0,0,0,0.1) solid",
+          borderRadius: "5px",
+          overflow: "hidden",
+        },
+      },
+      MuiToolbar: {
+        root: {
+          left: {
+            flex: "0 0 auto !important"
+          },
+          actions: {
+            flex: "0 0 auto !important"
+          }
+        }
+      },
+      MUIDataTableToolbar: {
+        root: {
+          backgroundColor: secondColor,
+        },
+        titleText: {
+          color: "#555"
+        },
+        icon: {
+          color: "#555"
+        },
+      },
+      MUIDataTableSearch: {
+        searchIcon: {
+          color: "#555"
+        },
+        searchText: {
+          color: "#555",
+        },
+        clearIcon: {
+          color: "#555"
+        },
+      },
+      MUIDataTableHead: {
+        main: {
+          backgroundColor: mainColor,
+          color: "#555"
+        }
+      },
+      MUIDataTableHeadRow: {
+        root: {
+          backgroundColor: mainColor,
+        }
+      },
+      MUIDataTableHeadCell: {
+        root: {
+          fontSize: "10pt",
+          fontWeight: "500",
+          color: mainColor,
+        },
+        fixedHeader: {
+          position: "relative",
+          backgroundColor: secondColor,
+          color: "#555",
+          padding: "10px",
+          height: "auto",
+        },
+        toolButton: {
+          display: "flex",
+          height: "auto"
+        },
+        data: {
+          display: "inline-block",
+          verticalAlign: "top",
+        },
+        sortActive: {
+          color: "#555"
+        },
+        sortAction: {
+          color: "#555",
+          display: "inline-block",
+          verticalAlign: "top",
+          MuiButtonBase: {
+            color: "#555",
+            root: {
+              color: "#555",
+            }
+          }
+        }
+      },
+      MUIDataTableBodyCell: {
+        root: {
+          fontSize: "10pt",
+          padding: "3px"
+        }
+      },
+      MUIDataTableSelectCell: {
+        headerCell: {
+          backgroundColor: secondColor,
+          checkboxRoot: {
+            color: "#fff",
+          }
+        },
+        checkboxRoot: {
+          color: "#555"
+        }
+      },
+    }
+  }
+}
+
 exports.customOptions = function () {
   return {
     // selectableRows: false,