Merge branch 'didam' into 'master'

update didam

See merge request !85

src/api/index.js

@@ -90,6 +90,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getPerusahaan = () => api.get('company/get_all_company')
   const createPerusahaan = (body) => api.post('/company/create_company', body)
   const updatePerusahaan = (body) => api.post('/company/update_company', body)
+  const getPerusahaanHierarki = () => api.get('company/get_company_hierarki')
 
   // APPROVAL MATRIX
   const getAM = () => api.get('approval_matrix/get_all_approval_matrix')
@@ -104,10 +105,9 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getUser = () => api.get('user/get_all_user')
   const getDetailUser = (userId) => api.get(`user/get_user_by_id/${userId}`)
   const searchUser = (body) => api.post('user/search_user', body)
-  const createUser = (body) => api.get('user/create_user', body)
-  const updateUser = (body) => api.get('user/update_user', body)
+  const createUser = (body) => api.post('user/create_user', body)
+  const updateUser = (body) => api.post('user/update_user', body)
   const deleteUser = (userId) => api.get(`user/delete_user/${userId}`)
-
   const changePassword = (body) => api.post('/user/change_password', body)
  
   //Template
@@ -161,7 +161,8 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
     downloadTemplate,
     checkUploadUnitBisnis,
     uploadUnitBisnis,
-    changePassword
+    changePassword,
+    getPerusahaanHierarki
   }
 }
 

src/container/ApprovalMatrix/VisualisasiAM.js

@@ -70,31 +70,44 @@ export default class VisualisasiAM extends Component {
         api.create().searchAM(body).then(response => {
             if (response.data.status == 'success') {
                 let data = response.data.data
+                console.log(data)
                 let listVisual = []
                 data.map((item, index) => {
-                    let indexId = listVisual.findIndex((val) => val.orders == item.orders)
+                    let indexId = listVisual.findIndex((val) => val.orderId == item.orders)
                     if(indexId == -1){
-                        listVisual.push(item)
+                        listVisual.push({
+                            orderId: item.orders,
+                            data: [item]
+                        })
+                        console.log(listVisual);
                     } else {
-                        return
+                        listVisual[indexId].data.push(item)
                     }
                 })
-                this.setState({ listApproval: listVisual,  typeData: response.data.data })
-                console.log(data);
+                this.setState({ listApproval: listVisual })
+                console.log(listVisual);
             } else {
                 alert(response.data.message)
             }
         })
     }
 
+    handleChangeOrder(fromIndex, toIndex, that) {
+        let listApproval = that.state.listApproval
+        listApproval[fromIndex].orderId = listApproval[toIndex].orderId
+        listApproval[toIndex].orderId = listApproval[fromIndex].orderId
+        console.log(fromIndex, toIndex)
+    }
+
     render() {
         const that = this;
         const dragProps = {
             onDragEnd(fromIndex, toIndex) {
-                const data = [...that.state.data];
+                const data = [...that.state.listApproval];
                 const item = data.splice(fromIndex, 1)[0];
+                that.handleChangeOrder(fromIndex, toIndex, that)
                 data.splice(toIndex, 0, item);
-                that.setState({ data });
+                that.setState({ listApproval: data });
             },
             nodeSelector: 'li',
             handleSelector: 'a'
@@ -125,8 +138,7 @@ export default class VisualisasiAM extends Component {
                                         <ol>
                                         {this.state.listApproval.map((item, index) => (
                                             <li key={index}>
-                                            {'urutan: ' + item.orders}
-                                            <a href="#">Drag</a>
+                                            <a href="#">{`${item.data.map((items, indexs) => {return(items.fullname)})} ${item.data.length == 1? '' : item.data[0].operator_type_name}`}</a>
                                             </li>
                                         ))}
                                         </ol>

src/container/Home.js

@@ -39,6 +39,7 @@ import { Avatar } from '@material-ui/core';
 import HomeRoutes from '../router/homeRoutes'
 import ArraySide from '../library/Array'
 import Constant from '../library/Constant';
+import api from '../api';
 
 const drawerWidth = 307;
 
@@ -126,10 +127,25 @@ export default function MiniDrawer() {
   const [selectedIndex, setSelectedIndex] = React.useState([]);
   const [selectedIndexs, setSelectedIndexs] = React.useState([]);
   const [selectedSubIndex, setSelectSub] = React.useState([]);
+  const [userFullname, setUserFullname] = React.useState("")
+  const [userEmail, setUserEmail] = React.useState("")
+  
+  React.useEffect(() => {
+    if(userFullname == "" && userEmail == "") {
+      getUserData()
+    } 
+  })
 
-  // React.useEffect(() => {
-  //   // 
-  // })
+  const getUserData = () => {
+    let userId = localStorage.getItem(Constant.USER)
+    api.create().getDetailUser(userId).then((response) => {
+      if (response.data.status == 'success') {
+        setUserFullname(response.data.data.fullname == null? 'Anonym' : response.data.data.fullname)
+        setUserEmail(response.data.data.email == null? 'Anonym@123.xyz' : response.data.data.email)
+        console.log(userEmail)
+      }
+    })
+  }
 
   const handleDrawerOpen = () => {
     setOpen(true);

src/container/Otorisasi/User.js

@@ -172,7 +172,7 @@ export default class UserRole extends Component {
 
   downloadFile = async () => {
     let res = await fetch(
-        "https://trftia.eksad.com/tia-reporting-dev/public/attachment/download_file?fileName=UserTemplate&&fileType=xlsx"
+        "https://tia.eksad.com/tia-reporting-dev/public/attachment/download_file?fileName=UserTemplate&&fileType=xlsx"
     )
     res = await res.blob()
     console.log(res)
@@ -186,7 +186,7 @@ export default class UserRole extends Component {
   }
 
   downloadDataTables = async () => {
-    let res = await fetch ("https://trftia.eksad.com/tia-reporting-dev/public/user/export_user")
+    let res = await fetch ("https://tia.eksad.com/tia-reporting-dev/public/user/export_user")
     res = await res.blob()
     console.log(res)
     if (res.size > 0) {
@@ -289,7 +289,7 @@ export default class UserRole extends Component {
     return (
       <div style={{ height: this.props.height }}>
         {/* <Row> */}
-        <div className={"main-color"} style={{ height: 199, width: '100%' }} />
+        <div style={{ height: 199, backgroundColor: '#354960', width: '100%' }} />
         {this.state.visibleUser ? <div>
           <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', paddingRight: 25, paddingLeft: 25, marginTop: -150 }}>
             <label style={{ fontFamily: 'nunito', color: 'white', width: '20%', alignSelf: 'center', fontSize: 18}}>Master Data - User</label>
@@ -424,12 +424,14 @@ export default class UserRole extends Component {
         {this.state.add && (
           <AddUser 
             onClickClose={this.closeAdd.bind(this)}
+            refresh={this.getUser.bind(this)}
             data={this.state.indexData}
           />
         )}
         {this.state.edit && (
           <EditUser 
             onClickClose={this.closeEdit.bind(this)}
+            refresh={this.getUser.bind(this)}
             data={this.state.indexData}
           />
         )}