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/.gitignore

@@ -0,0 +1 @@
+.env

backend/env/env.go

@@ -0,0 +1,63 @@
+package env
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/joho/godotenv"
+)
+
+type EnvKey string
+
+const (
+	Env           EnvKey = "ENV"
+	GinMode       EnvKey = "GIN_MODE"
+	Debug         EnvKey = "DEBUG"
+	PrivKey       EnvKey = "PRIVKEY"
+	Fullchain     EnvKey = "FULLCHAIN"
+	Https         EnvKey = "HTTPS"
+	HostUrl       EnvKey = "HOST_URL"
+	HostPort      EnvKey = "HOST_PORT"
+	WorkingDir    EnvKey = "WORKING_DIR"
+	Spa           EnvKey = "SPA"
+	AccessSecret  EnvKey = "ACCESS_SECRET"
+	RefreshSecret EnvKey = "REFRESH_SECRET"
+	Organization  EnvKey = "ORGANIZATION"
+	DOMAIN        EnvKey = "DOMAIN"
+	AllowOrigin   EnvKey = "ALLOWORIGIN"
+	TimeZone      EnvKey = "TMEZONE"
+)
+
+const (
+	EnvDevelopment = "development"
+	EnvProduction  = "Prodction"
+)
+
+func (key EnvKey) GetValue() string {
+	return os.Getenv(string(key))
+}
+
+func (key EnvKey) GetBoolValue() bool {
+	return strings.ToLower(os.Getenv(string(key))) == "true"
+}
+
+func (key EnvKey) GetUIntValue() uint {
+	value, err := strconv.ParseUint(os.Getenv(string(key)), 10, 32)
+	if err != nil {
+		return 0
+	}
+	return uint(value)
+}
+
+func Load(file string) error {
+	return godotenv.Load(file)
+}
+
+func InDevelopmentMode() bool {
+	return Env.GetValue() == EnvDevelopment
+}
+
+func InDebugMode() bool {
+	return strings.ToLower(Debug.GetValue()) == "true"
+}

backend/example/example.env

@@ -0,0 +1,15 @@
+ENV=development
+GIN_MODE=release
+DEBUG=false
+SPA=directory_of_spa_files
+WORKING_DIR=.
+HOST_URL=your_local_url
+HOST_PORT=your_local_port
+HTTPS=true
+PRIVKEY=your_certificate_key_file
+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
+TIMEZONE=your_timezone in IANA format

backend/go.mod

@@ -3,17 +3,18 @@ module backend
 go 1.24.5
 
 require (
-	gitea.tecamino.com/paadi/access-handler v1.0.13
-	gitea.tecamino.com/paadi/memberDB v1.0.18
+	gitea.tecamino.com/paadi/access-handler v1.0.29
+	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
 	github.com/gin-gonic/gin v1.11.0
+	github.com/joho/godotenv v1.5.1
 	golang.org/x/crypto v0.43.0
 )
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.0.4 // 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.13 h1:2BqLo+cmF7ijk8XMnTdNuUKGbWPRsW6jMbk44FMCpyY=
-gitea.tecamino.com/paadi/access-handler v1.0.13/go.mod h1:w71lpnuu5MgAWG3oiI9vsY2dWi4njF/iPrM/xV/dbBQ=
-gitea.tecamino.com/paadi/dbHandler v1.0.4 h1:ctnaec0GDdtw3gRQdUISVDYLJ9x+vt50VW41OemfhD4=
-gitea.tecamino.com/paadi/dbHandler v1.0.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
-gitea.tecamino.com/paadi/memberDB v1.0.18 h1:S774DtR5t6jpkRfa6uHlrnvTjabHG2KSjfbMmjGkdTM=
-gitea.tecamino.com/paadi/memberDB v1.0.18/go.mod h1:iLm7nunVRzqJK8CV4PJVuWIhgPlQjNIaeOkmtfK5fMg=
+gitea.tecamino.com/paadi/access-handler v1.0.29 h1:FZ67co/rfJffftT6xOp6psZKFtdEReaAR7PnEZi7ltI=
+gitea.tecamino.com/paadi/access-handler v1.0.29/go.mod h1:Dmme8URu3lENPhlkZcdEeIKm8VMlAgT/jNLECLLS7Vs=
+gitea.tecamino.com/paadi/dbHandler v1.1.7 h1:NqVbxbUwd7EZX6HYntyLYwwPbyTPevOhIBTFqoCVqOU=
+gitea.tecamino.com/paadi/dbHandler v1.1.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/memberDB v1.1.13 h1:P5UsTt3d8829H9d3vfMAWpDN7ONqwhr8ndIuL9lBuvQ=
+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=
@@ -56,6 +56,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=

backend/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"backend/env"
 	"backend/models"
 	"backend/server"
 	"backend/utils"
