Member create, edit and delete

This commit is contained in:
Julian Krauser 2024-09-26 13:16:31 +02:00
parent 1e3d0771b5
commit 585ff008b9
18 changed files with 392 additions and 126 deletions

View file

@ -6,7 +6,7 @@
</div>
</template>
<template #diffMain>
<div class="flex flex-col w-full h-full gap-2 justify-center items-center px-7">
<div class="flex flex-col w-full h-full gap-2 justify-center px-7">
<div class="flex flex-col w-full grow gap-2 pr-2 overflow-y-scroll">
<MemberListItem v-for="member in members" :key="member.id" :member="member" />
</div>
@ -43,18 +43,23 @@
</li>
</ul>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="openCreateModal">Mitglied erstellen</button>
</div>
</div>
</template>
</MainTemplate>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
import { mapActions, mapState } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { ChevronRightIcon, ChevronLeftIcon } from "@heroicons/vue/20/solid";
import { useMemberStore } from "@/stores/admin/member";
import MemberListItem from "@/components/admin/club/member/MemberListItem.vue";
import { useModalStore } from "@/stores/modal";
</script>
<script lang="ts">
@ -115,10 +120,11 @@ export default defineComponent({
},
},
mounted() {
this.fetchMembers(0, this.maxEntriesPerPage);
this.fetchMembers(0, this.maxEntriesPerPage, true);
},
methods: {
...mapActions(useMemberStore, ["fetchMembers"]),
...mapActions(useModalStore, ["openModal"]),
loadPage(newPage: number | ".") {
if (newPage == ".") return;
if (newPage < 0 || newPage >= this.countOfPages) return;
@ -135,6 +141,11 @@ export default defineComponent({
filterData(array: Array<any>, start: number, end: number): Array<any> {
return array.filter((elem, index) => (elem?.tab_pos ?? index) >= start && (elem?.tab_pos ?? index) < end);
},
openCreateModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/club/member/CreateMemberModal.vue")))
);
},
},
});
</script>

View file

@ -6,6 +6,9 @@
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="">Auszeichnung hinzufügen</button>
</div>
</template>
<script setup lang="ts">

View file

@ -10,6 +10,9 @@
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="">Kommunikation hinzufügen</button>
</div>
</template>
<script setup lang="ts">

View file

