From b9f11281e54998f821874a9814756de07d2db461 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 21 Mar 2024 21:58:27 +0100 Subject: [PATCH 01/12] [BUGFIX] close div index html --- templates/index.html.tera | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/index.html.tera b/templates/index.html.tera index 7215fc4..dbfd798 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -176,4 +176,5 @@ - {% endblock content %} + +{% endblock content %} From 67eea1beb073f462d150942e40e1e70a62d1b787 Mon Sep 17 00:00:00 2001 From: philipp Date: Fri, 22 Mar 2024 20:49:56 +0100 Subject: [PATCH 02/12] remove boat reservation --- templates/includes/macros.html.tera | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 1c49080..e861533 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -1,5 +1,5 @@ {% macro boatreservation() %} -

Bootsreservierungen

@@ -10,7 +10,7 @@
  • 22.04. | Christian Gusenbauer | Boot: Linz + kleiner Hänger
    • -
    + #} {% endmacro boatreservation %} {% macro header(loggedin_user) %}
    From 272b6f3eb191bd2d60d42a768ae634c051ff12cc Mon Sep 17 00:00:00 2001 From: philipp Date: Fri, 22 Mar 2024 21:03:43 +0100 Subject: [PATCH 03/12] better wording for notification --- src/model/logbook.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/logbook.rs b/src/model/logbook.rs index 9dbbf64..36fcd9c 100644 --- a/src/model/logbook.rs +++ b/src/model/logbook.rs @@ -531,7 +531,7 @@ ORDER BY departure DESC db, &user, &format!( - "Ausfahrt am {}.{}.{} nach {} ({} km)", + "Ausfahrt am {}.{}.{}; Ziel: {} ({} km)", dep.day(), dep.month(), dep.year(), From 9b70875c7269c6a744de1e39840865b81a42e324 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 24 Mar 2024 14:02:22 +0100 Subject: [PATCH 04/12] add /planned to quick menu --- frontend/tests/cox.spec.ts | 4 ++-- templates/includes/macros.html.tera | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/tests/cox.spec.ts b/frontend/tests/cox.spec.ts index 339d98a..c19ae45 100644 --- a/frontend/tests/cox.spec.ts +++ b/frontend/tests/cox.spec.ts @@ -7,7 +7,7 @@ test("cox can create and delete trip", async ({ page }) => { await page.getByPlaceholder("Name").press("Tab"); await page.getByPlaceholder("Passwort").fill("cox"); await page.getByPlaceholder("Passwort").press("Enter"); - await page.locator('a').filter({ hasText: /^Geplante Ausfahrten$/ }).click(); + await page.locator('li').filter({ hasText: 'Geplante Ausfahrten' }).getByRole('link').click(); await page.locator(".relative").first().click(); await page.locator("#sidebar #planned_starting_time").click(); await page.locator("#sidebar #planned_starting_time").fill("18:00"); @@ -38,7 +38,7 @@ test.describe("cox can edit trips", () => { await page.getByPlaceholder("Name").press("Tab"); await page.getByPlaceholder("Passwort").fill("cox"); await page.getByPlaceholder("Passwort").press("Enter"); - await page.locator('a').filter({ hasText: /^Geplante Ausfahrten$/ }).click(); + await page.locator('li').filter({ hasText: 'Geplante Ausfahrten' }).getByRole('link').click(); await page.locator(".relative").first().click(); await page.locator("#sidebar #planned_starting_time").click(); await page.locator("#sidebar #planned_starting_time").fill("18:00"); diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index e861533..0c819bb 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -50,6 +50,7 @@