diff --git a/backend/go.mod b/backend/go.mod index 99fdf8f..51cc4a2 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -4,7 +4,7 @@ go 1.24.5 require ( gitea.tecamino.com/paadi/access-handler v1.0.19 - gitea.tecamino.com/paadi/memberDB v1.0.21 + gitea.tecamino.com/paadi/memberDB v1.1.2 gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 gitea.tecamino.com/paadi/tecamino-logger v0.2.1 github.com/gin-contrib/cors v1.7.6 diff --git a/backend/go.sum b/backend/go.sum index 1cf0f8b..819237b 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -2,8 +2,8 @@ gitea.tecamino.com/paadi/access-handler v1.0.19 h1:L51Qg5RNjdIGeQsHwGUTV+ADRpUqP gitea.tecamino.com/paadi/access-handler v1.0.19/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M= gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU= gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= -gitea.tecamino.com/paadi/memberDB v1.0.21 h1:kGQe5fUOc50oQj8caWcjnmmxJaSPuQEjeSG5qDT9Iz4= -gitea.tecamino.com/paadi/memberDB v1.0.21/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU= +gitea.tecamino.com/paadi/memberDB v1.1.2 h1:j/Tsr7JnzAkdOvgjG77TzTVBWd4vBrmEFzPXNpW7GYk= +gitea.tecamino.com/paadi/memberDB v1.1.2/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU= gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 h1:vAq7mwUxlxJuLzCQSDMrZCwo8ky5usWi9Qz+UP+WnkI= gitea.tecamino.com/paadi/tecamino-dbm v0.1.1/go.mod h1:+tmf1rjPaKEoNeUcr1vdtoFIFweNG3aUGevDAl3NMBk= gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE= diff --git a/src/assets/lang/de-CH.yaml b/src/assets/lang/de-CH.yaml index 1595442..4e69602 100644 --- a/src/assets/lang/de-CH.yaml +++ b/src/assets/lang/de-CH.yaml @@ -113,3 +113,5 @@ deleteResponsible: Veratwortläche entfernt deleteResponsibles: Veratwortläche entfernt expiration: Ablauf never: Nie +responsibles: Verantwortliche +comment: Bemerkung diff --git a/src/assets/lang/de-DE.yaml b/src/assets/lang/de-DE.yaml index b2df1bc..3d93d51 100644 --- a/src/assets/lang/de-DE.yaml +++ b/src/assets/lang/de-DE.yaml @@ -113,3 +113,5 @@ deleteResponsible: Verantwortliche entfernt deleteResponsibles: Verantwortliche entfernt expiration: Ablauf never: Nie +responsibles: Verantwortliche +comment: Bemerkung diff --git a/src/assets/lang/en-US.yaml b/src/assets/lang/en-US.yaml index 7f482e9..3c5a7cc 100644 --- a/src/assets/lang/en-US.yaml +++ b/src/assets/lang/en-US.yaml @@ -113,3 +113,5 @@ deleteResponsible: Responsible deleted deleteResponsibles: Responsibles deleted expiration: Expiration never: Never +responsibles: Responsibles +comment: Comment diff --git a/src/vueLib/models/member.ts b/src/vueLib/models/member.ts index ed64714..943f2ef 100644 --- a/src/vueLib/models/member.ts +++ b/src/vueLib/models/member.ts @@ -4,6 +4,7 @@ export interface Member { lastName: string; birthday?: string; age?: string; + comment?: string; address?: string; town?: string; zip?: string; diff --git a/src/vueLib/tables/members/MembersTable.ts b/src/vueLib/tables/members/MembersTable.ts index ac2933a..afb3ee8 100644 --- a/src/vueLib/tables/members/MembersTable.ts +++ b/src/vueLib/tables/members/MembersTable.ts @@ -26,6 +26,7 @@ export function useMemberTable() { birthday: true, age: true, address: true, + comment: true, town: true, zip: true, phone: true, @@ -68,6 +69,13 @@ export function useMemberTable() { field: 'age', sortable: true, }, + { + name: 'comment', + align: 'left' as const, + label: i18n.global.t('comment'), + field: 'comment', + sortable: true, + }, { name: 'address', align: 'left' as const, @@ -191,7 +199,7 @@ export function useMemberTable() { } //updates member list from database - async function updateMembers() { + async function updateMembers(filter?: Members, filterbyName?: boolean) { loading.value = true; await updateResponsibles().catch((err) => NotifyResponse(err, 'error')); @@ -224,6 +232,20 @@ export function useMemberTable() { }) .finally(() => { loading.value = false; + console.log(4545, members.value.length); + //filter same members out so list is shorter + if (filter) { + members.value = members.value.filter( + (m1) => + !filter.some((m2) => { + if (filterbyName) { + return m1.firstName === m2.firstName && m1.lastName === m2.lastName; + } + return m1.id === m2.id; + }), + ); + } + console.log(4546, members.value.length); }); } @@ -234,6 +256,7 @@ export function useMemberTable() { } }); } + return { members, responsibles,