From 8fe3d71ddef248332cfe2af26f6b8f02844b7e65 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 16 Jan 2026 11:25:34 +0100 Subject: [PATCH] fix: fix error user dont get updated targetWorkingHours also perform code formatting and cleanup --- frontend/index.html | 22 +- frontend/jsconfig.json | 10 +- frontend/src/App.svelte | 49 +- frontend/src/components/AdminDashboard.svelte | 479 ++++++--- frontend/src/components/Login.svelte | 132 ++- frontend/src/components/ScheduleItem.svelte | 43 +- frontend/src/components/ScheduleItems.svelte | 37 +- .../src/components/ToastNotification.svelte | 74 +- frontend/src/components/UserDashboard.svelte | 984 ++++++++++++------ .../components/admin/AdminScheduleTab.svelte | 569 ++++++---- .../admin/AdminSchoolYearsTab.svelte | 107 +- .../components/admin/AdminSettingsTab.svelte | 78 +- .../admin/AdminTimeEntriesTab.svelte | 287 +++-- .../src/components/admin/AdminUsersTab.svelte | 215 ++-- frontend/src/lib/api.js | 329 +++--- frontend/src/lib/stores.js | 83 +- frontend/src/lib/utils.js | 38 +- frontend/src/main.js | 8 +- frontend/svelte.config.js | 4 +- frontend/tailwind.config.js | 10 +- frontend/vite.config.js | 25 +- 21 files changed, 2348 insertions(+), 1235 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 705ff05..55d0a6d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,14 +1,16 @@ - - - - - school-timetracker - - -
- - + + + + + school-timetracker + + + +
+ + + diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json index c7a0b10..49869a6 100644 --- a/frontend/jsconfig.json +++ b/frontend/jsconfig.json @@ -17,7 +17,9 @@ */ "sourceMap": true, "esModuleInterop": true, - "types": ["vite/client"], + "types": [ + "vite/client" + ], "skipLibCheck": true, /** * Typecheck JS in `.svelte` and `.js` files by default. @@ -29,5 +31,9 @@ * Use global.d.ts instead of compilerOptions.types * to avoid limiting type declarations. */ - "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] + "include": [ + "src/**/*.d.ts", + "src/**/*.js", + "src/**/*.svelte" + ] } diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 38f9a5e..f7bcbde 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -1,52 +1,54 @@
- +
{#if !isAuthenticated} @@ -57,4 +59,3 @@ {/if}
- diff --git a/frontend/src/components/AdminDashboard.svelte b/frontend/src/components/AdminDashboard.svelte index 09c0e7c..ba77bf1 100644 --- a/frontend/src/components/AdminDashboard.svelte +++ b/frontend/src/components/AdminDashboard.svelte @@ -1,179 +1,342 @@
- - - -
- -
-
- -
- -
-
diff --git a/frontend/src/components/ScheduleItems.svelte b/frontend/src/components/ScheduleItems.svelte index 11ce34d..c95444d 100644 --- a/frontend/src/components/ScheduleItems.svelte +++ b/frontend/src/components/ScheduleItems.svelte @@ -1,31 +1,33 @@ -
isClickable && dispatch('toggle')} + on:click={() => isClickable && dispatch("toggle")} on:keydown={() => {}} role="button" tabindex="0" @@ -34,6 +36,7 @@ {schedule.startTime} - {schedule.endTime}

- {schedule.title} {schedule.scheduleType === 'break' ? '(Pause)' : ''} + {schedule.title} + {schedule.scheduleType === "break" ? "(Pause)" : ""}

