From 5f8adbaf108bd65cfcec88936ef03a6b415a2318 Mon Sep 17 00:00:00 2001 From: TobiZog Date: Thu, 10 Oct 2024 14:29:45 +0200 Subject: [PATCH] Bugfixes, reset exercise progress from frontend --- software/src/data/api/mainApi.ts | 4 ++ software/src/data/enums/bannerStateEnum.ts | 3 ++ software/src/locales/de.json | 8 +++- software/src/locales/en.json | 6 ++- .../events/bandDetailPage/concertSection.vue | 2 +- .../pages/events/ticketOrderPage/index.vue | 5 ++- .../system/preferencesPage/systemSetup.vue | 41 +++++++++++++++---- 7 files changed, 55 insertions(+), 14 deletions(-) diff --git a/software/src/data/api/mainApi.ts b/software/src/data/api/mainApi.ts index b4413a9..2371d89 100644 --- a/software/src/data/api/mainApi.ts +++ b/software/src/data/api/mainApi.ts @@ -9,4 +9,8 @@ export function getServerState() { export function resetDatabase() { return axios.get(BASE_URL + "/resetdatabase") +} + +export function resetExerciseProgress() { + return axios.get(BASE_URL + "/resetExerciseProgress") } \ No newline at end of file diff --git a/software/src/data/enums/bannerStateEnum.ts b/software/src/data/enums/bannerStateEnum.ts index 0c92816..1f26c8c 100644 --- a/software/src/data/enums/bannerStateEnum.ts +++ b/software/src/data/enums/bannerStateEnum.ts @@ -14,6 +14,9 @@ export enum BannerStateEnum { // Status: 200 OK DATABASERESETSUCCESSFUL, + // Status: 200 OK + EXERCISEPROGRESSRESETSUCCESSFUL, + ////////// API Endpoint /accounts ////////// diff --git a/software/src/locales/de.json b/software/src/locales/de.json index 254c3b7..a1cd2dd 100644 --- a/software/src/locales/de.json +++ b/software/src/locales/de.json @@ -7,7 +7,7 @@ "concert": "Konzert | Konzerte", "resetPreferences": "Einstellungen zurücksetzen", "resetDatabase": "Datenbank zurücksetzen", - "resetConfirm": { + "resetDatabaseConfirm": { "title": "Datenbank zurücksetzen?", "description": "Soll die Datenbank des Servers wirklich zurückgesetzt werden? Dies kann nicht rückgänig gemacht werden! Der Bearbeitungsfortschritt der Aufgaben wird nicht gelöscht." }, @@ -164,5 +164,9 @@ "exercise": "Aufgabe", "resetProgress": "Aufgabenfortschritt zurücksetzen", "youAreHere": "Du bist hier:", - "standingPlaces": "Stehplätze" + "standingPlaces": "Stehplätze", + "resetExerciseProgressConfirm": { + "title": "Übungsfortschritt zurücksetzen?", + "description": "Soll der Bearbeitungsfortschritt der Übungen wirklich zurückgesetzt werden? Dies kann nicht rückgänig gemacht werden!" + } } diff --git a/software/src/locales/en.json b/software/src/locales/en.json index 6e69b89..1459d37 100644 --- a/software/src/locales/en.json +++ b/software/src/locales/en.json @@ -164,5 +164,9 @@ "exercise": "Exercise", "resetProgress": "Reset Exercise Progress", "youAreHere": "You are here:", - "standingPlaces": "Standing capacity" + "standingPlaces": "Standing capacity", + "resetExerciseProgressConfirm": { + "title": "Reset Exercise progress?", + "description": "Do you really want to reset the exercise progress? This can't be undone!" + } } diff --git a/software/src/pages/events/bandDetailPage/concertSection.vue b/software/src/pages/events/bandDetailPage/concertSection.vue index 06ed563..f0b5c33 100644 --- a/software/src/pages/events/bandDetailPage/concertSection.vue +++ b/software/src/pages/events/bandDetailPage/concertSection.vue @@ -27,7 +27,7 @@ defineProps({