change version name to 1.2.0

simplify tables with table components close #31

.gitignore

@@ -38,6 +38,9 @@ yarn-error.log*
 *.db
 *.dba
 
+# local personal backup files
+*.back
+
 # local .log files
 *.log
 

backend/env/env.go

@@ -26,6 +26,7 @@ const (
 	Organization  EnvKey = "ORGANIZATION"
 	DOMAIN        EnvKey = "DOMAIN"
 	AllowOrigin   EnvKey = "ALLOWORIGIN"
+	TimeZone      EnvKey = "TMEZONE"
 )
 
 const (

backend/example/example.env

@@ -11,4 +11,5 @@ FULLCHAIN=your_certificate_fullchain_file
 ACCESS_SECRET=your_32bit_long_access_secret
 REFRESH_SECRET=your_32bit_long_referesh_secret
 ALLOWORIGIN=all_allowed_urls
-DOMAIN=your_domain
+DOMAIN=your_domain
+TIMEZONE=your_timezone in IANA format

backend/go.mod

@@ -3,8 +3,8 @@ module backend
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/access-handler v1.0.25
+	gitea.tecamino.com/paadi/access-handler v1.0.29
-	gitea.tecamino.com/paadi/memberDB v1.1.3
+	gitea.tecamino.com/paadi/memberDB v1.1.13
 	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
@@ -14,7 +14,7 @@ require (
 )
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.0.8 // indirect
+	gitea.tecamino.com/paadi/dbHandler v1.1.7 // indirect
 	github.com/bytedance/sonic v1.14.0 // indirect
 	github.com/bytedance/sonic/loader v0.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect

backend/go.sum

@@ -1,9 +1,9 @@
-gitea.tecamino.com/paadi/access-handler v1.0.25 h1:GiMnkEM0/fo2B1uCzGVyjpAhM2S58LG22N6+BdtdpgQ=
+gitea.tecamino.com/paadi/access-handler v1.0.29 h1:FZ67co/rfJffftT6xOp6psZKFtdEReaAR7PnEZi7ltI=
-gitea.tecamino.com/paadi/access-handler v1.0.25/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M=
+gitea.tecamino.com/paadi/access-handler v1.0.29/go.mod h1:Dmme8URu3lENPhlkZcdEeIKm8VMlAgT/jNLECLLS7Vs=
-gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
+gitea.tecamino.com/paadi/dbHandler v1.1.7 h1:NqVbxbUwd7EZX6HYntyLYwwPbyTPevOhIBTFqoCVqOU=
-gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.1.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
-gitea.tecamino.com/paadi/memberDB v1.1.3 h1:ZwSA+TNL1ZvL8bMnJ5a2odc44bQBa31gVxD2fBA6o0I=
+gitea.tecamino.com/paadi/memberDB v1.1.13 h1:P5UsTt3d8829H9d3vfMAWpDN7ONqwhr8ndIuL9lBuvQ=
-gitea.tecamino.com/paadi/memberDB v1.1.3/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU=
+gitea.tecamino.com/paadi/memberDB v1.1.13/go.mod h1:FRbhFgXq4jDpfCrCfHCVr7VcA44fR8J3XXQFeO6QSBk=
 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=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightcontrol",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A Tecamino App",
   "productName": "Attendence Records",
   "author": "A. Zuercher",

src/assets/lang/de-CH.yaml

@@ -86,9 +86,9 @@ members: Mitglider
 attendanceTable: Anweseheits Tabelle
 excursionTable: Usflugs Tabelle
 updated: aktualisiert
-events: Veranstalige
+events: Verastautige
-eventNameIsRequired: Verastatigsname isch erforderlich
+eventNameIsRequired: Verastautigssname isch erforderlich
-eventName: Verastatigsname
+eventName: Verastautigssname
 attendees: Teilnähmer
 now: Jetzt
 addToEvent: Füge zu Veranstautig
@@ -131,3 +131,12 @@ groupName: Gruppename
 filterByColumn: Spaltenfilter
 filterByColumnValue: Spaltenwerte
 saveAsDefault: Aus Standard spichere
+day: Tag
+Monday: Mäntig
+Tuesday: Zistig
+Wednesday: Mittwuch
+Thursday: Donstig
+Friday: Fritig
+Saturday: Samstig
+Sunday: Suntig
+currentPassword: Aktuelles Passwort

src/assets/lang/de-DE.yaml

@@ -71,7 +71,7 @@ veryWeak: sehr Schwach
 weak: Schwach
 fair: Ausreichend
 good: Gut
-strong:
+strong: Stark
 passwordIsRequired: Password ist erforderlich
 passwordTooShort: Das Passwort muss mindestens 8 Zeichen lang sein
 passwordNeedsUppercase: Das Passwort muss mindestens einen Großbuchstaben enthalten
@@ -131,3 +131,12 @@ groupName: Gruppenname
 filterByColumn: Spaltenfilter
 filterByColumnValue: Spaltenwerte
 saveAsDefault: Als Standard speichern
+day: Tag
+Monday: Montag
+Tuesday: Dienstag
+Wednesday: Mittwoch
+Thursday: Donnerstag
+Friday: Freitag
+Saturday: Samstag
+Sunday: Sonntag
+currentPassword: Aktuelles Passwort

src/assets/lang/en-US.yaml

@@ -131,3 +131,12 @@ groupName: Groupname
 filterByColumn: Columnfilter
 filterByColumnValue: Columnvalues
 saveAsDefault: Save a Default
+day: Day
+Monday: Monday
+Tuesday: Tuesday
+Wednesday: Wednesday
+Thursday: Thursday
+Friday: Friday
+Saturday: Saturday
+Sunday: Sunday
+currentPassword: Current Password

src/boot/auth.ts

@@ -15,7 +15,11 @@ export default boot(async ({ app }) => {
     .get('/login/me')
     .then((resp) => {
       useStore
-        .setUser({ id: resp.data.id, username: resp.data.username, role: resp.data.role })
+        .setUser({
+          id: resp.data.id,
+          username: resp.data.username,
+          role: { role: resp.data.role, permissions: [] },
+        })
         .catch((err) => console.error(err));
       login.refresh().catch((err) => console.error(err));
     })

src/boot/quasar-global.ts

@@ -14,8 +14,12 @@ export default boot(({ app, router }) => {
 
   const settings = getLocalSettings();
 
-  logo.value = settings.icon ?? logo.value;
+  if (settings.icon) {
-  appName.value = settings.appName ?? appName.value;
+    logo.value = settings.icon;
+  }
+  if (settings.appName) {
+    appName.value = settings.appName;
+  }
   databaseName.value = settings.databaseName ?? databaseName.value;
 
   document.documentElement.style.setProperty('--q-primary', settings.primaryColor ?? '#1976d2');

src/boot/restore-route.js

@@ -8,6 +8,8 @@ export default boot(async ({ router }) => {
   // load user
   try {
     const { data } = await appApi.get('/login/me');
+
+    data.role.role = data.role;
     await userStore.setUser(data);
   } catch {
     /* ignore error */

src/components/AddToEvent.vue

@@ -1,7 +1,9 @@
 <template>
   <DialogFrame ref="dialog" :header-title="localTitle">
     <div class="row justify-center">
-      <q-select
+      <SearchableSelect
+        class="q-mx-xl"
+        dense
         autofocus
         :label="$t('event')"
         filled
@@ -12,7 +14,7 @@
         @keyup.enter="addAttendees"
         map-options
         emit-value
-      ></q-select>
+      ></SearchableSelect>
     </div>
     <div class="row justify-center">
       <q-btn class="q-ma-md" color="primary" no-caps @click="addAttendees">{{ localTitle }}</q-btn>
@@ -40,6 +42,7 @@ import type { Members } from 'src/vueLib/models/member';
 import EditAllDialog from 'src/components/EventEditAllDialog.vue';
 import { useAttendeesTable } from 'src/vueLib/tables/attendees/AttendeesTable';
 import { useEventTable } from 'src/vueLib/tables/events/EventsTable';
+import SearchableSelect from 'src/vueLib/general/SearchableSelect .vue';
 
 const dialog = ref();
 const newEventRef = ref();
@@ -105,7 +108,7 @@ async function addAttendees() {
       NotifyResponse(err, 'error');
     });
 
-  await updateAttendees();
+  await updateAttendees(0);
   updateEvents();
 }
 

src/components/MemberEditAllDialog.vue

@@ -60,19 +60,24 @@
           filled
           v-model="localMember.email"
         ></q-input>
-        <q-input
+        <q-select
           class="q-ml-md col-5"
           :label="$t('group')"
+          :options="props.group"
           filled
+          emit-value
+          map-options
+          option-value="name"
+          option-label="name"
           v-model="localMember.group"
-        ></q-input>
+        ></q-select>
         <q-select
           class="q-ml-md col-5"
           :label="$t('responsible')"
           filled
           :options="props.responsibles"
           :option-label="(opt) => opt.firstName + ' ' + opt.lastName"
-          v-model="localMember.responsiblePerson"
+          v-model="localMember.responsible"
         ></q-select>
         <q-input
           v-if="!newMember"
@@ -100,9 +105,10 @@
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import { type PropType, ref } from 'vue';
 import { appApi } from 'src/boot/axios';
-import type { Member, Members } from 'src/vueLib/models/member';
+import type { Member } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'src/boot/lang';
+import type { Responsibles } from 'src/vueLib/models/responsible';
 
 const { NotifyResponse } = useNotify();
 const dialog = ref();
@@ -116,7 +122,10 @@ const localMember = ref<Member>({
 
 const props = defineProps({
   responsibles: {
-    type: Object as PropType<Members>,
+    type: Object as PropType<Responsibles>,
+  },
+  group: {
+    type: Array,
   },
 });
 

src/components/UserEditAllDialog.vue

@@ -24,63 +24,7 @@
           :rules="[(val) => !!val || $t('emailIsRequired')]"
           v-model="localUser.email"
         ></q-input>
-        <div class="col-5">
+        <EnterNewPassword class="col-5 required" v-model:password="localUser.password!" />
-          <q-input
-            class="col-5 required"
-            :label="$t('password')"
-            filled
-            :lazy-rules="false"
-            :rules="[validatePassword]"
-            v-model="localUser.password"
-            @update:model-value="checkStrength"
-            :type="showPassword1 ? 'text' : 'password'"
-          >
-            <template v-slot:append>
-              <q-btn
-                flat
-                dense
-                :icon="showPassword1 ? 'visibility_off' : 'visibility'"
-                @mousedown.prevent="showPassword1 = true"
-                @mouseup.prevent="showPassword1 = false"
-                @mouseleave.prevent="showPassword1 = false"
-                @touchstart.prevent="showPassword1 = true"
-                @touchend.prevent="showPassword1 = false"
-                @touchcancel.prevent="showPassword1 = false"
-              ></q-btn>
-              <q-icon :name="strengthIcon" :color="strengthColor"></q-icon>
-            </template>
-          </q-input>
-
-          <div class="q-mt-md q-px-xl">
-            <q-linear-progress :value="strengthValue" :color="strengthColor" size="8px" rounded />
-            <div class="text-caption text-center q-mt-xs">
-              {{ strengthLabel }}
-            </div>
-          </div>
-          <q-input
-            class="col-5 required"
-            :label="$t('password')"
-            filled
-            :type="showPassword2 ? 'text' : 'password'"
-            :rules="[checkSamePassword]"
-            v-model="passwordCheck"
-          >
-            <template v-slot:append>
-              <q-btn
-                flat
-                dense
-                :icon="showPassword2 ? 'visibility_off' : 'visibility'"
-                @mousedown.prevent="showPassword2 = true"
-                @mouseup.prevent="showPassword2 = false"
-                @mouseleave.prevent="showPassword2 = false"
-                @touchstart.prevent="showPassword2 = true"
-                @touchend.prevent="showPassword2 = false"
-                @touchcancel.prevent="showPassword2 = false"
-              ></q-btn>
-            </template>
-          </q-input>
-        </div>
-
         <div class="col-5">
           <q-select
             class="col-5 required"
@@ -88,7 +32,7 @@
             filled
             :options="props.roles"
             :rules="[(val) => !!val || $t('roleIsRequired')]"
-            v-model="localUser.role"
+            v-model="role"
           ></q-select>
           <q-input
             class="col-5 q-mt-xl"
@@ -109,29 +53,22 @@
 <script setup lang="ts">
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import { ref } from 'vue';
-import zxcvbn from 'zxcvbn';
 import { appApi } from 'src/boot/axios';
 import type { User } from 'src/vueLib/models/users';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { validateQForm } from 'src/vueLib/utils/validation';
 import { i18n } from 'src/boot/lang';
 import { DefaultSettings } from 'src/vueLib/models/settings';
+import EnterNewPassword from 'src/vueLib/login/EnterNewPassword.vue';
 
 const { NotifyResponse } = useNotify();
 const dialog = ref();
 const form = ref();
 const newUser = ref(false);
-const showPassword1 = ref(false);
+const role = ref('');
-const showPassword2 = ref(false);
-const passwordCheck = ref('');
-const strengthValue = ref(0);
-const strengthLabel = ref('Enter a password');
-const strengthColor = ref('grey');
-const strengthIcon = ref('lock');
 const localUser = ref<User>({
   user: '',
   email: '',
-  role: '',
 });
 
 const props = defineProps({
@@ -155,7 +92,6 @@ async function open(user: User | null) {
     localUser.value = {
       user: '',
       email: '',
-      role: '',
     };
     newUser.value = true;
   }
@@ -164,47 +100,6 @@ async function open(user: User | null) {
   await validateQForm(form.value);
 }
 
-function checkStrength() {
-  const result = zxcvbn(localUser.value.password || '');
-  strengthValue.value = (result.score + 1) / 5;
-  const levels = [
-    i18n.global.t('veryWeak'),
-    i18n.global.t('weak'),
-    i18n.global.t('fair'),
-    i18n.global.t('good'),
-    i18n.global.t('strong'),
-  ];
-  const colors = ['red', 'orange', 'yellow', 'light-green', 'green'];
-  const icon = ['lock', 'warning', 'error_outline', 'check_circle_outline', 'verified_user'];
-
-  strengthLabel.value = levels[result.score] || i18n.global.t('veryWeak');
-  strengthColor.value = colors[result.score] || 'grey';
-  strengthIcon.value = icon[result.score] || 'lock';
-}
-
-function validatePassword(): string | boolean {
-  if (!localUser.value.password) return i18n.global.t('passwordIsRequired');
-
-  if (localUser.value.password.length < 8) {
-    return i18n.global.t('passwordTooShort');
-  } else if (!/[A-Z]/.test(localUser.value.password)) {
-    return i18n.global.t('passwordNeedsUppercase');
-  } else if (!/[a-z]/.test(localUser.value.password)) {
-    return i18n.global.t('passwordNeedsLowercase');
-  } else if (!/[0-9]/.test(localUser.value.password)) {
-    return i18n.global.t('passwordNeedsNumber');
-  } else if (!/[!@#$%^&*(),.?":{}|<>]/.test(localUser.value.password)) {
-    return i18n.global.t('passwordNeedsSpecial');
-  }
-
-  return true;
-}
-
-function checkSamePassword(): string | boolean {
-  if (localUser.value.password === passwordCheck.value) return true;
-  return i18n.global.t('passwordDoNotMatch');
-}
-
 async function save() {
   if (!(await validateQForm(form.value))) {
     NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
@@ -216,6 +111,7 @@ async function save() {
     localUser.value.settings = DefaultSettings();
   }
 
+  localUser.value.role = { role: role.value || '', permissions: [] };
   appApi
     .post(query, JSON.stringify(localUser.value))
     .then(() => {

src/localstorage/localStorage.ts

@@ -1,5 +1,5 @@
 import { Dark } from 'quasar';
-import type { Settings } from 'src/vueLib/models/settings';
+import { appName, databaseName, type Settings } from 'src/vueLib/models/settings';
 import { updateOrAddObject } from 'src/vueLib/utils/utils';
 import { ref } from 'vue';
 
@@ -16,8 +16,8 @@ export function setLocalSettings(settings: Settings) {
 export function getLocalSettings(): Settings {
   return <Settings>{
     icon: localStorage.getItem('icon'),
-    appName: localStorage.getItem('appName'),
+    appName: localStorage.getItem('appName') || appName.value,
-    databaseName: localStorage.getItem('databaseName'),
+    databaseName: localStorage.getItem('databaseName') || databaseName.value,
     primaryColor: localStorage.getItem('primaryColor'),
     primaryColorText: localStorage.getItem('primaryColorText'),
     secondaryColor: localStorage.getItem('secondaryColor'),

src/pages/EventsTable.vue

@@ -1,11 +1,11 @@
 <template>
   <q-page>
-    <h4 class="text-primary text-bold text-center">{{ $t('events') }}</h4>
+    <SiteTitle :title="$t('events')" />
-
     <EventsTable />
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import EventsTable from 'src/vueLib/tables/events/EventsTable.vue';
 </script>

src/pages/GroupTable.vue

@@ -1,10 +1,11 @@
 <template>
   <q-page>
-    <h4 class="text-primary text-bold text-center">{{ $t('groups') }}</h4>
+    <SiteTitle :title="$t('groups')" />
     <GroupTable />
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import GroupTable from 'src/vueLib/tables/group/GroupTable.vue';
 </script>

src/pages/LoginPage.vue

@@ -15,7 +15,7 @@ const router = useRouter();
 const userStore = useUserStore();
 
 onMounted(() => {
-  if (userStore.user?.username !== '' && userStore.user?.role !== '') {
+  if (userStore.user?.username !== '' && userStore.user?.role.role !== '') {
     forwardToPage().catch((err) => console.error(err));
   }
 });

src/pages/MembersTable.vue

@@ -1,10 +1,13 @@
 <template>
   <q-page>
-    <h4 class="text-primary text-bold text-center">{{ $t('members') }}</h4>
+    <SiteTitle :title="$t('members')" />
-    <MembersTable />
+    <div class="q-pa-md">
+      <MembersTable />
+    </div>
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import MembersTable from 'src/vueLib/tables/members/MembersTable.vue';
 </script>

src/pages/ResponsibleTable.vue

@@ -1,11 +1,11 @@
 <template>
   <q-page>
-    <h4 class="text-primary text-bold text-center">{{ $t('responsibles') }}</h4>
+    <SiteTitle :title="$t('responsibles')" />
-
     <ResponsibleTable />
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import ResponsibleTable from 'src/vueLib/tables/responsible/ResponsibleTable.vue';
 </script>

src/pages/SettingsPage.vue

@@ -1,6 +1,5 @@
 <template>
-  <h4 class="text-primary text-bold text-center">{{ $t('userSettings') }}</h4>
+  <SiteTitle :title="$t('userSettings')" />
-
   <div class="text-h2 flex flex-center">
     <q-card class="q-gutter-md">
       <div>
@@ -152,6 +151,7 @@ import { useNotify } from 'src/vueLib/general/useNotify';
 import { type Settings } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { setLocalSettings } from 'src/localstorage/localStorage';
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 
 const { NotifyResponse } = useNotify();
 const colorGroup = ref(false);
@@ -194,6 +194,7 @@ function save() {
   setLocalSettings(settings);
 
   const tempuser = user.user;
+
   if (tempuser) {
     tempuser.settings = settings;
   }

src/pages/UserSettings.vue

@@ -1,33 +1,30 @@
 <template>
-  <h4 class="text-primary text-bold text-center">{{ $t('userSettings') }}</h4>
+  <SiteTitle :title="$t('userSettings')" />
+  <div class="q-gutter-y-md">
+    <q-card>
+      <q-tabs
+        v-model="tab"
+        dense
+        class="taxt-grey"
+        active-color="primary"
+        indicator-color="primary"
+        align="justify"
+        narrow-indicator
+      >
+        <q-tab name="users" no-caps :label="$t('users')" />
+        <q-tab name="roles" no-caps :label="$t('roles')" />
+      </q-tabs>
+      <q-separator />
 
-  <div class="q-pa-md">
+      <q-tab-panels v-model="tab" animated>
-    <div class="q-gutter-y-md">
+        <q-tab-panel name="users" style="padding: 0px">
-      <q-card>
+          <UserTable />
-        <q-tabs
+        </q-tab-panel>
-          v-model="tab"
+        <q-tab-panel name="roles" style="padding: 0px">
-          dense
+          <RoleTable />
-          class="taxt-grey"
+        </q-tab-panel>
-          active-color="primary"
+      </q-tab-panels>
-          indicator-color="primary"
+    </q-card>
-          align="justify"
-          narrow-indicator
-        >
-          <q-tab name="users" no-caps :label="$t('users')" />
-          <q-tab name="roles" no-caps :label="$t('roles')" />
-        </q-tabs>
-        <q-separator />
-
-        <q-tab-panels v-model="tab" animated>
-          <q-tab-panel name="users">
-            <UserTable />
-          </q-tab-panel>
-          <q-tab-panel name="roles">
-            <RoleTable />
-          </q-tab-panel>
-        </q-tab-panels>
-      </q-card>
-    </div>
   </div>
 </template>
 
@@ -35,6 +32,7 @@
 import { ref } from 'vue';
 import UserTable from 'src/vueLib/tables/users/UserTable.vue';
 import RoleTable from 'src/vueLib/tables/roles/RoleTable.vue';
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 
 const tab = ref('users');
 </script>

src/router/routes.ts

@@ -25,12 +25,12 @@ const routes: RouteRecordRaw[] = [
       },
       {
         path: 'responsible',
-        component: () => import('pages/ResponsibleTable.vue'),
+        component: () => import('src/pages/ResponsibleTable.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },
       {
         path: 'group',
-        component: () => import('pages/GroupTable.vue'),
+        component: () => import('src/pages/GroupTable.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },
       {

src/vueLib/dialog/DialogFrame.vue

@@ -25,7 +25,7 @@
       <q-separator color="black" />
 
       <!-- Content Slot -->
-      <div class="scrollArea">
+      <div class="scrollArea" :style="'padding: ' + props.innerPadding + 'px'">
         <slot />
       </div>
 
@@ -48,6 +48,7 @@ const props = defineProps({
   headerTitle: { type: String, default: '' },
   width: { type: Number, default: 400 },
   height: { type: Number, default: 250 },
+  innerPadding: { type: Number, default: 16 },
 });
 
 // Fullscreen toggle
@@ -153,7 +154,6 @@ const cardStyle = computed(() => {
   flex: 1 1 auto;
   min-height: 0;
   overflow-y: auto;
-  padding: 16px;
 }
 
 /* Resize handle in bottom right */

src/vueLib/general/SearchableSelect .vue

@@ -0,0 +1,115 @@
+<template>
+  <q-select
+    ref="selectRef"
+    v-model="modelValueLocal"
+    :options="filteredOptions"
+    :option-label="optionLabel"
+    :option-value="optionValue"
+    :use-input="search"
+    input-debounce="200"
+    @filter="filterFn"
+    @update:model-value="emitValue"
+    v-bind="$attrs"
+    ><template v-slot:append
+      ><q-btn
+        size="xs"
+        flat
+        dense
+        round
+        icon="search"
+        :color="search ? 'primary' : 'grey'"
+        @click="searchBox"
+      >
+      </q-btn
+    ></template>
+  </q-select>
+</template>
+
+<script setup lang="ts" generic="T extends Record<string, string | number | object>">
+import type { PropType } from 'vue';
+import { ref, watch } from 'vue';
+
+const search = ref(false);
+const selectRef = ref();
+
+defineOptions({ inheritAttrs: false });
+
+const props = defineProps({
+  modelValue: {
+    type: [String, Number, Object] as PropType<string | number | object | null>,
+    default: null,
+  },
+  options: {
+    type: Array as PropType<T[]>,
+    required: true,
+  },
+  optionLabel: {
+    type: [Function, String] as PropType<((option: T) => string) | string | undefined>,
+    required: true,
+  },
+  optionValue: {
+    type: String,
+    required: true,
+  },
+});
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string | number | null): void;
+}>();
+
+const optionLabel = props.optionLabel;
+const optionValue = props.optionValue;
+
+const modelValueLocal = ref<string | number | object | null | undefined>(props.modelValue);
+const filteredOptions = ref<T[]>([...(props.options || [])]);
+
+function searchBox() {
+  if (search.value) {
+    selectRef.value.updateInputValue('');
+  }
+  search.value = !search.value;
+}
+
+watch(
+  () => props.modelValue,
+  (v) => (modelValueLocal.value = v),
+);
+watch(
+  () => props.options,
+  (o) => (filteredOptions.value = [...o]),
+);
+
+function filterFn(val: string, update: (fn: () => void) => void) {
+  update(() => {
+    if (!val) {
+      filteredOptions.value = [...props.options];
+      return;
+    }
+    const needle = val.toLowerCase();
+    filteredOptions.value = props.options.filter((opt) => {
+      let field = null;
+      if (typeof optionLabel === 'function') {
+        field = optionLabel(opt);
+      } else {
+        field = opt[String(optionLabel)];
+      }
+
+      if (typeof field !== 'string' && typeof field !== 'number') return false;
+      return String(field).toLowerCase().includes(needle);
+    });
+
+    // Remove duplicates by optionValue
+    const seen = new Set();
+    filteredOptions.value = filteredOptions.value.filter((opt) => {
+      const value = opt[optionValue];
+      if (seen.has(value)) return false;
+      seen.add(value);
+      return true;
+    });
+  });
+}
+
+function emitValue(val: string | number | null) {
+  emit('update:modelValue', val);
+}
+</script>

src/vueLib/general/SiteTitle.vue

@@ -0,0 +1,12 @@
+<template>
+  <h4 class="text-primary text-bold text-center" :style="{ margin: props.marging + 'px' }">
+    {{ props.title }}
+  </h4>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  title: { type: String },
+  marging: { type: Number, default: 28 },
+});
+</script>

src/vueLib/login/ChangePassword.vue

@@ -0,0 +1,85 @@
+<template>
+  <DialogFrame
+    ref="dialog"
+    :header-title="$t('changePassword') + ' ' + $t('user') + ' ' + localUser.user"
+    :height="510"
+    :width="500"
+    :inner-padding="48"
+  >
+    <q-form ref="form">
+      <div class="row justify-center q-gutter-md">
+        <q-input
+          class="col-6 required"
+          filled
+          autocomplete="current-password"
+          :type="showPassword ? 'text' : 'password'"
+          :label="$t('currentPassword')"
+          v-model="localUser.password"
+          :rules="[(val) => !!val || $t('currentPassword') + ' ' + $t('isRequired')]"
+        >
+          <template #append>
+            <q-btn
+              flat
+              dense
+              :icon="showPassword ? 'visibility_off' : 'visibility'"
+              @mousedown.prevent="showPassword = true"
+              @mouseup.prevent="showPassword = false"
+              @mouseleave.prevent="showPassword = false"
+              @touchstart.prevent="showPassword = true"
+              @touchend.prevent="showPassword = false"
+              @touchcancel.prevent="showPassword = false"
+            ></q-btn>
+          </template>
+        </q-input>
+        <div class="col-6">
+          <EnterNewPassword v-model:password="localUser.newPassword!" />
+        </div>
+      </div>
+    </q-form>
+    <div class="row justify-center">
+      <q-btn class="q-ma-md" color="primary" no-caps @click="save">{{ $t('save') }}</q-btn>
+    </div>
+  </DialogFrame>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import DialogFrame from '../dialog/DialogFrame.vue';
+import type { User } from 'src/vueLib/models/users';
+import { i18n } from 'src/boot/lang';
+import { useNotify } from '../general/useNotify';
+import { validateQForm } from '../utils/validation';
+import EnterNewPassword from './EnterNewPassword.vue';
+
+const { NotifyResponse } = useNotify();
+const dialog = ref();
+const showPassword = ref(false);
+const form = ref();
+const localUser = ref<User>({
+  user: '',
+  email: '',
+});
+
+const open = (user: User) => {
+  localUser.value = user;
+  localUser.value.password = '';
+  localUser.value.newPassword = '';
+  dialog.value?.open();
+};
+
+const close = () => {
+  dialog.value?.close();
+};
+
+const emit = defineEmits(['update:password']);
+
+async function save() {
+  if (!(await validateQForm(form.value))) {
+    NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
+    return;
+  }
+  emit('update:password', localUser.value);
+}
+
+defineExpose({ open, close });
+</script>

src/vueLib/login/EnterNewPassword.vue

@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <q-input
+      class="col-5 required"
+      :label="$t('password')"
+      autocomplete="new-password"
+      filled
+      :lazy-rules="false"
+      :rules="[validatePassword]"
+      v-model="password"
+      @update:model-value="checkStrength"
+      :type="showPassword1 ? 'text' : 'password'"
+    >
+      <template v-slot:append>
+        <q-btn
+          flat
+          dense
+          :icon="showPassword1 ? 'visibility_off' : 'visibility'"
+          @mousedown.prevent="showPassword1 = true"
+          @mouseup.prevent="showPassword1 = false"
+          @mouseleave.prevent="showPassword1 = false"
+          @touchstart.prevent="showPassword1 = true"
+          @touchend.prevent="showPassword1 = false"
+          @touchcancel.prevent="showPassword1 = false"
+        ></q-btn>
+        <q-icon :name="strengthIcon" :color="strengthColor"></q-icon>
+      </template>
+    </q-input>
+
+    <div class="q-mt-md q-px-xl">
+      <q-linear-progress :value="strengthValue" :color="strengthColor" size="8px" rounded />
+      <div class="text-caption text-center q-mt-xs">
+        {{ strengthLabel }}
+      </div>
+    </div>
+    <q-input
+      ref="pwdForm2"
+      class="col-5 required"
+      :label="$t('password')"
+      autocomplete="new-password"
+      filled
+      :type="showPassword2 ? 'text' : 'password'"
+      :rules="[checkSamePassword]"
+      v-model="passwordCheck"
+    >
+      <template v-slot:append>
+        <q-btn
+          flat
+          dense
+          :icon="showPassword2 ? 'visibility_off' : 'visibility'"
+          @mousedown.prevent="showPassword2 = true"
+          @mouseup.prevent="showPassword2 = false"
+          @mouseleave.prevent="showPassword2 = false"
+          @touchstart.prevent="showPassword2 = true"
+          @touchend.prevent="showPassword2 = false"
+          @touchcancel.prevent="showPassword2 = false"
+        ></q-btn>
+      </template>
+    </q-input>
+  </div>
+</template>
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import zxcvbn from 'zxcvbn';
+import { i18n } from 'src/boot/lang';
+
+const props = defineProps({
+  password: { type: String },
+});
+
+const emit = defineEmits(['update:password']);
+
+const pwdForm2 = ref();
+const showPassword1 = ref(false);
+const showPassword2 = ref(false);
+const passwordCheck = ref('');
+const strengthValue = ref(0);
+const strengthLabel = ref('Enter a password');
+const strengthColor = ref('grey');
+const strengthIcon = ref('lock');
+
+function checkStrength() {
+  const result = zxcvbn(password.value || '');
+  strengthValue.value = (result.score + 1) / 5;
+  const levels = [
+    i18n.global.t('veryWeak'),
+    i18n.global.t('weak'),
+    i18n.global.t('fair'),
+    i18n.global.t('good'),
+    i18n.global.t('strong'),
+  ];
+  const colors = ['red', 'orange', 'yellow', 'light-green', 'green'];
+  const icon = ['lock', 'warning', 'error_outline', 'check_circle_outline', 'verified_user'];
+
+  strengthLabel.value = levels[result.score] || i18n.global.t('veryWeak');
+  strengthColor.value = colors[result.score] || 'grey';
+  strengthIcon.value = icon[result.score] || 'lock';
+}
+
+function validatePassword(): string | boolean {
+  pwdForm2.value?.validate();
+
+  if (!password.value) return i18n.global.t('passwordIsRequired');
+
+  if (password.value.length < 8) {
+    return i18n.global.t('passwordTooShort');
+  } else if (!/[A-Z]/.test(password.value)) {
+    return i18n.global.t('passwordNeedsUppercase');
+  } else if (!/[a-z]/.test(password.value)) {
+    return i18n.global.t('passwordNeedsLowercase');
+  } else if (!/[0-9]/.test(password.value)) {
+    return i18n.global.t('passwordNeedsNumber');
+  } else if (!/[!@#$%^&*(),.?":{}|<>]/.test(password.value)) {
+    return i18n.global.t('passwordNeedsSpecial');
+  }
+
+  return true;
+}
+
+function checkSamePassword(): string | boolean {
+  if (password.value === passwordCheck.value) return true;
+  return i18n.global.t('passwordDoNotMatch');
+}
+
+const password = computed({
+  get: () => props.password,
+  set: (v) => emit('update:password', v),
+});
+</script>

src/vueLib/login/useLogin.ts

@@ -17,8 +17,12 @@ export function useLogin() {
       await appApi.post('/login', { user, password }).then((resp) => {
         const sets = resp.data.settings as Settings;
 
-        logo.value = sets.icon;
+        if (sets.icon) {
-        appName.value = sets.appName;
+          logo.value = sets.icon;
+        }
+        if (sets.appName) {
+          appName.value = sets.appName;
+        }
         document.documentElement.style.setProperty('--q-primary', sets.primaryColor);
         document.documentElement.style.setProperty('--q-primary-text', sets.primaryColorText);
         document.documentElement.style.setProperty('--q-secondary', sets.secondaryColor);
@@ -28,7 +32,11 @@ export function useLogin() {
 
       const resp = await appApi.get('/login/me');
       await userStore
-        .setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role })
+        .setUser({
+          id: resp.data.id,
+          username: resp.data.user,
+          role: { role: resp.data.role, permissions: [] },
+        })
         .catch((err) => NotifyResponse(err, 'error'));
 
       startRefreshInterval();
@@ -57,7 +65,11 @@ export function useLogin() {
           .get('/login/me')
           .then((resp) => {
             userStore
-              .setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role })
+              .setUser({
+                id: resp.data.id,
+                username: resp.data.user,
+                role: { role: resp.data.role, permissions: [] },
+              })
               .catch((err) => NotifyResponse(err, 'error'));
             if (!intervalId) {
               startRefreshInterval();

src/vueLib/login/userStore.ts

@@ -20,7 +20,7 @@ export const useUserStore = defineStore('user', {
 
     isAuthorizedAs: (state: UserState) => {
       return (roles: string[]) => {
-        return state.user !== null && roles.includes(state.user.role);
+        return state.user !== null && roles.includes(state.user.role?.role);
       };
     },
     isPermittedTo: (state: UserState) => {
@@ -44,9 +44,9 @@ export const useUserStore = defineStore('user', {
   actions: {
     async setUser(user: User) {
       await appApi
-        .get('roles?role=' + user.role)
+        .get('roles?role=' + user.role?.role)
         .then((resp) => {
-          const roleData = resp.data.find((role: Role) => role.role === user.role);
+          const roleData = resp.data.find((role: Role) => role.role === user.role?.role);
           user.permissions = roleData?.permissions || [];
           this.user = user;
         })

src/vueLib/models/event.ts

@@ -3,6 +3,8 @@ import type { Members } from './member';
 export interface Event {
   id: number;
   name: string;
+  date?: string;
+  day?: string;
   attendees: Members;
 }
 

src/vueLib/models/member.ts

@@ -1,5 +1,10 @@
+import type { Group } from './group';
+import type { Responsible } from './responsible';
+
 export interface Member {
   id: number;
+  memberId?: number;
+  responsibleId?: number | undefined;
   firstName: string;
   lastName: string;
   birthday?: string;
@@ -10,8 +15,8 @@ export interface Member {
   zip?: string;
   phone?: string;
   email?: string;
-  group?: string;
+  group?: Group;
-  responsiblePerson?: Member;
+  responsible?: Responsible;
   firstVisit?: string;
   lastVisit?: string;
 }

src/vueLib/models/responsible.ts

@@ -0,0 +1,9 @@
+import type { Member } from './member';
+
+export interface Responsible {
+  id: number;
+  memberId: number;
+  member: Member;
+}
+
+export type Responsibles = Responsible[];

src/vueLib/models/user.ts

@@ -1,10 +1,11 @@
 import type { Permissions } from '../checkboxes/permissions';
+import type { Role } from './roles';
 import type { Settings } from './settings';
 
 export interface User {
   id: number;
   username: string;
-  role: string;
+  role: Role;
   permissions?: Permissions;
   settings?: Settings;
 }

src/vueLib/models/users.ts

@@ -1,12 +1,14 @@
+import type { Role } from './roles';
 import type { Settings } from './settings';
 
 export interface User {
   id?: number;
   user: string;
   email: string;
-  role: string;
+  role?: Role;
   expiration?: string;
   password?: string;
+  newPassword?: string;
   settings?: Settings;
 }
 

src/vueLib/tables/attendees/AttendeesTable.ts

@@ -38,7 +38,7 @@ export function useAttendeesTable() {
   const loading = ref(false);
 
   //updates Attendees list from database
-  async function updateAttendees() {
+  async function updateAttendees(eventArray: number) {
     loading.value = true;
 
     let events: Events | undefined;
@@ -60,11 +60,16 @@ export function useAttendeesTable() {
         loading.value = false;
       });
 
-    if (!events || events.length === 0 || !events[0]?.attendees || events[0].attendees === null) {
+    if (
+      !events ||
+      events.length === 0 ||
+      !events[eventArray]?.attendees ||
+      events[eventArray].attendees === null
+    ) {
       attendees.value = [];
       return;
     }
-    attendees.value = events[0].attendees ?? [];
+    attendees.value = events[eventArray].attendees ?? [];
   }
 
   return {

src/vueLib/tables/attendees/AttendeesTable.vue

@@ -1,102 +1,104 @@
 <template>
-  <div class="q-pa-md">
+  <q-table
-    <q-table
+    flat
-      flat
+    bordered
-      bordered
+    ref="tableRef"
-      ref="tableRef"
+    :title="$t('attendees')"
-      :title="$t('attendees')"
+    title-class="text-bold text-blue-9"
-      title-class="text-bold text-blue-9"
+    :no-data-label="$t('noDataAvailable')"
-      :no-data-label="$t('noDataAvailable')"
+    :loading-label="$t('loading')"
-      :loading-label="$t('loading')"
+    :rows-per-page-label="$t('recordsPerPage')"
-      :rows-per-page-label="$t('recordsPerPage')"
+    :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
+    :rows="attendees"
-      :rows="attendees"
+    :columns="columns"
-      :columns="columns"
+    row-key="id"
-      row-key="id"
+    v-model:pagination="pagination"
-      v-model:pagination="pagination"
+    :loading="loading"
-      :loading="loading"
+    :filter="filter"
-      :filter="filter"
+    :selection="selectOption ? 'multiple' : 'none'"
-      :selection="selectOption ? 'multiple' : 'none'"
+    v-model:selected="selected"
-      v-model:selected="selected"
+    binary-state-sort
-      binary-state-sort
+    dense
-      class="bigger-table-text"
+    class="bigger-table-text"
-    >
+  >
-      <template v-slot:top-left>
+    <!--top left of event table-->
-        <q-btn-group push flat style="color: grey">
+    <template v-slot:top-left>
-          <q-btn
+      <q-btn-group push flat style="color: grey">
-            v-if="user.isPermittedTo('events', 'write')"
+        <q-btn
-            dense
+          v-if="user.isPermittedTo('events', 'write')"
-            flat
+          dense
-            icon="person"
+          flat
-            @click="openAllValueDialog"
+          icon="person"
-            ><q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
+          @click="openAttendanceDialog"
-            <q-tooltip>{{ $t('addNewAttendees') }}</q-tooltip>
+          ><q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
-          </q-btn>
+          <q-tooltip>{{ $t('addNewAttendees') }}</q-tooltip>
-          <q-btn
+        </q-btn>
-            v-if="user.isPermittedTo('events', 'write')"
+        <q-btn
-            dense
+          v-if="user.isPermittedTo('events', 'write')"
-            flat
+          dense
-            style="color: grey"
+          flat
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+          style="color: grey"
-            @click="selectOption = !selectOption"
+          :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+          @click="selectOption = !selectOption"
+        >
+          <q-tooltip>{{ $t('selectAttendeesOptions') }}</q-tooltip>
+        </q-btn>
+      </q-btn-group>
+      <div v-if="selectOption && selected.length > 0">
+        <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+        <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+          <q-item
+            clickable
+            v-close-popup
+            @click="openRemoveDialog(...selected)"
+            class="text-negative"
+            >{{ $t('delete') }}</q-item
           >
-            <q-tooltip>{{ $t('selectAttendeesOptions') }}</q-tooltip>
+        </q-menu>
-          </q-btn>
+      </div>
-        </q-btn-group>
+      <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
-        <div v-if="selectOption && selected.length > 0">
+        {{ $t('selected') }}: {{ selected.length }}
-          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+      </div>
-          <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+    </template>
-            <q-item
+    <!--top right of event table-->
-              clickable
+    <template v-slot:top-right>
-              v-close-popup
+      <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
-              @click="openRemoveDialog(...selected)"
+        <template v-slot:append>
-              class="text-negative"
+          <q-icon name="search" />
-              >{{ $t('delete') }}</q-item
+        </template>
-            >
+      </q-input>
-          </q-menu>
+    </template>
-        </div>
+    <!--body of event table-->
-        <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
+    <template v-slot:body-cell="props">
-          {{ $t('selected') }}: {{ selected.length }}
+      <q-td v-if="props.col.field === 'attendees'" :props="props">
-        </div>
+        <q-btn v-if="props.value !== null && props.value.length > 0" dense flat icon="people"
-      </template>
+          ><q-badge color="primary" text-color="primary-text" floating transparent>{{
-      <template v-slot:top-right>
+            props.row.attendees.length
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+          }}</q-badge></q-btn
-          <template v-slot:append>
+        >
-            <q-icon name="search" />
+      </q-td>
-          </template>
+      <q-td v-else :props="props">
-        </q-input>
+        {{ props.value }}
-      </template>
+      </q-td>
-      <template v-slot:body-cell="props">
+    </template>
-        <q-td v-if="props.col.field === 'attendees'" :props="props">
+    <template v-slot:body-cell-option="props">
-          <q-btn v-if="props.value !== null && props.value.length > 0" dense flat icon="people"
+      <q-td :props="props">
-            ><q-badge color="primary" text-color="primary-text" floating transparent>{{
+        <q-btn
-              props.row.count
+          v-if="user.isPermittedTo('events', 'delete')"
-            }}</q-badge></q-btn
+          flat
-          >
+          dense
-        </q-td>
+          @click="openRemoveDialog(props.row)"
-        <q-td v-else :props="props">
+          color="negative"
-          {{ props.value }}
+          icon="delete"
-        </q-td>
+        />
-      </template>
+      </q-td>
-      <template v-slot:body-cell-option="props">
+    </template>
-        <q-td :props="props">
+  </q-table>
-          <q-btn
+  <DialogFrame ref="attendanceDialog" :header-title="$t('members')" :width="700" :height="500">
-            v-if="user.isPermittedTo('events', 'delete')"
-            flat
-            dense
-            @click="openRemoveDialog(props.row)"
-            color="negative"
-            icon="delete"
-          />
-        </q-td>
-      </template>
-    </q-table>
-  </div>
-  <DialogFrame ref="memberTableDialog" :header-title="$t('members')" :width="700" :height="500">
     <MembersTable
       add-attendees
       :compare-members="attendees"
-      v-on:update-event="updateTable"
+      v-on:update-event="(val) => updateTable(val)"
       :event-id="localEvent?.id ?? 0"
     />
   </DialogFrame>
@@ -115,6 +117,7 @@
 </template>
 
 <script setup lang="ts">
+//imports
 import { appApi } from 'src/boot/axios';
 import { onMounted, type PropType, ref } from 'vue';
 import type { Members } from 'src/vueLib/models/member';
@@ -127,21 +130,24 @@ import type { Event } from 'src/vueLib/models/event';
 import MembersTable from '../members/MembersTable.vue';
 import { i18n } from 'src/boot/lang';
 
-export interface AttendeesDialog {
+//use constants and function of imports
-  getSelected: () => Members;
+const { attendees, pagination, loading, columns, updateAttendees } = useAttendeesTable();
-}
 
+//define given properties
 const props = defineProps({
   event: {
     type: Object as PropType<Event>,
     required: true,
   },
+  eventArray: { type: Number, default: 0, required: true },
 });
 
+// define emits
 const emit = defineEmits(['update']);
 
+// definitions
 const { NotifyResponse } = useNotify();
-const memberTableDialog = ref();
+const attendanceDialog = ref();
 const okDialog = ref();
 const deleteText = ref('');
 const selectOption = ref(false);
@@ -151,16 +157,15 @@ const openSubmenu = ref(false);
 const filter = ref('');
 const user = useUserStore();
 
-const { attendees, pagination, loading, columns, updateAttendees } = useAttendeesTable();
+// load at page mount
-
 onMounted(() => {
   localEvent.value = props.event;
   attendees.value = props.event.attendees ?? [];
 });
 
-//opens dialog for one value
+//opens attendance dialog
-function openAllValueDialog() {
+function openAttendanceDialog() {
-  memberTableDialog.value?.open();
+  attendanceDialog.value?.open();
 }
 
 //opens remove dialog
@@ -174,10 +179,11 @@ function openRemoveDialog(...attendees: Members) {
   } else {
     deleteText.value = String(attendees.length) + ' ' + i18n.global.t('attendees');
   }
+
   okDialog.value?.open(attendees);
 }
 
-//remove Attendees from database
+//remove attendees from database
 async function removeAttendees(...removeAttendees: Members) {
   if (!localEvent.value) {
     NotifyResponse('event is empty', 'error');
@@ -200,27 +206,17 @@ async function removeAttendees(...removeAttendees: Members) {
     .finally(() => {
       loading.value = false;
     });
-  await updateAttendees();
+  await updateAttendees(props.eventArray);
-  emit('update');
+  emit('update', -removeAttendees.length);
 }
 
-async function updateTable() {
+async function updateTable(amount: number) {
-  await updateAttendees();
+  await updateAttendees(props.eventArray);
-  emit('update');
+  emit('update', amount);
 }
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
 .bigger-table-text .q-table__middle td {
   font-size: 14px;
 }

src/vueLib/tables/attendees/AttendeesTableDialog.vue

@@ -1,6 +1,13 @@
 <template>
-  <DialogFrame ref="dialog" :header-title="$t('attendees')" :width="700" :height="600">
+  <DialogFrame
+    ref="dialog"
+    :header-title="$t('attendees')"
+    :width="700"
+    :height="600"
+    :inner-padding="0"
+  >
     <q-card>
+      <!-- tabs declaration in header-->
       <q-tabs
         v-model="tab"
         dense
@@ -10,21 +17,37 @@
         align="justify"
         narrow-indicator
       >
-        <q-tab no-caps name="attendance" :label="$t('attendees')" />
+        <q-tab no-caps name="attendance" :label="$t('attendees')"
-        <q-tab no-caps name="noneAttendees" :label="$t('noneAttendees')" />
+          ><q-badge color="primary" text-color="primary-text" floating transparent>{{
+            attendees.length
+          }}</q-badge></q-tab
+        >
+
+        <q-tab no-caps name="noneAttendees" :label="$t('noneAttendees')"
+          ><q-badge color="primary" text-color="primary-text" floating transparent>{{
+            missingAttendanceAmount
+          }}</q-badge></q-tab
+        >
       </q-tabs>
 
       <q-separator />
 
+      <!--tab of attenting members-->
+
       <q-tab-panels v-model="tab" animated>
-        <q-tab-panel name="attendance">
+        <q-tab-panel name="attendance" style="padding: 0px">
-          <AttendeesTable :event="localEvent!" v-on:update="updateTable" />
+          <AttendeesTable
+            :event="localEvent!"
+            :event-array="eA"
+            v-on:update="(val) => updateTable(val)"
+          />
         </q-tab-panel>
-        <q-tab-panel name="noneAttendees">
+        <!--tab of missing attenting members-->
+        <q-tab-panel name="noneAttendees" style="padding: 0px">
           <MembersTable
             add-attendees
             :compare-members="attendees"
-            v-on:update-event="updateTable"
+            v-on:update-event="(val) => updateTable(val)"
             :event-id="localEvent?.id ?? 0"
           />
         </q-tab-panel>
@@ -34,28 +57,68 @@
 </template>
 
 <script setup lang="ts">
+// imports
 import AttendeesTable from './AttendeesTable.vue';
 import MembersTable from '../members/MembersTable.vue';
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import type { Event } from 'src/vueLib/models/event';
 import { ref } from 'vue';
 import { useAttendeesTable } from './AttendeesTable';
+import { useMemberTable } from '../members/MembersTable';
+import { getLocalPageDefaults } from 'src/localstorage/localStorage';
 
+//use constants and function of imports
+const { attendees, updateAttendees } = useAttendeesTable();
+const { setNewFilter, filteredMembers, updateMembers } = useMemberTable();
+
+// declare emits
 const emit = defineEmits(['update']);
 
+// declarations
 const dialog = ref();
 const localEvent = ref<Event>();
+const missingAttendanceAmount = ref(0);
+const attendanceAmount = ref(0);
+const eA = ref(0);
 const tab = ref('attendance');
-const { attendees, updateAttendees } = useAttendeesTable();
 
-const open = (event: Event) => {
+// opens attendace dialog of event
+const open = async (eventArray: number, event: Event) => {
+  // local declarations
   localEvent.value = event;
-  attendees.value = event.attendees ?? [];
+  attendanceAmount.value = event.attendees.length ?? [];
+  eA.value = eventArray;
+
+  // get attendance
+  await updateAttendees(eventArray);
+  //get missing attendance from memer updateTable
+  await updateMembers(event.attendees);
+
+  // set custom filter
+  const defaults = getLocalPageDefaults('attendance');
+  setNewFilter(defaults?.filteredColumn || '', ...(defaults?.filteredValue ?? []));
+
+  // set amount of missing attendace
+  missingAttendanceAmount.value = filteredMembers.value.length;
+
+  //open atttendance dialog
   dialog.value.open();
 };
 
-async function updateTable() {
+//updates amount of table display and both tables
-  await updateAttendees();
+async function updateTable(amount?: number) {
+  // check wether amount is given and if it adds or substracts amount
+  if (amount && amount < 0) {
+    missingAttendanceAmount.value -= amount;
+  } else if (amount) {
+    missingAttendanceAmount.value = amount;
+  }
+
+  // update attendace table
+  await updateAttendees(eA.value);
+  // update for amoutn display in tab
+  if (localEvent.value) localEvent.value.attendees = attendees.value;
+  //emit to update event table
   emit('update');
 }
 

src/vueLib/tables/components/ClickableComponent.vue

@@ -0,0 +1,31 @@
+<template>
+  <q-td
+    :props="props.tdProps"
+    v-bind="$attrs"
+    :class="props.inClass"
+    :style="props.permitted ? 'cursor: pointer' : ''"
+    @click="props.permitted && emit('onClick')"
+  >
+    {{ props.value ?? '' }}
+  </q-td>
+</template>
+
+<script setup lang="ts">
+import type { PropType } from 'vue';
+
+defineOptions({
+  inheritAttrs: false,
+});
+
+const emit = defineEmits(['onClick']);
+
+const props = defineProps({
+  tdProps: { type: Object },
+  inClass: String,
+  style: String,
+  permitted: { type: Boolean, default: false },
+  value: {
+    type: null as unknown as PropType<unknown>,
+  },
+});
+</script>

src/vueLib/tables/components/FilterSelect.vue

@@ -0,0 +1,49 @@
+<template>
+  <q-card flat class="q-pa-sm">
+    <q-select
+      :label="$t('filterByColumn')"
+      dense
+      v-model="columnFilter"
+      option-label="label"
+      option-value="name"
+      map-options
+      emit-value
+      clearable
+      :options="props.filterOptions"
+      v-on:clear="emit('clear')"
+      class="q-mt-xs"
+    />
+    <q-select
+      v-if="columnFilter"
+      :label="$t('filterByColumnValue')"
+      dense
+      v-model="columnOption"
+      :options="props.columnOptions"
+      class="q-mt-xs"
+      multiple
+      clearable
+    />
+  </q-card>
+</template>
+<script setup lang="ts">
+import { computed } from 'vue';
+
+const props = defineProps({
+  columnFilter: String,
+  columnOption: Array,
+  filterOptions: Array,
+  columnOptions: Array,
+});
+
+const emit = defineEmits(['update:columnFilter', 'update:columnOption', 'clear']);
+
+const columnFilter = computed({
+  get: () => props.columnFilter,
+  set: (v) => emit('update:columnFilter', v),
+});
+
+const columnOption = computed({
+  get: () => props.columnOption,
+  set: (v) => emit('update:columnOption', v),
+});
+</script>

src/vueLib/tables/components/IconComponent.vue

@@ -0,0 +1,18 @@
+<template>
+  <q-td :props="props.tdProps" :class="props.inClass">
+    <q-icon :name="props.name" :color="props.color" :size="props.size" />
+  </q-td>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  tdProps: { type: Object },
+  name: { type: String, required: true },
+  color: String,
+  inClass: String,
+  size: {
+    type: String,
+    validator: (v: string) => ['xs', 'sm', 'md', 'lg', 'xl'].includes(v),
+  },
+});
+</script>

src/vueLib/tables/components/MenuComponent.vue

@@ -0,0 +1,45 @@
+<template>
+  <q-td :props="props.tdProps">
+    <q-btn v-if="props.permitEdit || props.permitDelete" flat dense icon="more_vert">
+      <q-menu anchor="top right" self="top left">
+        <q-item
+          dense
+          v-if="props.permitEdit"
+          clickable
+          v-close-popup
+          @click="editFunction?.()"
+          class="text-primary"
+          >{{ $t('edit') }}</q-item
+        >
+        <q-item
+          v-if="props.permitDelete"
+          dense
+          clickable
+          v-close-popup
+          @click="removeFunction?.()"
+          class="text-negative"
+          title="zu"
+          >{{ $t('delete') }}</q-item
+        >
+      </q-menu>
+    </q-btn>
+  </q-td>
+</template>
+
+<script setup lang="ts">
+import { QTd } from 'quasar';
+
+const props = defineProps({
+  tdProps: { type: Object },
+  permitEdit: { type: Boolean, default: false },
+  permitDelete: { type: Boolean, default: false },
+  editFunction: {
+    type: Function,
+    required: false,
+  },
+  removeFunction: {
+    type: Function,
+    required: false,
+  },
+});
+</script>

src/vueLib/tables/components/SearchableInput.vue

@@ -0,0 +1,26 @@
+<template>
+  <q-td :props="props.tdProps"></q-td>
+  <q-input filled dense :debounce="debounce" v-model="model" :placeholder="placeholder">
+    <template #append>
+      <q-icon name="search" />
+    </template>
+  </q-input>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+
+const props = defineProps({
+  tdProps: { type: Object },
+  modelValue: String,
+  placeholder: { type: String, default: 'Search' },
+  debounce: { type: Number, default: 300 },
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const model = computed({
+  get: () => props.modelValue,
+  set: (v) => emit('update:modelValue', v),
+});
+</script>

src/vueLib/tables/components/SearchableSelect.vue

@@ -0,0 +1,53 @@
+<template>
+  <q-td :props="props.tdProps" :class="props.inClass">
+    <SearchableSelect
+      v-if="props.options && props.options.length > 0"
+      :dense="props.dense"
+      :readonly="props.readOnly"
+      :options="props.options"
+      :option-label="props.optionLabel"
+      :option-value="props.optionValue!"
+      :model-value="modelValueLocal"
+      @update:model-value="emitValue"
+    />
+  </q-td>
+</template>
+
+<script setup lang="ts" generic="T extends Record<string, string | number | object>">
+import { ref, type PropType, watch } from 'vue';
+import SearchableSelect from 'src/vueLib/general/SearchableSelect .vue';
+
+defineOptions({
+  inheritAttrs: false,
+});
+
+const props = defineProps({
+  tdProps: { type: Object },
+  dense: Boolean,
+  readOnly: Boolean,
+  inClass: String,
+  options: { type: Array as PropType<T[]> },
+  optionLabel: { type: [Function, String] as PropType<((opt: T) => string) | string> },
+  optionValue: { type: String },
+  modelValue: {
+    type: [String, Number, Object] as PropType<string | number | object | null>,
+    default: null,
+  },
+});
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string | number | object | null): void;
+}>();
+
+const modelValueLocal = ref(props.modelValue);
+
+watch(
+  () => props.modelValue,
+  (v) => (modelValueLocal.value = v),
+);
+
+function emitValue(val: string | number | object | null) {
+  modelValueLocal.value = val;
+  emit('update:modelValue', val);
+}
+</script>

src/vueLib/tables/components/TopButtonGroup.vue

@@ -0,0 +1,48 @@
+<template>
+  <q-btn-group push flat style="color: grey">
+    <q-btn v-if="props.permitAdd" dense flat icon="add" @click="emit('add')">
+      <q-tooltip v-if="props.toolTipAdd">{{ props.toolTipAdd }}</q-tooltip>
+    </q-btn>
+    <q-btn
+      v-if="props.permitSelect"
+      dense
+      flat
+      style="color: grey"
+      :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+      @click="selectOption = !selectOption"
+    >
+      <q-tooltip v-if="props.toolTipSelect">{{ props.toolTipSelect }}</q-tooltip>
+    </q-btn>
+    <q-btn v-if="props.permitImport" dense flat icon="upload" @click="emit('import')">
+      <q-tooltip v-if="props.toolTipImport">{{ props.toolTipImport }}</q-tooltip>
+    </q-btn>
+    <q-btn v-if="props.permitExport" dense flat icon="download" @click="emit('export')">
+      <q-tooltip v-if="props.toolTipExport">{{ props.toolTipExport }}</q-tooltip>
+    </q-btn>
+  </q-btn-group>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+
+const props = defineProps({
+  permitAdd: Boolean,
+  toolTipAdd: String,
+  toolTipSelect: String,
+  toolTipImport: String,
+  toolTipExport: String,
+  permitSelect: Boolean,
+  permitImport: Boolean,
+  permitExport: Boolean,
+  selectOption: Boolean,
+});
+
+const emit = defineEmits(['add', 'update:selectOption', 'import', 'export']);
+
+const selectOption = computed({
+  get: () => props.selectOption,
+  set: (v) => {
+    emit('update:selectOption', v);
+  },
+});
+</script>

src/vueLib/tables/events/EventsTable.ts

@@ -3,6 +3,8 @@ import { ref, computed } from 'vue';
 import type { Events } from 'src/vueLib/models/event';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'boot/lang';
+import MenuComponent from '../components/MenuComponent.vue';
+import ClickableComponent from '../components/ClickableComponent.vue';
 
 export function useEventTable() {
   const Events = ref<Events>([]);
@@ -21,6 +23,7 @@ export function useEventTable() {
       label: i18n.global.t('name'),
       field: 'name',
       sortable: true,
+      component: ClickableComponent,
     },
     {
       name: 'attendees',
@@ -29,14 +32,30 @@ export function useEventTable() {
       field: 'attendees',
       sortable: true,
     },
+    {
+      name: 'day',
+      align: 'left' as const,
+      label: i18n.global.t('day'),
+      field: 'day',
+      sortable: true,
+      component: ClickableComponent,
+    },
     {
       name: 'date',
       align: 'left' as const,
       label: i18n.global.t('dateAndTime'),
       field: 'date',
       sortable: true,
+      component: ClickableComponent,
+    },
+    {
+      name: 'option',
+      align: 'center' as const,
+      label: '',
+      field: 'option',
+      icon: 'option',
+      component: MenuComponent,
     },
-    { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
 
   const { NotifyResponse } = useNotify();

src/vueLib/tables/events/EventsTable.vue

@@ -19,30 +19,18 @@
       :selection="selectOption ? 'multiple' : 'none'"
       v-model:selected="selected"
       binary-state-sort
+      dense
       class="bigger-table-text"
     >
       <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
+        <TopButtonGroup
-          <q-btn
+          :permit-add="user.isPermittedTo('events', 'write')"
-            v-if="user.isPermittedTo('events', 'write')"
+          v-on:add="openAllValueDialog(null)"
-            dense
+          :tool-tip-add="$t('addNewEvent')"
-            flat
+          :permit-select="user.isPermittedTo('events', 'write')"
-            icon="add"
+          :tool-tip-select="$t('selectEventOptions')"
-            @click="openAllValueDialog(null)"
+          v-model:select-option="selectOption"
-          >
+        />
-            <q-tooltip>{{ $t('addNewEvent') }}</q-tooltip>
-          </q-btn>
-          <q-btn
-            v-if="user.isPermittedTo('events', 'write')"
-            dense
-            flat
-            style="color: grey"
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-            @click="selectOption = !selectOption"
-          >
-            <q-tooltip>{{ $t('selectEventOptions') }}</q-tooltip>
-          </q-btn>
-        </q-btn-group>
         <div v-if="selectOption && selected.length > 0">
           <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
           <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
@@ -59,67 +47,49 @@
           {{ $t('selected') }}: {{ selected.length }}
         </div>
       </template>
+
+      <!-- top right of table-->
+
       <template v-slot:top-right>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+        <SearchableInput v-model="filter" :placeholder="$t('search')" />
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
       </template>
+
+      <!-- table body content-->
+
       <template v-slot:body-cell="props">
         <q-td v-if="props.col.field === 'attendees'" :props="props">
-          <q-btn dense flat icon="people" @click="openAttendees(props.row)"
+          <q-btn dense flat icon="people" @click="openAttendees(props.rowIndex, props.row)"
             ><q-badge color="primary" text-color="primary-text" floating transparent>{{
-              props.row.count
+              props.row.attendees.length
             }}</q-badge></q-btn
           >
         </q-td>
-        <q-td
+        <component
           v-else
-          :props="props"
+          :td-props="props"
-          :style="
+          :is="props.col.component"
-            user.isPermittedTo('events', 'write') && props.col.field !== 'count'
+          :permitted="user.isPermittedTo('events', 'write') && props.col.field !== 'count'"
-              ? 'cursor: pointer'
+          v-on:onClick="openSingleValueDialog(props.col.label, props.col.name, props.row)"
-              : ''
+          :value="props.value"
-          "
+        />
-          @click="
+      </template>
-            user.isPermittedTo('events', 'write') &&
+      <template v-slot:body-cell-day="props">
-            props.col.field !== 'count' &&
+        <component
-            openSingleValueDialog(props.col.label, props.col.name, props.row)
+          :td-props="props"
-          "
+          :is="props.col.component"
-        >
+          :value="props.value ? $t(props.value) : ''"
-          {{ props.value }}
+        />
-        </q-td>
       </template>
       <template v-slot:body-cell-option="props">
-        <q-td :props="props">
+        <component
-          <q-btn
+          :is="props.col.component"
-            v-if="user.isPermittedTo('events', 'write') || user.isPermittedTo('events', 'delete')"
+          :td-props="props"
-            flat
+          :permitEdit="user.isPermittedTo('events', 'write')"
-            dense
+          :permitDelete="user.isPermittedTo('events', 'delete')"
-            icon="more_vert"
+          :editFunction="() => openAllValueDialog(props.row)"
-            @click="openSubmenu = true"
+          :removeFunction="() => openRemoveDialog(props.row)"
-          />
+        >
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
+        </component>
-            <q-item
-              v-if="user.isPermittedTo('events', 'write')"
-              clickable
-              v-close-popup
-              @click="openAllValueDialog(props.row)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
-            >
-            <q-item
-              v-if="user.isPermittedTo('events', 'delete')"
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
-              class="text-negative"
-              title="zu"
-              >{{ $t('delete') }}</q-item
-            >
-          </q-menu>
-        </q-td>
       </template>
     </q-table>
   </div>
@@ -158,6 +128,8 @@ import { useUserStore } from 'src/vueLib/login/userStore';
 import AttendeesTableDialog from '../attendees/AttendeesTableDialog.vue';
 import type { Members } from 'src/vueLib/models/member';
 import { i18n } from 'src/boot/lang';
+import SearchableInput from '../components/SearchableInput.vue';
+import TopButtonGroup from '../components/TopButtonGroup.vue';
 
 export interface EventDialog {
   getSelected: () => Events;
@@ -217,8 +189,8 @@ function openRemoveDialog(...Events: Events) {
   okDialog.value?.open(Events);
 }
 
-function openAttendees(attendees: Members | null) {
+function openAttendees(eventArray: number, attendees: Members | null) {
-  attendeesDialog.value.open(attendees);
+  attendeesDialog.value.open(eventArray, attendees);
 }
 
 //remove Event from database
@@ -243,20 +215,6 @@ function removeEvent(...removeEvents: Events) {
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
-.blink-yellow {
-  animation: blink-yellow 1.5s step-start 6 !important;
-}
-
 .bigger-table-text .q-table__middle td {
   font-size: 14px;
 }

src/vueLib/tables/group/GroupTable.ts

@@ -3,6 +3,8 @@ import { ref, computed } from 'vue';
 import type { Members } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'boot/lang';
+import ClickableComponent from '../components/ClickableComponent.vue';
+import MenuComponent from '../components/MenuComponent.vue';
 
 export function useGroupTable() {
   const groups = ref<Members>([]);
@@ -21,8 +23,16 @@ export function useGroupTable() {
       label: i18n.global.t('name'),
       field: 'name',
       sortable: true,
+      component: ClickableComponent,
+    },
+    {
+      name: 'option',
+      align: 'center' as const,
+      label: '',
+      field: 'option',
+      icon: 'option',
+      component: MenuComponent,
     },
-    { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
 
   const { NotifyResponse } = useNotify();

src/vueLib/tables/group/GroupTable.vue

@@ -19,30 +19,20 @@
       :selection="selectOption ? 'multiple' : 'none'"
       v-model:selected="selected"
       binary-state-sort
+      dense
       class="bigger-table-text"
     >
       <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
+        <TopButtonGroup
-          <q-btn
+          :permit-add="user.isPermittedTo('group', 'write')"
-            v-if="user.isPermittedTo('group', 'write')"
+          v-on:add="openGroupDialog"
-            dense
+          :tool-tip-add="$t('addNewgroup')"
-            flat
+          :permit-select="
-            icon="add"
+            user.isPermittedTo('group', 'write') || user.isPermittedTo('group', 'delete')
-            @click="openGroupDialog()"
+          "
-          >
+          v-model:select-option="selectOption"
-            <q-tooltip>{{ $t('addNewgroup') }}</q-tooltip>
+          :tool-tip-select="$t('selectgroupOptions')"
-          </q-btn>
+        />
-          <q-btn
-            v-if="user.isPermittedTo('group', 'write') || user.isPermittedTo('group', 'delete')"
-            dense
-            flat
-            style="color: grey"
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-            @click="selectOption = !selectOption"
-          >
-            <q-tooltip>{{ $t('selectgroupOptions') }}</q-tooltip>
-          </q-btn>
-        </q-btn-group>
         <div v-if="selectOption && selected.length > 0">
           <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
           <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
@@ -60,49 +50,35 @@
           {{ $t('selected') }}: {{ selected.length }}
         </div>
       </template>
+
+      <!-- top right of table-->
+
       <template v-slot:top-right>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+        <SearchableInput v-model="filter" :placeholder="$t('search')" />
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
       </template>
+
+      <!-- table body content-->
       <template v-slot:body-cell="props">
-        <q-td
+        <component
-          :props="props"
+          :is="props.col.component"
-          :style="user.isPermittedTo('group', 'write') ? 'cursor: pointer' : ''"
+          :td-props="props"
-          @click="
+          :permitted="user.isPermittedTo('group', 'write')"
-            user.isPermittedTo('group', 'write') && openGroupDialog(props.col.label, props.row)
+          v-on:onClick="openGroupDialog(props.col.label, props.row)"
-          "
+          :value="props.value"
-        >
+        />
-          {{ props.value }}
-        </q-td>
       </template>
       <template v-slot:body-cell-option="props">
-        <q-td :props="props">
+        <component
-          <q-btn
+          :td-props="props"
-            v-if="user.isPermittedTo('group', 'write') || user.isPermittedTo('group', 'delete')"
+          :is="props.col.component"
-            flat
+          :permitDelete="user.isPermittedTo('group', 'delete')"
-            dense
+          :removeFunction="() => openRemoveDialog(props.row)"
-            icon="more_vert"
+        >
-            @click="openSubmenu = true"
+        </component>
-          />
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
-            <q-item
-              v-if="user.isPermittedTo('group', 'delete')"
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
-              class="text-negative"
-              title="zu"
-              >{{ $t('delete') }}</q-item
-            >
-          </q-menu>
-        </q-td>
       </template>
     </q-table>
   </div>
-  <DialogFrame ref="groupDialog" :header-title="$t('addNewgroup')" :height="600" :width="500">
+  <DialogFrame ref="groupDialog" :header-title="$t('addNewgroup')" :height="250" :width="350">
     <q-form ref="form">
       <div class="row justify-center q-gutter-md">
         <q-input
@@ -144,10 +120,8 @@ import { databaseName } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { i18n } from 'src/boot/lang';
 import type { Group, Groups } from 'src/vueLib/models/group';
-
+import SearchableInput from '../components/SearchableInput.vue';
-export interface groupDialog {
+import TopButtonGroup from '../components/TopButtonGroup.vue';
-  getSelected: () => Groups;
-}
 
 const { NotifyResponse } = useNotify();
 const groupDialog = ref();
@@ -245,16 +219,6 @@ async function save() {
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
 .bigger-table-text .q-table__middle td {
   font-size: 14px;
 }

src/vueLib/tables/members/MembersTable.ts

@@ -6,6 +6,10 @@ import { i18n } from 'boot/lang';
 import { useResponsibleTable } from '../responsible/ResponsibleTable';
 import { appName } from 'src/vueLib/models/settings';
 import { useGroupTable } from '../group/GroupTable';
+import IconComponent from '../components/IconComponent.vue';
+import SearchableSelectComponent from '../components/SearchableSelect.vue';
+import ClickableComponent from '../components/ClickableComponent.vue';
+import MenuComponent from '../components/MenuComponent.vue';
 
 export function useMemberTable() {
   const allMembers = ref<Members>([]);
@@ -16,7 +20,7 @@ export function useMemberTable() {
       keys: string[];
     }[]
   >();
-  const { responsibles, updateResponsibles } = useResponsibleTable();
+  const { responsibles, responsibleMember, updateResponsibles } = useResponsibleTable();
   const { groups, updateGroups } = useGroupTable();
 
   const pagination = ref({
@@ -40,21 +44,30 @@ export function useMemberTable() {
     phone: true,
     email: true,
     group: true,
-    responsiblePerson: true,
+    responsible: true,
     firstVisit: true,
     lastVisit: true,
     option: true,
+    test: true,
   });
 
   const columns = computed(() =>
     [
-      { name: 'cake', align: 'center' as const, label: '', field: 'cake', icon: 'cake' },
+      {
+        name: 'cake',
+        align: 'center' as const,
+        label: '',
+        field: 'cake',
+        icon: 'cake',
+        component: IconComponent,
+      },
       {
         name: 'firstName',
         align: 'left' as const,
         label: i18n.global.t('prename'),
         field: 'firstName',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'lastName',
@@ -62,6 +75,7 @@ export function useMemberTable() {
         label: i18n.global.t('lastName'),
         field: 'lastName',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'birthday',
@@ -69,6 +83,7 @@ export function useMemberTable() {
         label: i18n.global.t('birthday'),
         field: 'birthday',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'age',
@@ -76,6 +91,7 @@ export function useMemberTable() {
         label: i18n.global.t('age'),
         field: 'age',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'comment',
@@ -83,6 +99,7 @@ export function useMemberTable() {
         label: i18n.global.t('comment'),
         field: 'comment',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'address',
@@ -90,6 +107,7 @@ export function useMemberTable() {
         label: i18n.global.t('address'),
         field: 'address',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'town',
@@ -97,6 +115,7 @@ export function useMemberTable() {
         label: i18n.global.t('town'),
         field: 'town',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'zip',
@@ -104,6 +123,7 @@ export function useMemberTable() {
         label: i18n.global.t('zipCode'),
         field: 'zip',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'phone',
@@ -111,6 +131,7 @@ export function useMemberTable() {
         label: i18n.global.t('phone'),
         field: 'phone',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'email',
@@ -118,6 +139,7 @@ export function useMemberTable() {
         label: i18n.global.t('email'),
         field: 'email',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'group',
@@ -125,13 +147,15 @@ export function useMemberTable() {
         label: i18n.global.t('group'),
         field: 'group',
         sortable: true,
+        component: SearchableSelectComponent,
       },
       {
-        name: 'responsiblePerson',
+        name: 'responsible',
         align: 'left' as const,
         label: i18n.global.t('responsible'),
-        field: 'responsiblePerson',
+        field: 'responsible',
         sortable: true,
+        component: SearchableSelectComponent,
       },
       {
         name: 'firstVisit',
@@ -139,6 +163,7 @@ export function useMemberTable() {
         label: i18n.global.t('firstVisit'),
         field: 'firstVisit',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'lastVisit',
@@ -146,8 +171,16 @@ export function useMemberTable() {
         label: i18n.global.t('lastVisit'),
         field: 'lastVisit',
         sortable: true,
+        component: ClickableComponent,
+      },
+      {
+        name: 'option',
+        align: 'center' as const,
+        label: '',
+        field: 'option',
+        icon: 'option',
+        component: MenuComponent,
       },
-      { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
     ].filter((c) => enabledColumns.value[c.name]),
   );
 
@@ -225,11 +258,13 @@ export function useMemberTable() {
           return;
         }
         allMembers.value.forEach((member) => {
-          if (!responsibles.value.some((r) => r.id === member.responsiblePerson?.id)) {
+          // remove responsible of member if it does not exist in responsible list any longer
-            delete member.responsiblePerson;
+          if (!responsibles.value.some((r) => r.id === member.responsible?.id)) {
+            delete member.responsible;
           }
 
-          if (member.birthday !== undefined) {
+          //calculte years if a birth date is entered
+          if (member.birthday) {
             member.age = String(calculateAge(member.birthday));
           }
         });
@@ -241,8 +276,9 @@ export function useMemberTable() {
       .finally(() => {
         loading.value = false;
         //filter same members out so list is shorter
+        filteredMembers.value = allMembers.value;
         if (filter) {
-          filteredMembers.value = allMembers.value.filter(
+          filteredMembers.value = filteredMembers.value.filter(
             (m1) =>
               !filter.some((m2) => {
                 if (filterbyName) {
@@ -256,7 +292,7 @@ export function useMemberTable() {
         //second filter
         const list = filterList.value ?? [];
         if (filterList.value && filterList.value.length > 0) {
-          filteredMembers.value = allMembers.value.filter((member) =>
+          filteredMembers.value = filteredMembers.value.filter((member) =>
             list.every((filterItem) => {
               const keys = filterItem.keys ?? [];
               if (keys.includes('null')) return true;
@@ -278,7 +314,6 @@ export function useMemberTable() {
           );
           return;
         }
-        filteredMembers.value = allMembers.value;
       });
   }
 
@@ -314,9 +349,14 @@ export function useMemberTable() {
       exportableColumns
         .map((col) => {
           const value = member[col.field];
-          // handle nested objects (e.g. responsiblePerson)
+          // handle nested objects (e.g. responsible)
           if (typeof value === 'object' && value !== null) {
-            if ('firstName' in value && 'lastName' in value)
+            if (
+              'firstName' in value &&
+              'lastName' in value &&
+              typeof value.firstName === 'string' &&
+              typeof value.lastName === 'string'
+            )
               return `"${value.firstName} ${value.lastName}"`;
             return `"${JSON.stringify(value)}"`;
           }
@@ -344,6 +384,7 @@ export function useMemberTable() {
     allMembers,
     filteredMembers,
     responsibles,
+    responsibleMember,
     groups,
     pagination,
     columns,

src/vueLib/tables/members/MembersTable.vue

@@ -1,224 +1,173 @@
 <template>
-  <div class="q-pa-md">
+  <q-table
-    <q-table
+    flat
-      flat
+    bordered
-      bordered
+    ref="tableRef"
-      ref="tableRef"
+    title="Members"
-      title="Members"
+    title-class="text-bold text-blue-9"
-      title-class="text-bold text-blue-9"
+    :no-data-label="$t('noDataAvailable')"
-      :no-data-label="$t('noDataAvailable')"
+    :loading-label="$t('loading')"
-      :loading-label="$t('loading')"
+    :rows-per-page-label="$t('recordsPerPage')"
-      :rows-per-page-label="$t('recordsPerPage')"
+    :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
+    :rows="filteredMembers"
-      :rows="filteredMembers"
+    :columns="columns"
-      :columns="columns"
+    row-key="id"
-      row-key="id"
+    v-model:pagination="pagination"
-      v-model:pagination="pagination"
+    :loading="loading"
-      :loading="loading"
+    :filter="filter"
-      :filter="filter"
+    :selection="selectOption ? 'multiple' : 'none'"
-      :selection="selectOption ? 'multiple' : 'none'"
+    v-model:selected="selected"
-      v-model:selected="selected"
+    binary-state-sort
-      binary-state-sort
+    dense
-      class="bigger-table-text"
+    class="bigger-table-text"
-    >
+  >
-      <template v-slot:top-left>
+    <!-- top left of table-->
-        <div>
+    <template v-slot:top-left>
-          <q-btn-group push flat style="color: grey">
+      <div>
-            <q-btn
+        <TopButtonGroup
-              v-if="user.isPermittedTo('members', 'write')"
+          :permit-add="user.isPermittedTo('members', 'write')"
-              dense
+          :tool-tip-add="$t('addNewMember')"
-              flat
+          :permit-select="
-              icon="add"
+            user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')
-              @click="openAllValueDialog(null)"
-            >
-              <q-tooltip>{{ $t('addNewMember') }}</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="
-                user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')
-              "
-              dense
-              flat
-              style="color: grey"
-              :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-              @click="selectOption = !selectOption"
-            >
-              <q-tooltip>{{ $t('selectMemberOptions') }}</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="user.isPermittedTo('members', 'import')"
-              dense
-              flat
-              icon="upload"
-              @click="openUploadDialog"
-            >
-              <q-tooltip>{{ $t('importCSV') }}</q-tooltip>
-            </q-btn>
-            <q-btn
-              v-if="user.isPermittedTo('members', 'export')"
-              dense
-              flat
-              icon="download"
-              @click="exportCsv"
-            >
-              <q-tooltip>{{ $t('exportCSV') }}</q-tooltip>
-            </q-btn>
-          </q-btn-group>
-          <div v-if="selectOption && selected.length > 0">
-            <q-btn
-              v-if="inProps.addAttendees || inProps.addResponsible"
-              dense
-              color="grey-7"
-              flat
-              icon="person"
-              @click="addMemberTo"
-            >
-              <q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
-            </q-btn>
-            <q-btn v-else flat dense icon="more_vert" @click="openSubmenu = true" />
-
-            <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
-              <q-item clickable v-close-popup @click="addToEvent" class="text-primary">{{
-                $t('addToEvent')
-              }}</q-item>
-              <q-item
-                v-if="user.isPermittedTo('members', 'delete')"
-                clickable
-                v-close-popup
-                @click="openRemoveDialog(...selected)"
-                class="text-negative"
-                >{{ $t('delete') }}</q-item
-              >
-            </q-menu>
-          </div>
-          <q-card flat class="q-pa-sm">
-            <q-select
-              :label="$t('filterByColumn')"
-              dense
-              v-model="selectedColumnFilter"
-              option-label="label"
-              option-value="name"
-              map-options
-              emit-value
-              clearable
-              :options="columns.filter((col) => col.label !== '')"
-              v-on:clear="selectedColumnOptions = []"
-              @update:model-value="
-                filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
-              "
-              class="q-mt-xs"
-            />
-            <q-select
-              v-if="selectedColumnFilter"
-              :label="$t('filterByColumnValue')"
-              dense
-              v-model="selectedColumnOptions"
-              :options="setColumnOptions(selectedColumnFilter)"
-              class="q-mt-xs"
-              multiple
-              clearable
-              @update:model-value="
-                filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
-              "
-            />
-          </q-card>
-        </div>
-        <div v-if="selectOption && selected.length > 0" class="text-weight-bold">
-          {{ $t('selected') }}: {{ selected.length }}
-        </div>
-      </template>
-      <template v-slot:top-right>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <template v-slot:body-cell="props">
-        <q-td
-          :props="props"
-          :class="getRowClass(props.row)"
-          :style="user.isPermittedTo('members', 'write') ? 'cursor: pointer' : ''"
-          @click="
-            user.isPermittedTo('members', 'write') &&
-            openSingleValueDialog(props.col.label, props.col.name, props.row)
           "
-        >
+          :tool-tip-select="$t('selectMemberOptions')"
-          {{ props.value }}
+          :permit-import="user.isPermittedTo('members', 'import')"
-        </q-td>
+          :permit-export="user.isPermittedTo('members', 'export')"
-      </template>
+          v-model:select-option="selectOption"
-      <template v-slot:body-cell-cake="props">
+          v-on:add="openAllValueDialog(null)"
-        <q-td :props="props" :class="getRowClass(props.row)">
+          v-on:import="openUploadDialog"
-          <q-icon
+          :tool-tip-import="$t('importCSV')"
-            :name="isXDaysBeforeAnnualDate(props.row.birthday, 1) ? 'cake' : ''"
+          v-on:export="exportCsv"
-            :color="'red'"
+          :tool-tip-export="$t('exportCSV')"
-            size="md"
+        />
-          />
+        <div v-if="selectOption && selected.length > 0">
-        </q-td>
-      </template>
-      <template v-slot:body-cell-group="props">
-        <q-td :props="props">
-          <q-select
-            v-if="groups.length > 0"
-            :readonly="!user.isPermittedTo('members', 'write')"
-            :options="groups"
-            emit-value
-            map-options
-            option-value="name"
-            option-label="name"
-            v-model="props.row.group"
-            @update:model-value="updateMember(props.row)"
-          ></q-select>
-        </q-td>
-      </template>
-      <template v-slot:body-cell-responsiblePerson="props">
-        <q-td :props="props">
-          <q-select
-            v-if="responsibles.length > 0"
-            :readonly="!user.isPermittedTo('members', 'write')"
-            :options="responsibles"
-            :option-label="(opt) => opt.firstName + ' ' + opt.lastName"
-            v-model="props.row.responsiblePerson"
-            @update:model-value="updateMember(props.row)"
-          ></q-select>
-        </q-td>
-      </template>
-      <template v-slot:body-cell-option="props">
-        <q-td :props="props">
           <q-btn
-            v-if="user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')"
+            v-if="inProps.addAttendees || inProps.addResponsible"
-            flat
             dense
-            icon="more_vert"
+            color="grey-7"
-            @click="openSubmenu = true"
+            flat
-          />
+            icon="person"
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
+            @click="addMemberTo"
+          >
+            <q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
+            <q-tooltip>{{
+              inProps.addAttendees ? $t('addToEvent') : $t('addNewResponsible')
+            }}</q-tooltip>
+          </q-btn>
+          <q-btn v-else flat dense icon="more_vert" @click="openSubmenu = true" />
+
+          <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+            <q-item clickable v-close-popup @click="addToEvent" class="text-primary">{{
+              $t('addToEvent')
+            }}</q-item>
             <q-item
-              v-if="user.isPermittedTo('members', 'write')"
+              v-if="user.isPermittedTo('members', 'delete')"
               clickable
               v-close-popup
-              @click="openAllValueDialog(props.row)"
+              @click="openRemoveDialog(...selected)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
-            >
-            <q-item
-              v-if="
-                user.isPermittedTo('members', 'delete') &&
-                !inProps.addAttendees &&
-                !inProps.addResponsible
-              "
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
               class="text-negative"
-              title="zu"
               >{{ $t('delete') }}</q-item
             >
           </q-menu>
-        </q-td>
+        </div>
-      </template>
+        <FilterSelect
-    </q-table>
+          :filter-options="columns.filter((col) => col.label !== '')"
-  </div>
+          :column-options="setColumnOptions(selectedColumnFilter)"
+          v-on:clear="selectedColumnOptions = []"
+          v-model:column-filter="selectedColumnFilter"
+          v-model:column-option="selectedColumnOptions"
+          @update:column-filter="
+            filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
+          "
+          @update:column-option="
+            filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
+          "
+        />
+      </div>
+      <div v-if="selectOption && selected.length > 0" class="text-weight-bold">
+        {{ $t('selected') }}: {{ selected.length }}
+      </div>
+    </template>
+
+    <!-- top right of table-->
+    <template v-slot:top-right>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
+    </template>
+
+    <!-- table body content-->
+
+    <!-- usual cell content -->
+    <template v-slot:body-cell="props">
+      <component
+        :is="props.col.component"
+        :td-props="props"
+        :inClass="getRowClass(props.row)"
+        :permitted="user.isPermittedTo('members', 'write')"
+        :value="props.value"
+        v-on:onClick="openSingleValueDialog(props.col, props.row)"
+      />
+    </template>
+
+    <!-- birthday icon -->
+    <template v-slot:body-cell-cake="props">
+      <component
+        :td-props="props"
+        :is="props.col.component"
+        :inClass="getRowClass(props.row)"
+        size="md"
+        :name="isXDaysBeforeAnnualDate(props.row.birthday, 1) ? 'cake' : ''"
+        color="red"
+      >
+      </component>
+    </template>
+
+    <!-- group select -->
+    <template v-slot:body-cell-group="props" v-if="groups.length > 0">
+      <component
+        :td-props="props"
+        :is="props.col.component"
+        dense
+        :readonly="!user.isPermittedTo('members', 'write')"
+        :options="groups"
+        emit-value
+        option-label="name"
+        option-value=""
+        v-model="props.row.group"
+        @update:model-value="updateMember(props.row)"
+      >
+      </component>
+    </template>
+
+    <!-- responsible person select -->
+    <template v-slot:body-cell-responsible="props" v-if="responsibles.length > 0">
+      <component
+        :td-props="props"
+        :is="props.col.component"
+        :read-only="!user.isPermittedTo('members', 'write')"
+        :options="responsibles"
+        :option-label="
+          (opt: Responsible) => (opt.member ? opt.member.firstName + ' ' + opt.member.lastName : '')
+        "
+        option-value="memberId"
+        v-model="props.row.responsible"
+        @update:model-value="updateMember(props.row)"
+      >
+      </component>
+    </template>
+
+    <!-- option menu -->
+    <template v-slot:body-cell-option="props">
+      <component
+        :td-props="props"
+        :is="props.col.component"
+        :permitEdit="user.isPermittedTo('members', 'write')"
+        :permitDelete="user.isPermittedTo('members', 'delete')"
+        :editFunction="() => openAllValueDialog(props.row)"
+        :removeFunction="() => openRemoveDialog(props.row)"
+      >
+      </component>
+    </template>
+  </q-table>
   <EditOneDialog
     ref="editOneDialog"
     endpoint="members/edit"
@@ -228,6 +177,7 @@
   <EditAllDialog
     ref="editAllDialog"
     :responsibles="responsibles"
+    :group="groups"
     v-on:update="updateMember"
   ></EditAllDialog>
   <OkDialog
@@ -245,7 +195,7 @@
   <AddToEvent
     ref="addToEventDialog"
     endpoint="events/add/attendees"
-    v-on:update-event="(val) => updateMemberLastVisit(val)"
+    @update-event="updateMemberLastVisit"
   />
 </template>
 
@@ -264,6 +214,11 @@ import { databaseName } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { i18n } from 'src/boot/lang';
 import { getLocalPageDefaults, setLocalPageDefaults } from 'src/localstorage/localStorage';
+import type { Responsible } from 'src/vueLib/models/responsible';
+import type { QTableColumn } from 'quasar';
+import SearchableInput from '../components/SearchableInput.vue';
+import FilterSelect from '../components/FilterSelect.vue';
+import TopButtonGroup from '../components/TopButtonGroup.vue';
 
 const inProps = defineProps({
   addAttendees: { type: Boolean },
@@ -324,7 +279,7 @@ onMounted(() => {
       'email',
       'address',
       'phone',
-      'responsiblePerson',
+      'responsible',
       'firstVisit',
       'lastVisit',
     );
@@ -338,13 +293,13 @@ onMounted(() => {
   selectedColumnFilter.value = defaults?.filteredColumn || '';
   selectedColumnOptions.value = defaults?.filteredValue ?? [];
 
+  // set custom filter
   setNewFilter(selectedColumnFilter.value, ...selectedColumnOptions.value);
+
   appApi
     .post('database/open', { dbPath: databaseName.value, create: true })
     .then(() => {
-      updateMembers(inProps.compareMembers, inProps.addResponsible).catch((err) =>
+      updateTable().catch((err) => NotifyResponse(err, 'error'));
-        NotifyResponse(err, 'error'),
-      );
     })
     .catch((err) => NotifyResponse(err, 'error'))
 
@@ -353,9 +308,17 @@ onMounted(() => {
     });
 });
 
+async function updateTable() {
+  localCompareMembers.value = inProps.compareMembers;
+  await updateMembers(localCompareMembers.value, inProps.addResponsible).catch((err) =>
+    NotifyResponse(err, 'error'),
+  );
+}
+
 // opens dialog for all member values
-function openSingleValueDialog(label: string, field: string, member: Member) {
+function openSingleValueDialog(col: QTableColumn, row: Member) {
-  editOneDialog.value?.open(label, field, member);
+  if (!col || !row) return () => {};
+  editOneDialog.value?.open(col.label, col.field, row);
 }
 
 //opens dialog for one value
@@ -404,7 +367,7 @@ function setColumnOptions(columnName: string) {
 async function filterMembers(field: string, ...keys: string[]) {
   setNewFilter(field, ...keys);
   setLocalPageDefaults(page.value, field, keys);
-  await updateMembers();
+  await updateTable();
 }
 
 //remove member from database
@@ -418,7 +381,7 @@ function removeMember(...removeMembers: Members) {
   appApi
     .post('members/delete', { ids: memberIds })
     .then(() => {
-      updateMembers().catch((err) => NotifyResponse(err, 'error'));
+      updateTable().catch((err) => NotifyResponse(err, 'error'));
       selected.value = [];
     })
     .catch((err) => NotifyResponse(err, 'error'))
@@ -431,9 +394,11 @@ function updateMember(member: Member | null) {
   if (!member) NotifyResponse(i18n.global.t('memberUpdated'));
   appApi
     .post('/members/edit', [member])
-    .then(() => NotifyResponse(i18n.global.t('memberUpdated')))
+    .then(() => {
+      NotifyResponse(i18n.global.t('memberUpdated'));
+    })
     .catch((err) => NotifyResponse(err, 'error'));
-  updateMembers().catch((err) => NotifyResponse(err, 'error'));
+  updateTable().catch((err) => NotifyResponse(err, 'error'));
 }
 
 function addToEvent() {
@@ -455,7 +420,13 @@ async function addMemberTo() {
     notificationPlural = 'attendeesAdded';
   } else if (inProps.addResponsible) {
     query = 'responsible/add';
+
+    selected.value.forEach((s) => {
+      s.memberId = s.id;
+      s.id = 0;
+    });
     payload = selected.value;
+
     notificationSingular = 'responsibleAdded';
     notificationPlural = 'responsiblesAdded';
   }
@@ -475,8 +446,10 @@ async function addMemberTo() {
 
   if (inProps.addAttendees) {
     await updateMemberLastVisit(selected.value);
+  } else {
+    await updateTable();
+    emit('update-event', filteredMembers.value.length);
   }
-  emit('update-event');
 }
 
 async function updateMemberLastVisit(members: Members) {
@@ -504,11 +477,13 @@ async function updateMemberLastVisit(members: Members) {
       }
     })
     .catch((err) => NotifyResponse(err, 'error'));
-  await updateMembers(localCompareMembers.value, inProps.addResponsible)
+  localCompareMembers.value?.push(...members);
-    .then(() => localCompareMembers.value?.push(...members))
+  await updateTable().catch((err) => NotifyResponse(err, 'error'));
-    .catch((err) => NotifyResponse(err, 'error'));
+
-  emit('update-event');
+  emit('update-event', filteredMembers.value.length);
 }
+
+defineExpose({ allMembers, filteredMembers });
 </script>
 
 <style>

src/vueLib/tables/responsible/ResponsibleTable.ts

@@ -3,9 +3,13 @@ import { ref, computed } from 'vue';
 import type { Members } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'boot/lang';
+import type { Responsibles } from 'src/vueLib/models/responsible';
+import MenuComponent from '../components/MenuComponent.vue';
+import ClickableComponent from '../components/ClickableComponent.vue';
 
 export function useResponsibleTable() {
-  const responsibles = ref<Members>([]);
+  const responsibleMember = ref<Members>([]);
+  const responsibles = ref<Responsibles>([]);
 
   const pagination = ref({
     sortBy: 'firstName',
@@ -21,6 +25,7 @@ export function useResponsibleTable() {
       label: i18n.global.t('prename'),
       field: 'firstName',
       sortable: true,
+      component: ClickableComponent,
     },
     {
       name: 'lastName',
@@ -28,8 +33,16 @@ export function useResponsibleTable() {
       label: i18n.global.t('lastName'),
       field: 'lastName',
       sortable: true,
+      component: ClickableComponent,
+    },
+    {
+      name: 'option',
+      align: 'center' as const,
+      label: '',
+      field: 'option',
+      icon: 'option',
+      component: MenuComponent,
     },
-    { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
 
   const { NotifyResponse } = useNotify();
@@ -43,11 +56,17 @@ export function useResponsibleTable() {
     await appApi
       .get('responsible')
       .then((resp) => {
+        responsibleMember.value = [];
         if (resp.data === null) {
-          responsibles.value = [];
           return;
         }
-        responsibles.value = resp.data as Members;
+
+        responsibles.value = resp.data as Responsibles;
+        responsibles.value.forEach((d) => {
+          d.member.memberId = d.memberId;
+          d.member.id = d.id;
+          responsibleMember.value.push(d.member);
+        });
       })
 
       .catch((err) => {
@@ -60,6 +79,7 @@ export function useResponsibleTable() {
 
   return {
     responsibles,
+    responsibleMember,
     pagination,
     columns,
     loading,

src/vueLib/tables/responsible/ResponsibleTable.vue

@@ -10,7 +10,7 @@
       :loading-label="$t('loading')"
       :rows-per-page-label="$t('recordsPerPage')"
       :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :rows="responsibles"
+      :rows="responsibleMember"
       :columns="columns"
       row-key="id"
       v-model:pagination="pagination"
@@ -19,33 +19,21 @@
       :selection="selectOption ? 'multiple' : 'none'"
       v-model:selected="selected"
       binary-state-sort
+      dense
       class="bigger-table-text"
     >
       <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
+        <TopButtonGroup
-          <q-btn
+          :permit-add="user.isPermittedTo('responsible', 'write')"
-            v-if="user.isPermittedTo('responsible', 'write')"
+          v-on:add="openResponsibleDialog"
-            dense
+          :tool-tip-add="$t('addNewResponsible')"
-            flat
+          :permit-select="
-            icon="add"
+            user.isPermittedTo('responsible', 'write') ||
-            @click="openResponsibleDialog"
+            user.isPermittedTo('responsible', 'delete')
-          >
+          "
-            <q-tooltip>{{ $t('addNewResponsible') }}</q-tooltip>
+          v-model:select-option="selectOption"
-          </q-btn>
+          :tool-tip-select="$t('selectResponsibleOptions')"
-          <q-btn
+        />
-            v-if="
-              user.isPermittedTo('responsible', 'write') ||
-              user.isPermittedTo('responsible', 'delete')
-            "
-            dense
-            flat
-            style="color: grey"
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-            @click="selectOption = !selectOption"
-          >
-            <q-tooltip>{{ $t('selectResponsibleOptions') }}</q-tooltip>
-          </q-btn>
-        </q-btn-group>
         <div v-if="selectOption && selected.length > 0">
           <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
           <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
@@ -63,42 +51,26 @@
           {{ $t('selected') }}: {{ selected.length }}
         </div>
       </template>
+
+      <!-- top right of table-->
+
       <template v-slot:top-right>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+        <SearchableInput v-model="filter" :placeholder="$t('search')" />
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
       </template>
+
+      <!-- table body content-->
       <template v-slot:body-cell="props">
-        <q-td :props="props">
+        <component :td-props="props" :is="props.col.component" :value="props.value" />
-          {{ props.value }}
-        </q-td>
       </template>
+
       <template v-slot:body-cell-option="props">
-        <q-td :props="props">
+        <component
-          <q-btn
+          :is="props.col.component"
-            v-if="
+          :td-props="props"
-              user.isPermittedTo('responsible', 'write') ||
+          :permitDelete="user.isPermittedTo('responsible', 'delete')"
-              user.isPermittedTo('responsible', 'delete')
+          :removeFunction="() => openRemoveDialog(props.row)"
-            "
+        >
-            flat
+        </component>
-            dense
-            icon="more_vert"
-            @click="openSubmenu = true"
-          />
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
-            <q-item
-              v-if="user.isPermittedTo('responsible', 'delete')"
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
-              class="text-negative"
-              title="zu"
-              >{{ $t('delete') }}</q-item
-            >
-          </q-menu>
-        </q-td>
       </template>
     </q-table>
   </div>
@@ -110,7 +82,7 @@
   >
     <MembersTable
       add-responsible
-      :compare-members="responsibles"
+      :compare-members="responsibleMember"
       v-on:update-event="updateResponsibles"
     />
   </DialogFrame>
@@ -132,17 +104,16 @@ import { appApi } from 'src/boot/axios';
 import { ref, onMounted } from 'vue';
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import MembersTable from '../members/MembersTable.vue';
-import type { Member, Members } from 'src/vueLib/models/member';
+import type { Members } from 'src/vueLib/models/member';
 import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { useResponsibleTable } from './ResponsibleTable';
 import { databaseName } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { i18n } from 'src/boot/lang';
-
+import type { Responsible, Responsibles } from 'src/vueLib/models/responsible';
-export interface ResponsibleDialog {
+import SearchableInput from '../components/SearchableInput.vue';
-  getSelected: () => Members;
+import TopButtonGroup from '../components/TopButtonGroup.vue';
-}
 
 const { NotifyResponse } = useNotify();
 const responsibleDialog = ref();
@@ -154,7 +125,8 @@ const openSubmenu = ref(false);
 const filter = ref('');
 const user = useUserStore();
 
-const { responsibles, pagination, loading, columns, updateResponsibles } = useResponsibleTable();
+const { responsibleMember, pagination, loading, columns, updateResponsibles } =
+  useResponsibleTable();
 
 //load on mounting page
 onMounted(() => {
@@ -197,14 +169,14 @@ function openRemoveDialog(...Responsibles: Members) {
 }
 
 //remove Responsible from database
-function removeResponsible(...removeResponsibles: Members) {
+async function removeResponsible(...removeResponsibles: Responsibles) {
   const ResponsibleIds: number[] = [];
 
-  removeResponsibles.forEach((Responsible: Member) => {
+  removeResponsibles.forEach((Responsible: Responsible) => {
-    ResponsibleIds.push(Responsible.id);
+    if (Responsible.id) ResponsibleIds.push(Responsible.id);
   });
 
-  appApi
+  await appApi
     .post('responsible/delete', { ids: ResponsibleIds })
     .then(() => {
       updateResponsibles().catch((err) => {
@@ -216,20 +188,11 @@ function removeResponsible(...removeResponsibles: Members) {
     .finally(() => {
       loading.value = false;
     });
+  await updateResponsibles();
 }
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
 .bigger-table-text .q-table__middle td {
   font-size: 14px;
 }

src/vueLib/tables/roles/RoleTable.vue

@@ -1,127 +1,128 @@
 <template>
-  <div class="q-pa-md">
+  <q-table
-    <q-table
+    flat
-      flat
+    bordered
-      bordered
+    ref="tableRef"
-      ref="tableRef"
+    title="Roles"
-      title="Roles"
+    title-class="text-bold text-blue-9"
-      title-class="text-bold text-blue-9"
+    :no-data-label="$t('noDataAvailable')"
-      :no-data-label="$t('noDataAvailable')"
+    :loading-label="$t('loading')"
-      :loading-label="$t('loading')"
+    :rows-per-page-label="$t('recordsPerPage')"
-      :rows-per-page-label="$t('recordsPerPage')"
+    :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
+    :rows="roles"
-      :rows="roles"
+    :columns="columns"
-      :columns="columns"
+    row-key="id"
-      row-key="id"
+    v-model:pagination="pagination"
-      v-model:pagination="pagination"
+    :loading="loading"
-      :loading="loading"
+    :filter="filter"
-      :filter="filter"
+    :selection="selectOption ? 'multiple' : 'none'"
-      :selection="selectOption ? 'multiple' : 'none'"
+    v-model:selected="selected"
-      v-model:selected="selected"
+    binary-state-sort
-      binary-state-sort
+    dense
-      class="bigger-table-text"
+    class="bigger-table-text"
-    >
+  >
-      <template v-slot:top-left>
+    <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
+      <q-btn-group push flat style="color: grey">
-          <q-btn
+        <q-btn
-            v-if="user.isPermittedTo('userSettings', 'write')"
+          v-if="user.isPermittedTo('userSettings', 'write')"
-            dense
+          dense
-            flat
+          flat
-            icon="add"
+          icon="add"
-            @click="openAllValueDialog(null)"
+          @click="openAllValueDialog(null)"
+        >
+          <q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
+        </q-btn>
+        <q-btn
+          v-if="user.isPermittedTo('userSettings', 'write')"
+          dense
+          flat
+          style="color: grey"
+          :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+          @click="selectOption = !selectOption"
+        >
+          <q-tooltip>{{ $t('selectRoleOptions') }}</q-tooltip>
+        </q-btn>
+      </q-btn-group>
+      <div v-if="selectOption && selected.length > 0">
+        <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+        <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+          <q-item
+            clickable
+            v-close-popup
+            @click="openRemoveDialog(...selected)"
+            class="text-negative"
+            >{{ $t('delete') }}</q-item
           >
-            <q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
+        </q-menu>
-          </q-btn>
+      </div>
-          <q-btn
+      <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
-            v-if="user.isPermittedTo('userSettings', 'write')"
+        {{ $t('selected') }}: {{ selected.length }}
-            dense
+      </div>
-            flat
+    </template>
-            style="color: grey"
+
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
+    <!-- top right of table-->
-            @click="selectOption = !selectOption"
+
-          >
+    <template v-slot:top-right>
-            <q-tooltip>{{ $t('selectRoleOptions') }}</q-tooltip>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
-          </q-btn>
+    </template>
-        </q-btn-group>
+
-        <div v-if="selectOption && selected.length > 0">
+    <!-- table body content-->
-          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
+
-          <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
+    <template v-slot:body-cell="props">
-            <q-item
+      <q-td
-              clickable
+        :props="props"
-              v-close-popup
+        :disable="!autorized(props.row)"
-              @click="openRemoveDialog(...selected)"
+        :style="
-              class="text-negative"
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              >{{ $t('delete') }}</q-item
+            ? 'cursor: pointer'
-            >
+            : ''
-          </q-menu>
+        "
-        </div>
+        @click="
-        <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-          {{ $t('selected') }}: {{ selected.length }}
+            ? openSingleValueDialog(props.col.label, props.col.name, props.row)
-        </div>
+            : ''
-      </template>
+        "
-      <template v-slot:top-right>
+      >
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
+        {{ props.value }}
-          <template v-slot:append>
+      </q-td>
-            <q-icon name="search" />
+    </template>
-          </template>
+    <template v-slot:body-cell-permissions="props">
-        </q-input>
+      <q-td :props="props">
-      </template>
+        <q-btn
-      <template v-slot:body-cell="props">
+          :disable="!autorized(props.row) || !user.isPermittedTo('userSettings', 'write')"
-        <q-td
+          flat
-          :props="props"
+          dense
-          :disable="!autorized(props.row)"
+          icon="rule"
-          :style="
+          :color="
             autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              ? 'cursor: pointer'
+              ? 'secondary'
-              : ''
+              : 'grey'
           "
           @click="
-            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+            user.isPermittedTo('userSettings', 'write') &&
-              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+            openAllValueDialog(props.row, 'permissions')
-              : ''
           "
         >
-          {{ props.value }}
+          <q-tooltip> {{ $t('permissions') }} </q-tooltip>
-        </q-td>
+        </q-btn>
-      </template>
+      </q-td>
-      <template v-slot:body-cell-permissions="props">
+    </template>
-        <q-td :props="props">
+    <template v-slot:body-cell-option="props">
-          <q-btn
+      <q-td :props="props">
-            :disable="!autorized(props.row) || !user.isPermittedTo('userSettings', 'write')"
+        <q-btn
-            flat
+          v-if="user.isPermittedTo('userSettings', 'delete')"
-            dense
+          :disable="!autorized(props.row)"
-            icon="rule"
+          flat
-            :color="
+          dense
-              autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+          icon="delete"
-                ? 'secondary'
+          color="negative"
-                : 'grey'
+          @click="openRemoveDialog(props.row)"
-            "
+        >
-            @click="
+          <q-tooltip> {{ $t('delete') }} </q-tooltip>
-              user.isPermittedTo('userSettings', 'write') &&
+        </q-btn>
-              openAllValueDialog(props.row, 'permissions')
+      </q-td>
-            "
+    </template>
-          >
+  </q-table>
-            <q-tooltip> {{ $t('permissions') }} </q-tooltip>
-          </q-btn>
-        </q-td>
-      </template>
-      <template v-slot:body-cell-option="props">
-        <q-td :props="props">
-          <q-btn
-            v-if="user.isPermittedTo('userSettings', 'delete')"
-            :disable="!autorized(props.row)"
-            flat
-            dense
-            icon="delete"
-            color="negative"
-            @click="openRemoveDialog(props.row)"
-          >
-            <q-tooltip> {{ $t('delete') }} </q-tooltip>
-          </q-btn>
-        </q-td>
-      </template>
-    </q-table>
-  </div>
   <EditOneDialog
     ref="editOneDialog"
     endpoint="roles/update"
@@ -154,6 +155,7 @@ import { useRoleTable } from './RoleTable';
 import { i18n } from 'src/boot/lang';
 import { QTable } from 'quasar';
 import { useUserStore } from 'src/vueLib/login/userStore';
+import SearchableInput from '../components/SearchableInput.vue';
 
 const { NotifyResponse } = useNotify();
 const editOneDialog = ref();
@@ -232,16 +234,6 @@ function removeRole(...removeRoles: Roles) {
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
 .blink-yellow {
   animation: blink-yellow 1.5s step-start 6 !important;
 }

src/vueLib/tables/users/UserTable.ts

@@ -29,6 +29,12 @@ export function useUserTable() {
       field: 'email',
       sortable: true,
     },
+    {
+      name: 'newPassword',
+      align: 'left' as const,
+      label: '',
+      field: 'newPassword',
+    },
     {
       name: 'role',
       align: 'left' as const,

src/vueLib/tables/users/UserTable.vue

@@ -1,133 +1,148 @@
 <template>
-  <div class="q-pa-md">
+  <q-table
-    <q-table
+    flat
-      flat
+    bordered
-      bordered
+    ref="tableRef"
-      ref="tableRef"
+    title="Users"
-      title="Users"
+    title-class="text-bold text-blue-9"
-      title-class="text-bold text-blue-9"
+    :no-data-label="$t('noDataAvailable')"
-      :no-data-label="$t('noDataAvailable')"
+    :loading-label="$t('loading')"
-      :loading-label="$t('loading')"
+    :rows-per-page-label="$t('recordsPerPage')"
-      :rows-per-page-label="$t('recordsPerPage')"
+    :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
+    :rows="users"
-      :rows="users"
+    :columns="columns"
-      :columns="columns"
+    row-key="id"
-      row-key="id"
+    v-model:pagination="pagination"
-      v-model:pagination="pagination"
+    :loading="loading"
-      :loading="loading"
+    :filter="filter"
-      :filter="filter"
+    :selection="selectOption ? 'multiple' : 'none'"
-      :selection="selectOption ? 'multiple' : 'none'"
+    v-model:selected="selected"
-      v-model:selected="selected"
+    binary-state-sort
-      binary-state-sort
+    dense
-      class="bigger-table-text"
+    class="bigger-table-text"
-    >
+  >
-      <template v-slot:top-left>
+    <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
+      <q-btn-group push flat style="color: grey">
-          <q-btn
+        <q-btn
-            v-if="user.isPermittedTo('userSettings', 'write')"
+          v-if="user.isPermittedTo('userSettings', 'write')"
-            dense
+          dense
-            flat
+          flat
-            icon="add"
+          icon="add"
-            @click="openAllValueDialog(null)"
+          @click="openAllValueDialog(null)"
-          >
-            <q-tooltip>{{ $t('addNewUser') }}</q-tooltip>
-          </q-btn>
-          <q-btn
-            v-if="user.isPermittedTo('userSettings', 'write')"
-            dense
-            flat
-            style="color: grey"
-            :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-            @click="selectOption = !selectOption"
-          >
-            <q-tooltip>{{ $t('selectUserOptions') }}</q-tooltip>
-          </q-btn>
-        </q-btn-group>
-        <div v-if="selectOption && selected.length > 0">
-          <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
-          <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
-            <q-item
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(...selected)"
-              class="text-negative"
-              >{{ $t('delete') }}</q-item
-            >
-          </q-menu>
-        </div>
-        <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
-          {{ $t('selected') }}: {{ selected.length }}
-        </div>
-      </template>
-      <template v-slot:top-right>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <template v-slot:body-cell="props">
-        <q-td
-          :props="props"
-          :style="
-            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              ? 'cursor: pointer'
-              : ''
-          "
-          @click="
-            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
-              : ''
-          "
         >
-          {{ props.value }}
+          <q-tooltip>{{ $t('addNewUser') }}</q-tooltip>
-        </q-td>
+        </q-btn>
-      </template>
+        <q-btn
-      <template v-slot:body-cell-role="props">
+          v-if="user.isPermittedTo('userSettings', 'write')"
-        <q-td :props="props">
+          dense
-          <q-select
+          flat
-            :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
+          style="color: grey"
-            dense
+          :icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
-            v-model="props.row.role"
+          @click="selectOption = !selectOption"
-            :options="localRoles"
-            @update:model-value="updateUser(props.row)"
-          ></q-select>
-        </q-td>
-      </template>
-      <template v-slot:body-cell-expiration="props">
-        <q-td
-          :props="props"
-          :style="
-            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              ? 'cursor: pointer'
-              : ''
-          "
-          @click="
-            autorized(props.row) && user.isPermittedTo('userSettings', 'write')
-              ? openSingleValueDialog(props.col.label, props.col.name, props.row)
-              : ''
-          "
         >
-          {{ props.value === 'never' ? $t('never') : props.value }}
+          <q-tooltip>{{ $t('selectUserOptions') }}</q-tooltip>
-        </q-td>
+        </q-btn>
-      </template>
+      </q-btn-group>
-      <template v-slot:body-cell-option="props">
+      <div v-if="selectOption && selected.length > 0">
-        <q-td :props="props">
+        <q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
-          <q-btn
+        <q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
-            v-if="user.isPermittedTo('userSettings', 'delete')"
+          <q-item
-            :disable="!autorized(props.row)"
+            clickable
-            flat
+            v-close-popup
-            dense
+            @click="openRemoveDialog(...selected)"
-            icon="delete"
+            class="text-negative"
-            color="negative"
+            >{{ $t('delete') }}</q-item
-            @click="openRemoveDialog(props.row)"
           >
-            <q-tooltip> {{ $t('delete') }} </q-tooltip>
+        </q-menu>
-          </q-btn>
+      </div>
-        </q-td>
+      <div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
-      </template>
+        {{ $t('selected') }}: {{ selected.length }}
-    </q-table>
+      </div>
-  </div>
+    </template>
+
+    <!-- top right of table-->
+
+    <template v-slot:top-right>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
+    </template>
+
+    <!-- table body content-->
+
+    <template v-slot:body-cell="props">
+      <q-td
+        :props="props"
+        :style="
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+            ? 'cursor: pointer'
+            : ''
+        "
+        @click="
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+            ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+            : ''
+        "
+      >
+        {{ props.value }}
+      </q-td>
+    </template>
+    <template v-slot:body-cell-newPassword="props">
+      <q-td :props="props">
+        <q-btn
+          v-if="autorized(props.row) && currentUser.id === props.row.id"
+          flat
+          dense
+          no-caps
+          color="primary"
+          :label="$t('changePassword')"
+          @click="openPwdDialog(props.row)"
+        ></q-btn>
+      </q-td>
+    </template>
+    <template v-slot:body-cell-role="props">
+      <q-td :props="props">
+        <q-select
+          :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
+          dense
+          v-model="props.row.role"
+          :options="localRoles"
+          option-label="role"
+          @update:model-value="updateUser(props.row)"
+        ></q-select>
+      </q-td>
+    </template>
+    <template v-slot:body-cell-expiration="props">
+      <q-td
+        :props="props"
+        :style="
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+            ? 'cursor: pointer'
+            : ''
+        "
+        @click="
+          autorized(props.row) && user.isPermittedTo('userSettings', 'write')
+            ? openSingleValueDialog(props.col.label, props.col.name, props.row)
+            : ''
+        "
+      >
+        {{ props.value === 'never' ? $t('never') : props.value }}
+      </q-td>
+    </template>
+    <template v-slot:body-cell-option="props">
+      <q-td :props="props">
+        <q-btn
+          v-if="user.isPermittedTo('userSettings', 'delete')"
+          :disable="!autorized(props.row)"
+          flat
+          dense
+          icon="delete"
+          color="negative"
+          @click="openRemoveDialog(props.row)"
+        >
+          <q-tooltip> {{ $t('delete') }} </q-tooltip>
+        </q-btn>
+      </q-td>
+    </template>
+  </q-table>
   <EditOneDialog
     ref="editOneDialog"
     query-id
@@ -145,6 +160,7 @@
     button-ok-color="red"
     v-on:update-confirm="(val) => removeUser(...val)"
   ></OkDialog>
+  <ChangePassword ref="changePwdDialog" v-on:update:password="changePassword" />
 </template>
 
 <script setup lang="ts">
@@ -159,6 +175,8 @@ import { useUserTable } from './UserTable';
 import { roles, useRoleTable } from '../roles/RoleTable';
 import { i18n } from 'src/boot/lang';
 import { useUserStore } from 'src/vueLib/login/userStore';
+import ChangePassword from 'src/vueLib/login/ChangePassword.vue';
+import SearchableInput from '../components/SearchableInput.vue';
 
 const { NotifyResponse } = useNotify();
 const editOneDialog = ref();
@@ -176,6 +194,7 @@ const currentUser = ref();
 const { users, pagination, loading, columns, updateUsers } = useUserTable();
 const { updateRoles } = useRoleTable();
 const user = useUserStore();
+const changePwdDialog = ref();
 
 //load on mounting page
 onMounted(() => {
@@ -201,6 +220,26 @@ function openAllValueDialog(user: User | null) {
   editAllDialog.value?.open(user);
 }
 
+//opens password change dialog
+function openPwdDialog(user: User) {
+  changePwdDialog.value.open(user);
+}
+
+//change password api request
+async function changePassword(user: User) {
+  console.log(8, user);
+  if (user.password == user.newPassword) {
+    NotifyResponse(i18n.global.t('samePasswordEntered'), 'error');
+    return;
+  }
+
+  await appApi
+    .post('/users/new/password', user)
+    .then((resp) => console.log(67, resp))
+    .catch((err) => console.error(err));
+  changePwdDialog.value.close();
+}
+
 //opens remove dialog
 function openRemoveDialog(...users: Users) {
   if (users.length === 1) {
@@ -245,20 +284,6 @@ function updateUser(user: User) {
 </script>
 
 <style>
-@keyframes blink-yellow {
-  0%,
-  100% {
-    background-color: yellow;
-  }
-  50% {
-    background-color: transparent;
-  }
-}
-
-.blink-yellow {
-  animation: blink-yellow 1.5s step-start 6 !important;
-}
-
 .bigger-table-text .q-table__middle td {
   font-size: 14px;
 }