Merge branch 'general' of https://git.oslog.id/ordo/adw-frontend

src/views/Master/MasterMenu/DialogForm.js

@@ -7,7 +7,7 @@ import 'antd/dist/antd.css';
 import { useTranslation } from 'react-i18next';
 
 const { Option } = Select
-
+const company_id = window.localStorage.getItem('company_id');
 const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit, dataMenu }) => {
   const [id, setId] = useState(0)
   const [name, setName] = useState('')
@@ -68,7 +68,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
           url,
           sequence: parseInt(sequence),
           icon,
-          alias_name: aliasName
+          alias_name: aliasName,
+          company_id
         }
 
         if (parentId && parentId > 0) {
@@ -83,7 +84,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
           url,
           sequence: parseInt(sequence),
           icon,
-          alias_name: aliasName
+          alias_name: aliasName,
+          company_id
         }
 
         if (parentId && parentId > 0) {

src/views/Master/MasterMenu/index.js

@@ -10,7 +10,7 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { Pagination, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
 const token = window.localStorage.getItem('token');
-
+const company_id = window.localStorage.getItem('company_id');
 const column = [
   { name: "Nama" },
   { name: "Url" },
@@ -94,7 +94,8 @@ const Index = ({ params }) => {
     const payload = {
       "paging": { "start": start, "length": rowsPerPage },
       "columns": [
-        { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" }
+        { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" },
+        { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" },
       ],
       "joins": [{
         "name": "m_menu",

src/views/Master/MasterRoles/DialogForm.js

@@ -9,6 +9,7 @@ import { MENU_SEARCH } from '../../../const/ApiConst.js';
 
 const { Option } = Select
 const token = window.localStorage.getItem('token');
+const company_id = localStorage.getItem("company_id")
 const config = {
   headers:
   {
@@ -27,7 +28,8 @@ class DialogForm extends Component {
       openDialog: false,
       isParentClick: false,
       menu: [],
-      selectedMenu: null
+      selectedMenu: null,
+      company_id
     }
   }
 
@@ -44,7 +46,8 @@ class DialogForm extends Component {
           id: dataEdit.id,
           name: dataEdit.name,
           description: dataEdit.description,
-          selectedMenu: dataEdit.default_page
+          selectedMenu: dataEdit.default_page,
+          company_id
         })
       } else {
         this.setState({
@@ -96,7 +99,8 @@ class DialogForm extends Component {
       id,
       name,
       description,
-      selectedMenu
+      selectedMenu,
+      company_id
     } = this.state
 
     let data = '';
@@ -107,15 +111,18 @@ class DialogForm extends Component {
           id,
           name,
           description,
-          selectedMenu
+          selectedMenu,
+          company_id
         }
+        // console.log('data', data);
         this.props.closeDialog('save', data);
       } else {
         data = {
           id,
           name,
           description,
-          selectedMenu
+          selectedMenu,
+          company_id
         }
         this.props.closeDialog('edit', data);
       }

src/views/Master/MasterRoles/index.js

@@ -12,6 +12,8 @@ import { ROLE_ADD, ROLE_SEARCH, ROLE_EDIT, ROLE_DELETE, ROLEMENU_ADD, ROLEMENU_S
 import { withTranslation } from 'react-i18next';
 
 const token = window.localStorage.getItem('token');
+const company_id = window.localStorage.getItem('company_id');
+
 
 const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
 
@@ -55,6 +57,7 @@ class index extends Component {
 			tooltipTambah: false,
 			totalPage: 0,
 			typeDialog: 'Save',
+			company_id: company_id
 		}
 
 		this.columns = [
@@ -108,7 +111,8 @@ class index extends Component {
 		const formData = {
 			"paging": { "start": start, "length": this.state.rowsPerPage },
 			"columns": [
-				{ "name": "name", "logic_operator": "ilike", "value": this.state.search, "operator": "AND" }
+				{ "name": "name", "logic_operator": "ilike", "value": this.state.search, "operator": "AND" },
+				{ "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" }
 			],
 			"joins": [],
 			"orders": { "columns": ["id"], "ascending": false }
@@ -180,7 +184,8 @@ class index extends Component {
 		const formData = {
 			name: data.name,
 			description: data.description,
-      default_page : data.selectedMenu
+			default_page: data.selectedMenu,
+			company_id: company_id
 		}
 
 		const result = await axios.post(ROLE_ADD, formData, config)

src/views/Master/ProjectPhase/DialogForm.js

@@ -8,6 +8,7 @@ import InputColor from "./InputColor";
 import "./styles.css";
 import "rc-color-picker/assets/index.css";
 import { useTranslation } from 'react-i18next';
+const company_id = localStorage.getItem("company_id")
 const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit }) => {
   const [id, setId] = useState(0)
   const [projectType, setProjectType] = useState('')
@@ -31,14 +32,16 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
     if (typeDialog === "Save") {
       data = {
         name: projectType,
-        color
+        color,
+        company_id
       }
       closeDialog('save', data);
     } else {
       data = {
         id,
         name: projectType,
-        color
+        color,
+        company_id
       }
       closeDialog('edit', data);
     }

src/views/Master/ProjectPhase/index.js

@@ -10,6 +10,7 @@ import { PROJECT_PHASE_ADD, PROJECT_PHASE_EDIT, PROJECT_PHASE_DELETE, PROJECT_PH
 import { Pagination, Button, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
 const token = window.localStorage.getItem('token');
+const company_id = window.localStorage.getItem('company_id');
 const config = {
   headers:
   {
@@ -20,6 +21,7 @@ const config = {
 
 const ProjectPhase = ({ params }) => {
   const token = localStorage.getItem("token")
+  const company_id = localStorage.getItem("company_id")
   /*const HEADER = {
     headers: {
       "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
@@ -74,6 +76,12 @@ const ProjectPhase = ({ params }) => {
           "logic_operator": "ilike",
           "value": search,
           "operator": "AND"
+        },
+        {
+          "name": "company_id",
+          "logic_operator": "=",
+          "value": company_id,
+          "operator": "AND"
         }
       ],
       "orders": {

src/views/Master/RoleProject/DialogForm.js

@@ -3,7 +3,7 @@ import { Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
 import { Button, Form, FormGroup, Label, Input } from 'reactstrap';
 import 'antd/dist/antd.css';
 import { withTranslation } from 'react-i18next';
-
+const company_id = localStorage.getItem("company_id")
 class DialogForm extends Component {
   constructor(props) {
     super(props)
@@ -13,6 +13,7 @@ class DialogForm extends Component {
       description: "",
       openDialog: false,
       isParentClick: false,
+      company_id
     }
   }
 
@@ -27,7 +28,8 @@ class DialogForm extends Component {
         this.setState({
           id: dataEdit.id,
           name: dataEdit.name,
-          description: dataEdit.description
+          description: dataEdit.description,
+          company_id
         })
       } else {
         this.setState({
@@ -58,14 +60,16 @@ class DialogForm extends Component {
       data = {
         id,
         name,
-        description
+        description,
+        company_id
       }
       this.props.closeDialog('save', data);
     } else {
       data = {
         id,
         name,
-        description
+        description,
+        company_id
       }
       this.props.closeDialog('edit', data);
     }

src/views/Master/RoleProject/index.js

@@ -10,7 +10,7 @@ import { PROJECT_ROLE_ADD, PROJECT_ROLE_SEARCH, PROJECT_ROLE_EDIT, PROJECT_ROLE_
 import { Pagination, Tooltip, Table } from 'antd';
 import { withTranslation } from 'react-i18next';
 const token = window.localStorage.getItem('token');
-
+const company_id = localStorage.getItem("company_id")
 const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
 
 const config = {
@@ -60,6 +60,7 @@ class index extends Component {
       tooltipTambah: false,
       totalPage: 0,
       typeDialog: 'Save',
+      company_id
     }
     this.columns = [
       {
@@ -108,7 +109,8 @@ class index extends Component {
     const formData = {
       "paging": { "start": start, "length": this.state.rowsPerPage },
       "columns": [
-        { "name": "name", "logic_operator": "ilike", "value": this.state.search, "operator": "AND" }
+        { "name": "name", "logic_operator": "ilike", "value": this.state.search, "operator": "AND" },
+        { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" }
       ],
       "joins": [],
       "orders": { "columns": ["id"], "ascending": false }
@@ -178,7 +180,8 @@ class index extends Component {
 
     const formData = {
       name: data.name,
-      description: data.description
+      description: data.description,
+      company_id
     }
 
     const result = await axios.post(PROJECT_ROLE_ADD, formData, config)
@@ -198,7 +201,8 @@ class index extends Component {
 
     const formData = {
       name: data.name,
-      description: data.description
+      description: data.description,
+      company_id
     }
     const url = PROJECT_ROLE_EDIT(data.id)
     const result = await axios.put(url, formData, config)

src/views/Pages/Login/Login.js

@@ -215,6 +215,7 @@ class Login extends Component {
 			window.localStorage.setItem('user_id', data_user.id);
 			window.localStorage.setItem('user_name', data_user.name);
 			window.localStorage.setItem('role_id', data_user.role_id);
+			window.localStorage.setItem('company_id', data_user.company_id);
 		} else {
 			console.log("kode : ", doLogin.data.code);
 			// NotificationManager.error('Cek username atau password anda!', 'Gagal Login!');

src/views/SimproV2/Divisi/index.js

@@ -12,6 +12,7 @@ import { useTranslation } from 'react-i18next';
 const url = "";
 const proyek_id = localStorage.getItem('proyek_id');
 const role_id = localStorage.getItem('role_id');
+const company_id = localStorage.getItem("company_id")
 const format = "DD-MM-YYYY";
 const token = window.localStorage.getItem('token');
 const config = {
@@ -95,6 +96,12 @@ const ProjectType = ({ params }) => {
 					logic_operator: "ilike",
 					value: search,
 					operator: "AND"
+				},
+				{
+					name: "company_id",
+					logic_operator: "=",
+					value: company_id,
+					operator: "AND"
 				}
 			],
 			"orders": {
@@ -277,7 +284,7 @@ const ProjectType = ({ params }) => {
 		if (dataTable.length === 0) {
 			return (
 				<tr>
-					<td align="center" colSpan="3">{t('noData')}</td>
+					<td align="center" colSpan="4">{t('noData')}</td>
 				</tr>
 			)
 		}

src/views/SimproV2/ProjectType/DialogForm.js

@@ -9,6 +9,7 @@ import moment from 'moment';
 import 'antd/dist/antd.css';
 import { useTranslation } from 'react-i18next';
 const { Option } = Select
+const company_id = window.localStorage.getItem('company_id');
 
 const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit }) => {
   const [id, setId] = useState(0)
@@ -39,7 +40,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
     if (typeDialog === "Save") {
       data = {
         name: projectType,
-        description
+        description,
+        company_id
       }
 
       closeDialog('save', data);
@@ -47,7 +49,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
       data = {
         id,
         name: projectType,
-        description
+        description,
+        company_id
       }
       closeDialog('edit', data);
     }

src/views/SimproV2/ProjectType/index.js

@@ -16,6 +16,7 @@ const proyek_id = localStorage.getItem('proyek_id');
 const role_id = localStorage.getItem('role_id');
 const format = "DD-MM-YYYY";
 const token = window.localStorage.getItem('token');
+const company_id = window.localStorage.getItem('company_id');
 const config = {
   headers:
   {
@@ -81,6 +82,12 @@ const ProjectType = ({ params }) => {
           "logic_operator": "like",
           "value": search,
           "operator": "AND"
+        },
+        {
+          "name": "company_id",
+          "logic_operator": "like",
+          "value": company_id,
+          "operator": "AND"
         }
       ],
       "orders": {

src/views/SimproV2/ResourceWorker/DialogForm.js

@@ -12,6 +12,7 @@ import { useTranslation } from 'react-i18next';
 const { Option } = Select
 
 const token = window.localStorage.getItem('token');
+const company_id = localStorage.getItem("company_id")
 const config = {
   headers:
   {
@@ -117,7 +118,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
         divisi_id: divisionId,
         address,
         status_resource: statusResource,
-        status_boundary: statusRestriction
+        status_boundary: statusRestriction,
+        company_id: company_id
       }
       console.log(data)
 
@@ -165,7 +167,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
         divisi_id: divisionId,
         address,
         status_resource: statusResource,
-        status_boundary: statusRestriction
+        status_boundary: statusRestriction,
+        company_id: company_id
       }
 
       if (birthDate && birthDate != "") {

src/views/SimproV2/ResourceWorker/index.js

@@ -28,6 +28,7 @@ const config = {
 
 const ResourceWorker = ({ params }) => {
   const token = localStorage.getItem("token")
+  const company_id = localStorage.getItem("company_id")
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -171,6 +172,11 @@ const ResourceWorker = ({ params }) => {
             "logic_operator": "~*",
             "value": search
           },
+          {
+            "name": "company_id",
+            "logic_operator": "=",
+            "value": company_id
+          },
         ]
       },
       "joins": [

src/views/SimproV2/Satuan/DialogForm.js

@@ -6,6 +6,7 @@ import {
 import 'antd/dist/antd.css';
 import { useTranslation } from 'react-i18next';
 
+const company_id = localStorage.getItem("company_id")
 
 const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit }) => {
   const [id, setId] = useState(0)
@@ -31,7 +32,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
     if (typeDialog === "Save") {
       data = {
         name: name,
-        description
+        description,
+        company_id
       }
 
       closeDialog('save', data);
@@ -39,7 +41,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
       data = {
         id,
         name: name,
-        description
+        description,
+        company_id
       }
       closeDialog('edit', data);
     }

src/views/SimproV2/Satuan/index.js

@@ -10,6 +10,7 @@ import { SATUAN_ADD, SATUAN_EDIT, SATUAN_DELETE, SATUAN_SEARCH } from '../../../
 import { useTranslation } from 'react-i18next';
 
 const token = window.localStorage.getItem('token');
+const company_id = window.localStorage.getItem('company_id');
 const config = {
 	headers:
 	{
@@ -20,6 +21,7 @@ const config = {
 
 const Satuan = ({ params }) => {
 	const token = localStorage.getItem("token")
+	const company_id = localStorage.getItem("company_id")
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -72,6 +74,12 @@ const Satuan = ({ params }) => {
 					"logic_operator": "ilike",
 					"value": search,
 					"operator": "AND"
+				},
+				{
+					"name": "company_id",
+					"logic_operator": "=",
+					"value": company_id,
+					"operator": "AND"
 				}
 			],
 			"orders": {