@ -1,98 +1,87 @@
<template>
<MainTemplate>
<template #topBar>
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8">
Mitglied {{ origin?.lastname }}, {{ origin?.firstname }}
{{ origin?.nameaffix ? `- ${origin?.nameaffix}` : "" }}
</h1>
</div>
</template>
<template #main>
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
<form
v-else-if="member != null"
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
@submit.prevent="triggerUpdate"
>
<div>
<Listbox v-model="member.salutation" name="salutation">
<ListboxLabel>Anrede</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"> {{ member.salutation }}</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>
<div class="flex flex-col gap-2 h-full w-full overflow-y-auto">
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
<form
v-else-if="member != null"
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
@submit.prevent="triggerUpdate"
>
<p class="mx-auto">Mitglied bearbeiten</p>
<div>
<Listbox v-model="member.salutation" name="salutation">
<ListboxLabel>Anrede</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"> {{ member.salutation }}</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"
<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"
>
<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-slot="{ active, selected }"
v-for="salutation in salutations"
:key="salutation"
:value="salutation"
as="template"
>
<ListboxOption
v-slot="{ active, selected }"
v-for="salutation in salutations"
:key="salutation"
:value="salutation"
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',
]"
>
<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']">{{
salutation
}}</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="firstname">Vorname</label>
<input type="text" id="firstname" required v-model="member.firstname" />
</div>
<div>
<label for="lastname">Nachname</label>
<input type="text" id="lastname" required v-model="member.lastname" />
</div>
<div>
<label for="nameaffix">Nameaffix (optional)</label>
<input type="text" id="nameaffix" v-model="member.nameaffix" />
</div>
<div>
<label for="birthdate">Geburtsdatum</label>
<input type="date" id="birthdate" required v-model="member.birthdate" />
</div>
<div class="flex flex-row justify-end 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>
</template>
</MainTemplate>
<span :class="[selected ? 'font-medium' : 'font-normal', 'block truncate']">{{ salutation }}</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="firstname">Vorname</label>
<input type="text" id="firstname" required v-model="member.firstname" />
</div>
<div>
<label for="lastname">Nachname</label>
<input type="text" id="lastname" required v-model="member.lastname" />
</div>
<div>
<label for="nameaffix">Nameaffix (optional)</label>
<input type="text" id="nameaffix" v-model="member.nameaffix" />
</div>
<div>
<label for="birthdate">Geburtsdatum</label>
<input type="date" id="birthdate" required v-model="member.birthdate" />
</div>
<div class="flex flex-row justify-end 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>
</template>
<script setup lang="ts">
@ -114,13 +103,20 @@ import { Salutation } from "@/enums/salutation";
<script lang="ts">
export default defineComponent({
props: {
id: String,
memberId: String,
},
watch: {
loadingActive() {
if (this.loading == "loading") {
this.loading = this.loadingActive;
}
if (this.loadingActive == "fetched") this.member = cloneDeep(this.activeMemberObj);
},
},
data() {
return {
loading: "loading" as "loading" | "fetched" | "failed",
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
origin: null as null | MemberViewModel,
member: null as null | MemberViewModel,
timeout: null as any,
salutations: [] as Array<string>,
@ -128,8 +124,9 @@ export default defineComponent({
},
computed: {
canSaveOrReset(): boolean {
return isEqual(this.origin, this.member);
return isEqual(this.activeMemberObj, this.member);
},
...mapState(useMemberStore, ["activeMemberObj", "loadingActive"]),
},
mounted() {
this.fetchItem();
@ -141,20 +138,12 @@ export default defineComponent({
} catch (error) {}
},
methods: {
...mapActions(useMemberStore, ["fetchMemberById", "updateActiveMember"]),
...mapActions(useMemberStore, ["fetchMemberByActiveId", "updateActiveMember"]),
resetForm() {
this.member = cloneDeep(this.origin);
this.member = cloneDeep(this.activeMemberObj);
},
fetchItem() {
this.fetchMemberById(parseInt(this.id ?? ""))
.then((result) => {
this.member = result.data;
this.origin = cloneDeep(result.data);
this.loading = "fetched";
})
.catch((err) => {
this.loading = "failed";
});
this.fetchMemberByActiveId();
},
triggerUpdate(e: any) {
if (this.member == null) return;

View file

@ -10,6 +10,9 @@
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="">Vereinsamt hinzufügen</button>
</div>
</template>
<script setup lang="ts">

View file

@ -56,7 +56,7 @@
</div>
</div>
</div>
<div v-if="activeMemberObj.preferredCommunication">
<div v-if="activeMemberObj.preferredCommunication?.length != 0">
<p>bevorzugte Kommunikationswege</p>
<div
v-for="com in activeMemberObj.preferredCommunication"

View file

@ -10,6 +10,9 @@
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="">Qualifikation hinzufügen</button>
</div>
</template>
<script setup lang="ts">

View file

@ -4,11 +4,15 @@
<RouterLink to="../" class="text-primary">zurück zur Liste</RouterLink>
</template>
<template #topBar>
<div class="flex flex-row items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8">
Mitglied {{ activeMemberObj?.lastname }}, {{ activeMemberObj?.firstname }}
<div class="flex flex-row gap-2 items-center justify-between pt-5 pb-3 px-7">
<h1 class="font-bold text-xl h-8 min-h-fit grow">
{{ activeMemberObj?.lastname }}, {{ activeMemberObj?.firstname }}
{{ activeMemberObj?.nameaffix ? `- ${activeMemberObj?.nameaffix}` : "" }}
</h1>
<RouterLink :to="{ name: 'admin-club-member-edit' }">
<PencilIcon class="w-5 h-5" />
</RouterLink>
<TrashIcon class="w-5 h-5 cursor-pointer" @click="openDeleteModal" />
</div>
</template>
<template #diffMain>
@ -40,11 +44,13 @@
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { defineAsyncComponent, defineComponent, markRaw } from "vue";
import { mapActions, mapState } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { RouterLink, RouterView } from "vue-router";
import { useMemberStore } from "@/stores/admin/member";
import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
import { useModalStore } from "@/stores/modal";
</script>
<script lang="ts">
@ -59,7 +65,7 @@ export default defineComponent({
{ route: "admin-club-member-membership", title: "Mitgliedschaft" },
{ route: "admin-club-member-communication", title: "Kommunikation" },
{ route: "admin-club-member-awards", title: "Auszeichnungen" },
{ route: "admin-club-member-qualifications", title: "Qualificationen" },
{ route: "admin-club-member-qualifications", title: "Qualifikationen" },
{ route: "admin-club-member-positions", title: "Vereinsämter" },
],
};
@ -72,6 +78,13 @@ export default defineComponent({
},
methods: {
...mapActions(useMemberStore, ["fetchMemberByActiveId"]),
...mapActions(useModalStore, ["openModal"]),
openDeleteModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/club/member/DeleteMemberModal.vue"))),
parseInt(this.memberId ?? "")
);
},
},
});
</script>

View file

@ -6,6 +6,9 @@
<Spinner v-if="loading == 'loading'" class="mx-auto" />
<p v-else-if="loading == 'failed'">laden fehlgeschlagen</p>
</div>
<div class="flex flex-row gap-4">
<button primary class="!w-fit" @click="">Mitgliedschaft hinzufügen</button>
</div>
</template>
<script setup lang="ts">