diff --git a/src/components/admin/club/member/CreateMemberModal.vue b/src/components/admin/club/member/CreateMemberModal.vue
index 0addfc7..0099fc5 100644
--- a/src/components/admin/club/member/CreateMemberModal.vue
+++ b/src/components/admin/club/member/CreateMemberModal.vue
@@ -66,6 +66,10 @@
+
+
+
+
@@ -127,6 +131,7 @@ export default defineComponent({
lastname: formData.lastname.value,
nameaffix: formData.nameaffix.value,
birthdate: formData.birthdate.value,
+ internalId: formData.internalId.value,
};
this.createMember(createMember)
.then(() => {
diff --git a/src/components/admin/club/member/MemberListItem.vue b/src/components/admin/club/member/MemberListItem.vue
index 24daf11..b9155c5 100644
--- a/src/components/admin/club/member/MemberListItem.vue
+++ b/src/components/admin/club/member/MemberListItem.vue
@@ -1,41 +1,25 @@
-
-
+
{{ member.lastname }}, {{ member.firstname }} {{ member.nameaffix ? `- ${member.nameaffix}` : "" }}
-
-
-
-
beigetreten: {{ member.firstMembershipEntry?.start }}
-
ausgetreten: {{ member.lastMembershipEntry?.end }}
-
+
+
Interne ID: {{ member.internalId }}
+
beigetreten: {{ member.firstMembershipEntry?.start }}
+
ausgetreten: {{ member.lastMembershipEntry?.end }}, da {{member.lastMembershipEntry?.terminationReason ?? '- kein Grund angegeben'}}
+
+
@@ -47,14 +31,5 @@ export default defineComponent({
computed: {
...mapState(useAbilityStore, ["can"]),
},
- methods: {
- ...mapActions(useModalStore, ["openModal"]),
- openDeleteModal() {
- // this.openModal(
- // markRaw(defineAsyncComponent(() => import("@/components/admin/.vue"))),
- // this.member.id
- // );
- },
- },
});
diff --git a/src/components/admin/club/member/MembershipCreateModal.vue b/src/components/admin/club/member/MembershipCreateModal.vue
index 433392f..42d3614 100644
--- a/src/components/admin/club/member/MembershipCreateModal.vue
+++ b/src/components/admin/club/member/MembershipCreateModal.vue
@@ -63,10 +63,6 @@
-
-
-
-
@@ -132,7 +128,6 @@ export default defineComponent({
if (this.selectedStatus == undefined) return;
let formData = e.target.elements;
let createMember: CreateMembershipViewModel = {
- internalId: formData.internalId.value,
start: formData.start.value,
statusId: this.selectedStatus.id,
};
diff --git a/src/components/admin/club/member/MembershipEditModal.vue b/src/components/admin/club/member/MembershipEditModal.vue
index 4d621ae..548cfcf 100644
--- a/src/components/admin/club/member/MembershipEditModal.vue
+++ b/src/components/admin/club/member/MembershipEditModal.vue
@@ -63,10 +63,6 @@
-
-
-
-
-
-
Interne ID: {{ membership.internalId }}
-
beendet, weil: {{ membership.terminationReason }}
+
+
Grund: {{ membership.terminationReason }}
diff --git a/src/stores/admin/member.ts b/src/stores/admin/member.ts
index b0075de..2a391bb 100644
--- a/src/stores/admin/member.ts
+++ b/src/stores/admin/member.ts
@@ -62,6 +62,7 @@ export const useMemberStore = defineStore("member", {
lastname: member.lastname,
nameaffix: member.nameaffix,
birthdate: member.birthdate,
+ internalId: member.internalId,
});
this.fetchMembers();
return result;
@@ -73,6 +74,7 @@ export const useMemberStore = defineStore("member", {
lastname: member.lastname,
nameaffix: member.nameaffix,
birthdate: member.birthdate,
+ internalId: member.internalId,
});
this.fetchMembers();
return result;
diff --git a/src/stores/admin/membership.ts b/src/stores/admin/membership.ts
index e53734e..56e7bb8 100644
--- a/src/stores/admin/membership.ts
+++ b/src/stores/admin/membership.ts
@@ -38,7 +38,6 @@ export const useMembershipStore = defineStore("membership", {
async createMembership(membership: CreateMembershipViewModel): Promise> {
const memberId = useMemberStore().activeMember;
const result = await http.post(`/admin/member/${memberId}/membership`, {
- internalId: membership.internalId,
start: membership.start,
statusId: membership.statusId,
});
@@ -48,7 +47,6 @@ export const useMembershipStore = defineStore("membership", {
async updateMembership(membership: UpdateMembershipViewModel): Promise> {
const memberId = useMemberStore().activeMember;
const result = await http.patch(`/admin/member/${memberId}/membership/${membership.id}`, {
- internalId: membership.internalId,
start: membership.start,
end: membership.end,
terminationReason: membership.terminationReason,
diff --git a/src/viewmodels/admin/member.models.ts b/src/viewmodels/admin/member.models.ts
index 0f95af6..ca5fcc1 100644
--- a/src/viewmodels/admin/member.models.ts
+++ b/src/viewmodels/admin/member.models.ts
@@ -9,6 +9,7 @@ export interface MemberViewModel {
lastname: string;
nameaffix: string;
birthdate: Date;
+ internalId?: string;
firstMembershipEntry?: MembershipViewModel;
lastMembershipEntry?: MembershipViewModel;
sendNewsletter?: CommunicationViewModel;
@@ -22,6 +23,7 @@ export interface CreateMemberViewModel {
lastname: string;
nameaffix: string;
birthdate: Date;
+ internalId?: string;
}
export interface UpdateMemberViewModel {
@@ -31,4 +33,5 @@ export interface UpdateMemberViewModel {
lastname: string;
nameaffix: string;
birthdate: Date;
+ internalId?: string;
}
diff --git a/src/viewmodels/admin/membership.models.ts b/src/viewmodels/admin/membership.models.ts
index 76b804e..82ede06 100644
--- a/src/viewmodels/admin/membership.models.ts
+++ b/src/viewmodels/admin/membership.models.ts
@@ -1,6 +1,5 @@
export interface MembershipViewModel {
id: number;
- internalId?: string;
start: Date;
end?: Date;
terminationReason?: string;
@@ -9,14 +8,12 @@ export interface MembershipViewModel {
}
export interface CreateMembershipViewModel {
- internalId?: string;
start: Date;
statusId: number;
}
export interface UpdateMembershipViewModel {
id: number;
- internalId?: string;
start: Date;
end?: Date;
terminationReason?: string;
diff --git a/src/views/admin/club/members/MemberEdit.vue b/src/views/admin/club/members/MemberEdit.vue
index aa70158..b3c4af8 100644
--- a/src/views/admin/club/members/MemberEdit.vue
+++ b/src/views/admin/club/members/MemberEdit.vue
@@ -69,6 +69,10 @@
+
+
+
+