diff --git a/src/components/admin/club/calendar/CreateCalendarModal.vue b/src/components/admin/club/calendar/CreateCalendarModal.vue
index 4273b8a..8f2734f 100644
--- a/src/components/admin/club/calendar/CreateCalendarModal.vue
+++ b/src/components/admin/club/calendar/CreateCalendarModal.vue
@@ -89,11 +89,17 @@
       <div v-else class="flex flex-row gap-2">
         <div class="w-full">
           <label for="startdate">Startdatum</label>
-          <input type="date" id="startdate" required :value="data.start" />
+          <input
+            type="date"
+            id="startdate"
+            required
+            :value="data.start"
+            @change="($event) => ($refs.enddate.max = ($event.target as HTMLInputElement).value)"
+          />
         </div>
         <div class="w-full">
           <label for="enddate">Enddatum</label>
-          <input type="date" id="enddate" required :value="data.end" />
+          <input ref="enddate" type="date" id="enddate" required :value="data.end" :min="data.start" />
         </div>
       </div>
       <div>
diff --git a/src/components/admin/club/calendar/DeleteCalendarModal.vue b/src/components/admin/club/calendar/DeleteCalendarModal.vue
index 1771a62..07fc72f 100644
--- a/src/components/admin/club/calendar/DeleteCalendarModal.vue
+++ b/src/components/admin/club/calendar/DeleteCalendarModal.vue
@@ -4,6 +4,28 @@
       <p class="text-xl font-medium">Termin {{ calendar?.title }} löschen?</p>
     </div>
     <br />
+    <p class="text-center">
+      {{
+        new Date(calendar?.starttime ?? "").toLocaleString("de-De", {
+          day: "2-digit",
+          month: "2-digit",
+          year: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+        })
+      }}
+      bis
+      {{
+        new Date(calendar?.endtime ?? "").toLocaleString("de-De", {
+          day: "2-digit",
+          month: "2-digit",
+          year: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+        })
+      }}
+    </p>
+    <br />
 
     <div class="flex flex-row gap-2">
       <button primary :disabled="status == 'loading' || status?.status == 'success'" @click="triggerDelete">
