salutation management views

This commit is contained in:
Julian Krauser 2025-01-25 12:16:05 +01:00
parent 3866d406b2
commit bc721d06ab
14 changed files with 541 additions and 91 deletions

View file

@ -12,7 +12,7 @@
<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"> {{ selectedSalutation }}</span>
<span class="block truncate w-full text-start"> {{ selectedSalutation?.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>
@ -102,6 +102,7 @@ import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
import { useMemberStore } from "@/stores/admin/club/member/member";
import type { CreateMemberViewModel } from "@/viewmodels/admin/club/member/member.models";
import { useSalutationStore } from "../../../../stores/admin/settings/salutation";
import type { SalutationViewModel } from "../../../../viewmodels/admin/settings/salutation.models";
</script>
<script lang="ts">
@ -110,12 +111,15 @@ export default defineComponent({
return {
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
timeout: undefined as any,
selectedSalutation: null as null | number,
selectedSalutation: null as null | SalutationViewModel,
};
},
computed: {
...mapState(useSalutationStore, ["salutations"]),
},
mounted() {
this.fetchSalutations();
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
@ -129,7 +133,7 @@ export default defineComponent({
if (!this.selectedSalutation) return;
let formData = e.target.elements;
let createMember: CreateMemberViewModel = {
salutationId: this.selectedSalutation,
salutationId: this.selectedSalutation.id,
firstname: formData.firstname.value,
lastname: formData.lastname.value,
nameaffix: formData.nameaffix.value,

View file

@ -0,0 +1,76 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Anrede erstellen</p>
</div>
<br />
<form class="flex flex-col gap-4 py-2" @submit.prevent="triggerCreate">
<div>
<label for="salutation">Anrede</label>
<input type="text" id="salutation" required />
</div>
<div class="flex flex-row gap-2">
<button primary type="submit" :disabled="status == 'loading' || status?.status == 'success'">erstellen</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 == 'loading' || status?.status == 'success'">
abbrechen
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent } 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 { useSalutationStore } from "@/stores/admin/settings/salutation";
import type { CreateSalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
timeout: undefined as any,
};
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
methods: {
...mapActions(useModalStore, ["closeModal"]),
...mapActions(useSalutationStore, ["createSalutation"]),
triggerCreate(e: any) {
let formData = e.target.elements;
let createSalutation: CreateSalutationViewModel = {
salutation: formData.salutation.value,
};
this.status = "loading";
this.createSalutation(createSalutation)
.then(() => {
this.status = { status: "success" };
this.timeout = setTimeout(() => {
this.closeModal();
}, 1500);
})
.catch(() => {
this.status = { status: "failed" };
});
},
},
});
</script>

View file

@ -0,0 +1,76 @@
<template>
<div class="w-full md:max-w-md">
<div class="flex flex-col items-center">
<p class="text-xl font-medium">Anrede {{ salutation?.salutation }} löschen?</p>
</div>
<br />
<div class="flex flex-row gap-2">
<button primary :disabled="status == 'loading' || status?.status == 'success'" @click="triggerDelete">
unwiederuflich löschen
</button>
<Spinner v-if="status == 'loading'" class="my-auto" />
<SuccessCheckmark v-else-if="status?.status == 'success'" />
<FailureXMark v-else-if="status?.status == 'failed'" />
</div>
<div class="flex flex-row justify-end">
<div class="flex flex-row gap-4 py-2">
<button primary-outline @click="closeModal" :disabled="status == 'loading' || status?.status == 'success'">
abbrechen
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent } 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 { useRoleStore } from "@/stores/admin/user/role";
import { useSalutationStore } from "@/stores/admin/settings/salutation";
</script>
<script lang="ts">
export default defineComponent({
data() {
return {
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
timeout: undefined as any,
};
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
computed: {
...mapState(useModalStore, ["data"]),
...mapState(useSalutationStore, ["salutations"]),
salutation() {
return this.salutations.find((r) => r.id == this.data);
},
},
methods: {
...mapActions(useModalStore, ["closeModal"]),
...mapActions(useSalutationStore, ["deleteSalutation"]),
triggerDelete() {
this.status = "loading";
this.deleteSalutation(this.data)
.then(() => {
this.status = { status: "success" };
this.timeout = setTimeout(() => {
this.closeModal();
}, 1500);
})
.catch(() => {
this.status = { status: "failed" };
});
},
},
});
</script>

View file

@ -0,0 +1,47 @@
<template>
<div class="flex flex-col h-fit w-full border border-primary rounded-md">
<div class="bg-primary p-2 text-white flex flex-row justify-between items-center">
<p>{{ salutation.salutation }}</p>
<div class="flex flex-row">
<RouterLink
v-if="can('update', 'settings', 'salutation')"
:to="{ name: 'admin-settings-salutation-edit', params: { id: salutation.id } }"
>
<PencilIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
</RouterLink>
<div v-if="can('delete', 'settings', 'salutation')" @click="openDeleteModal">
<TrashIcon class="w-5 h-5 p-1 box-content cursor-pointer" />
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { defineComponent, defineAsyncComponent, markRaw, type PropType } from "vue";
import { mapState, mapActions } from "pinia";
import { PencilIcon, TrashIcon } from "@heroicons/vue/24/outline";
import { useAbilityStore } from "@/stores/ability";
import { useModalStore } from "@/stores/modal";
import type { SalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
</script>
<script lang="ts">
export default defineComponent({
props: {
salutation: { type: Object as PropType<SalutationViewModel>, default: {} },
},
computed: {
...mapState(useAbilityStore, ["can"]),
},
methods: {
...mapActions(useModalStore, ["openModal"]),
openDeleteModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/settings/salutation/DeleteSalutationModal.vue"))),
this.salutation.id
);
},
},
});
</script>

View file

@ -422,6 +422,28 @@ const router = createRouter({
},
],
},
{
path: "salutation",
name: "admin-settings-salutation-route",
component: () => import("@/views/RouterView.vue"),
meta: { type: "read", section: "settings", module: "salutation" },
beforeEnter: [abilityAndNavUpdate],
children: [
{
path: "",
name: "admin-settings-salutation",
component: () => import("@/views/admin/settings/salutation/Salutation.vue"),
},
{
path: ":id/edit",
name: "admin-settings-salutation-edit",
component: () => import("@/views/admin/settings/salutation/SalutationEdit.vue"),
meta: { type: "update", section: "settings", module: "salutation" },
beforeEnter: [abilityAndNavUpdate],
props: true,
},
],
},
{
path: "calendar-type",
name: "admin-settings-calendar_type-route",

View file

@ -88,7 +88,7 @@ export const useMemberStore = defineStore("member", {
},
async createMember(member: CreateMemberViewModel): Promise<AxiosResponse<any, any>> {
const result = await http.post(`/admin/member`, {
salutation: member.salutation,
salutationId: member.salutationId,
firstname: member.firstname,
lastname: member.lastname,
nameaffix: member.nameaffix,
@ -100,7 +100,7 @@ export const useMemberStore = defineStore("member", {
},
async updateActiveMember(member: UpdateMemberViewModel): Promise<AxiosResponse<any, any>> {
const result = await http.patch(`/admin/member/${member.id}`, {
salutation: member.salutation,
salutationId: member.salutationId,
firstname: member.firstname,
lastname: member.lastname,
nameaffix: member.nameaffix,

View file

@ -63,7 +63,7 @@ export const useNavigationStore = defineStore("navigation", {
{
key: "settings",
title: "Einstellungen",
levelDefault: "award",
levelDefault: "salutation",
} as topLevelNavigationModel,
]
: []),
@ -99,6 +99,7 @@ export const useNavigationStore = defineStore("navigation", {
mainTitle: "Einstellungen",
main: [
{ key: "divider1", title: "Mitgliederdaten" },
...(abilityStore.can("read", "settings", "salutation") ? [{ key: "salutation", title: "Anrede" }] : []),
...(abilityStore.can("read", "settings", "award") ? [{ key: "award", title: "Auszeichnungen" }] : []),
...(abilityStore.can("read", "settings", "communication_type")
? [{ key: "communication_type", title: "Kommunikationsarten" }]

View file

@ -15,7 +15,7 @@
<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="block truncate w-full text-start"> {{ member.salutation.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>
@ -136,6 +136,7 @@ export default defineComponent({
},
mounted() {
this.fetchItem();
this.fetchSalutations();
},
beforeUnmount() {
try {
@ -144,6 +145,7 @@ export default defineComponent({
},
methods: {
...mapActions(useMemberStore, ["fetchMemberByActiveId", "updateActiveMember"]),
...mapActions(useSalutationStore, ["fetchSalutations"]),
resetForm() {
this.member = cloneDeep(this.activeMemberObj);
},

View file

@ -7,7 +7,7 @@
</div>
<div>
<label for="salutation">Anrede</label>
<input type="text" id="salutation" :value="activeMemberObj.salutation" readonly />
<input type="text" id="salutation" :value="activeMemberObj.salutation.salutation" readonly />
</div>
<div>
<label for="firstname">Vorname</label>

View file

@ -0,0 +1,52 @@
<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">Anrede</h1>
</div>
</template>
<template #diffMain>
<div class="flex flex-col gap-4 h-full pl-7">
<div class="flex flex-col gap-2 grow overflow-y-scroll pr-7">
<SalutationListItem v-for="salutation in salutations" :key="salutation.id" :salutation="salutation" />
</div>
<div class="flex flex-row gap-4">
<button v-if="can('create', 'settings', 'salutation')" primary class="!w-fit" @click="openCreateModal">
Anrede erstellen
</button>
</div>
</div>
</template>
</MainTemplate>
</template>
<script setup lang="ts">
import { defineComponent, defineAsyncComponent, markRaw } from "vue";
import { mapState, mapActions } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { useSalutationStore } from "@/stores/admin/settings/salutation";
import SalutationListItem from "@/components/admin/settings/salutation/SalutationListItem.vue";
import { useModalStore } from "@/stores/modal";
import { useAbilityStore } from "@/stores/ability";
</script>
<script lang="ts">
export default defineComponent({
computed: {
...mapState(useSalutationStore, ["salutations"]),
...mapState(useAbilityStore, ["can"]),
},
mounted() {
this.fetchSalutations();
},
methods: {
...mapActions(useSalutationStore, ["fetchSalutations"]),
...mapActions(useModalStore, ["openModal"]),
openCreateModal() {
this.openModal(
markRaw(defineAsyncComponent(() => import("@/components/admin/settings/salutation/CreateSalutationModal.vue")))
);
},
},
});
</script>

View file

@ -0,0 +1,120 @@
<template>
<MainTemplate>
<template #headerInsert>
<RouterLink to="../" class="text-primary">zurück zur Liste (abbrechen)</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">Anrede {{ origin?.salutation }} - Daten bearbeiten</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="salutation != null"
class="flex flex-col gap-4 py-2 w-full max-w-xl mx-auto"
@submit.prevent="triggerUpdate"
>
<div>
<label for="salutation">Anrede</label>
<input type="text" id="salutation" required v-model="salutation.salutation" />
</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>
</template>
<script setup lang="ts">
import { defineComponent } from "vue";
import { mapState, mapActions } from "pinia";
import MainTemplate from "@/templates/Main.vue";
import { useSalutationStore } from "@/stores/admin/settings/salutation";
import Spinner from "@/components/Spinner.vue";
import SuccessCheckmark from "@/components/SuccessCheckmark.vue";
import FailureXMark from "@/components/FailureXMark.vue";
import { RouterLink } from "vue-router";
import type { SalutationViewModel, UpdateSalutationViewModel } from "@/viewmodels/admin/settings/salutation.models";
import cloneDeep from "lodash.clonedeep";
import isEqual from "lodash.isequal";
</script>
<script lang="ts">
export default defineComponent({
props: {
id: String,
},
data() {
return {
loading: "loading" as "loading" | "fetched" | "failed",
status: null as null | "loading" | { status: "success" | "failed"; reason?: string },
origin: null as null | SalutationViewModel,
salutation: null as null | SalutationViewModel,
timeout: null as any,
};
},
computed: {
canSaveOrReset(): boolean {
return isEqual(this.origin, this.salutation);
},
},
mounted() {
this.fetchItem();
},
beforeUnmount() {
try {
clearTimeout(this.timeout);
} catch (error) {}
},
methods: {
...mapActions(useSalutationStore, ["fetchSalutationById", "updateActiveSalutation"]),
resetForm() {
this.salutation = cloneDeep(this.origin);
},
fetchItem() {
this.fetchSalutationById(parseInt(this.id ?? ""))
.then((result) => {
this.salutation = result.data;
this.origin = cloneDeep(result.data);
this.loading = "fetched";
})
.catch((err) => {
this.loading = "failed";
});
},
triggerUpdate(e: any) {
if (this.salutation == null) return;
let formData = e.target.elements;
let updateSalutation: UpdateSalutationViewModel = {
id: this.salutation.id,
salutation: formData.salutation.value,
};
this.status = "loading";
this.updateActiveSalutation(updateSalutation)
.then(() => {
this.fetchItem();
this.status = { status: "success" };
})
.catch((err) => {
this.status = { status: "failed" };
})
.finally(() => {
this.timeout = setTimeout(() => {
this.status = null;
}, 2000);
});
},
},
});
</script>