From db4325ad2c053265a859ee06510d256a9236c56a Mon Sep 17 00:00:00 2001 From: Jens Cornelsen Date: Sun, 7 Sep 2025 13:46:11 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Fernw=C3=A4rme=20Erfurt=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Ausweis/brennstoffListe.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Ausweis/brennstoffListe.ts b/src/components/Ausweis/brennstoffListe.ts index 0bbae001..3448c190 100644 --- a/src/components/Ausweis/brennstoffListe.ts +++ b/src/components/Ausweis/brennstoffListe.ts @@ -42,6 +42,7 @@ const brennstoffe: [ ["Fernwärme HKW FB", "kWh", 1.0, 1.3, 0.4], ["Fernwärme HKW EB", "kWh", 1.0, 0.1, 0.06], ["Fernwärme Hamburg", "kWh", 1.0, 0.33, 0.064], + ["Fernwärme Erfurt", "kWh", 1.0, 0.3, 0], ["Erdgas", "kWh", 1.0, 1.1, 0.24], ["Heizöl", "kWh", 1.0, 1.1, 0.31], ["Heizöl", "l", 10.0, 1.1, 0.31], -- 2.49.1 From d31c8c2fb2d569fac71b7f2876a87cff2e13cad0 Mon Sep 17 00:00:00 2001 From: Jens Cornelsen Date: Mon, 8 Sep 2025 14:05:27 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Fernw=C3=A4rme=20Neum=C3=BCnster?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Ausweis/brennstoffListe.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Ausweis/brennstoffListe.ts b/src/components/Ausweis/brennstoffListe.ts index 3448c190..cd9fd9c0 100644 --- a/src/components/Ausweis/brennstoffListe.ts +++ b/src/components/Ausweis/brennstoffListe.ts @@ -43,6 +43,7 @@ const brennstoffe: [ ["Fernwärme HKW EB", "kWh", 1.0, 0.1, 0.06], ["Fernwärme Hamburg", "kWh", 1.0, 0.33, 0.064], ["Fernwärme Erfurt", "kWh", 1.0, 0.3, 0], + ["Fernwärme Neumünster", "kWh", 1.0, 0.28, 0.0133], ["Erdgas", "kWh", 1.0, 1.1, 0.24], ["Heizöl", "kWh", 1.0, 1.1, 0.31], ["Heizöl", "l", 10.0, 1.1, 0.31], -- 2.49.1 From b4f84d7ecd4593760b2856c85748c4e3c5eca73e Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Fri, 12 Sep 2025 12:11:05 -0400 Subject: [PATCH 3/3] Abrechnung Fix --- src/components/Dashboard/DashboardSidebar.svelte | 8 +++++++- src/pages/dashboard/abrechnung/index.astro | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/Dashboard/DashboardSidebar.svelte b/src/components/Dashboard/DashboardSidebar.svelte index 46d486c6..8e2a414e 100644 --- a/src/components/Dashboard/DashboardSidebar.svelte +++ b/src/components/Dashboard/DashboardSidebar.svelte @@ -5,7 +5,7 @@ CaretDown, MagnifyingGlass, } from "radix-svelte-icons"; - import { Benutzer, Enums } from "#lib/server/prisma.js"; + import { Benutzer, Enums } from "#lib/client/prisma.js"; export let lightTheme: boolean; export let benutzer: Benutzer; @@ -38,6 +38,12 @@ {benutzer.name}
{benutzer.email}
+ {#if benutzer.rolle === Enums.BenutzerRolle.RESELLER} +
Reseller
+ {/if} + {#if benutzer.rolle === Enums.BenutzerRolle.ADMIN} +
Admin
+ {/if} Logout diff --git a/src/pages/dashboard/abrechnung/index.astro b/src/pages/dashboard/abrechnung/index.astro index d98ab029..53d818d0 100644 --- a/src/pages/dashboard/abrechnung/index.astro +++ b/src/pages/dashboard/abrechnung/index.astro @@ -13,8 +13,8 @@ moment.tz.setDefault("Europe/Berlin"); const start = moment(Astro.url.searchParams.get("start")); const end = moment(Astro.url.searchParams.get("end")); -let startdatum = start.isValid() ? start.toDate() : moment().startOf("month").toDate(); -let enddatum = end.isValid() ? end.toDate() : moment().endOf("month").toDate(); +let startdatum = start.isValid() ? start.startOf("day").toDate() : moment().startOf("month").toDate(); +let enddatum = end.isValid() ? end.endOf("day").toDate() : moment().endOf("month").toDate(); // Wir dürfen die Abrechnung erst ab Juni starten lassen. if (startdatum < moment().set("year", 2025).set("month", 5).set("date", 1).toDate()) { -- 2.49.1