diff --git a/src/components/admin/club/calendar/UpdateCalendarModal.vue b/src/components/admin/club/calendar/UpdateCalendarModal.vue
new file mode 100644
index 0000000..4587603
--- /dev/null
+++ b/src/components/admin/club/calendar/UpdateCalendarModal.vue
@@ -0,0 +1,282 @@
+<template>
+  <div class="relative w-full md:max-w-md">
+    <TrashIcon class="absolute top-3 right-3 w-5 h-5 cursor-pointer" @click="deleteCalendar" />
+    <div class="flex flex-col items-center">
+      <p class="text-xl font-medium">Termintyp erstellen</p>
+    </div>
+    <br />
+    <Spinner v-if="loading == 'loading'" class="mx-auto" />
+    <p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
+    <form v-else-if="calendar != null" class="flex flex-col gap-4 py-2" @submit.prevent="triggerUpdate">
+      <div>
+        <Listbox v-model="calendar.type" name="type">
+          <ListboxLabel>Termintyp</ListboxLabel>
+          <div class="relative mt-1">
+            <ListboxButton
+              class="rounded-md shadow-sm relative block w-full px-3 py-2 border border-gray-300 focus:border-primary placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-0 focus:z-10 sm:text-sm resize-none"
+            >
+              <span class="block truncate w-full text-start">
+                {{
+                  calendarTypes.length != 0 ? (calendar.type?.type ?? "bitte auswählen") : "keine Auswahl vorhanden"
+                }}</span
+              >
+              <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
+                <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+              </span>
+            </ListboxButton>
+
+            <transition
+              leave-active-class="transition duration-100 ease-in"
+              leave-from-class="opacity-100"
+              leave-to-class="opacity-0"
+            >
+              <ListboxOptions
+                class="absolute mt-1 max-h-60 z-20 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black/5 focus:outline-none sm:text-sm h-32 overflow-y-auto"
+              >
+                <ListboxOption v-if="calendarTypes.length == 0" disabled as="template">
+                  <li :class="['relative cursor-default select-none py-2 pl-10 pr-4']">
+                    <span :class="['font-normal', 'block truncate']">keine Auswahl vorhanden</span>
+                  </li>
+                </ListboxOption>
+                <ListboxOption
+                  v-slot="{ active, selected }"
+                  v-for="type in calendarTypes"
+                  :key="type.id"
+                  :value="type"
+                  as="template"
+                >
+                  <li
+                    :class="[
+                      active ? 'bg-red-200 text-amber-900' : 'text-gray-900',
+                      'relative cursor-default select-none py-2 pl-10 pr-4',
+                    ]"
+                  >
+                    <span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{ type.type }}</span>
+                    <span v-if="selected" class="absolute inset-y-0 left-0 flex items-center pl-3 text-primary">
+                      <CheckIcon class="h-5 w-5" aria-hidden="true" />
+                    </span>
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
+          </div>
+        </Listbox>
+      </div>
+      <div>
+        <label for="title">Titel</label>
+        <input type="text" id="title" required v-model="calendar.title" />
+      </div>
+      <div>
+        <label for="content">Beschreibung (optional)</label>
+        <textarea id="content" class="h-18" v-model="calendar.content"></textarea>
+      </div>
+      <div class="flex flex-row gap-2 items-center">
+        <input type="checkbox" id="allDay" v-model="calendar.allDay" />
+        <label for="allDay">ganztägig</label>
+      </div>
+      <div v-if="calendar.allDay == false" class="flex flex-row gap-2">
+        <div class="w-full">
+          <label for="starttime">Startzeit</label>
+          <input
+            type="datetime-local"
+            id="starttime"
+            required
+            :value="calendar.starttime.replace('Z', '')"
+            @change="
+              ($event) => {
+                calendar!.starttime = ($event.target as HTMLInputElement).value;
+                $refs.endtime.min = ($event.target as HTMLInputElement).value;
+              }
+            "
+          />
+        </div>
+        <div class="w-full">
+          <label for="endtime">Endzeit</label>
+          <input
+            ref="endtime"
+            type="datetime-local"
+            id="endtime"
+            required
+            :value="calendar.endtime.replace('Z', '')"
+            :min="calendar.starttime.replace('Z', '')"
+            @change="
+              ($event) => {
+                calendar!.endtime = ($event.target as HTMLInputElement).value;
+              }
+            "
+          />
+        </div>
+      </div>
+      <div v-else class="flex flex-row gap-2">
+        <div class="w-full">
+          <label for="startdate">Startdatum</label>
+          <input
+            type="date"
+            id="startdate"
+            required
+            :value="calendar.starttime.split('T')[0]"
+            @change="
+              ($event) => {
+                calendar!.starttime = ($event.target as HTMLInputElement).value;
+                $refs.enddate.min = ($event.target as HTMLInputElement).value;
+              }
+            "
+          />
+        </div>
+        <div class="w-full">
+          <label for="enddate">Enddatum</label>
+          <input
+            ref="enddate"
+            type="date"
+            id="enddate"
+            required
+            :min="calendar.starttime.split('T')[0]"
+            :value="calendar.endtime.split('T')[0]"
+            @change="
+              ($event) => {
+                calendar!.endtime = ($event.target as HTMLInputElement).value;
+              }
+            "
+          />
+        </div>
+      </div>
+      <div>
+        <label for="location">Ort (optional)</label>
+        <input type="text" id="location" v-model="calendar.location" />
+      </div>
+
+      <div class="flex flex-row gap-2">
+        <button primary-outline type="reset" class="!w-fit" :disabled="canSaveOrReset" @click="resetForm">
+          verwerfen
+        </button>
+        <button primary type="submit" class="!w-fit" :disabled="status == 'loading' || canSaveOrReset">
+          speichern
+        </button>
+        <Spinner v-if="status == 'loading'" class="my-auto" />
+        <SuccessCheckmark v-else-if="status?.status == 'success'" />
+        <FailureXMark v-else-if="status?.status == 'failed'" />
+      </div>
+    </form>
+
+    <div class="flex flex-row justify-end">
+      <div class="flex flex-row gap-4 py-2">
+        <button
+          primary-outline
+          @click="closeModal"
+          :disabled="status != null && status != 'loading' && status?.status != 'failed'"
+        >
+          abbrechen / schließen
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
+import { mapState, mapActions } from "pinia";
+import { useModalStore } from "@/stores/modal";
+import Spinner from "@/components/Spinner.vue";
+import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
+import FailureXMark from "@/components/FailureXMark.vue";
+import { useCalendarStore } from "@/stores/admin/calendar";
+import type {
+  CalendarViewModel,
+  CreateCalendarViewModel,
+  UpdateCalendarViewModel,
+} from "@/viewmodels/admin/calendar.models";
+import { Listbox, ListboxButton, ListboxOptions, ListboxOption, ListboxLabel } from "@headlessui/vue";
+import { CheckIcon, ChevronUpDownIcon, TrashIcon } from "@heroicons/vue/20/solid";
+import { useCalendarTypeStore } from "@/stores/admin/calendarType";
+import type { CalendarTypeViewModel } from "@/viewmodels/admin/calendarType.models";
+import cloneDeep from "lodash.clonedeep";
+import isEqual from "lodash.isEqual";
+</script>
+
+<script lang="ts">
+export default defineComponent({
+  data() {
+    return {
+      loading: "loading" as "loading" | "fetched" | "failed",
+      status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
+      origin: null as null | CalendarViewModel,
+      calendar: null as null | CalendarViewModel,
+      timeout: undefined as any,
+    };
+  },
+  computed: {
+    ...mapState(useModalStore, ["data"]),
+    ...mapState(useCalendarStore, ["calendars"]),
+    ...mapState(useCalendarTypeStore, ["calendarTypes"]),
+    canSaveOrReset(): boolean {
+      return isEqual(this.origin, this.calendar);
+    },
+  },
+  mounted() {
+    this.fetchCalendarTypes();
+    this.fetchItem();
+  },
+  beforeUnmount() {
+    try {
+      clearTimeout(this.timeout);
+    } catch (error) {}
+  },
+  methods: {
+    ...mapActions(useModalStore, ["closeModal", "openModal"]),
+    ...mapActions(useCalendarStore, ["updateCalendar", "fetchCalendarById"]),
+    ...mapActions(useCalendarTypeStore, ["fetchCalendarTypes"]),
+    resetForm() {
+      this.calendar = cloneDeep(this.origin);
+    },
+    fetchItem() {
+      this.fetchCalendarById(parseInt(this.data ?? ""))
+        .then((result) => {
+          this.calendar = result.data;
+          this.origin = cloneDeep(result.data);
+          this.loading = "fetched";
+        })
+        .catch((err) => {
+          this.loading = "failed";
+        });
+    },
+    triggerUpdate(e: any) {
+      if (this.calendar == null) return;
+      let formData = e.target.elements;
+      let updateCalendar: UpdateCalendarViewModel = {
+        id: this.calendar.id,
+        typeId: this.calendar.type.id,
+        starttime: this.calendar.allDay
+          ? new Date(new Date(formData.startdate.value).setHours(0, 0, 0, 0))
+          : formData.starttime.value,
+        endtime: this.calendar.allDay
+          ? new Date(new Date(formData.enddate.value).setHours(23, 59, 59, 999))
+          : formData.endtime.value,
+        title: formData.title.value,
+        content: formData.content.value,
+        location: formData.location.value,
+        allDay: this.calendar.allDay,
+      };
+      this.updateCalendar(updateCalendar)
+        .then(() => {
+          this.fetchItem();
+          this.status = { status: "success" };
+        })
+        .catch(() => {
+          this.status = { status: "failed" };
+        })
+        .finally(() => {
+          this.timeout = setTimeout(() => {
+            this.status = null;
+          }, 2000);
+        });
+    },
+    deleteCalendar() {
+      if (this.origin == null) return;
+      this.openModal(
+        markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/DeleteCalendarModal.vue"))),
+        this.origin.id
+      );
+    },
+  },
+});
+</script>
diff --git a/src/stores/admin/calendar.ts b/src/stores/admin/calendar.ts
index 25759ac..b128bf4 100644
--- a/src/stores/admin/calendar.ts
+++ b/src/stores/admin/calendar.ts
@@ -55,7 +55,7 @@ export const useCalendarStore = defineStore("calendar", {
       this.fetchCalendars();
       return result;
     },
-    async updateActiveCalendar(calendar: UpdateCalendarViewModel): Promise<AxiosResponse<any, any>> {
+    async updateCalendar(calendar: UpdateCalendarViewModel): Promise<AxiosResponse<any, any>> {
       const result = await http.patch(`/admin/calendar/item/${calendar.id}`, {
         starttime: calendar.starttime,
         endtime: calendar.endtime,
diff --git a/src/viewmodels/admin/calendar.models.ts b/src/viewmodels/admin/calendar.models.ts
index ba04c50..aa0612b 100644
--- a/src/viewmodels/admin/calendar.models.ts
+++ b/src/viewmodels/admin/calendar.models.ts
@@ -2,8 +2,8 @@ import type { CalendarTypeViewModel } from "./calendarType.models";
 
 export interface CalendarViewModel {
   id: string;
-  starttime: Date;
-  endtime: Date;
+  starttime: string;
+  endtime: string;
   title: string;
   content: string;
   location: string;
diff --git a/src/views/admin/club/calendar/Calendar.vue b/src/views/admin/club/calendar/Calendar.vue
index 65f86ae..213f2ea 100644
--- a/src/views/admin/club/calendar/Calendar.vue
+++ b/src/views/admin/club/calendar/Calendar.vue
@@ -67,7 +67,6 @@ export default defineComponent({
     ...mapActions(useModalStore, ["openModal"]),
     ...mapActions(useCalendarStore, ["fetchCalendars"]),
     select(e: any) {
-      console.log("s", e);
       this.openModal(
         markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/CreateCalendarModal.vue"))),
         {
@@ -78,9 +77,8 @@ export default defineComponent({
       );
     },
     eventClick(e: any) {
-      console.log("ec", e);
       this.openModal(
-        markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/DeleteCalendarModal.vue"))),
+        markRaw(defineAsyncComponent(() => import("@/components/admin/club/calendar/UpdateCalendarModal.vue"))),
         e.event.id
       );
     },