Merge pull request #104 from Sebbben/newVoucherSystem

New voucher system

Author: pvk05

app/(pages)/(main)/volunteering/logs/page.js

@@ -21,136 +21,106 @@ import worklogInput from "./workLogInput";
 import voucherLogInput from "./voucherLogInput";
 
 const WORK_TABLE_HEADERS = [
-  { id: "workedAt_label", type: "date",     name: "work date",    flex: 2, sortBy: "workedAt_num" },
-  { id: "duration",       type: "number",   name: "duration",     flex: 1 },
-  { id: "description",    type: "string",   name: "description",  flex: 3 },
-  { id: "loggedBy",       type: "string",   name: "log by",       flex: 2 },
-  { id: "loggedFor",      type: "string",   name: "log for",      flex: 2 },
+  { id: "workedAt_label", type: "date", name: "work date", flex: 2, sortBy: "workedAt_num" },
+  { id: "duration", type: "number", name: "duration", flex: 1 },
+  { id: "description", type: "string", name: "description", flex: 3 },
+  { id: "loggedBy", type: "string", name: "log by", flex: 2 },
+  { id: "loggedFor", type: "string", name: "log for", flex: 2 },
 ];
 
 const VOUCHER_TABLE_HEADERS = [
-  { id: "usedAt_label",   type: "date",     name: "usage date",   flex: 2, sortBy: "usedAt_num" },
-  { id: "amount",         type: "number",   name: "vouchers",     flex: 2 },
-  { id: "description",    type: "string",   name: "description",  flex: 4 },
-  { id: "loggedFor",      type: "string",   name: "log for",      flex: 2 },
+  { id: "usedAt", type: "date", name: "usage date", flex: 2, sortBy: "usedAt_num" },
+  { id: "amount", type: "number", name: "vouchers", flex: 2 },
+  { id: "description", type: "string", name: "description", flex: 4 },
+  { id: "loggedFor", type: "string", name: "log for", flex: 2 },
 ];
 
 function LogsPage() {
   const [users, setUsers] = useState([]);
   const [workGroups, setWorkGroups] = useState([]);
   const [workLogs, setWorkLogs] = useState([]);
   const [voucherLogs, setVoucherLogs] = useState([]);
-  const [lastSemVoucherLogs, setLastSemVoucherLogs] = useState([]);
+  const [voucherAmount, setVoucherAmount] = useState(0);
 
   const [mode, setMode] = useState(false);
-  const [vouchersEarned, setVouchersEarned] = useState(0);
-  const [vouchersEarnedLastSemester, setVouchersEarnedLastSemester] = useState(0);
-  const [vouchersUsed, setVouchersUsed] = useState(0);
-  const [vouchersUsedLastSemester, setVouchersUsedLastSemester] = useState(0);
-
   const [refresh, setRefresh] = useState(false);
 
   const session = useSession();
 
-  let startOfSemester = false;
-  let lastSemester;
-
-  const dateTime = new Date();
-  const deadline = new Date();
-  deadline.setDate(16);
-  deadline.setMonth(1);
-
-  if (dateTime < deadline) {
-    startOfSemester = true;
-    lastSemester = {
-      id: session.data.semester.id - 1,
-      vouchersEarned: 0,
-      vouchersUsed: 0,
-    }
-  }
-  
   useEffect(() => {
     fetch("/api/v2/users")
-    .then(res => res.json())
-    .then(data => {
-      setUsers(
-        data.users.map((e) => ({
-          ...e,
-          name: `${e.firstName} ${e.lastName}`
-        }))
-      )
-    })
+      .then(res => res.json())
+      .then(data => {
+        setUsers(
+          data.users.map((e) => ({
+            ...e,
+            name: `${e.firstName} ${e.lastName}`
+          }))
+        )
+      })
 
     fetch("/api/v2/workGroups")
-    .then(res => res.json())
-    .then(groups => {
-      setWorkGroups(groups.groups)
-    })
+      .then(res => res.json())
+      .then(groups => {
+        setWorkGroups(groups.groups)
+      })
   }, []);
 
   useEffect(() => {
-    fetch("/api/v2/workLogs")
-    .then(res => res.json())
-    .then(resData => {
-      handleWorkLogs(resData.workLogs, session, setWorkLogs, setVouchersEarned)
-    })
-    
-    fetch("/api/v2/voucherLogs")
-    .then(res => res.json())
-    .then(voucherLog => {
-      handleVoucherLogs(voucherLog.voucherLogs, session, setVoucherLogs, setVouchersUsed)
-    })
-
-    if (startOfSemester) {
-      fetch("/api/v2/workLogs?semesterId=" + lastSemester.id)
+    fetch("/api/v2/work")
       .then(res => res.json())
       .then(resData => {
-        handleLastSemesterWorkLogs(resData.workLogs, session, setVouchersEarnedLastSemester)
+        handleWorkLogs(resData.workLogs, session, setWorkLogs)
       })
 
-      fetch("/api/v2/voucherLogs?semesterId=" + lastSemester.id)
+    fetch("/api/v2/vouchers?action=logs")
       .then(res => res.json())
-      .then(voucherLog => {
-        handleLastSemesterVoucherLogs(voucherLog.voucherLogs, session, setLastSemVoucherLogs, setVouchersUsedLastSemester)
+      .then(res => {
+        res = res.map(log => ({
+          ...log,
+          usedAt: format(parseISO(log.usedAt), "dd.MM HH:mm").toLowerCase(),
+          usedAt_num: parseISO(log.usedAt).getTime()
+        }))
+        setVoucherLogs(res)
       })
-    }
+
+    fetch("/api/v2/vouchers?action=amount")
+      .then(res => res.json())
+      .then(res => {
+        setVoucherAmount(res.voucherAmount)
+    })
+
   }, [refresh])
-  
+
   const worklogInputLayout = worklogInput(
     session,
     users,
     workGroups,
     setRefresh
   );
-  
+
   const voucherLogInputLayout = voucherLogInput(
     session,
-    vouchersEarned,
-    vouchersUsed,
-    setRefresh,
-    vouchersEarnedLastSemester,
-    vouchersUsedLastSemester,
-    startOfSemester
+    voucherAmount,
+    setRefresh
   );
-  
+
   const inputLayout = mode ? worklogInputLayout : voucherLogInputLayout;
   const tableLayout = (
     <CustomTable
       key={mode ? "workLogTable" : "voucherLogTable"}
       headers={mode ? WORK_TABLE_HEADERS : VOUCHER_TABLE_HEADERS}
-      data={mode ? workLogs : voucherLogs.concat(lastSemVoucherLogs)}
+      data={mode ? workLogs : voucherLogs}
       defaultFilterBy="loggedFor"
     />
   );
-  
-  const registerButtonText = `Register ${
-    useMediaQuery(cybTheme.breakpoints.down("md")) ? "" : "Work"
-  }`;
-  
-  const useButtonText = `Use ${
-    useMediaQuery(cybTheme.breakpoints.down("md")) ? "" : "Voucher"
-  }`;
-  
+
+  const registerButtonText = `Register ${useMediaQuery(cybTheme.breakpoints.down("md")) ? "" : "Work"
+    }`;
+
+  const useButtonText = `Use ${useMediaQuery(cybTheme.breakpoints.down("md")) ? "" : "Voucher"
+    }`;
+
   return (
     <Box>
       <PageHeader text="Logs" />
@@ -189,8 +159,8 @@ function LogsPage() {
   );
 }
 
-function handleWorkLogs(logs, session, setWorkLogs, setVouchersEarned) {
-  
+function handleWorkLogs(logs, session, setWorkLogs) {
+
   const newWorkLogs = logs.map((log) => ({
     ...log,
     loggedBy: getUserName(log.LoggedByUser),
@@ -199,81 +169,7 @@ function handleWorkLogs(logs, session, setWorkLogs, setVouchersEarned) {
     workedAt_label: format(parseISO(log.workedAt), "dd.MM HH:mm").toLowerCase(),
   }));
 
-  const newVouchersEarned = logs
-    .filter((e) => {
-      const person = e.LoggedForUser;
-      return person && person.id == session.data.user.id;
-    })
-    .reduce((total, e) => {
-      return (total += e.duration * 0.5);
-    }, 0.0);
-    
   setWorkLogs(newWorkLogs);
-  setVouchersEarned(newVouchersEarned);
-}
-
-function handleLastSemesterWorkLogs(logs, session, setVouchersEarnedLastSemester) {
-
-  const newVouchersEarned = logs
-    .filter((e) => {
-      const person = e.LoggedForUser;
-      return person && person.id == session.data.user.id;
-    })
-    .reduce((total, e) => {
-      return (total += e.duration * 0.5);
-    }, 0.0);
-    
-  setVouchersEarnedLastSemester(newVouchersEarned);
-}
-
-function handleVoucherLogs(logs, session, setVoucherLogs, setVouchersUsed) {
-
-  const newVoucherLogs = logs.map((log) => ({
-    ...log,
-    loggedFor: getUserName(log.LoggedForUser),
-    usedAt_num: parseISO(log.usedAt).getTime(),
-    usedAt_label: format(parseISO(log.usedAt), "dd.MM HH:mm").toLowerCase(),
-  }));
-  
-  const newVouchersUsed = logs
-    .filter((e) => {
-      const person = e.LoggedForUser;
-      const personId = person.id;
-      return personId == session.data.user.id;
-    })
-    .reduce((total, e) => {
-      return (total += e.amount);
-    }, 0.0);
-
-  setVoucherLogs(newVoucherLogs);
-  setVouchersUsed(parseFloat(newVouchersUsed));
-}
-
-function handleLastSemesterVoucherLogs(logs, session, setLastSemVoucherLogs, setVouchersUsedLastSemester) {
-  
-  let newVoucherLogs = logs.map((log) => ({
-      ...log,
-      loggedFor: getUserName(log.LoggedForUser),
-      usedAt_num: parseISO(log.usedAt).getTime(),
-      usedAt_label: format(parseISO(log.usedAt), "dd.MM HH:mm").toLowerCase(),
-    }))
-  newVoucherLogs = newVoucherLogs.filter((e) => {
-      const year = new Date(e.usedAt).getFullYear();
-      return year == new Date().getFullYear();
-    });
-  
-  const newVouchersUsed = logs
-    .filter((e) => {
-      const person = e.LoggedForUser;
-      const personId = person.id;
-      return personId == session.data.user.id;
-    })
-    .reduce((total, e) => {
-      return (total += e.amount);
-    }, 0.0);
-
-  setLastSemVoucherLogs(newVoucherLogs);
-  setVouchersUsedLastSemester(parseFloat(newVouchersUsed));
 }
 
 export default authWrapper(LogsPage);