diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/club/member/member.ts index 1d96dc7..c7892c2 100644 --- a/src/stores/admin/club/member/member.ts +++ b/src/stores/admin/club/member/member.ts @@ -1,9 +1,5 @@ import { defineStore } from "pinia"; -import type { - CreateMemberViewModel, - MemberStatisticsViewModel, - UpdateMemberViewModel, -} from "@/viewmodels/admin/club/member/member.models"; +import type { CreateMemberViewModel, UpdateMemberViewModel } from "@/viewmodels/admin/club/member/member.models"; import { http } from "@/serverCom"; import type { AxiosResponse } from "axios"; import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.models"; @@ -16,7 +12,6 @@ export const useMemberStore = defineStore("member", { loading: "loading" as "loading" | "fetched" | "failed", activeMember: null as number | null, activeMemberObj: null as MemberViewModel | null, - activeMemberStatistics: null as MemberStatisticsViewModel | null, loadingActive: "loading" as "loading" | "fetched" | "failed", }; }, @@ -75,17 +70,6 @@ export const useMemberStore = defineStore("member", { fetchMemberById(id: number) { return http.get(`/admin/member/${id}`); }, - fetchMemberStatisticsByActiveId() { - http - .get(`/admin/member/${this.activeMember}/statistics`) - .then((res) => { - this.activeMemberStatistics = res.data; - }) - .catch((err) => {}); - }, - fetchMemberStatisticsById(id: number) { - return http.get(`/admin/member/${id}/statistics`); - }, async createMember(member: CreateMemberViewModel): Promise> { const result = await http.post(`/admin/member`, { salutation: member.salutation, diff --git a/src/stores/admin/club/member/membership.ts b/src/stores/admin/club/member/membership.ts index fd2aaf8..a430bf4 100644 --- a/src/stores/admin/club/member/membership.ts +++ b/src/stores/admin/club/member/membership.ts @@ -6,7 +6,6 @@ import type { MemberViewModel } from "@/viewmodels/admin/club/member/member.mode import { useMemberStore } from "./member"; import type { CreateMembershipViewModel, - MembershipStatisticsViewModel, MembershipViewModel, UpdateMembershipViewModel, } from "@/viewmodels/admin/club/member/membership.models"; @@ -15,7 +14,6 @@ export const useMembershipStore = defineStore("membership", { state: () => { return { memberships: [] as Array, - membershipStatistics: [] as Array, loading: "loading" as "loading" | "fetched" | "failed", }; }, @@ -33,15 +31,6 @@ export const useMembershipStore = defineStore("membership", { this.loading = "failed"; }); }, - fetchMembershipStatisticsForMember() { - const memberId = useMemberStore().activeMember; - http - .get(`/admin/member/${memberId}/memberships/statistics`) - .then((result) => { - this.membershipStatistics = result.data; - }) - .catch((err) => {}); - }, fetchMembershipById(id: number) { const memberId = useMemberStore().activeMember; return http.get(`/admin/member/${memberId}/membership/${id}`); diff --git a/src/viewmodels/admin/club/member/member.models.ts b/src/viewmodels/admin/club/member/member.models.ts index 0283545..ca5fcc1 100644 --- a/src/viewmodels/admin/club/member/member.models.ts +++ b/src/viewmodels/admin/club/member/member.models.ts @@ -17,18 +17,6 @@ export interface MemberViewModel { preferredCommunication?: Array; } -export interface MemberStatisticsViewModel { - id: number; - salutation: Salutation; - firstname: string; - lastname: string; - nameaffix: string; - birthdate: Date; - todayAge: number; - ageThisYear: number; - exactAge: string; -} - export interface CreateMemberViewModel { salutation: Salutation; firstname: string; diff --git a/src/viewmodels/admin/club/member/membership.models.ts b/src/viewmodels/admin/club/member/membership.models.ts index b2114c0..82ede06 100644 --- a/src/viewmodels/admin/club/member/membership.models.ts +++ b/src/viewmodels/admin/club/member/membership.models.ts @@ -1,5 +1,3 @@ -import type { Salutation } from "../../../../enums/salutation"; - export interface MembershipViewModel { id: number; start: Date; @@ -9,19 +7,6 @@ export interface MembershipViewModel { statusId: number; } -export interface MembershipStatisticsViewModel { - durationInDays: number; - durationInYears: string; - status: string; - statusId: number; - memberId: number; - memberSalutation: Salutation; - memberFirstname: string; - memberLastname: string; - memberNameaffix: string; - memberBirthdate: Date; -} - export interface CreateMembershipViewModel { start: Date; statusId: number; diff --git a/src/views/admin/club/members/MemberOverview.vue b/src/views/admin/club/members/MemberOverview.vue index 6716daf..6cc0ed2 100644 --- a/src/views/admin/club/members/MemberOverview.vue +++ b/src/views/admin/club/members/MemberOverview.vue @@ -25,20 +25,6 @@ -
-

Statistiken zur Mitgliedschaft

-
-
-

- {{ stat.status }} für gesamt {{ stat.durationInDays }} Tage - ~> {{ stat.durationInYears.replace("_", "") }} Jahre -

-
-
-

Erster Eintrag Mitgliedschaft

@@ -139,7 +125,6 @@ import { defineComponent } from "vue"; import { mapActions, mapState } from "pinia"; import Spinner from "@/components/Spinner.vue"; import { useMemberStore } from "@/stores/admin/club/member/member"; -import { useMembershipStore } from "@/stores/admin/club/member/membership";