Revize ebfe6347

re #58 client part(especially rebuilt api.js, all fetches, little edits in YourRequests/UpcomingRequests and fixed bugs in calendar and overview (add event, save, post, numbers)

client/src/OverviewAdmin.js

@@ -3 +3 @@
 import * as api_fetch from './api'
 
 
-const OverviewAdmin = () => {
+const OverviewAdmin = (props) => {
 
    useEffect(() => {
       api_fetch.getUsersOverview().then(usersOverview => {
-         setEmployees(usersOverview);
+         props.setEmployees(usersOverview);
          }).catch(reason => {
          alert(reason)
       });
    }, []);
 
    // states
-   const [employees, setEmployees] = useState([
-      {
-         name: 'Sadam',
-         id: 0,
-         sickday: 10,
-         holiday: 10
-      }
-   ]);
+   // const [employees, setEmployees] = useState([
+   //    {
+   //       name: 'Sadam',
+   //       id: 0,
+   //       sickday: 10,
+   //       holiday: 10
+   //    }
+   // ]);
 
    const [isEdit, setEdit] = useState(false);
    const [editedUserId, setEditedUserId] = useState();
@@ -30 +30 @@
 
    // functions
    function changeSickdays(newValue) {
-      const newEmployees = employees.map(employee => {
+      const newEmployees = props.employees.map(employee => {
          if (editedUserId === employee.id) {
             return {
                ...employee,
@@ -40 +40 @@
             return employee
          }
       })
-      setEmployees(newEmployees);
+      props.setEmployees(newEmployees);
    }
 
    function changeHoliday(newValue) {
-      const newEmployees = employees.map(employee => {
+      const newEmployees = props.employees.map(employee => {
          if (editedUserId === employee.id) {
             return {
                ...employee,
@@ -54 +54 @@
             return employee
          }
       })
-      setEmployees(newEmployees);
+      props.setEmployees(newEmployees);
    }
 
    const submitEdit = async (e) => {
       
       setEdit(isEdit === true ? false : true);
-      setPrevEdit(employees);
+      setPrevEdit(props.employees);
       e.preventDefault();
 
-      const found = employees.find(employee => editedUserId === employee.id);
+      const found = props.employees.find(employee => editedUserId === employee.id);
       const foundPrevEdit = prevEdit.find(employee => editedUserId === employee.id);
 
       const dataOverviewObject = {
@@ -79 +79 @@
    }
 
    const cancel = () => {
-      setEmployees(prevEdit)
+      props.setEmployees(prevEdit)
       setEdit(false)
    }
 
@@ -88 +88 @@
    const editEmployee = (employeeId, e) => {
       setEdit(true)
       setEditedUserId(employeeId)
-      setPrevEdit(employees)
+      setPrevEdit(props.employees)
       
      e.preventDefault();
    }
@@ -112 +112 @@
                   <th>Holiday</th>
                   <th></th>
                </tr>
-                  {employees.map(employee => (
+                  {props.employees.map(employee => (
                <tr>
-                  <td>{employee.name} {editedUserId}</td>
+                  <td>{employee.name}</td>
                   {/* SickDays Input */}
                   <td className="td-center">
                      {isEdit === true && editedUserId === employee.id ? (
                         <input className="offsInput" type="number" min="0" value={employee.sickday} onChange={(e) => changeSickdays(e.target.value)}/>
                      ) : (
-                        employee.sickday
+                        employee.takenSickday + '/' + employee.sickday
                      )}
                   </td>
                   {/* Holiday Input */}