diff --git a/frontend/src/components/ToastNotification.svelte b/frontend/src/components/ToastNotification.svelte index c8e6f23..0541026 100644 --- a/frontend/src/components/ToastNotification.svelte +++ b/frontend/src/components/ToastNotification.svelte @@ -1,34 +1,74 @@
{#each $toasts as toast (toast.id)} -
- {#if toast.type === 'error'} - - {:else if toast.type === 'success'} - + {#if toast.type === "error"} + + {:else if toast.type === "success"} + {:else} - + {/if} - + {toast.message} - - + +
{/each}
diff --git a/frontend/src/components/UserDashboard.svelte b/frontend/src/components/UserDashboard.svelte index ec4534e..5c74191 100644 --- a/frontend/src/components/UserDashboard.svelte +++ b/frontend/src/components/UserDashboard.svelte @@ -1,99 +1,135 @@
- - + +
- -
-
- -
- -
- - KW {currentWeek} -
- -
- -
-
-
- {$auth.user?.username?.charAt(0).toUpperCase()} -
-
-
    -
    • -
-
-
+
+
+
-
- -
-
- -
-

Kalenderwoche

-

KW {currentWeek} / {currentISOYear}

-

{weekDates[0]?.date} — {weekDates[4]?.date}

-
- -
-
- -
-
-
-
Geleistet
-
{yearlyTotal.toFixed(1)}
-
-
-
-
-
Offen
-
{Math.max(0, remaining).toFixed(1)}
-
-
-
- - {#if isLoadingData} - -
- {#each Array(5) as _}
{/each} -
- - {:else} - {#if hasEntriesForWeek && !weekEditMode} - - {:else if weekEditMode} - - {:else} - - {/if} - - - -
- {#each weekDates as day} -
- -
- {day.name} - {day.date} -
-
-
- {#each schedules.filter(s => s.dayOfWeek === day.dayIndex) as schedule} - e.scheduleId === schedule.id && e.dayOfWeek === day.dayIndex)} - isClickable={(!hasEntriesForWeek || weekEditMode) && !processing} - on:toggle={() => toggleSelection(schedule.id, day.dayIndex)} - /> - {/each} -
-
-
- {/each} -
- {/if} - +
+ + KW {currentWeek}
- - {#if (!hasEntriesForWeek || weekEditMode) && !isLoadingData} -
- -
- {/if} - -
- -
- - - -
+ + +
+
+
-
-
Jahresfortschritt
- -
-
-
{yearlyTotal.toFixed(1)}
-
von {userTarget.toFixed(1)} Stunden
-
-
- {Math.round(progressPercent)}% -
-
+
+
+
+ +
+

+ Kalenderwoche +

+

+ KW {currentWeek} / + {currentISOYear} +

+

+ {weekDates[0]?.date} — {weekDates[4]?.date} +

+
+ +
+
-
+
+
+
+
Geleistet
+
{yearlyTotal.toFixed(1)}
+
+
+
+
+
Offen
+
+ {Math.max(0, remaining).toFixed(1)} +
+
+
+
-
- Verbleibend: - - {Math.max(0, remaining).toFixed(1)} h - -
- - + {#if isLoadingData} + +
+ {#each Array(5) as _} +
+ {/each} +
+ {:else} + {#if hasEntriesForWeek && !weekEditMode} + + {:else if weekEditMode} + + {:else} + + {/if} + + -
- +
+ {#each weekDates as day} +
+ +
+ {day.name} + {day.date} +
+
+
+ {#each schedules.filter((s) => s.dayOfWeek === day.dayIndex) as schedule} + + e.scheduleId === schedule.id && + e.dayOfWeek === day.dayIndex, + )} + isClickable={(!hasEntriesForWeek || weekEditMode) && + !processing} + on:toggle={() => + toggleSelection(schedule.id, day.dayIndex)} + /> + {/each} +
+
+
+ {/each}
+ {/if} +
+ + {#if (!hasEntriesForWeek || weekEditMode) && !isLoadingData} +
+ +
+ {/if} +
+ +
+ + +
@@ -417,29 +677,59 @@

Passwort ändern

- +
-
- - -
-
- - -
-
- - -
+
+ + +
+
+ + +
+
+ + +
- - + +
+ diff --git a/frontend/src/components/admin/AdminScheduleTab.svelte b/frontend/src/components/admin/AdminScheduleTab.svelte index 323eb83..34ab17d 100644 --- a/frontend/src/components/admin/AdminScheduleTab.svelte +++ b/frontend/src/components/admin/AdminScheduleTab.svelte @@ -1,205 +1,341 @@
- - - - + + + +
-
-

Neuen Eintrag erstellen

- -
-
- - +
+

+ Neuen Eintrag erstellen +

+ +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
-
- - -
- -
- - -
- -
- - -
- -
- - +
+
- -
- -
-
-
+
- + {#each schedules as s (s.id)} - + - + {/each} @@ -207,47 +343,78 @@ -
-

Tag kopieren

- -
-
- - -
+
+

Tag kopieren

-
- -
- {#each dayNames as day, i} - {#if String(i) !== copySourceDay} - - {/if} - {/each} +
+
+ + +
+ +
+ +
+ {#each dayNames as day, i} + {#if String(i) !== copySourceDay} + + {/if} + {/each} +
+
+ +
+
-
- +
+ +
- -
- - -
-
diff --git a/frontend/src/components/admin/AdminSchoolYearsTab.svelte b/frontend/src/components/admin/AdminSchoolYearsTab.svelte index fe0039a..8684929 100644 --- a/frontend/src/components/admin/AdminSchoolYearsTab.svelte +++ b/frontend/src/components/admin/AdminSchoolYearsTab.svelte @@ -1,35 +1,56 @@ {#if activeSchoolYear}
-

Aktives Schuljahr: {activeSchoolYear.name}

-
{activeSchoolYear.startDate} bis {activeSchoolYear.endDate}
+

+ Aktives Schuljahr: {activeSchoolYear.name} +

+
+ {activeSchoolYear.startDate} bis {activeSchoolYear.endDate} +
{:else} @@ -43,23 +64,46 @@
- +
- +
- +
- +
TagZeitTypTitelAktion
TagZeitTypTitelAktion
{dayNames[s.dayOfWeek]} {s.startTime} - {s.endTime}{s.scheduleType === 'break' ? 'Pause' : 'Unterricht'}{s.scheduleType === "break" + ? "Pause" + : "Unterricht"} {s.title}
- + {#each schoolYears as sy} @@ -75,9 +119,16 @@ {/each} diff --git a/frontend/src/components/admin/AdminSettingsTab.svelte b/frontend/src/components/admin/AdminSettingsTab.svelte index 8d05bb1..633907c 100644 --- a/frontend/src/components/admin/AdminSettingsTab.svelte +++ b/frontend/src/components/admin/AdminSettingsTab.svelte @@ -1,34 +1,34 @@
@@ -38,27 +38,35 @@
- +
-
+
- Logo e.target.style.display='none'} /> + Logo (e.target.style.display = "none")} + />
-
- Empfohlen: PNG mit transparentem Hintergrund.
+ Empfohlen: PNG mit transparentem Hintergrund.
Max. 2MB.
diff --git a/frontend/src/components/admin/AdminTimeEntriesTab.svelte b/frontend/src/components/admin/AdminTimeEntriesTab.svelte index e6d3a6a..5a9bbc6 100644 --- a/frontend/src/components/admin/AdminTimeEntriesTab.svelte +++ b/frontend/src/components/admin/AdminTimeEntriesTab.svelte @@ -1,71 +1,144 @@ -
-
-

Jahresübersicht

+

+ Jahresübersicht +

NameStartEndeStatusAktion
NameStartEndeStatusAktion
{#if !sy.isActive} - + {/if} - +
- + {#each yearlySummary as s} - + @@ -78,47 +151,101 @@
-

Manuelle Korrektur / Eintragung

-
+

+ Manuelle Korrektur / Eintragung +

+
- - - {#each users as u} {/each} + {#each users as u} + + {/each}
- - + +
- - + +
-
-
+
MitarbeiterSollIstDifferenzStatus
MitarbeiterSollIstDifferenzStatus
{s.username} {s.yearlyTarget} {s.yearlyActual}{s.remainingYearly.toFixed(1)}{s.remainingYearly.toFixed(1)} {#if s.remainingYearly > 0} - Offen + Offen {:else} - Erfüllt + Erfüllt {/if}
- + {#each timeEntries as entry (entry.id)} {#if editingEntryId === entry.id} - + @@ -138,15 +273,35 @@ - + diff --git a/frontend/src/components/admin/AdminUsersTab.svelte b/frontend/src/components/admin/AdminUsersTab.svelte index 338d5a9..cde79ec 100644 --- a/frontend/src/components/admin/AdminUsersTab.svelte +++ b/frontend/src/components/admin/AdminUsersTab.svelte @@ -1,81 +1,129 @@
-

Neuen Benutzer anlegen

-
+

+ Neuen Benutzer anlegen +

+
- - + +
- - + +
-
- +
-
+
UserDatumZeitTypStundenAktion
UserDatumZeitTypStundenAktion
{entry.username}
- - + +
- @@ -127,8 +254,16 @@ -
- - + +
{entry.date} {entry.startTime} - {entry.endTime} - + {entry.entryType} {entry.entryType === 'lesson' ? '1.0' : calculateHours(entry.startTime, entry.endTime)}{entry.entryType === "lesson" + ? "1.0" + : calculateHours( + entry.startTime, + entry.endTime, + )}
- - + +
- + {#each users as user (user.id)} @@ -83,16 +131,32 @@ - + diff --git a/frontend/src/lib/api.js b/frontend/src/lib/api.js index 8eabbe7..94fe70c 100644 --- a/frontend/src/lib/api.js +++ b/frontend/src/lib/api.js @@ -1,65 +1,84 @@ -import { get } from 'svelte/store'; -import { auth, addToast, loading } from './stores'; +import { get } from "svelte/store"; +import { auth, addToast, loading } from "./stores"; -const BASE_URL = '/api'; +const BASE_URL = "/api"; function parseJwt(token) { - if (!token) return {}; - try { - const base64Url = token.split('.')[1]; - if (!base64Url) return {}; - let base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/'); - const padding = base64.length % 4; - if (padding) base64 += '='.repeat(4 - padding); - const jsonPayload = decodeURIComponent(window.atob(base64).split('').map(c => - '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2) - ).join('')); - return JSON.parse(jsonPayload); - } catch (e) { - console.error("JWT Parse Error:", e); - return {}; - } + if (!token) return {}; + try { + const base64Url = token.split(".")[1]; + if (!base64Url) return {}; + let base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/"); + const padding = base64.length % 4; + if (padding) base64 += "=".repeat(4 - padding); + const jsonPayload = decodeURIComponent( + window + .atob(base64) + .split("") + .map((c) => "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2)) + .join(""), + ); + return JSON.parse(jsonPayload); + } catch (e) { + console.error("JWT Parse Error:", e); + return {}; + } } function mapScheduleFromApi(s) { - return { - id: s.id, dayOfWeek: s.day_of_week, startTime: s.start_time, - endTime: s.end_time, scheduleType: s.type, title: s.title - }; + return { + id: s.id, + dayOfWeek: s.day_of_week, + startTime: s.start_time, + endTime: s.end_time, + scheduleType: s.type, + title: s.title, + }; } function mapScheduleToApi(s) { - return { - day_of_week: parseInt(s.dayOfWeek), start_time: s.startTime, - end_time: s.endTime, type: s.scheduleType, title: s.title - }; + return { + day_of_week: parseInt(s.dayOfWeek), + start_time: s.startTime, + end_time: s.endTime, + type: s.scheduleType, + title: s.title, + }; } function mapTimeEntryFromApi(e) { - return { - id: e.id, userId: e.user_id, scheduleId: e.schedule_id, date: e.date, - entryType: e.type || e.entry_type, username: e.username, - startTime: e.start_time, endTime: e.end_time - }; + return { + id: e.id, + userId: e.user_id, + scheduleId: e.schedule_id, + date: e.date, + entryType: e.type || e.entry_type, + username: e.username, + startTime: e.start_time, + endTime: e.end_time, + }; } function mapUserFromApi(u) { - return { - ...u, - yearlyWorkHours: u.yearly_hours || u.yearly_work_hours || u.yearlyWorkHours || 0, - isAdmin: !!(u.isAdmin || u.is_admin) - }; + return { + ...u, + yearlyWorkHours: + u.yearly_hours || u.yearly_work_hours || u.yearlyWorkHours || 0, + isAdmin: !!(u.isAdmin || u.is_admin), + }; } -async function request(endpoint, method = 'GET', body = null, isBlob = false) { +async function request(endpoint, method = "GET", body = null, isBlob = false) { loading.set(true); const token = get(auth).token; const headers = {}; - - if (!isBlob) headers['Content-Type'] = 'application/json'; - if (token) headers['Authorization'] = `Bearer ${token}`; + + if (!isBlob) headers["Content-Type"] = "application/json"; + if (token) headers["Authorization"] = `Bearer ${token}`; try { const res = await fetch(`${BASE_URL}${endpoint}`, { - method, headers, body: body ? JSON.stringify(body) : null + method, + headers, + body: body ? JSON.stringify(body) : null, }); loading.set(false); @@ -67,19 +86,22 @@ async function request(endpoint, method = 'GET', body = null, isBlob = false) { if (!res.ok) { if (res.status === 401) { if (get(auth).isAuthenticated) { - addToast("Ihre Sitzung ist abgelaufen. Bitte neu anmelden.", "warning"); - logout(); + addToast( + "Ihre Sitzung ist abgelaufen. Bitte neu anmelden.", + "warning", + ); + logout(); } - throw new Error('Sitzung abgelaufen'); + throw new Error("Sitzung abgelaufen"); } const errText = await res.text(); let errorMsg = errText || `Fehler: ${res.status}`; - + try { - const jsonErr = JSON.parse(errText); - if(jsonErr.message) errorMsg = jsonErr.message; - } catch(e) {} + const jsonErr = JSON.parse(errText); + if (jsonErr.message) errorMsg = jsonErr.message; + } catch (e) {} throw new Error(errorMsg); } @@ -87,44 +109,53 @@ async function request(endpoint, method = 'GET', body = null, isBlob = false) { if (isBlob) return await res.blob(); const text = await res.text(); return text ? JSON.parse(text) : null; - } catch (error) { loading.set(false); - - if (error.message === 'Sitzung abgelaufen') { - throw error; + + if (error.message === "Sitzung abgelaufen") { + throw error; } - if (error.name === 'TypeError' && error.message.includes('fetch')) { - addToast("Verbindung zum Server fehlgeschlagen. Sind Sie online?", "error"); - throw new Error("Verbindungsfehler"); + if (error.name === "TypeError" && error.message.includes("fetch")) { + addToast( + "Verbindung zum Server fehlgeschlagen. Sind Sie online?", + "error", + ); + throw new Error("Verbindungsfehler"); } - if (endpoint !== '/login') { - addToast(error.message || "Unbekannter Fehler", 'error'); + if (endpoint !== "/login") { + addToast(error.message || "Unbekannter Fehler", "error"); } - + throw error; } } export const login = async (username, password) => { try { - const data = await request('/login', 'POST', { username, password }); - const jwtData = parseJwt(data.token); - - const userObj = { - username: data.username, - is_admin: data.is_admin, - id: jwtData.user_id || jwtData.id || data.id || 0 - }; - - auth.set({ token: data.token, user: mapUserFromApi(userObj), isAuthenticated: true }); - addToast("Erfolgreich angemeldet", "success"); - return true; + const data = await request("/login", "POST", { username, password }); + const jwtData = parseJwt(data.token); + + const userObj = { + username: data.username, + is_admin: data.is_admin, + id: jwtData.user_id || jwtData.id || data.id || 0, + }; + + auth.set({ + token: data.token, + user: mapUserFromApi(userObj), + isAuthenticated: true, + }); + addToast("Erfolgreich angemeldet", "success"); + return true; } catch (e) { - addToast("Anmeldung fehlgeschlagen. Prüfen Sie Benutzername und Passwort.", "error"); - return false; + addToast( + "Anmeldung fehlgeschlagen. Prüfen Sie Benutzername und Passwort.", + "error", + ); + return false; } }; @@ -132,90 +163,144 @@ export const logout = () => { auth.set({ token: null, user: null, isAuthenticated: false }); }; +export const getMyInfo = async () => { + const data = await request("/my-info"); + return mapUserFromApi(data); +}; + export const getSchedules = async () => { - const data = await request('/schedules'); - return data.map(mapScheduleFromApi); + const data = await request("/schedules"); + return data.map(mapScheduleFromApi); }; export const createSchedule = (s) => { - const payload = mapScheduleToApi(s); - return request('/admin/schedules', 'POST', payload); + const payload = mapScheduleToApi(s); + return request("/admin/schedules", "POST", payload); }; -export const deleteSchedule = (id) => request(`/admin/schedules/delete?id=${id}`, 'DELETE'); +export const deleteSchedule = (id) => + request(`/admin/schedules/delete?id=${id}`, "DELETE"); export const getMyTimeEntries = async () => { - const data = await request('/my-time-entries'); - return data.map(mapTimeEntryFromApi); + const data = await request("/my-time-entries"); + return data.map(mapTimeEntryFromApi); }; -export const saveTimeEntriesBatch = (entries) => request('/time-entries/batch', 'POST', { entries }); -export const deleteWeekEntries = (year, week) => request(`/my-time-entries/week?year=${year}&week=${week}`, 'DELETE'); +export const saveTimeEntriesBatch = (entries) => + request("/time-entries/batch", "POST", { entries }); +export const deleteWeekEntries = (year, week) => + request(`/my-time-entries/week?year=${year}&week=${week}`, "DELETE"); export const getUsers = async () => { - const data = await request('/admin/users/list'); - return data.map(mapUserFromApi); + const data = await request("/admin/users/list"); + return data.map(mapUserFromApi); }; -export const createUser = (u) => request('/admin/users', 'POST', { username: u.username, password: u.password, is_admin: u.isAdmin }); -export const deleteUser = (id) => request(`/admin/users/delete?id=${id}`, 'DELETE'); +export const createUser = (u) => + request("/admin/users", "POST", { + username: u.username, + password: u.password, + is_admin: u.isAdmin, + }); +export const deleteUser = (id) => + request(`/admin/users/delete?id=${id}`, "DELETE"); -export const updateUserWorkHours = (id, hours) => request(`/admin/users/${id}`, 'PUT', { yearly_hours: parseFloat(hours) }); -export const resetUserPassword = (id, new_password) => request(`/admin/users/${id}/reset-password`, 'PUT', { new_password }); +export const updateUserWorkHours = (id, hours) => + request(`/admin/users/${id}`, "PUT", { yearly_hours: parseFloat(hours) }); +export const resetUserPassword = (id, new_password) => + request(`/admin/users/${id}/reset-password`, "PUT", { new_password }); export const getAllTimeEntries = async () => { - const data = await request('/admin/time-entries'); - return data.map(mapTimeEntryFromApi); + const data = await request("/admin/time-entries"); + return data.map(mapTimeEntryFromApi); }; export const updateTimeEntry = (id, entry) => { - const payload = { date: entry.date, start_time: entry.startTime, end_time: entry.endTime, type: entry.entryType }; - return request(`/admin/time-entries/${id}`, 'PUT', payload); + const payload = { + date: entry.date, + start_time: entry.startTime, + end_time: entry.endTime, + type: entry.entryType, + }; + return request(`/admin/time-entries/${id}`, "PUT", payload); }; -export const deleteTimeEntry = (id) => request(`/admin/time-entries/${id}`, 'DELETE'); +export const deleteTimeEntry = (id) => + request(`/admin/time-entries/${id}`, "DELETE"); -export const createAdminTimeEntry = (entry) => request('/admin/time-entry', 'POST', { - user_id: entry.selectedUserId, date: entry.date, hours: parseFloat(entry.hours), type: 'manual' -}); +export const createAdminTimeEntry = (entry) => + request("/admin/time-entry", "POST", { + user_id: entry.selectedUserId, + date: entry.date, + hours: parseFloat(entry.hours), + type: "manual", + }); export const getYearlySummary = async () => { - const data = await request('/yearly-hours-summary'); - return data.map(s => ({ ...s, userId: s.user_id, yearlyTarget: s.yearly_target, yearlyActual: s.yearly_actual, remainingYearly: s.remaining_yearly })); + const data = await request("/yearly-hours-summary"); + return data.map((s) => ({ + ...s, + userId: s.user_id, + yearlyTarget: s.yearly_target, + yearlyActual: s.yearly_actual, + remainingYearly: s.remaining_yearly, + })); }; -export const downloadYearlySummaryPDF = () => request('/admin/yearly-summary/pdf', 'GET', null, true); +export const downloadYearlySummaryPDF = () => + request("/admin/yearly-summary/pdf", "GET", null, true); export const getSchoolYears = async () => { - const data = await request('/admin/school-years'); - return data.map(sy => ({ ...sy, startDate: sy.start_date, endDate: sy.end_date, isActive: sy.is_active })); + const data = await request("/admin/school-years"); + return data.map((sy) => ({ + ...sy, + startDate: sy.start_date, + endDate: sy.end_date, + isActive: sy.is_active, + })); }; export const getActiveSchoolYear = async () => { - const sy = await request('/school-year/active'); - if(!sy) return null; - return { ...sy, startDate: sy.start_date, endDate: sy.end_date, isActive: sy.is_active }; + const sy = await request("/school-year/active"); + if (!sy) return null; + return { + ...sy, + startDate: sy.start_date, + endDate: sy.end_date, + isActive: sy.is_active, + }; }; export const uploadLogo = async (file) => { - const formData = new FormData(); - formData.append('logo', file); - - const token = localStorage.getItem('token'); - - const res = await fetch('/api/admin/settings/logo', { - method: 'POST', - headers: { - 'Authorization': `Bearer ${token}` - }, - body: formData - }); - - if (!res.ok) throw new Error("Upload fehlgeschlagen"); - return true; + const formData = new FormData(); + formData.append("logo", file); + + const token = localStorage.getItem("token"); + + const res = await fetch("/api/admin/settings/logo", { + method: "POST", + headers: { + Authorization: `Bearer ${token}`, + }, + body: formData, + }); + + if (!res.ok) throw new Error("Upload fehlgeschlagen"); + return true; }; -export const createSchoolYear = (sy) => request('/admin/school-years', 'POST', { name: sy.name, start_date: sy.startDate, end_date: sy.endDate }); -export const activateSchoolYear = (id) => request(`/admin/school-years/${id}/activate`, 'PUT'); -export const deleteSchoolYear = (id) => request(`/admin/school-years/${id}`, 'DELETE'); -export const changeMyPassword = (oldPw, newPw) => request('/change-password', 'POST', { old_password: oldPw, new_password: newPw }); +export const createSchoolYear = (sy) => + request("/admin/school-years", "POST", { + name: sy.name, + start_date: sy.startDate, + end_date: sy.endDate, + }); +export const activateSchoolYear = (id) => + request(`/admin/school-years/${id}/activate`, "PUT"); +export const deleteSchoolYear = (id) => + request(`/admin/school-years/${id}`, "DELETE"); +export const changeMyPassword = (oldPw, newPw) => + request("/change-password", "POST", { + old_password: oldPw, + new_password: newPw, + }); diff --git a/frontend/src/lib/stores.js b/frontend/src/lib/stores.js index 795939f..8d63a01 100644 --- a/frontend/src/lib/stores.js +++ b/frontend/src/lib/stores.js @@ -1,19 +1,30 @@ -import { writable, get } from 'svelte/store'; +import { writable, get } from "svelte/store"; function safeParse(jsonString) { - if (!jsonString || jsonString === 'undefined' || jsonString === 'null') return null; - try { return JSON.parse(jsonString); } catch (e) { return null; } + if (!jsonString || jsonString === "undefined" || jsonString === "null") + return null; + try { + return JSON.parse(jsonString); + } catch (e) { + return null; + } } function decodeJwt(token) { - try { - const base64Url = token.split('.')[1]; - const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/'); - const jsonPayload = decodeURIComponent(window.atob(base64).split('').map(c => - '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2) - ).join('')); - return JSON.parse(jsonPayload); - } catch (e) { return null; } + try { + const base64Url = token.split(".")[1]; + const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/"); + const jsonPayload = decodeURIComponent( + window + .atob(base64) + .split("") + .map((c) => "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2)) + .join(""), + ); + return JSON.parse(jsonPayload); + } catch (e) { + return null; + } } const normalizeUser = (u) => { @@ -21,37 +32,37 @@ const normalizeUser = (u) => { return { ...u, isAdmin: !!(u.isAdmin || u.is_admin) }; }; -const storedToken = localStorage.getItem('token'); -let initialUser = normalizeUser(safeParse(localStorage.getItem('user'))); +const storedToken = localStorage.getItem("token"); +let initialUser = normalizeUser(safeParse(localStorage.getItem("user"))); let initialAuth = false; if (storedToken) { - const decoded = decodeJwt(storedToken); - const currentTime = Date.now() / 1000; - - if (decoded && decoded.exp && decoded.exp < currentTime) { - console.warn("Token im Storage ist abgelaufen. Auto-Logout."); - localStorage.removeItem('token'); - localStorage.removeItem('user'); - initialUser = null; - } else { - initialAuth = !!initialUser; - } + const decoded = decodeJwt(storedToken); + const currentTime = Date.now() / 1000; + + if (decoded && decoded.exp && decoded.exp < currentTime) { + console.warn("Token im Storage ist abgelaufen. Auto-Logout."); + localStorage.removeItem("token"); + localStorage.removeItem("user"); + initialUser = null; + } else { + initialAuth = !!initialUser; + } } export const auth = writable({ token: initialAuth ? storedToken : null, user: initialUser, - isAuthenticated: initialAuth + isAuthenticated: initialAuth, }); -auth.subscribe(value => { +auth.subscribe((value) => { if (value.token && value.user) { - localStorage.setItem('token', value.token); - localStorage.setItem('user', JSON.stringify(value.user)); + localStorage.setItem("token", value.token); + localStorage.setItem("user", JSON.stringify(value.user)); } else { - localStorage.removeItem('token'); - localStorage.removeItem('user'); + localStorage.removeItem("token"); + localStorage.removeItem("user"); } }); @@ -59,13 +70,13 @@ export const loading = writable(false); export const toasts = writable([]); -export function addToast(message, type = 'info') { - const id = Date.now() + Math.random(); - const newToast = { id, message, type }; - toasts.update(all => [newToast, ...all]); - setTimeout(() => removeToast(id), 5000); +export function addToast(message, type = "info") { + const id = Date.now() + Math.random(); + const newToast = { id, message, type }; + toasts.update((all) => [newToast, ...all]); + setTimeout(() => removeToast(id), 5000); } export function removeToast(id) { - toasts.update(all => all.filter(t => t.id !== id)); + toasts.update((all) => all.filter((t) => t.id !== id)); } diff --git a/frontend/src/lib/utils.js b/frontend/src/lib/utils.js index 468eae9..cb9f7bc 100644 --- a/frontend/src/lib/utils.js +++ b/frontend/src/lib/utils.js @@ -1,9 +1,9 @@ export function calculateHours(startTime, endTime) { if (!startTime || !endTime) return 0; - if (endTime === 'manual') return parseFloat(startTime) || 0; + if (endTime === "manual") return parseFloat(startTime) || 0; const parseTime = (timeStr) => { - const parts = timeStr.split(':'); + const parts = timeStr.split(":"); if (parts.length !== 2) return 0; return parseFloat(parts[0]) + parseFloat(parts[1]) / 60; }; @@ -16,36 +16,44 @@ export function calculateHours(startTime, endTime) { } export function getISOWeek(date) { - const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); + const d = new Date( + Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()), + ); const dayNum = d.getUTCDay() || 7; d.setUTCDate(d.getUTCDate() + 4 - dayNum); const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1)); - return Math.ceil((((d - yearStart) / 86400000) + 1) / 7); + return Math.ceil(((d - yearStart) / 86400000 + 1) / 7); } export function getISOYear(date) { - const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); - const dayNum = d.getUTCDay() || 7; - d.setUTCDate(d.getUTCDate() + 4 - dayNum); - return d.getUTCFullYear(); + const d = new Date( + Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()), + ); + const dayNum = d.getUTCDay() || 7; + d.setUTCDate(d.getUTCDate() + 4 - dayNum); + return d.getUTCFullYear(); } export function getDateOfISOWeek(w, y) { const simple = new Date(y, 0, 1 + (w - 1) * 7); const dow = simple.getDay(); const ISOweekStart = simple; - if (dow <= 4) - ISOweekStart.setDate(simple.getDate() - simple.getDay() + 1); - else - ISOweekStart.setDate(simple.getDate() + 8 - simple.getDay()); + if (dow <= 4) ISOweekStart.setDate(simple.getDate() - simple.getDay() + 1); + else ISOweekStart.setDate(simple.getDate() + 8 - simple.getDay()); return ISOweekStart; } export function formatDate(date) { const year = date.getFullYear(); - const month = String(date.getMonth() + 1).padStart(2, '0'); - const day = String(date.getDate()).padStart(2, '0'); + const month = String(date.getMonth() + 1).padStart(2, "0"); + const day = String(date.getDate()).padStart(2, "0"); return `${year}-${month}-${day}`; } -export const dayNames = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag"]; +export const dayNames = [ + "Montag", + "Dienstag", + "Mittwoch", + "Donnerstag", + "Freitag", +]; diff --git a/frontend/src/main.js b/frontend/src/main.js index a2beaa5..23223e4 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -1,9 +1,9 @@ -import { mount } from 'svelte'; -import './app.css'; -import App from './App.svelte'; +import { mount } from "svelte"; +import "./app.css"; +import App from "./App.svelte"; const app = mount(App, { - target: document.getElementById('app'), + target: document.getElementById("app"), }); export default app; diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js index 96b3455..a710f1b 100644 --- a/frontend/svelte.config.js +++ b/frontend/svelte.config.js @@ -1,8 +1,8 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' +import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; /** @type {import("@sveltejs/vite-plugin-svelte").SvelteConfig} */ export default { // Consult https://svelte.dev/docs#compile-time-svelte-preprocess // for more information about preprocessors preprocess: vitePreprocess(), -} +}; diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 773ab5a..cb5c5ad 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,15 +1,11 @@ /** @type {import('tailwindcss').Config} */ export default { - content: [ - "./src/**/*.{html,js,svelte,ts}", - ], + content: ["./src/**/*.{html,js,svelte,ts}"], theme: { extend: {}, }, - plugins: [ - require('daisyui'), - ], + plugins: [require("daisyui")], daisyui: { themes: ["light", "dark"], }, -} +}; diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 64d63ba..6278ad0 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,18 +1,15 @@ -import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' -import tailwindcss from '@tailwindcss/vite'; +import { defineConfig } from "vite"; +import { svelte } from "@sveltejs/vite-plugin-svelte"; +import tailwindcss from "@tailwindcss/vite"; export default defineConfig({ - plugins: [ - svelte(), - tailwindcss() - ], + plugins: [svelte(), tailwindcss()], server: { proxy: { - '/api': { - target: 'http://127.0.0.1:8085', - changeOrigin: true - } - } - } -}) + "/api": { + target: "http://127.0.0.1:8085", + changeOrigin: true, + }, + }, + }, +});
IDNameRolleJahresstundenAktionen
IDNameRolleJahresstundenAktionen
{user.id} {user.username} - {#if user.isAdmin}Admin - {:else}User{/if} + {#if user.isAdmin}Admin + {:else}User{/if} {#if editingUserId === user.id}
- - - + + +
{:else} {user.yearlyWorkHours} h @@ -101,15 +165,40 @@ 		{#if resetPasswordUserId === user.id} -
- - - +
+ + +
- {:else if user.id !== 1}
- - - + {:else if user.id !== 1} +
+ + +
{/if}