@@ -23,24 +24,37 @@ import (
 )
 
 func main() {
-	var allowOrigins models.StringSlice
-
-	flag.Var(&allowOrigins, "allowOrigin", "Allowed origin (can repeat this flag)")
-
-	spa := flag.String("spa", "./dist/spa", "quasar spa files")
-	workingDir := flag.String("workingDirectory", ".", "quasar spa files")
-	ip := flag.String("ip", "0.0.0.0", "server listening ip")
-	organization := flag.String("organization", "", "self signed ciertificate organization")
-	port := flag.Uint("port", 9500, "server listening port")
-	https := flag.Bool("https", false, "serves as https needs flag -cert and -chain")
-	sslKey := flag.String("privkey", "", "ssl private key path")
-	sslFullchain := flag.String("fullchain", "", "ssl fullchain path")
-	debug := flag.Bool("debug", false, "log debug")
+	// set cli flage
+	envFile := flag.String("env", ".env", "enviroment file")
 	flag.Parse()
 
+	// load enviroment file if exists
+	if err := env.Load(*envFile); err != nil {
+		fmt.Println("no .env found path: ", *envFile)
+	}
+
+	devMode := env.InDevelopmentMode()
+	// set gin mode
+	if !devMode {
+		gin.SetMode(env.GinMode.GetValue())
+	}
+
+	workingDir := env.WorkingDir.GetValue()
+	spa := env.Spa.GetValue()
+
 	//change working directory only if value is given
-	if *workingDir != "." && *workingDir != "" {
-		os.Chdir(*workingDir)
+	if workingDir != "." && workingDir != "" {
+		os.Chdir(workingDir)
+	}
+
+	//set allowed origins
+	var allowOrigins models.StringSlice
+
+	if strings.Contains(env.DOMAIN.GetValue(), "http") {
+		allowOrigins.Set(env.DOMAIN.GetValue())
+	}
+	if env.AllowOrigin.GetValue() != "" {
+		allowOrigins.Set(env.AllowOrigin.GetValue())
 	}
 
 	wd, err := os.Getwd()
@@ -55,7 +69,7 @@ func main() {
 		MaxSize:     1,
 		MaxBackup:   3,
 		MaxAge:      28,
-		Debug:       *debug,
+		Debug:       env.InDebugMode(),
 		TerminalOut: true,
 	})
 	if err != nil {
@@ -82,11 +96,11 @@ func main() {
 
 	//get local ip
 	httpString := "http://"
-	if *https {
+	if env.Https.GetBoolValue() {
 		httpString = "https://"
 
 	}
-	allowOrigins = append(allowOrigins, httpString+"localhost:9000", httpString+"localhost:9500", httpString+"127.0.0.1:9500", httpString+"0.0.0.0:9500")
+	allowOrigins = append(allowOrigins, httpString+"localhost:9000", httpString+"localhost:9500", httpString+"127.0.0.1:9000", httpString+"0.0.0.0:9500")
 
 	localIP, err := utils.GetLocalIP()
 	if err != nil {
@@ -95,6 +109,8 @@ func main() {
 		allowOrigins = append(allowOrigins, fmt.Sprintf("%s%s:9000", httpString, localIP), fmt.Sprintf("%s%s:9500", httpString, localIP))
 	}
 
+	fmt.Println(100, allowOrigins)
+
 	s.Routes.Use(cors.New(cors.Config{
 		AllowOrigins: allowOrigins,
 		//AllowOrigins:     []string{"*"},
@@ -122,6 +138,7 @@ func main() {
 	role := auth.Group("", accessHandler.AuthorizeRole("/api"))
 	role.GET("/members", dbHandler.GetMember)
 	auth.GET("/events", dbHandler.GetEvent)
+	auth.GET("/groups", dbHandler.GetGroup)
 
 	auth.GET("/users", accessHandler.GetUser)
 	auth.GET("/roles", accessHandler.GetRole)
@@ -138,6 +155,10 @@ func main() {
 	auth.POST("/events/delete/attendees", dbHandler.DeleteAttendee)
 	auth.POST("/events/delete", dbHandler.DeleteEvent)
 
+	auth.POST("/groups/add", dbHandler.NewGroup)
+	auth.POST("/groups/edit", dbHandler.UpdateGroup)
+	auth.POST("/groups/delete", dbHandler.DeleteGroup)
+
 	auth.GET("/responsible", dbHandler.GetResponsible)
 	auth.POST("/responsible/add", dbHandler.AddNewResponsible)
 	auth.POST("/responsible/delete", dbHandler.DeleteResponsible)
@@ -148,12 +169,13 @@ func main() {
 
 	auth.POST("/users/add", accessHandler.AddUser)
 	auth.POST("/users/update", accessHandler.UpdateUser)
+	auth.POST("/users/new/password", accessHandler.ChangePassword)
 	auth.POST("/users/delete", accessHandler.DeleteUser)
 
 	api.POST("/login/refresh", accessHandler.Refresh)
 
 	// Serve static files
-	s.Routes.StaticFS("/assets", gin.Dir(filepath.Join(*spa, "assets"), true))
+	s.Routes.StaticFS("/assets", gin.Dir(filepath.Join(spa, "assets"), true))
 	s.Routes.NoRoute(func(c *gin.Context) {
 		// Disallow fallback for /api paths
 		if strings.HasPrefix(c.Request.URL.Path, "/api") {
@@ -161,44 +183,44 @@ func main() {
 			return
 		}
 		// Try to serve file from SPA directory
-		filePath := filepath.Join(*spa, c.Request.URL.Path)
+		filePath := filepath.Join(spa, c.Request.URL.Path)
 		if _, err := os.Stat(filePath); err == nil {
 			c.File(filePath)
 			return
 		}
 		// Fallback to index.html for SPA routing
-		c.File(filepath.Join(*spa, "index.html"))
+		c.File(filepath.Join(spa, "index.html"))
 
 	})
 
 	go func() {
 		time.Sleep(500 * time.Millisecond)
-		if err := utils.OpenBrowser(fmt.Sprintf("%slocalhost:%d", httpString, *port), logger); err != nil {
+		if err := utils.OpenBrowser(fmt.Sprintf("%slocalhost:%s", httpString, env.HostPort.GetValue()), logger); err != nil {
 			logger.Error("main", fmt.Sprintf("starting browser error : %s", err))
 		}
 	}()
 
-	if *https {
-		if *sslFullchain == "" {
+	if env.Https.GetBoolValue() {
+		if env.Fullchain.GetValue() == "" {
 			logger.Error("ssl certificate", "-cert flag not given for https server")
 			log.Fatal("-cert flag not given for https server")
 		}
-		if *sslKey == "" {
+		if env.PrivKey.GetValue() == "" {
 			logger.Error("ssl key", "-chain flag not given for https server")
 			log.Fatal("-chain flag not given for https server")
 		}
 
 		// start https server
-		logger.Info("main", fmt.Sprintf("https listen on ip: %s port: %d", *ip, *port))
-		if err := s.ServeHttps(*ip, *port, cert.Cert{Organization: *organization, CertFile: *sslFullchain, KeyFile: *sslKey}); err != nil {
+		logger.Info("main", fmt.Sprintf("https listen on ip: %s port: %s", env.HostUrl.GetValue(), env.HostPort.GetValue()))
+		if err := s.ServeHttps(env.HostUrl.GetValue(), env.HostPort.GetUIntValue(), cert.Cert{Organization: env.Organization.GetValue(), CertFile: env.Fullchain.GetValue(), KeyFile: env.PrivKey.GetValue()}); err != nil {
 			logger.Error("main", "error https server "+err.Error())
 		}
 		return
 	}
 
 	// start http server
-	logger.Info("main", fmt.Sprintf("http listen on ip: %s port: %d", *ip, *port))
-	if err := s.ServeHttp(*ip, *port); err != nil {
+	logger.Info("main", fmt.Sprintf("http listen on ip: %s port: %s", env.HostUrl.GetValue(), env.HostPort.GetValue()))
+	if err := s.ServeHttp(env.HostUrl.GetValue(), env.HostPort.GetUIntValue()); err != nil {
 		logger.Error("main", "error http server "+err.Error())
 	}
 }

backend/models/rights.go

@@ -1,6 +0,0 @@
-package models
-
-// type Rights struct {
-// 	Name   string `json:"name"`
-// 	Rights int    `json:"rights"`
-// }

backend/models/role.go

@@ -1,11 +0,0 @@
-package models
-
-// type Role struct {
-// 	Id     int      `json:"id"`
-// 	Role   string   `json:"role"`
-// 	Rights []Rights `json:"rights"`
-// }
-
-// func (r *Role) IsValid() bool {
-// 	return r.Role != ""
-// }

backend/models/settings.go

@@ -1,11 +0,0 @@
-package models
-
-// type Settings struct {
-// 	PrimaryColor       string `json:"primaryColor,omitempty"`
-// 	PrimaryColorText   string `json:"primaryColorText,omitempty"`
-// 	SecondaryColor     string `json:"secondaryColor,omitempty"`
-// 	SecondaryColorText string `json:"secondaryColorText,omitempty"`
-// 	Icon               string `json:"icon,omitempty"`
-// 	DatabaseName       string `json:"databaseName,omitempty"`
-// 	DatabaseToken      string `json:"databaseToken,omitempty"`
-// }

backend/models/stringSlice.go

@@ -4,11 +4,10 @@ import "strings"
 
 type StringSlice []string
 
-func (s *StringSlice) String() string {
-	return strings.Join(*s, ",")
-}
-
-func (s *StringSlice) Set(value string) error {
+func (s *StringSlice) Set(value string) {
+	if strings.Contains(value, ",") {
+		*s = append(*s, strings.Split(value, ",")...)
+		return
+	}
 	*s = append(*s, value)
-	return nil
 }

backend/models/user.go

@@ -1,14 +0,0 @@
-package models
-
-// type User struct {
-// 	Id       int      `json:"id"`
-// 	Name     string   `json:"user"`
-// 	Email    string   `json:"email"`
-// 	Role     string   `json:"role"`
-// 	Password string   `json:"password,omitempty"`
-// 	Settings Settings `json:"settings"`
-// }
-
-// func (u *User) IsValid() bool {
-// 	return u.Name != ""
-// }

index.html

@@ -1,19 +1,22 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title><%= productName %></title>
 
-    <meta charset="utf-8">
-    <meta name="description" content="<%= productDescription %>">
-    <meta name="format-detection" content="telephone=no">
-    <meta name="msapplication-tap-highlight" content="no">
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
+    <meta charset="utf-8" />
+    <meta name="description" content="<%= productDescription %>" />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="msapplication-tap-highlight" content="no" />
+    <meta
+      name="viewport"
+      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
+    />
 
-    <link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
-    <link rel="icon" type="image/ico" href="favicon.ico">
+    <link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
+    <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
+    <link rel="icon" type="image/ico" href="favicon.ico" />
   </head>
   <body>
     <!-- quasar:entry-point -->

package.json

@@ -1,8 +1,8 @@
 {
   "name": "lightcontrol",
-  "version": "1.0.5",
+  "version": "1.2.0",
   "description": "A Tecamino App",
-  "productName": "Member Database",
+  "productName": "Attendence Records",
   "author": "A. Zuercher",
   "type": "module",
   "private": true,

src/assets/lang/de-CH.yaml

@@ -4,6 +4,7 @@ lastName: Nachname
 birthday: Geburtstag
 email: Email
 group: Gruppe
+groups: Gruppen
 age: Auter
 address: Adresse
 town: Ort
@@ -15,6 +16,7 @@ lastVisit: Letscht Bsuech
 search: Suechi
 noDataAvailable: Keni Date
 importCSV: importier CSV
+exportCSV: exportier CSV
 selectMemberOptions: Wähle Mitglieder Optione
 addNewMember: Neues Mitglied
 csvOptions: CSV Optionen
@@ -32,6 +34,7 @@ settings: Iistellige
 databaseName: Datebank Name
 token: Schlüssu
 login: Amäude
+logout: Abmäude
 user: Benutzer
 password: Passwort
 isRequired: isch erforderlich
@@ -83,9 +86,9 @@ members: Mitglider
 attendanceTable: Anweseheits Tabelle
 excursionTable: Usflugs Tabelle
 updated: aktualisiert
-events: Veranstalige
-eventNameIsRequired: Verastatigsname isch erforderlich
-eventName: Verastatigsname
+events: Verastautige
+eventNameIsRequired: Verastautigssname isch erforderlich
+eventName: Verastautigssname
 attendees: Teilnähmer
 now: Jetzt
 addToEvent: Füge zu Veranstautig
@@ -111,3 +114,29 @@ responsibleAdded: Veratwortläche hinzuegfüegt
 responsiblesAdded: Veratwortläche hinzuegfüegt
 deleteResponsible: Veratwortläche entfernt
 deleteResponsibles: Veratwortläche entfernt
+expiration: Ablauf
+never: Nie
+responsibles: Verantwortliche
+comment: Bemerkung
+dark_mode: Dunkel-Modus
+light_mode: Hell-Modus
+import: Import
+export: Export
+changePassword: Passwort ändere
+noneAttendees: Fählendi Telnähmer
+addNewgroup: Neui Gruppe
+selectgroupOptions: Wähle Gruppe Optionen
+groupNameIsRequired: Gruppename isch erforderlich
+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

@@ -4,6 +4,7 @@ lastName: Nachname
 birthday: Geburtstag
 email: Email
 group: Gruppe
+groups: Gruppen
 age: Alter
 address: Adresse
 town: Ort
@@ -15,6 +16,7 @@ lastVisit: Letzter Besuch
 search: Suche
 noDataAvailable: Keine Daten
 importCSV: importiere CSV
+exportCSV: exportiere CSV
 selectMemberOptions: Wähle Mitglieder Optionen
 addNewMember: Neues Mitglied
 csvOptions: CSV Optionen
@@ -32,6 +34,7 @@ settings: Einstellungen
 databaseName: Datenbank Name
 token: Schlüssel
 login: Anmelden
+logout: Abmelden
 user: Benutzer
 password: Passwort
 isRequired: ist erforderlich
@@ -68,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
@@ -111,3 +114,29 @@ responsibleAdded: Veratwortläche hinzuegfüegt
 responsiblesAdded: Verantwortliche hinzuegfüegt
 deleteResponsible: Verantwortliche entfernt
 deleteResponsibles: Verantwortliche entfernt
+expiration: Ablauf
+never: Nie
+responsibles: Verantwortliche
+comment: Bemerkung
+dark_mode: Dunkel-Modus
+light_mode: Hell-Modus
+import: Import
+export: Export
+changePassword: Passwort ändern
+noneAttendees: Fehlende Teilnehmer
+addNewgroup: Neue Gruppe
+selectgroupOptions: Wähle Gruppen Optionen
+groupNameIsRequired: Gruppenname ist erforderlich
+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

@@ -4,6 +4,7 @@ lastName: Name
 birthday: Birthday
 email: Email
 group: Group
+groups: Groups
 age: Age
 address: Address
 town: Town
@@ -12,9 +13,10 @@ phone: Phone
 responsible: Responsible
 firstVisit: First Visit
 lastVisit: Last Visit
-search: search
+search: Search
 noDataAvailable: No data available
 importCSV: Import CSV
+exportCSV: Export CSV
 selectMemberOptions: Select Member Options
 addNewMember: Add new Member
 csvOptions: CSV Options
@@ -32,6 +34,7 @@ settings: Settings
 databaseName: Database Name
 token: Token
 login: Login
+logout: Logout
 user: User
 password: Password
 isRequired: is required
@@ -111,3 +114,29 @@ responsibleAdded: Responsible hinzuegfüegt
 responsiblesAdded: Responsibles hinzuegfüegt
 deleteResponsible: Responsible deleted
 deleteResponsibles: Responsibles deleted
+expiration: Expiration
+never: Never
+responsibles: Responsibles
+comment: Comment
+dark_mode: Dark-Mode
+light_mode: Light-Mode
+import: Import
+export: Export
+changePassword: change Password
+noneAttendees: Missing Attendees
+addNewgroup: New Group
+selectgroupOptions: Select Group Options
+groupNameIsRequired: Groupname is required
+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/axios.ts

@@ -55,6 +55,21 @@ appApi.interceptors.response.use(
 
     // Handle unauthorized responses
     if (error.response?.status === 401 && !originalRequest._retry) {
+      const data = error.response?.data;
+      const serverMessage =
+        typeof data === 'object' && data !== null && 'message' in data
+          ? (data as { message: string }).message
+          : undefined;
+
+      if (['no refresh token', 'is expired'].some((msg) => serverMessage?.includes(msg))) {
+        console.warn('[Axios] No refresh token — logging out');
+        try {
+          await logout();
+        } catch (logoutErr) {
+          console.error('[Axios] Logout failed:', logoutErr);
+        }
+        throw new Error('Session expired: no refresh token');
+      }
       if (isRefreshing) {
         // Wait until refresh completes
         return new Promise<AxiosResponse>((resolve, reject) => {

src/boot/lang.js

@@ -1,10 +1,10 @@
 import { createI18n } from 'vue-i18n';
 import yaml from 'js-yaml';
+import { getLocalLanguage } from 'src/localstorage/localStorage';
 
 export const lang = [];
 
 const systemLocale = navigator.language || 'en-US';
-const savedLang = localStorage.getItem('lang');
 
 const messages = {};
 const modules = import.meta.glob('src/assets/lang/*.yaml', {
@@ -24,10 +24,27 @@ for (const path in modules) {
   messages[locale] = parsed;
 }
 
+function resolveLocale(desiredLocale) {
+  if (messages[desiredLocale]) return desiredLocale;
+
+  const baseLang = desiredLocale.split('-')[0];
+  // exact base match (e.g. en)
+  if (messages[baseLang]) return baseLang;
+
+  // first locale starting with that base (e.g. en-US, en-GB)
+  const partialMatch = Object.keys(messages).find((l) => l.startsWith(baseLang));
+  if (partialMatch) return partialMatch;
+
+  // fallback to English or the first available
+  return messages['en'] ? 'en' : Object.keys(messages)[0];
+}
+
+const selectedLocale = resolveLocale(getLocalLanguage() || systemLocale);
+
 const i18n = createI18n({
   legacy: false, // Composition API mode
-  locale: savedLang || systemLocale,
-  fallbackLocale: systemLocale,
+  locale: selectedLocale,
+  fallbackLocale: resolveLocale(selectedLocale),
   messages,
 });
 

src/boot/quasar-global.ts

@@ -1,43 +1,35 @@
 import { boot } from 'quasar/wrappers';
 import { setQuasarInstance } from 'src/vueLib/utils/globalQ';
 import { setRouterInstance } from 'src/vueLib/utils/globalRouter';
-import { databaseName } from 'src/vueLib/tables/members/MembersTable';
-import { Logo } from 'src/vueLib/models/logo';
+import { databaseName, logo, appName } from 'src/vueLib/models/settings';
+import { Dark } from 'quasar';
+import { getLocalDarkMode, getLocalSettings } from 'src/localstorage/localStorage';
 
 export default boot(({ app, router }) => {
   setRouterInstance(router); // store router for global access
   const $q = app.config.globalProperties.$q;
   setQuasarInstance($q);
 
-  Logo.value = localStorage.getItem('icon') ?? Logo.value;
-  databaseName.value = localStorage.getItem('databaseName') ?? databaseName.value;
-  let primaryColor = localStorage.getItem('primaryColor');
-  if (primaryColor == null || primaryColor === 'undefined' || primaryColor.trim() === '') {
-    primaryColor = null;
-  }
-  let primaryColorText = localStorage.getItem('primaryColorText');
-  if (
-    primaryColorText == null ||
-    primaryColorText === 'undefined' ||
-    primaryColorText.trim() === ''
-  ) {
-    primaryColorText = null;
-  }
-  let secondaryColor = localStorage.getItem('secondaryColor');
-  if (secondaryColor == null || secondaryColor === 'undefined' || secondaryColor.trim() === '') {
-    secondaryColor = null;
-  }
-  let secondaryColorText = localStorage.getItem('secondaryColorText');
-  if (
-    secondaryColorText == null ||
-    secondaryColorText === 'undefined' ||
-    secondaryColorText.trim() === ''
-  ) {
-    secondaryColorText = null;
-  }
+  Dark.set(getLocalDarkMode());
 
-  document.documentElement.style.setProperty('--q-primary', primaryColor ?? '#1976d2');
-  document.documentElement.style.setProperty('--q-primary-text', primaryColorText ?? '#ffffff');
-  document.documentElement.style.setProperty('--q-secondary', secondaryColor ?? '#26a69a');
-  document.documentElement.style.setProperty('--q-secondary-text', secondaryColorText ?? '#ffffff');
+  const settings = getLocalSettings();
+
+  if (settings.icon) {
+    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');
+  document.documentElement.style.setProperty(
+    '--q-primary-text',
+    settings.primaryColorText ?? '#ffffff',
+  );
+  document.documentElement.style.setProperty('--q-secondary', settings.secondaryColor ?? '#26a69a');
+  document.documentElement.style.setProperty(
+    '--q-secondary-text',
+    settings.secondaryColorText ?? '#ffffff',
+  );
 });

src/boot/restore-route.js

@@ -1,12 +1,23 @@
 import { boot } from 'quasar/wrappers';
 import { useUserStore } from 'src/vueLib/login/userStore';
+import { appApi } from './axios';
+import { getLocalLastRoute, setLocalLastRoute } from 'src/localstorage/localStorage';
 
 export default boot(async ({ router }) => {
   const userStore = useUserStore();
+  // load user
+  try {
+    const { data } = await appApi.get('/login/me');
+
+    data.role.role = data.role;
+    await userStore.setUser(data);
+  } catch {
+    /* ignore error */
+  }
 
   // Restore logic after router is ready but before navigation
   router.isReady().then(() => {
-    const lastRoute = sessionStorage.getItem('lastRoute');
+    const lastRoute = getLocalLastRoute();
     const currentPath = router.currentRoute.value.fullPath;
 
     // Restore only if:
@@ -26,7 +37,7 @@ export default boot(async ({ router }) => {
   router.afterEach((to) => {
     // Don't save login page as "last route"
     if (to.path !== '/login' && to.path !== '/') {
-      sessionStorage.setItem('lastRoute', to.fullPath);
+      setLocalLastRoute(to.fullPath);
     }
   });
 });

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,13 +14,21 @@
         @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>
     </div>
   </DialogFrame>
-  <EditAllDialog ref="newEventRef" v-on:update="(val) => resolveNewEvent(val)"></EditAllDialog>
+  <EditAllDialog
+    ref="newEventRef"
+    v-on:update="
+      (val) => {
+        resolveNewEvent(val);
+        NotifyResponse($t('memberUpdated'));
+      }
+    "
+  ></EditAllDialog>
 </template>
 
 <script setup lang="ts">
@@ -32,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();
@@ -97,7 +108,7 @@ async function addAttendees() {
       NotifyResponse(err, 'error');
     });
 
-  await updateAttendees();
+  await updateAttendees(0);
   updateEvents();
 }
 

src/components/EditOneDialog.vue

@@ -2,24 +2,46 @@
   <DialogFrame ref="dialog" :header-title="'Edit ' + localTitle">
     <div class="row justify-center">
       <q-input autofocus :label="localTitle" filled v-model="value" @keyup.enter="save">
-        <template v-if="['firstVisit', 'lastVisit', 'date'].includes(localField)" v-slot:prepend>
+        <template
+          v-if="['firstVisit', 'lastVisit', 'date', 'expiration'].includes(localField)"
+          v-slot:prepend
+        >
           <q-icon name="event" class="cursor-pointer">
             <q-popup-proxy cover transition-show="scale" transition-hide="scale">
               <q-date v-model="value" mask="YYYY-MM-DD HH:mm:ss">
                 <div class="row items-center justify-end">
                   <q-btn :label="$t('now')" color="primary" no-caps flat @click="setTimeNow" />
+                  <q-btn
+                    v-if="localField"
+                    :label="$t('never')"
+                    color="primary"
+                    no-caps
+                    flat
+                    @click="value = 'never'"
+                  />
                   <q-btn no-caps v-close-popup :label="$t('close')" color="primary" flat />
                 </div>
               </q-date>
             </q-popup-proxy>
           </q-icon>
         </template>
-        <template v-if="['firstVisit', 'lastVisit', 'date'].includes(localField)" v-slot:append>
+        <template
+          v-if="['firstVisit', 'lastVisit', 'date', 'expiration'].includes(localField)"
+          v-slot:append
+        >
           <q-icon name="access_time" class="cursor-pointer">
             <q-popup-proxy cover transition-show="scale" transition-hide="scale">
               <q-time with-seconds v-model="value" mask="YYYY-MM-DD HH:mm:ss" format24h>
                 <div class="row items-center justify-end">
                   <q-btn :label="$t('now')" color="primary" no-caps flat @click="setTimeNow" />
+                  <q-btn
+                    v-if="localField"
+                    :label="$t('never')"
+                    color="primary"
+                    no-caps
+                    flat
+                    @click="value = 'never'"
+                  />
                   <q-btn no-caps v-close-popup :label="$t('close')" color="primary" flat />
                 </div>
               </q-time>
@@ -40,7 +62,6 @@ import { ref } from 'vue';
 import { appApi } from 'src/boot/axios';
 import type { Member } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
-import { i18n } from 'src/boot/lang';
 
 const dialog = ref();
 const localMember = ref();
@@ -51,7 +72,6 @@ const value = ref('');
 const props = defineProps({
   endpoint: {
     type: String,
-    required: true,
   },
 });
 
@@ -74,6 +94,12 @@ function save() {
     dialog.value.close();
     return;
   }
+
+  if (!props.endpoint) {
+    localMember.value[localField.value] = value.value;
+    emit('update', localMember.value);
+    return;
+  }
   payload = [
     {
       id: localMember.value.id,
@@ -85,7 +111,6 @@ function save() {
     .post(props.endpoint, payload)
     .then(() => {
       emit('update');
-      NotifyResponse(i18n.global.t('memberUpdated'));
       dialog.value.close();
     })
     .catch((err) => {

src/components/MemberEditAllDialog.vue

@@ -25,9 +25,8 @@
           v-model="localMember.lastName"
         ></q-input>
         <q-input
-          class="q-ml-md col-5 required"
+          class="q-ml-md col-5"
           :label="$t('birthday')"
-          :rules="[(val) => !!val || $t('birthdayIsRequired')]"
           filled
           v-model="localMember.birthday"
         ></q-input>
@@ -61,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"
@@ -101,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();
@@ -117,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/ResponsibleEditAllDialog.vue

@@ -1,63 +0,0 @@
-<template>
-  <DialogFrame
-    ref="dialog"
-    :header-title="
-      newMember
-        ? $t('addNewResponsible')
-        : 'Edit ' + localMember.firstName + ' ' + localMember.lastName
-    "
-    :height="600"
-    :width="500"
-  >
-    <q-form ref="form">
-      <MembersTable add-responsible v-on:update-event="emit('updated')" />
-    </q-form>
-  </DialogFrame>
-</template>
-
-<script setup lang="ts">
-import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
-import MembersTable from 'src/vueLib/tables/members/MembersTable.vue';
-import { ref } from 'vue';
-import type { Member } from 'src/vueLib/models/member';
-
-const dialog = ref();
-const form = ref();
-const newMember = ref(false);
-const localMember = ref<Member>({
-  id: 0,
-  firstName: '',
-  lastName: '',
-});
-
-const emit = defineEmits(['updated']);
-
-function open(member: Member | null) {
-  if (member === undefined) {
-    return;
-  }
-
-  if (member !== null) {
-    localMember.value = { ...member };
-    newMember.value = false;
-  } else {
-    localMember.value = {
-      id: 0,
-      firstName: '',
-      lastName: '',
-    };
-    newMember.value = true;
-  }
-
-  dialog.value?.open();
-}
-
-defineExpose({ open });
-</script>
-
-<style>
-.required .q-field__label::after {
-  content: ' *';
-  color: red;
-}
-</style>

src/components/RoleEditAllDialog.vue

@@ -3,7 +3,7 @@
     ref="dialog"
     :header-title="newRole ? $t('addNewRole') : 'Edit ' + localRole.role"
     :height="700"
-    :width="500"
+    :width="700"
   >
     <div class="row justify-center">
       <q-input

src/components/UserEditAllDialog.vue

@@ -24,63 +24,7 @@
           :rules="[(val) => !!val || $t('emailIsRequired')]"
           v-model="localUser.email"
         ></q-input>
-        <div class="col-5">
-          <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>
-
+        <EnterNewPassword class="col-5 required" v-model:password="localUser.password!" />
         <div class="col-5">
           <q-select
             class="col-5 required"
@@ -88,13 +32,14 @@
             filled
             :options="props.roles"
             :rules="[(val) => !!val || $t('roleIsRequired')]"
-            v-model="localUser.role"
+            v-model="role"
           ></q-select>
           <q-input
-            class="col-5"
+            class="col-5 q-mt-xl"
             :label="$t('expires')"
             filled
-            v-model="localUser.expires"
+            type="datetime-local"
+            v-model="localUser.expiration"
           ></q-input>
         </div>
       </div>
@@ -108,30 +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 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 role = ref('');
 const localUser = ref<User>({
   user: '',
   email: '',
-  role: '',
-  expires: '',
 });
 
 const props = defineProps({
@@ -155,8 +92,6 @@ async function open(user: User | null) {
     localUser.value = {
       user: '',
       email: '',
-      role: '',
-      expires: '',
     };
     newUser.value = true;
   }
@@ -165,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');
@@ -217,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/layouts/MainLayout.vue

@@ -10,7 +10,7 @@
         />
         <q-btn flat dense round icon="menu" aria-label="Menu" @click="toggleLeftDrawer" />
 
-        <q-toolbar-title class="text-primary-text"> {{ productName }} </q-toolbar-title>
+        <q-toolbar-title class="text-primary-text"> {{ $t(appName) }} </q-toolbar-title>
 
         <div>Version {{ version }}</div>
         <q-btn dense icon="refresh" square class="q-px-md q-ml-md" @click="refresh" />
@@ -18,7 +18,7 @@
       </q-toolbar>
     </q-header>
 
-    <q-drawer v-model="leftDrawerOpen" bordered>
+    <q-drawer v-model="leftDrawerOpen" bordered :width="drawerWidth" :overlay="$q.screen.lt.sm">
       <q-list>
         <q-item v-if="!autorized" to="/login" exact clickable v-ripple @click="closeDrawer">
           <q-item-section>{{ $t('login') }}</q-item-section>
@@ -53,6 +53,16 @@
         >
           <q-item-section>{{ $t('responsible') }}</q-item-section>
         </q-item>
+        <q-item
+          v-if="autorized || user.isPermittedTo('group', 'read')"
+          to="/group"
+          exact
+          clickable
+          v-ripple
+          @click="closeDrawer"
+        >
+          <q-item-section>{{ $t('groups') }}</q-item-section>
+        </q-item>
       </q-list>
     </q-drawer>
     <q-page-container>
@@ -63,12 +73,13 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-import { version, productName } from '../../package.json';
+import { version } from '../../package.json';
 import LoginMenu from 'src/vueLib/login/LoginMenu.vue';
 import { useUserStore } from 'src/vueLib/login/userStore';
-import { Logo } from 'src/vueLib/models/logo';
+import { logo, appName } from 'src/vueLib/models/settings';
+import { useQuasar } from 'quasar';
 
-const localLogo = ref(Logo);
+const localLogo = ref(logo);
 
 const leftDrawerOpen = ref(false);
 const user = useUserStore();
@@ -87,4 +98,10 @@ function closeDrawer() {
 function refresh() {
   window.location.reload();
 }
+
+// Change width based on screen size
+const drawerWidth = computed(() => {
+  const $q = useQuasar();
+  return $q.screen.lt.sm ? 220 : 300; // phone: 220px, desktop: 300px
+});
 </script>

src/localstorage/localStorage.ts

@@ -0,0 +1,93 @@
+import { Dark } from 'quasar';
+import { appName, databaseName, type Settings } from 'src/vueLib/models/settings';
+import { updateOrAddObject } from 'src/vueLib/utils/utils';
+import { ref } from 'vue';
+
+export function setLocalSettings(settings: Settings) {
+  localStorage.setItem('icon', settings.icon);
+  localStorage.setItem('appName', settings.appName);
+  localStorage.setItem('databaseName', settings.databaseName);
+  localStorage.setItem('primaryColor', settings.primaryColor);
+  localStorage.setItem('primaryColorText', settings.primaryColorText);
+  localStorage.setItem('secondaryColor', settings.secondaryColor);
+  localStorage.setItem('secondaryColorText', settings.secondaryColorText);
+}
+
+export function getLocalSettings(): Settings {
+  return <Settings>{
+    icon: localStorage.getItem('icon'),
+    appName: localStorage.getItem('appName') || appName.value,
+    databaseName: localStorage.getItem('databaseName') || databaseName.value,
+    primaryColor: localStorage.getItem('primaryColor'),
+    primaryColorText: localStorage.getItem('primaryColorText'),
+    secondaryColor: localStorage.getItem('secondaryColor'),
+    secondaryColorText: localStorage.getItem('secondaryColorText'),
+  };
+}
+
+export function clearLocalStorage() {
+  localStorage.removeItem('icon');
+  localStorage.removeItem('appName');
+  localStorage.removeItem('databaseName');
+  localStorage.removeItem('primaryColor');
+  localStorage.removeItem('primaryColorText');
+  localStorage.removeItem('secondaryColor');
+  localStorage.removeItem('secondaryColorText');
+  localStorage.removeItem('lastRoute');
+  localStorage.removeItem('mode');
+  localStorage.removeItem('lang');
+}
+
+export function setLocalDarkMode() {
+  localStorage.setItem('mode', String(Dark.mode));
+}
+
+export function getLocalDarkMode(): boolean {
+  return localStorage.getItem('mode') === 'true';
+}
+
+export function setLocalLastRoute(route: string) {
+  localStorage.setItem('lastRoute', route);
+}
+
+export function getLocalLastRoute(): string {
+  return localStorage.getItem('lastRoute') || '/members';
+}
+
+export function setLocalLanguage(language: string) {
+  localStorage.setItem('lang', language);
+}
+
+export function getLocalLanguage(): string | null {
+  return localStorage.getItem('lang');
+}
+
+type pageDefault = {
+  page: string;
+  filteredColumn: string;
+  filteredValue: string[];
+};
+
+type pageDefaults = pageDefault[];
+
+const pageDefaults = ref<pageDefaults>([]);
+
+export function setLocalPageDefaults(
+  page: string,
+  filteredColumn?: string,
+  filteredValue?: string[],
+) {
+  updateOrAddObject(
+    pageDefaults.value,
+    { page: page, filteredColumn: filteredColumn, filteredValue: filteredValue },
+    'page',
+  );
+  localStorage.setItem('pageDefaults', JSON.stringify(pageDefaults.value));
+}
+
+export function getLocalPageDefaults(page: string): pageDefault | null {
+  const defaults = localStorage.getItem('pageDefaults');
+  if (!defaults) return null;
+  pageDefaults.value = JSON.parse(defaults);
+  return pageDefaults.value.find((e) => e.page === page) || null;
+}

src/pages/EventsTable.vue

@@ -1,21 +1,11 @@
 <template>
   <q-page>
+    <SiteTitle :title="$t('events')" />
     <EventsTable />
-    <DialogFrame ref="dialog" header-title="Test Frame">
-      <EventsTable ref="EventDialog" />
-    </DialogFrame>
-    <DialogFrame ref="uploadDialog" header-title="Test Frame">
-      <EventsTable ref="EventDialog" />
-    </DialogFrame>
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import EventsTable from 'src/vueLib/tables/events/EventsTable.vue';
-import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
-import { ref } from 'vue';
-import type { EventDialog } from 'src/vueLib/tables/events/EventsTable.vue';
-
-const dialog = ref();
-const EventDialog = ref<EventDialog>();
 </script>

src/pages/GroupTable.vue

@@ -0,0 +1,11 @@
+<template>
+  <q-page>
+    <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

@@ -5,6 +5,7 @@
 </template>
 
 <script setup lang="ts">
+import { getLocalLastRoute } from 'src/localstorage/localStorage';
 import LoginForm from 'src/vueLib/login/LoginForm.vue';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { nextTick, onMounted } from 'vue';
@@ -14,14 +15,13 @@ 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));
   }
 });
 
 const forwardToPage = async () => {
   await nextTick();
-  const lastRoute = sessionStorage.getItem('lastRoute') || '/members';
-  await router.push(lastRoute);
+  await router.push(getLocalLastRoute());
 };
 </script>

src/pages/MembersTable.vue

@@ -1,9 +1,13 @@
 <template>
   <q-page>
+    <SiteTitle :title="$t('members')" />
+    <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,28 +1,11 @@
 <template>
   <q-page>
+    <SiteTitle :title="$t('responsibles')" />
     <ResponsibleTable />
-    <DialogFrame ref="dialog" header-title="Test Frame">
-      <ResponsibleTable ref="memberDialog" />
-      <q-btn @click="getSelection">Get Selected</q-btn>
-    </DialogFrame>
-    <DialogFrame ref="uploadDialog" header-title="Test Frame">
-      <ResponsibleTable ref="memberDialog" />
-      <q-btn @click="getSelection">Get Selected</q-btn>
-    </DialogFrame>
   </q-page>
 </template>
 
 <script setup lang="ts">
+import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
 import ResponsibleTable from 'src/vueLib/tables/responsible/ResponsibleTable.vue';
-import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
-import { ref } from 'vue';
-import type { MemberDialog } from 'src/vueLib/tables/members/MembersTable.vue';
-import type { Members } from 'src/vueLib/models/member';
-
-const dialog = ref();
-const memberDialog = ref<MemberDialog>();
-
-function getSelection(): Members {
-  return memberDialog.value?.getSelected() || [];
-}
 </script>

src/pages/SettingsPage.vue

@@ -1,12 +1,23 @@
 <template>
+  <SiteTitle :title="$t('userSettings')" />
   <div class="text-h2 flex flex-center">
     <q-card class="q-gutter-md">
-      <p class="text-center text-bold text-h3 text-primary q-pt-md">{{ $t('settings') }}</p>
-
       <div>
         <q-card class="q-ma-lg">
           <p class="text-bold text-h6 text-primary q-pa-md">{{ $t('general') }}</p>
           <div class="row">
+            <q-input
+              :readonly="!user.isPermittedTo('settings', 'write')"
+              :class="[
+                colorGroup ? 'col-md-4' : 'col-md-3',
+                colorGroup ? 'col-md-6' : 'col-md-6',
+                colorGroup ? 'col-md-4' : 'col-md-12',
+                'q-pa-md',
+              ]"
+              filled
+              :label="$t('appName')"
+              v-model="settings.appName"
+            ></q-input>
             <q-input
               :readonly="!user.isPermittedTo('settings', 'write')"
               :class="[
@@ -133,20 +144,22 @@
 </template>
 
 <script setup lang="ts">
-import { databaseName } from 'src/vueLib/tables/members/MembersTable';
-import { Logo } from 'src/vueLib/models/logo';
+import { logo, appName, databaseName } from 'src/vueLib/models/settings';
 import { reactive, ref, watch } from 'vue';
 import { appApi } from 'src/boot/axios';
 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);
 const user = useUserStore();
 
 const settings = reactive<Settings>({
-  icon: Logo.value,
+  appName: appName.value,
+  icon: logo.value,
   databaseName: databaseName.value,
   primaryColor: document.documentElement.style.getPropertyValue('--q-primary'),
   primaryColorText: document.documentElement.style.getPropertyValue('--q-primary-text'),
@@ -155,7 +168,8 @@ const settings = reactive<Settings>({
 });
 
 watch(settings, (newSettings) => {
-  Logo.value = newSettings.icon;
+  logo.value = newSettings.icon;
+  appName.value = newSettings.appName;
   databaseName.value = newSettings.databaseName;
 });
 
@@ -175,15 +189,12 @@ function save() {
   document.documentElement.style.setProperty('--q-primary-text', settings.primaryColorText);
   document.documentElement.style.setProperty('--q-secondary', settings.secondaryColor);
   document.documentElement.style.setProperty('--q-secondary-text', settings.secondaryColorText);
-  Logo.value = settings.icon;
-  localStorage.setItem('icon', settings.icon);
-  localStorage.setItem('databaseName', settings.databaseName);
-  localStorage.setItem('primaryColor', settings.primaryColor);
-  localStorage.setItem('primaryColorText', settings.primaryColorText);
-  localStorage.setItem('secondaryColor', settings.secondaryColor);
-  localStorage.setItem('secondaryColorText', settings.secondaryColorText);
+  appName.value = settings.appName;
+  logo.value = settings.icon;
+  setLocalSettings(settings);
 
   const tempuser = user.user;
+
   if (tempuser) {
     tempuser.settings = settings;
   }

src/pages/UserSettings.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="q-pa-md">
+  <SiteTitle :title="$t('userSettings')" />
   <div class="q-gutter-y-md">
     <q-card>
       <q-tabs
@@ -17,22 +17,22 @@
       <q-separator />
 
       <q-tab-panels v-model="tab" animated>
-          <q-tab-panel name="users">
+        <q-tab-panel name="users" style="padding: 0px">
           <UserTable />
         </q-tab-panel>
-          <q-tab-panel name="roles">
+        <q-tab-panel name="roles" style="padding: 0px">
           <RoleTable />
         </q-tab-panel>
       </q-tab-panels>
     </q-card>
   </div>
-  </div>
 </template>
 
 <script setup lang="ts">
 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,7 +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('src/pages/GroupTable.vue'),
         meta: { requiresAuth: true, requiresAdmin: true },
       },
       {

src/vueLib/checkboxes/CheckBoxGroupPermissions.vue

@@ -24,6 +24,20 @@
           @update:model-value="(val) => toggleBit(index, 2, val)"
           >{{ i18n.global.t('delete') }}</q-checkbox
         >
+        <q-checkbox
+          v-if="permission.permissionNumber > 3"
+          class="q-mx-md"
+          :model-value="isFlagSet(permission.permission, 1 << 3)"
+          @update:model-value="(val) => toggleBit(index, 3, val)"
+          >{{ i18n.global.t('import') }}</q-checkbox
+        >
+        <q-checkbox
+          v-if="permission.permissionNumber > 4"
+          class="q-mx-md"
+          :model-value="isFlagSet(permission.permission, 1 << 4)"
+          @update:model-value="(val) => toggleBit(index, 4, val)"
+          >{{ i18n.global.t('export') }}</q-checkbox
+        >
       </div>
     </q-card>
   </q-card>
@@ -47,6 +61,7 @@ const localPermission = ref(
   props.permissions.map((e) => ({
     name: e.name,
     permission: e.permission ?? 0,
+    permissionNumber: e.name === 'members' ? 5 : 3,
   })),
 );
 

src/vueLib/checkboxes/permissions.ts

@@ -35,6 +35,11 @@ export const defaultPermissions = [
     label: i18n.global.t('responsible'),
     permission: 0,
   },
+  {
+    name: 'group',
+    label: i18n.global.t('group'),
+    permission: 0,
+  },
   {
     name: 'excursionTable',
     label: i18n.global.t('excursionTable'),

src/vueLib/dialog/DialogFrame.vue

@@ -7,10 +7,10 @@
     :no-refocus="!minMaxState"
     :seamless="!minMaxState"
   >
-    <q-card class="layout" :style="cardStyle">
+    <q-card class="layout bg-surface text-on-surface" :style="cardStyle">
       <!-- Draggable Header -->
       <div
-        class="dialog-header row items-center justify-between bg-grey-1"
+        class="dialog-header row items-center justify-between bg-transparent"
         v-touch-pan.mouse.prevent.stop="handlePan"
       >
         <div v-if="headerTitle" class="text-left text-bold text-caption q-mx-sm">
@@ -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
@@ -139,13 +140,11 @@ const cardStyle = computed(() => {
   display: flex;
   flex-direction: column;
   border-radius: 10px;
-  background-color: white;
 }
 
 /* Draggable header */
 .dialog-header {
   padding: 8px 0;
-  background: #f5f5f5;
   cursor: move;
   user-select: none;
 }
@@ -155,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/general/useNotify.ts

@@ -48,9 +48,20 @@ export function useNotify() {
       $q?.notify({
         message: message,
         color: color,
-        position: 'bottom-right',
+        position: 'top',
         icon: icon,
         timeout: timeout,
+        actions: [
+          {
+            icon: 'close',
+            color: 'white',
+            dense: true,
+            round: true,
+            handler: () => {
+              /* just closes */
+            },
+          },
+        ],
       });
     }
   }

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/LoginForm.vue

@@ -3,7 +3,7 @@
   <q-form ref="refForm">
     <q-item-section class="q-gutter-md q-pa-md">
       <q-card :class="['q-gutter-xs q-items-center q-pa-lg', { shake: shake }]">
-        <div class="text-h5 text-primary text-center">{{ productName }}</div>
+        <div class="text-h5 text-primary text-center">{{ $t(appName) }}</div>
         <q-input
           ref="refUserInput"
           dense
@@ -47,7 +47,7 @@
 </template>
 
 <script setup lang="ts">
-import { productName } from '../../../package.json';
+import { appName } from '../models/settings';
 import { ref } from 'vue';
 import { useNotify } from '../general/useNotify';
 import { useLogin } from './useLogin';

src/vueLib/login/LoginMenu.vue

@@ -8,7 +8,9 @@
             <q-item-section class="text-primary">{{ loginText }}</q-item-section>
           </q-item>
           <q-item>
-            <q-btn flat :icon="Dark.mode ? 'light_mode' : 'dark_mode'" @click="Dark.toggle"></q-btn>
+            <q-btn flat :icon="darkMode" @click="toggleDarkMode"
+              ><q-tooltip>{{ $t(darkMode) }}</q-tooltip></q-btn
+            >
           </q-item>
           <q-item>
             <q-select
@@ -18,7 +20,8 @@
               dense
               v-model="langSelected"
               :options="langSelection"
-            ></q-select>
+              ><q-tooltip>{{ $t('language') }}</q-tooltip></q-select
+            >
           </q-item>
           <q-item
             v-if="
@@ -51,24 +54,38 @@ import { useUserStore } from './userStore';
 import { useRoute } from 'vue-router';
 import { Dark } from 'quasar';
 import { useLogin } from './useLogin';
+import { setLocalDarkMode, setLocalLanguage } from 'src/localstorage/localStorage';
 
 const userLogin = useLogin();
 const route = useRoute();
+const refLoginDialog = ref();
+const user = useUserStore();
+const { NotifyResponse } = useNotify();
+const currentUser = computed(() => user.user);
+const darkMode = computed(() => {
+  if (Dark.mode) {
+    return 'light_mode';
+  }
+  return 'dark_mode';
+});
 const showLogin = computed(
   () => (route.path !== '/' && route.path !== '/login') || currentUser.value?.username === '',
 );
 
-const user = useUserStore();
 const autorized = computed(() => !!user.isAuthorizedAs(['admin']));
-const { NotifyResponse } = useNotify();
-const currentUser = computed(() => user.user);
 
+// switch between logged in or logged out text
 const loginText = computed(() => {
-  return currentUser.value ? 'Logout' : 'Login';
+  return currentUser.value ? i18n.global.t('logout') : i18n.global.t('login');
 });
 
-const refLoginDialog = ref();
+//switch between dark and light mode and save it in localStorage
+function toggleDarkMode() {
+  Dark.toggle();
+  setLocalDarkMode();
+}
 
+// opens login page if no user is logged in otherwise it serves as logout
 function openLogin() {
   if (currentUser.value) {
     userLogin.logout().catch((err) => NotifyResponse(err, 'error'));
@@ -83,6 +100,7 @@ const langSelection = ref(lang);
 // Watch for changes and update i18n locale
 watch(langSelected, (newLang) => {
   i18n.global.locale = newLang;
-  localStorage.setItem('lang', newLang);
+
+  setLocalLanguage(newLang);
 });
 </script>

src/vueLib/login/useLogin.ts

@@ -2,7 +2,8 @@ import { appApi } from 'src/boot/axios';
 import { useUserStore } from './userStore';
 import { useNotify } from '../general/useNotify';
 import type { Settings } from '../models/settings';
-import { Logo } from '../models/logo';
+import { appName, logo } from '../models/settings';
+import { clearLocalStorage, setLocalSettings } from 'src/localstorage/localStorage';
 
 const refreshTime = 10000;
 let intervalId: ReturnType<typeof setInterval> | null = null;
@@ -16,22 +17,26 @@ 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) {
+          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);
         document.documentElement.style.setProperty('--q-secondary-text', sets.secondaryColorText);
-        localStorage.setItem('icon', sets.icon);
-        localStorage.setItem('databaseName', sets.databaseName);
-        localStorage.setItem('primaryColor', sets.primaryColor);
-        localStorage.setItem('primaryColorText', sets.primaryColorText);
-        localStorage.setItem('secondaryColor', sets.secondaryColor);
-        localStorage.setItem('secondaryColorText', sets.secondaryColorText);
+        setLocalSettings(sets);
       });
 
       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();
@@ -48,7 +53,7 @@ export function useLogin() {
     });
 
     userStore.clearUser();
-    sessionStorage.clear();
+    clearLocalStorage();
     stopRefreshInterval();
   }
 
@@ -60,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,11 +20,11 @@ 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) => {
-      return (name: string, type: 'read' | 'write' | 'delete'): boolean => {
+      return (name: string, type: 'read' | 'write' | 'delete' | 'import' | 'export'): boolean => {
         const permission = state.user?.permissions?.find((r: Permission) => r.name === name);
         switch (type) {
           case 'read':
@@ -33,6 +33,10 @@ export const useUserStore = defineStore('user', {
             return permission?.permission ? (permission.permission & (1 << 1)) === 2 : false;
           case 'delete':
             return permission?.permission ? (permission.permission & (1 << 2)) === 4 : false;
+          case 'import':
+            return permission?.permission ? (permission.permission & (1 << 3)) === 8 : false;
+          case 'export':
+            return permission?.permission ? (permission.permission & (1 << 4)) === 16 : false;
         }
       };
     },
@@ -40,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;
         })
@@ -56,9 +60,20 @@ export const useUserStore = defineStore('user', {
         $q?.notify({
           message: "user '" + this.user?.username + "' logged out",
           color: 'orange',
-          position: 'bottom-right',
+          position: 'top',
           icon: 'warning',
           timeout: 5000,
+          actions: [
+            {
+              icon: 'close',
+              color: 'white',
+              dense: true,
+              round: true,
+              handler: () => {
+                /* just closes */
+              },
+            },
+          ],
         });
       } else {
         console.error("user '" + this.user?.username + "' logged out");
@@ -73,9 +88,20 @@ export const useUserStore = defineStore('user', {
           $q?.notify({
             message: err,
             color: 'orange',
-            position: 'bottom-right',
+            position: 'top',
             icon: 'warning',
             timeout: 5000,
+            actions: [
+              {
+                icon: 'close',
+                color: 'white',
+                dense: true,
+                round: true,
+                handler: () => {
+                  /* just closes */
+                },
+              },
+            ],
           });
         } else {
           console.error("user '" + this.user?.username + "' logged out");

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/group.ts

@@ -0,0 +1,6 @@
+export interface Group {
+  id: number;
+  name: string;
+}
+
+export type Groups = Group[];

src/vueLib/models/logo.ts

@@ -1,3 +0,0 @@
-import { ref } from 'vue';
-
-export const Logo = ref('');

src/vueLib/models/member.ts

@@ -1,16 +1,22 @@
+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;
   age?: string;
+  comment?: string;
   address?: string;
   town?: string;
   zip?: string;
   phone?: string;
   email?: string;
-  group?: string;
-  responsiblePerson?: Member;
+  group?: Group;
+  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/settings.ts

@@ -1,4 +1,11 @@
+import { ref } from 'vue';
+
+export const logo = ref('');
+export const appName = ref('Attendance Records');
+export const databaseName = ref('members.dba');
+
 export type Settings = {
+  appName: string;
   icon: string;
   databaseName: string;
   primaryColor: string;
@@ -9,6 +16,7 @@ export type Settings = {
 
 export function DefaultSettings(): Settings {
   return {
+    appName: 'Attendance Records',
     icon: '',
     databaseName: 'members.dba',
     primaryColor: document.documentElement.style.getPropertyValue('--q-primary-text'),

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;
-  expires: 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,6 +1,4 @@
 <template>
-  <DialogFrame ref="dialog" :header-title="$t('attendees')" :width="600">
-    <div class="q-pa-md">
   <q-table
     flat
     bordered
@@ -20,8 +18,10 @@
     :selection="selectOption ? 'multiple' : 'none'"
     v-model:selected="selected"
     binary-state-sort
+    dense
     class="bigger-table-text"
   >
+    <!--top left of event table-->
     <template v-slot:top-left>
       <q-btn-group push flat style="color: grey">
         <q-btn
@@ -29,7 +29,7 @@
           dense
           flat
           icon="person"
-              @click="openAllValueDialog"
+          @click="openAttendanceDialog"
           ><q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
           <q-tooltip>{{ $t('addNewAttendees') }}</q-tooltip>
         </q-btn>
@@ -60,6 +60,7 @@
         {{ $t('selected') }}: {{ selected.length }}
       </div>
     </template>
+    <!--top right of event table-->
     <template v-slot:top-right>
       <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
         <template v-slot:append>
@@ -67,11 +68,12 @@
         </template>
       </q-input>
     </template>
+    <!--body of event table-->
     <template v-slot:body-cell="props">
       <q-td v-if="props.col.field === 'attendees'" :props="props">
         <q-btn v-if="props.value !== null && props.value.length > 0" dense flat icon="people"
           ><q-badge color="primary" text-color="primary-text" floating transparent>{{
-                props.row.count
+            props.row.attendees.length
           }}</q-badge></q-btn
         >
       </q-td>
@@ -92,9 +94,13 @@
       </q-td>
     </template>
   </q-table>
-    </div>
-    <DialogFrame ref="memberTableDialog" :header-title="$t('members')" :width="700">
-      <MembersTable add-attendees v-on:update-event="updateTable" :event-id="localEvent?.id ?? 0" />
+  <DialogFrame ref="attendanceDialog" :header-title="$t('members')" :width="700" :height="500">
+    <MembersTable
+      add-attendees
+      :compare-members="attendees"
+      v-on:update-event="(val) => updateTable(val)"
+      :event-id="localEvent?.id ?? 0"
+    />
   </DialogFrame>
 
   <OkDialog
@@ -108,12 +114,12 @@
     button-ok-color="red"
     v-on:update-confirm="(val) => removeAttendees(...val)"
   ></OkDialog>
-  </DialogFrame>
 </template>
 
 <script setup lang="ts">
+//imports
 import { appApi } from 'src/boot/axios';
-import { ref } from 'vue';
+import { onMounted, type PropType, ref } from 'vue';
 import type { Members } from 'src/vueLib/models/member';
 import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
 import OkDialog from 'src/components/dialog/OkDialog.vue';
@@ -124,15 +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 {
-  getSelected: () => Members;
-}
+//use constants and function of imports
+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 dialog = ref();
+const attendanceDialog = ref();
 const okDialog = ref();
 const deleteText = ref('');
 const selectOption = ref(false);
@@ -142,17 +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 ?? [];
+});
 
-const open = (event: Event) => {
-  localEvent.value = event;
-  attendees.value = event.attendees ?? [];
-  dialog.value.open();
-};
-
-//opens dialog for one value
-function openAllValueDialog() {
-  memberTableDialog.value?.open();
+//opens attendance dialog
+function openAttendanceDialog() {
+  attendanceDialog.value?.open();
 }
 
 //opens remove dialog
@@ -164,15 +177,16 @@ function openRemoveDialog(...attendees: Members) {
     }
     deleteText.value += "'";
   } else {
-    deleteText.value = String(attendees.length) + ' attendees';
+    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) {
-    console.error('event is empty');
+    NotifyResponse('event is empty', 'error');
     return;
   }
 
@@ -192,31 +206,17 @@ async function removeAttendees(...removeAttendees: Members) {
     .finally(() => {
       loading.value = false;
     });
-  emit('update');
-  await updateAttendees();
+  await updateAttendees(props.eventArray);
+  emit('update', -removeAttendees.length);
 }
 
-async function updateTable() {
-  await updateAttendees();
-  emit('update');
+async function updateTable(amount: number) {
+  await updateAttendees(props.eventArray);
+  emit('update', amount);
 }
-
-defineExpose({
-  open,
-});
 </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

@@ -0,0 +1,126 @@
+<template>
+  <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
+        class="text-grey"
+        active-color="primary"
+        indicator-color="primary"
+        align="justify"
+        narrow-indicator
+      >
+        <q-tab no-caps name="attendance" :label="$t('attendees')"
+          ><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" style="padding: 0px">
+          <AttendeesTable
+            :event="localEvent!"
+            :event-array="eA"
+            v-on:update="(val) => updateTable(val)"
+          />
+        </q-tab-panel>
+        <!--tab of missing attenting members-->
+        <q-tab-panel name="noneAttendees" style="padding: 0px">
+          <MembersTable
+            add-attendees
+            :compare-members="attendees"
+            v-on:update-event="(val) => updateTable(val)"
+            :event-id="localEvent?.id ?? 0"
+          />
+        </q-tab-panel>
+      </q-tab-panels>
+    </q-card>
+  </DialogFrame>
+</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');
+
+// opens attendace dialog of event
+const open = async (eventArray: number, event: Event) => {
+  // local declarations
+  localEvent.value = event;
+  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();
+};
+
+//updates amount of table display and both tables
+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');
+}
+
+defineExpose({ open });
+</script>

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">
-          <q-btn
-            v-if="user.isPermittedTo('events', 'write')"
-            dense
-            flat
-            icon="add"
-            @click="openAllValueDialog(null)"
-          >
-            <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>
+        <TopButtonGroup
+          :permit-add="user.isPermittedTo('events', 'write')"
+          v-on:add="openAllValueDialog(null)"
+          :tool-tip-add="$t('addNewEvent')"
+          :permit-select="user.isPermittedTo('events', 'write')"
+          :tool-tip-select="$t('selectEventOptions')"
+          v-model:select-option="selectOption"
+        />
         <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')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+        <SearchableInput v-model="filter" :placeholder="$t('search')" />
       </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"
-          :style="
-            user.isPermittedTo('events', 'write') && props.col.field !== 'count'
-              ? 'cursor: pointer'
-              : ''
-          "
-          @click="
-            user.isPermittedTo('events', 'write') &&
-            props.col.field !== 'count' &&
-            openSingleValueDialog(props.col.label, props.col.name, props.row)
-          "
-        >
-          {{ props.value }}
-        </q-td>
+          :td-props="props"
+          :is="props.col.component"
+          :permitted="user.isPermittedTo('events', 'write') && props.col.field !== 'count'"
+          v-on:onClick="openSingleValueDialog(props.col.label, props.col.name, props.row)"
+          :value="props.value"
+        />
+      </template>
+      <template v-slot:body-cell-day="props">
+        <component
+          :td-props="props"
+          :is="props.col.component"
+          :value="props.value ? $t(props.value) : ''"
+        />
       </template>
       <template v-slot:body-cell-option="props">
-        <q-td :props="props">
-          <q-btn
-            v-if="user.isPermittedTo('events', 'write') || user.isPermittedTo('events', 'delete')"
-            flat
-            dense
-            icon="more_vert"
-            @click="openSubmenu = true"
-          />
-          <q-menu v-if="openSubmenu" anchor="top right" self="top left">
-            <q-item
-              v-if="user.isPermittedTo('events', 'write')"
-              clickable
-              v-close-popup
-              @click="openAllValueDialog(props.row)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
+        <component
+          :is="props.col.component"
+          :td-props="props"
+          :permitEdit="user.isPermittedTo('events', 'write')"
+          :permitDelete="user.isPermittedTo('events', 'delete')"
+          :editFunction="() => openAllValueDialog(props.row)"
+          :removeFunction="() => openRemoveDialog(props.row)"
         >
-            <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>
+        </component>
       </template>
     </q-table>
   </div>
@@ -130,7 +100,7 @@
     v-on:update="updateEvents"
   ></EditOneDialog>
   <EditAllDialog ref="editAllDialog" v-on:update="updateEvents"></EditAllDialog>
-  <AttendeesTable ref="attendeesDialog" v-on:update="updateEvents" />
+  <AttendeesTableDialog ref="attendeesDialog" v-on:update="updateEvents" />
   <OkDialog
     ref="okDialog"
     :dialog-label="$t('delete')"
@@ -153,10 +123,13 @@ import EditAllDialog from 'src/components/EventEditAllDialog.vue';
 import OkDialog from 'src/components/dialog/OkDialog.vue';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { useEventTable } from './EventsTable';
-import { databaseName } from '../members/MembersTable';
+import { databaseName } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
-import AttendeesTable from '../attendees/AttendeesTable.vue';
+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;
@@ -211,13 +184,13 @@ function openRemoveDialog(...Events: Events) {
     }
     deleteText.value += "'";
   } else {
-    deleteText.value = String(Events.length) + ' Events';
+    deleteText.value = String(Events.length) + ' ' + i18n.global.t('events');
   }
   okDialog.value?.open(Events);
 }
 
-function openAttendees(attendees: Members | null) {
-  attendeesDialog.value.open(attendees);
+function openAttendees(eventArray: number, attendees: Members | null) {
+  attendeesDialog.value.open(eventArray, attendees);
 }
 
 //remove Event from database
@@ -242,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

@@ -0,0 +1,71 @@
+import { appApi } from 'src/boot/axios';
+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>([]);
+
+  const pagination = ref({
+    sortBy: 'firstName',
+    descending: false,
+    page: 1,
+    rowsPerPage: 20,
+  });
+
+  const columns = computed(() => [
+    {
+      name: 'name',
+      align: 'left' as const,
+      label: i18n.global.t('name'),
+      field: 'name',
+      sortable: true,
+      component: ClickableComponent,
+    },
+    {
+      name: 'option',
+      align: 'center' as const,
+      label: '',
+      field: 'option',
+      icon: 'option',
+      component: MenuComponent,
+    },
+  ]);
+
+  const { NotifyResponse } = useNotify();
+
+  const loading = ref(false);
+
+  //updates group list from database
+  async function updateGroups() {
+    loading.value = true;
+
+    await appApi
+      .get('groups')
+      .then((resp) => {
+        if (resp.data === null) {
+          groups.value = [];
+          return;
+        }
+        groups.value = resp.data as Members;
+      })
+
+      .catch((err) => {
+        NotifyResponse(err, 'error');
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  }
+
+  return {
+    groups,
+    pagination,
+    columns,
+    loading,
+    updateGroups,
+  };
+}

src/vueLib/tables/group/GroupTable.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="q-pa-md">
+    <q-table
+      flat
+      bordered
+      ref="tableRef"
+      title="groups"
+      title-class="text-bold text-blue-9"
+      :no-data-label="$t('noDataAvailable')"
+      :loading-label="$t('loading')"
+      :rows-per-page-label="$t('recordsPerPage')"
+      :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
+      :rows="groups"
+      :columns="columns"
+      row-key="id"
+      v-model:pagination="pagination"
+      :loading="loading"
+      :filter="filter"
+      :selection="selectOption ? 'multiple' : 'none'"
+      v-model:selected="selected"
+      binary-state-sort
+      dense
+      class="bigger-table-text"
+    >
+      <template v-slot:top-left>
+        <TopButtonGroup
+          :permit-add="user.isPermittedTo('group', 'write')"
+          v-on:add="openGroupDialog"
+          :tool-tip-add="$t('addNewgroup')"
+          :permit-select="
+            user.isPermittedTo('group', 'write') || user.isPermittedTo('group', 'delete')
+          "
+          v-model:select-option="selectOption"
+          :tool-tip-select="$t('selectgroupOptions')"
+        />
+        <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
+              v-if="user.isPermittedTo('group', 'delete')"
+              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="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-->
+      <template v-slot:body-cell="props">
+        <component
+          :is="props.col.component"
+          :td-props="props"
+          :permitted="user.isPermittedTo('group', 'write')"
+          v-on:onClick="openGroupDialog(props.col.label, props.row)"
+          :value="props.value"
+        />
+      </template>
+      <template v-slot:body-cell-option="props">
+        <component
+          :td-props="props"
+          :is="props.col.component"
+          :permitDelete="user.isPermittedTo('group', 'delete')"
+          :removeFunction="() => openRemoveDialog(props.row)"
+        >
+        </component>
+      </template>
+    </q-table>
+  </div>
+  <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
+          class="q-ml-md col-5 required"
+          :label="$t('groupName')"
+          filled
+          :rules="[(val) => !!val || $t('groupNameIsRequired')]"
+          v-model="localGroup.name"
+          autofocus
+          @keyup.enter="save()"
+        ></q-input>
+      </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>
+  <OkDialog
+    ref="okDialog"
+    :dialog-label="$t('delete')"
+    :text="$t('doYouWantToDelete') + ' ' + deleteText"
+    label-color="red"
+    :button-cancel-label="$t('cancel')"
+    :button-ok-label="$t('confirm')"
+    :button-ok-flat="false"
+    button-ok-color="red"
+    v-on:update-confirm="(val) => removegroup(...val)"
+  ></OkDialog>
+</template>
+
+<script setup lang="ts">
+import { appApi } from 'src/boot/axios';
+import { ref, onMounted } from 'vue';
+import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
+import OkDialog from 'src/components/dialog/OkDialog.vue';
+import { useNotify } from 'src/vueLib/general/useNotify';
+import { useGroupTable } from './GroupTable';
+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';
+import TopButtonGroup from '../components/TopButtonGroup.vue';
+
+const { NotifyResponse } = useNotify();
+const groupDialog = ref();
+const form = ref();
+const localGroup = ref<Group>({} as Group);
+const localLabel = ref('');
+const okDialog = ref();
+const deleteText = ref('');
+const selectOption = ref(false);
+const selected = ref<Groups>([]);
+const openSubmenu = ref(false);
+const filter = ref('');
+const user = useUserStore();
+
+const { groups, pagination, loading, columns, updateGroups } = useGroupTable();
+
+//load on mounting page
+onMounted(() => {
+  loading.value = true;
+
+  appApi
+    .post('database/open', { dbPath: databaseName.value, create: true })
+    .then(() => {
+      updateGroups().catch((err) => {
+        NotifyResponse(err, 'error');
+      });
+    })
+    .catch((err) => NotifyResponse(err, 'error'))
+
+    .finally(() => {
+      loading.value = false;
+    });
+});
+
+//opens dialog for one value
+function openGroupDialog(label?: string, group?: Group) {
+  localLabel.value = label!;
+  localGroup.value = group ? group : <Group>{ name: '' };
+  groupDialog.value?.open();
+}
+
+//opens remove dialog
+function openRemoveDialog(...groups: Groups) {
+  if (groups.length === 1) {
+    deleteText.value = "'" + localGroup.value.name + "''";
+  } else {
+    deleteText.value = String(groups.length) + ' ' + i18n.global.t('groups');
+  }
+  okDialog.value?.open(groups);
+}
+
+//remove group from database
+function removegroup(...removegroups: Groups) {
+  const groupIds: number[] = [];
+
+  removegroups.forEach((group: Group) => {
+    groupIds.push(group.id);
+  });
+
+  appApi
+    .post('groups/delete', { ids: groupIds })
+    .then(() => {
+      updateGroups().catch((err) => {
+        NotifyResponse(err, 'error');
+      });
+      selected.value = [];
+    })
+    .catch((err) => NotifyResponse(err, 'error'))
+    .finally(() => {
+      loading.value = false;
+    });
+}
+
+async function save() {
+  const valid = await form.value.validate();
+
+  if (!valid) return;
+
+  let query = 'groups/edit';
+  let payload = JSON.stringify([localGroup.value]);
+
+  if (!localGroup.value.id) {
+    query = 'groups/add';
+    payload = JSON.stringify(localGroup.value);
+  }
+
+  appApi
+    .post(query, payload)
+    .then(() => {
+      updateGroups().catch((err) => NotifyResponse(err, 'error'));
+      groupDialog.value.close();
+    })
+    .catch((err) => NotifyResponse(err, 'error'));
+}
+</script>
+
+<style>
+.bigger-table-text .q-table__middle td {
+  font-size: 14px;
+}
+
+.bigger-table-text .q-table__top,
+.bigger-table-text .q-table__bottom,
+.bigger-table-text th {
+  font-size: 14px;
+}
+</style>

src/vueLib/tables/members/MembersTable.ts

@@ -4,12 +4,24 @@ import type { Member, Members } from 'src/vueLib/models/member';
 import { useNotify } from 'src/vueLib/general/useNotify';
 import { i18n } from 'boot/lang';
 import { useResponsibleTable } from '../responsible/ResponsibleTable';
-
-export const databaseName = ref('members.dba');
+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 members = ref<Members>([]);
-  const { responsibles, updateResponsibles } = useResponsibleTable();
+  const allMembers = ref<Members>([]);
+  const filteredMembers = ref<Members>([]);
+  const filterList = ref<
+    {
+      field: keyof Member;
+      keys: string[];
+    }[]
+  >();
+  const { responsibles, responsibleMember, updateResponsibles } = useResponsibleTable();
+  const { groups, updateGroups } = useGroupTable();
 
   const pagination = ref({
     sortBy: 'firstName',
@@ -25,27 +37,37 @@ export function useMemberTable() {
     lastName: true,
     birthday: true,
     age: true,
-    address: false,
+    address: true,
+    comment: true,
     town: true,
     zip: true,
     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',
@@ -53,6 +75,7 @@ export function useMemberTable() {
         label: i18n.global.t('lastName'),
         field: 'lastName',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'birthday',
@@ -60,6 +83,7 @@ export function useMemberTable() {
         label: i18n.global.t('birthday'),
         field: 'birthday',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'age',
@@ -67,6 +91,15 @@ export function useMemberTable() {
         label: i18n.global.t('age'),
         field: 'age',
         sortable: true,
+        component: ClickableComponent,
+      },
+      {
+        name: 'comment',
+        align: 'left' as const,
+        label: i18n.global.t('comment'),
+        field: 'comment',
+        sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'address',
@@ -74,6 +107,7 @@ export function useMemberTable() {
         label: i18n.global.t('address'),
         field: 'address',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'town',
@@ -81,6 +115,7 @@ export function useMemberTable() {
         label: i18n.global.t('town'),
         field: 'town',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'zip',
@@ -88,6 +123,7 @@ export function useMemberTable() {
         label: i18n.global.t('zipCode'),
         field: 'zip',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'phone',
@@ -95,6 +131,7 @@ export function useMemberTable() {
         label: i18n.global.t('phone'),
         field: 'phone',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'email',
@@ -102,6 +139,7 @@ export function useMemberTable() {
         label: i18n.global.t('email'),
         field: 'email',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'group',
@@ -109,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',
@@ -123,6 +163,7 @@ export function useMemberTable() {
         label: i18n.global.t('firstVisit'),
         field: 'firstVisit',
         sortable: true,
+        component: ClickableComponent,
       },
       {
         name: 'lastVisit',
@@ -130,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]),
   );
 
@@ -191,29 +240,31 @@ export function useMemberTable() {
   }
 
   //updates member list from database
-  async function updateMembers() {
+  async function updateMembers(filter?: Members, filterbyName?: boolean) {
     loading.value = true;
 
     await updateResponsibles().catch((err) => NotifyResponse(err, 'error'));
-
-    appApi
+    await updateGroups().catch((err) => NotifyResponse(err, 'error'));
+    await appApi
       .get('members')
       .then((resp) => {
         if (resp.data === null) {
-          members.value = [];
+          allMembers.value = [];
           return;
         }
-        members.value = resp.data as Members;
-        if (members.value === null) {
-          members.value = [];
+        allMembers.value = resp.data as Members;
+        if (allMembers.value === null) {
+          allMembers.value = [];
           return;
         }
-        members.value.forEach((member) => {
-          if (!responsibles.value.some((r) => r.id === member.responsiblePerson?.id)) {
-            delete member.responsiblePerson;
+        allMembers.value.forEach((member) => {
+          // remove responsible of member if it does not exist in responsible list any longer
+          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));
           }
         });
@@ -224,9 +275,57 @@ export function useMemberTable() {
       })
       .finally(() => {
         loading.value = false;
+        //filter same members out so list is shorter
+        filteredMembers.value = allMembers.value;
+        if (filter) {
+          filteredMembers.value = filteredMembers.value.filter(
+            (m1) =>
+              !filter.some((m2) => {
+                if (filterbyName) {
+                  return m1.firstName === m2.firstName && m1.lastName === m2.lastName;
+                }
+                return m1.id === m2.id;
+              }),
+          );
+        }
+
+        //second filter
+        const list = filterList.value ?? [];
+        if (filterList.value && filterList.value.length > 0) {
+          filteredMembers.value = filteredMembers.value.filter((member) =>
+            list.every((filterItem) => {
+              const keys = filterItem.keys ?? [];
+              if (keys.includes('null')) return true;
+              if (keys.length === 0) return true;
+
+              const value = member[filterItem.field];
+
+              if (value === undefined || value === null) {
+                return keys.includes('None');
+              }
+              if (typeof value === 'number') {
+                return keys.includes(value.toString());
+              }
+              if (typeof value === 'string') {
+                return keys.includes(value);
+              }
+              return false;
+            }),
+          );
+          return;
+        }
       });
   }
 
+  function setNewFilter(field: string, ...keys: string[]) {
+    filterList.value = [
+      {
+        field: field as keyof Member,
+        keys: keys.flat().map((k) => String(k)),
+      },
+    ];
+  }
+
   function disableColumns(...columns: string[]) {
     columns.forEach((col) => {
       if (col in enabledColumns.value) {
@@ -234,15 +333,67 @@ export function useMemberTable() {
       }
     });
   }
+
+  function exportCsv() {
+    const comma = ';';
+    // Extract only columns that have a field (not icons/options)
+    const exportableColumns = columns.value.filter(
+      (col) => typeof col.field === 'string' && col.field !== 'cake' && col.field !== 'option',
+    ) as { field: keyof Member; label: string }[];
+
+    // Build CSV header row
+    const header = exportableColumns.map((col) => col.field).join(comma);
+
+    // Build CSV rows
+    const data = allMembers.value.map((member) =>
+      exportableColumns
+        .map((col) => {
+          const value = member[col.field];
+          // handle nested objects (e.g. responsible)
+          if (typeof value === 'object' && value !== null) {
+            if (
+              'firstName' in value &&
+              'lastName' in value &&
+              typeof value.firstName === 'string' &&
+              typeof value.lastName === 'string'
+            )
+              return `"${value.firstName} ${value.lastName}"`;
+            return `"${JSON.stringify(value)}"`;
+          }
+          return `"${value ?? ''}"`;
+        })
+        .join(comma),
+    );
+
+    // Combine into CSV string
+    const csv = [header, ...data].join('\n');
+
+    // Create blob and trigger download
+    const BOM = '\uFEFF';
+    const blob = new Blob([BOM + csv], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.setAttribute('download', i18n.global.t(appName.value) + '.csv');
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+
   return {
-    members,
+    allMembers,
+    filteredMembers,
     responsibles,
+    responsibleMember,
+    groups,
     pagination,
     columns,
     loading,
     getRowClass,
     updateMembers,
+    setNewFilter,
     isXDaysBeforeAnnualDate,
     disableColumns,
+    exportCsv,
   };
 }

src/vueLib/tables/members/MembersTable.vue

@@ -1,5 +1,4 @@
 <template>
-  <div class="q-pa-md">
   <q-table
     flat
     bordered
@@ -10,7 +9,7 @@
     :loading-label="$t('loading')"
     :rows-per-page-label="$t('recordsPerPage')"
     :selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
-      :rows="members"
+    :rows="filteredMembers"
     :columns="columns"
     row-key="id"
     v-model:pagination="pagination"
@@ -19,39 +18,28 @@
     :selection="selectOption ? 'multiple' : 'none'"
     v-model:selected="selected"
     binary-state-sort
+    dense
     class="bigger-table-text"
   >
+    <!-- top left of table-->
     <template v-slot:top-left>
-        <q-btn-group push flat style="color: grey">
-          <q-btn
-            v-if="user.isPermittedTo('members', 'write')"
-            dense
-            flat
-            icon="add"
-            @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', 'write')"
-            dense
-            flat
-            icon="upload"
-            @click="openUploadDialog"
-          >
-            <q-tooltip>{{ $t('importCSV') }}</q-tooltip>
-          </q-btn>
-        </q-btn-group>
+      <div>
+        <TopButtonGroup
+          :permit-add="user.isPermittedTo('members', 'write')"
+          :tool-tip-add="$t('addNewMember')"
+          :permit-select="
+            user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')
+          "
+          :tool-tip-select="$t('selectMemberOptions')"
+          :permit-import="user.isPermittedTo('members', 'import')"
+          :permit-export="user.isPermittedTo('members', 'export')"
+          v-model:select-option="selectOption"
+          v-on:add="openAllValueDialog(null)"
+          v-on:import="openUploadDialog"
+          :tool-tip-import="$t('importCSV')"
+          v-on:export="exportCsv"
+          :tool-tip-export="$t('exportCSV')"
+        />
         <div v-if="selectOption && selected.length > 0">
           <q-btn
             v-if="inProps.addAttendees || inProps.addResponsible"
@@ -62,6 +50,9 @@
             @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" />
 
@@ -79,96 +70,115 @@
             >
           </q-menu>
         </div>
+        <FilterSelect
+          :filter-options="columns.filter((col) => col.label !== '')"
+          :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>
-        <q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
     </template>
+
+    <!-- table body content-->
+
+    <!-- usual cell content -->
     <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)
-          "
-        >
-          {{ props.value }}
-        </q-td>
+      <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">
-        <q-td :props="props" :class="getRowClass(props.row)">
-          <q-icon
-            :name="isXDaysBeforeAnnualDate(props.row.birthday, 1) ? 'cake' : ''"
-            :color="'red'"
+      <component
+        :td-props="props"
+        :is="props.col.component"
+        :inClass="getRowClass(props.row)"
         size="md"
-          />
-        </q-td>
+        :name="isXDaysBeforeAnnualDate(props.row.birthday, 1) ? 'cake' : ''"
+        color="red"
+      >
+      </component>
     </template>
-      <template v-slot:body-cell-responsiblePerson="props">
-        <q-td :props="props">
-          <q-select
-            v-if="responsibles.length > 0"
-            :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')"
-            flat
+
+    <!-- group select -->
+    <template v-slot:body-cell-group="props" v-if="groups.length > 0">
+      <component
+        :td-props="props"
+        :is="props.col.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('members', 'write')"
-              clickable
-              v-close-popup
-              @click="openAllValueDialog(props.row)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
+        :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)"
       >
-            <q-item
-              v-if="
-                user.isPermittedTo('members', 'delete') &&
-                !inProps.addAttendees &&
-                !inProps.addResponsible
+      </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 : '')
         "
-              clickable
-              v-close-popup
-              @click="openRemoveDialog(props.row)"
-              class="text-negative"
-              title="zu"
-              >{{ $t('delete') }}</q-item
+        option-value="memberId"
+        v-model="props.row.responsible"
+        @update:model-value="updateMember(props.row)"
       >
-          </q-menu>
-        </q-td>
+      </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>
-  </div>
   <EditOneDialog
     ref="editOneDialog"
     endpoint="members/edit"
     query-id
-    v-on:update="updateMembers"
+    v-on:update="updateMember"
   ></EditOneDialog>
   <EditAllDialog
     ref="editAllDialog"
     :responsibles="responsibles"
-    v-on:update="updateMembers"
+    :group="groups"
+    v-on:update="updateMember"
   ></EditAllDialog>
   <OkDialog
     ref="okDialog"
@@ -185,13 +195,13 @@
   <AddToEvent
     ref="addToEventDialog"
     endpoint="events/add/attendees"
-    v-on:update-event="(val) => updateMemberLastVisit(val)"
+    @update-event="updateMemberLastVisit"
   />
 </template>
 
 <script setup lang="ts">
 import { appApi } from 'src/boot/axios';
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, type PropType } from 'vue';
 import type { Member, Members } from 'src/vueLib/models/member';
 import EditOneDialog from 'src/components/EditOneDialog.vue';
 import EditAllDialog from 'src/components/MemberEditAllDialog.vue';
@@ -200,14 +210,21 @@ import { useNotify } from 'src/vueLib/general/useNotify';
 import { useMemberTable } from './MembersTable';
 import UploadDialog from 'src/components/UploadDialog.vue';
 import AddToEvent from 'src/components/AddToEvent.vue';
-import { databaseName } from './MembersTable';
+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 },
   addResponsible: { type: Boolean },
   eventId: { type: Number },
+  compareMembers: { type: Object as PropType<Members> },
 });
 export interface MemberDialog {
   getSelected: () => Members;
@@ -227,44 +244,62 @@ const selected = ref<Members>([]);
 const openSubmenu = ref(false);
 const filter = ref('');
 const user = useUserStore();
+const localCompareMembers = ref<Members>();
+const selectedColumnFilter = ref<string>('');
+const selectedColumnOptions = ref<string[]>([]);
+const page = ref<string>('members');
 
 const {
-  members,
+  allMembers,
+  filteredMembers,
   responsibles,
+  groups,
   pagination,
   loading,
   columns,
   getRowClass,
   updateMembers,
+  setNewFilter,
   isXDaysBeforeAnnualDate,
   disableColumns,
+  exportCsv,
 } = useMemberTable();
 
 //load on mounting page
 onMounted(() => {
+  page.value = 'members';
   if (inProps.addAttendees || inProps.addResponsible) {
     selectOption.value = true;
     disableColumns(
       'birthday',
       'age',
+      'comment',
       'town',
       'zip',
       'email',
       'address',
       'phone',
-      'group',
-      'responsiblePerson',
+      'responsible',
       'firstVisit',
       'lastVisit',
     );
+    page.value = 'attendance';
   }
 
   loading.value = true;
+  localCompareMembers.value = inProps.compareMembers;
+
+  const defaults = getLocalPageDefaults(page.value);
+  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().catch((err) => NotifyResponse(err, 'error'));
+      updateTable().catch((err) => NotifyResponse(err, 'error'));
     })
     .catch((err) => NotifyResponse(err, 'error'))
 
@@ -273,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) {
-  editOneDialog.value?.open(label, field, member);
+function openSingleValueDialog(col: QTableColumn, row: Member) {
+  if (!col || !row) return () => {};
+  editOneDialog.value?.open(col.label, col.field, row);
 }
 
 //opens dialog for one value
@@ -295,7 +338,7 @@ function openRemoveDialog(...members: Members) {
     }
     deleteText.value += "'";
   } else {
-    deleteText.value = String(members.length) + ' members';
+    deleteText.value = String(members.length) + ' ' + i18n.global.t('members');
   }
   okDialog.value?.open(members);
 }
@@ -305,6 +348,28 @@ function openUploadDialog() {
   uploadDialog.value?.open();
 }
 
+function setColumnOptions(columnName: string) {
+  const values = allMembers.value
+    .map((e) => e[columnName as keyof Member]) // could be undefined
+    .filter((v): v is string | number => v !== null && v !== undefined)
+    .map((v) => String(v));
+
+  const selection = [...new Set(values)];
+
+  // Add special option for missing/null/empty values
+  if (allMembers.value.some((e) => !e[columnName as keyof Member])) {
+    selection.unshift('None');
+  }
+
+  return selection;
+}
+
+async function filterMembers(field: string, ...keys: string[]) {
+  setNewFilter(field, ...keys);
+  setLocalPageDefaults(page.value, field, keys);
+  await updateTable();
+}
+
 //remove member from database
 function removeMember(...removeMembers: Members) {
   const memberIds: number[] = [];
@@ -316,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'))
@@ -325,11 +390,15 @@ function removeMember(...removeMembers: Members) {
     });
 }
 
-function updateMember(member: Member) {
+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'));
+  updateTable().catch((err) => NotifyResponse(err, 'error'));
 }
 
 function addToEvent() {
@@ -351,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';
   }
@@ -371,9 +446,12 @@ 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) {
   const now = new Date();
 
@@ -399,7 +477,13 @@ async function updateMemberLastVisit(members: Members) {
       }
     })
     .catch((err) => NotifyResponse(err, 'error'));
+  localCompareMembers.value?.push(...members);
+  await updateTable().catch((err) => NotifyResponse(err, 'error'));
+
+  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,39 +19,24 @@
       :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">
-          <q-btn
-            v-if="user.isPermittedTo('responsible', 'write')"
-            dense
-            flat
-            icon="add"
-            @click="openAllValueDialog(null)"
-          >
-            <q-tooltip>{{ $t('addNewResponsible') }}</q-tooltip>
-          </q-btn>
-          <q-btn
-            v-if="
+        <TopButtonGroup
+          :permit-add="user.isPermittedTo('responsible', 'write')"
+          v-on:add="openResponsibleDialog"
+          :tool-tip-add="$t('addNewResponsible')"
+          :permit-select="
             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>
+          v-model:select-option="selectOption"
+          :tool-tip-select="$t('selectResponsibleOptions')"
+        />
         <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="addToEvent" class="text-primary">{{
-              $t('addToEvent')
-            }}</q-item>
             <q-item
               v-if="user.isPermittedTo('responsible', 'delete')"
               clickable
@@ -66,67 +51,41 @@
           {{ $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')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+        <SearchableInput v-model="filter" :placeholder="$t('search')" />
       </template>
+
+      <!-- table body content-->
       <template v-slot:body-cell="props">
-        <q-td
-          :props="props"
-          :style="user.isPermittedTo('responsible', 'write') ? 'cursor: pointer' : ''"
-          @click="
-            user.isPermittedTo('responsible', 'write') &&
-            openSingleValueDialog(props.col.label, props.col.name, props.row)
-          "
-        >
-          {{ props.value }}
-        </q-td>
+        <component :td-props="props" :is="props.col.component" :value="props.value" />
       </template>
+
       <template v-slot:body-cell-option="props">
-        <q-td :props="props">
-          <q-btn
-            v-if="
-              user.isPermittedTo('responsible', 'write') ||
-              user.isPermittedTo('responsible', 'delete')
-            "
-            flat
-            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', 'write')"
-              clickable
-              v-close-popup
-              @click="openAllValueDialog(props.row)"
-              class="text-primary"
-              >{{ $t('edit') }}</q-item
+        <component
+          :is="props.col.component"
+          :td-props="props"
+          :permitDelete="user.isPermittedTo('responsible', 'delete')"
+          :removeFunction="() => openRemoveDialog(props.row)"
         >
-            <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>
+        </component>
       </template>
     </q-table>
   </div>
-  <EditOneDialog
-    ref="editOneDialog"
-    endpoint="Responsibles/edit"
-    query-id
-    v-on:update="updateResponsibles"
-  ></EditOneDialog>
-  <EditAllDialog ref="editAllDialog" v-on:updated="updateResponsibles"></EditAllDialog>
+  <DialogFrame
+    ref="responsibleDialog"
+    :header-title="$t('addNewResponsible')"
+    :height="600"
+    :width="500"
+  >
+    <MembersTable
+      add-responsible
+      :compare-members="responsibleMember"
+      v-on:update-event="updateResponsibles"
+    />
+  </DialogFrame>
   <OkDialog
     ref="okDialog"
     :dialog-label="$t('delete')"
@@ -143,24 +102,21 @@
 <script setup lang="ts">
 import { appApi } from 'src/boot/axios';
 import { ref, onMounted } from 'vue';
-import type { Member, Members } from 'src/vueLib/models/member';
-import EditOneDialog from 'src/components/EditOneDialog.vue';
-import EditAllDialog from 'src/components/ResponsibleEditAllDialog.vue';
+import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
+import MembersTable from '../members/MembersTable.vue';
+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 '../members/MembersTable';
+import { databaseName } from 'src/vueLib/models/settings';
 import { useUserStore } from 'src/vueLib/login/userStore';
 import { i18n } from 'src/boot/lang';
-
-export interface ResponsibleDialog {
-  getSelected: () => Members;
-}
+import type { Responsible, Responsibles } from 'src/vueLib/models/responsible';
+import SearchableInput from '../components/SearchableInput.vue';
+import TopButtonGroup from '../components/TopButtonGroup.vue';
 
 const { NotifyResponse } = useNotify();
-const editOneDialog = ref();
-const editAllDialog = ref();
-const addToEventDialog = ref();
+const responsibleDialog = ref();
 const okDialog = ref();
 const deleteText = ref('');
 const selectOption = ref(false);
@@ -169,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(() => {
@@ -189,14 +146,9 @@ onMounted(() => {
     });
 });
 
-// opens dialog for all Responsible values
-function openSingleValueDialog(label: string, field: string, Responsible: Member) {
-  editOneDialog.value?.open(label, field, Responsible);
-}
-
 //opens dialog for one value
-function openAllValueDialog(Responsible: Member | null) {
-  editAllDialog.value?.open(Responsible);
+function openResponsibleDialog() {
+  responsibleDialog.value?.open();
 }
 
 //opens remove dialog
@@ -211,20 +163,20 @@ function openRemoveDialog(...Responsibles: Members) {
     }
     deleteText.value += "'";
   } else {
-    deleteText.value = String(Responsibles.length) + ' Responsibles';
+    deleteText.value = String(Responsibles.length) + ' ' + i18n.global.t('responsibles');
   }
   okDialog.value?.open(Responsibles);
 }
 
 //remove Responsible from database
-function removeResponsible(...removeResponsibles: Members) {
+async function removeResponsible(...removeResponsibles: Responsibles) {
   const ResponsibleIds: number[] = [];
 
-  removeResponsibles.forEach((Responsible: Member) => {
-    ResponsibleIds.push(Responsible.id);
+  removeResponsibles.forEach((Responsible: Responsible) => {
+    if (Responsible.id) ResponsibleIds.push(Responsible.id);
   });
 
-  appApi
+  await appApi
     .post('responsible/delete', { ids: ResponsibleIds })
     .then(() => {
       updateResponsibles().catch((err) => {
@@ -236,24 +188,11 @@ function removeResponsible(...removeResponsibles: Members) {
     .finally(() => {
       loading.value = false;
     });
-}
-
-function addToEvent() {
-  addToEventDialog.value?.open(i18n.global.t('addToEvent'), selected.value);
+  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,5 +1,4 @@
 <template>
-  <div class="q-pa-md">
   <q-table
     flat
     bordered
@@ -19,6 +18,7 @@
     :selection="selectOption ? 'multiple' : 'none'"
     v-model:selected="selected"
     binary-state-sort
+    dense
     class="bigger-table-text"
   >
     <template v-slot:top-left>
@@ -59,13 +59,15 @@
         {{ $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')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
     </template>
+
+    <!-- table body content-->
+
     <template v-slot:body-cell="props">
       <q-td
         :props="props"
@@ -121,7 +123,6 @@
       </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();
@@ -196,7 +198,7 @@ function openRemoveDialog(...roles: Roles) {
   if (roles.length === 1) {
     deleteText.value = "'" + roles[0]?.role + "'";
   } else {
-    deleteText.value = String(roles.length) + ' roles';
+    deleteText.value = String(roles.length) + ' ' + i18n.global.t('roles');
   }
   okDialog.value?.open(roles);
 }
@@ -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,
@@ -37,6 +43,14 @@ export function useUserTable() {
       sortable: true,
       style: 'width: 120px; max-width: 120px;',
     },
+    {
+      name: 'expiration',
+      align: 'left' as const,
+      label: i18n.global.t('expiration'),
+      field: 'expiration',
+      sortable: true,
+      style: 'width: 120px; max-width: 120px;',
+    },
     { name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
   ]);
 

src/vueLib/tables/users/UserTable.vue

@@ -1,5 +1,4 @@
 <template>
-  <div class="q-pa-md">
   <q-table
     flat
     bordered
@@ -19,6 +18,7 @@
     :selection="selectOption ? 'multiple' : 'none'"
     v-model:selected="selected"
     binary-state-sort
+    dense
     class="bigger-table-text"
   >
     <template v-slot:top-left>
@@ -59,25 +59,17 @@
         {{ $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')">
-          <template v-slot:append>
-            <q-icon name="search" />
-          </template>
-        </q-input>
+      <SearchableInput v-model="filter" :placeholder="$t('search')" />
     </template>
+
+    <!-- table body content-->
+
     <template v-slot:body-cell="props">
-        <q-td v-if="props.col.name === 'role'" :props="props">
-          <q-select
-            :readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
-            dense
-            v-model="props.row.role"
-            :options="localRoles"
-            @update:model-value="updateUser(props.row)"
-          ></q-select>
-        </q-td>
       <q-td
-          v-else
         :props="props"
         :style="
           autorized(props.row) && user.isPermittedTo('userSettings', 'write')
@@ -93,6 +85,48 @@
         {{ 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
@@ -109,12 +143,10 @@
       </q-td>
     </template>
   </q-table>
-  </div>
   <EditOneDialog
     ref="editOneDialog"
-    endpoint="users/edit"
     query-id
-    v-on:update="updateUsers"
+    v-on:update="(val) => updateUser(val)"
   ></EditOneDialog>
   <EditAllDialog ref="editAllDialog" :roles="localRoles" v-on:update="updateUsers"></EditAllDialog>
   <OkDialog
@@ -128,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">
@@ -142,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();
@@ -159,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(() => {
@@ -184,12 +220,32 @@ 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) {
     deleteText.value = "'" + users[0]?.user + "'";
   } else {
-    deleteText.value = String(users.length) + ' users';
+    deleteText.value = String(users.length) + ' ' + i18n.global.t('users');
   }
   okDialog.value?.open(users);
 }
@@ -228,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;
 }

src/vueLib/utils/utils.ts

@@ -0,0 +1,12 @@
+export function updateOrAddObject<T extends Record<K, unknown>, K extends keyof T>(
+  arr: T[],
+  obj: T,
+  key: K,
+) {
+  const i = arr.findIndex((o) => o[key] === obj[key]);
+  if (i === -1) {
+    arr.push(obj);
+    return;
+  }
+  arr.splice(i, 1, obj);
+}