From: PhiTux Date: Fri, 15 Aug 2025 10:43:22 +0000 (+0200) Subject: further bugfixes at a-look-back X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=446973aefb344fc07e17091e7bf688e211cb70a5;p=DailyTxT.git further bugfixes at a-look-back --- diff --git a/backend/handlers/logs.go b/backend/handlers/logs.go index 63ed42a..cacd90f 100644 --- a/backend/handlers/logs.go +++ b/backend/handlers/logs.go @@ -537,8 +537,8 @@ func SaveTemplates(w http.ResponseWriter, r *http.Request) { }) } -// GetOnThisDay handles retrieving logs from previous years on the same day -func GetOnThisDay(w http.ResponseWriter, r *http.Request) { +// GetALookBack handles retrieving logs from previous years on the same day +func GetALookBack(w http.ResponseWriter, r *http.Request) { // Get user ID and derived key from context userID, ok := r.Context().Value(utils.UserIDKey).(int) if !ok { diff --git a/backend/main.go b/backend/main.go index 0f65dd8..316a937 100644 --- a/backend/main.go +++ b/backend/main.go @@ -54,7 +54,7 @@ func main() { mux.HandleFunc("POST /logs/removeTagFromLog", middleware.RequireAuth(handlers.RemoveTagFromLog)) mux.HandleFunc("GET /logs/getTemplates", middleware.RequireAuth(handlers.GetTemplates)) mux.HandleFunc("POST /logs/saveTemplates", middleware.RequireAuth(handlers.SaveTemplates)) - mux.HandleFunc("GET /logs/getOnThisDay", middleware.RequireAuth(handlers.GetOnThisDay)) + mux.HandleFunc("GET /logs/getALookBack", middleware.RequireAuth(handlers.GetALookBack)) mux.HandleFunc("GET /logs/searchString", middleware.RequireAuth(handlers.Search)) mux.HandleFunc("GET /logs/searchTag", middleware.RequireAuth(handlers.SearchTag)) mux.HandleFunc("GET /logs/loadMonthForReading", middleware.RequireAuth(handlers.LoadMonthForReading)) diff --git a/frontend/src/routes/(authed)/+layout.svelte b/frontend/src/routes/(authed)/+layout.svelte index 849d1a7..c195c0b 100644 --- a/frontend/src/routes/(authed)/+layout.svelte +++ b/frontend/src/routes/(authed)/+layout.svelte @@ -101,7 +101,7 @@ let settingsModal; function openSettingsModal() { $tempSettings = JSON.parse(JSON.stringify($settings)); - onThisDayYears = $settings.onThisDayYears.toString(); + aLookBackYears = $settings.aLookBackYears.toString(); settingsModal = new bootstrap.Modal(document.getElementById('settingsModal')); settingsModal.show(); @@ -114,7 +114,7 @@ }); } - let onThisDayYears = $state(''); + let aLookBackYears = $state(''); let isGettingUserSettings = $state(false); function getUserSettings() { if (isGettingUserSettings) return; @@ -124,7 +124,7 @@ .get(API_URL + '/users/getUserSettings') .then((response) => { $settings = response.data; - onThisDayYears = $settings.onThisDayYears.toString(); + aLookBackYears = $settings.aLookBackYears.toString(); }) .catch((error) => { console.error(error); @@ -137,26 +137,26 @@ }); } - let onThisDayYearsInvalid = $state(false); - // check if onThisDayYears is valid + let aLookBackYearsInvalid = $state(false); + // check if aLookBackYears is valid $effect(() => { - onThisDayYearsInvalid = false; - if ($tempSettings.useOnThisDay === false) { + aLookBackYearsInvalid = false; + if ($tempSettings.useALookBack === false) { return; } //regex: years may only contain numbers and commas - if (onThisDayYears.match(/[^0-9,]/)) { - onThisDayYearsInvalid = true; + if (aLookBackYears.match(/[^0-9,]/)) { + aLookBackYearsInvalid = true; return; } - onThisDayYears + aLookBackYears .trim() .split(',') .forEach((year) => { if (!Number.isInteger(parseInt(year.trim()))) { - onThisDayYearsInvalid = true; + aLookBackYearsInvalid = true; } return year; }); @@ -164,9 +164,9 @@ let settingsHaveChanged = $derived( JSON.stringify($settings) !== JSON.stringify($tempSettings) || - JSON.stringify($settings.onThisDayYears) !== + JSON.stringify($settings.aLookBackYears) !== JSON.stringify( - onThisDayYears + aLookBackYears .trim() .split(',') .map((year) => parseInt(year.trim())) @@ -178,7 +178,7 @@ if (isSaving) return; isSaving = true; - $tempSettings.onThisDayYears = onThisDayYears + $tempSettings.aLookBackYears = aLookBackYears .trim() .split(',') .map((year) => parseInt(year.trim())); @@ -664,29 +664,12 @@ @@ -859,11 +842,11 @@ -
- {#if $tempSettings.useOnThisDay !== $settings.useOnThisDay || JSON.stringify(onThisDayYears +
+ {#if $tempSettings.useALookBack !== $settings.useALookBack || JSON.stringify(aLookBackYears .trim() .split(',') - .map( (year) => parseInt(year.trim()) )) !== JSON.stringify($settings.onThisDayYears)} + .map( (year) => parseInt(year.trim()) )) !== JSON.stringify($settings.aLookBackYears)}
{/if} @@ -883,13 +866,13 @@
-
- - {#if onThisDayYearsInvalid} + {#if aLookBackYearsInvalid} {/if} -
+
Trage hier alle vergangenen Jahre ein, die angezeigt werden sollen. Beispiel: 1,5,10. Benutze Komma zur Trennung, verzichte auf Leerzeichen.