Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4663a9afc | ||
|
|
30974c4e55 | ||
|
|
e4055b58b5 | ||
|
|
edc2190581 | ||
|
|
db6168b84c | ||
|
|
1e869d705c | ||
|
|
54d0a77ee3 | ||
|
|
73471ed653 | ||
|
|
8f62f7af90 | ||
|
|
a8fd82022e | ||
|
|
409579dea6 | ||
|
|
2039b5f176 | ||
|
|
8bb8293047 | ||
|
|
6f7f969c49 | ||
|
|
1bec41bd1a | ||
|
|
6be85e86af | ||
|
|
714ca0219a | ||
|
|
dae921528e | ||
|
|
bdcceb53e0 | ||
|
|
62549c9039 | ||
|
|
5ecf1eca18 | ||
|
|
a81e9f8349 | ||
|
|
256b968509 | ||
|
|
26300e27c3 | ||
|
|
afff7c123a | ||
|
|
94dc125a1b | ||
|
|
f070a4b0df | ||
|
|
260767680b | ||
|
|
09299c65de | ||
|
|
39e5479947 | ||
|
|
5c15fb5599 | ||
|
|
dce451bfc2 | ||
|
|
bba4486136 | ||
|
|
a18b01450d |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -38,6 +38,9 @@ yarn-error.log*
|
||||
*.db
|
||||
*.dba
|
||||
|
||||
# local personal backup files
|
||||
*.back
|
||||
|
||||
# local .log files
|
||||
*.log
|
||||
|
||||
|
||||
1
backend/env/env.go
vendored
1
backend/env/env.go
vendored
@@ -26,6 +26,7 @@ const (
|
||||
Organization EnvKey = "ORGANIZATION"
|
||||
DOMAIN EnvKey = "DOMAIN"
|
||||
AllowOrigin EnvKey = "ALLOWORIGIN"
|
||||
TimeZone EnvKey = "TMEZONE"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -11,4 +11,5 @@ FULLCHAIN=your_certificate_fullchain_file
|
||||
ACCESS_SECRET=your_32bit_long_access_secret
|
||||
REFRESH_SECRET=your_32bit_long_referesh_secret
|
||||
ALLOWORIGIN=all_allowed_urls
|
||||
DOMAIN=your_domain
|
||||
DOMAIN=your_domain
|
||||
TIMEZONE=your_timezone in IANA format
|
||||
@@ -1,10 +1,10 @@
|
||||
module backend
|
||||
|
||||
go 1.24.5
|
||||
go 1.25.4
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.25
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.3
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.34
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.19
|
||||
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1
|
||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1
|
||||
github.com/gin-contrib/cors v1.7.6
|
||||
@@ -14,7 +14,7 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.8 // indirect
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.10 // 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
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.25 h1:GiMnkEM0/fo2B1uCzGVyjpAhM2S58LG22N6+BdtdpgQ=
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.25/go.mod h1:wKsB5/Rvaj580gdg3+GbUf5V/0N00XN6cID+C/8135M=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.3 h1:ZwSA+TNL1ZvL8bMnJ5a2odc44bQBa31gVxD2fBA6o0I=
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.3/go.mod h1:/Af2OeJIHq+8kE5L5DlJxhSJjB75eWBcKRpkxi+n9bU=
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.34 h1:6P65HiusSfvgv/ezOvxSahqyRJMK9UrxtGsz6loLoUk=
|
||||
gitea.tecamino.com/paadi/access-handler v1.0.34/go.mod h1:HyMp1WvzmqLw8Ljt3r1qlF8fY+T5WFXr9Da/CTIM0H8=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.10/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.19 h1:khbhtqS7rXTuOsWwxTO6rm13mIDjnBmJaTcJY4jmpQw=
|
||||
gitea.tecamino.com/paadi/memberDB v1.1.19/go.mod h1:VBsORoIIhh0/RM5AvmaAjMEM2/cNaIT2TqDL1VDcov4=
|
||||
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=
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"backend/env"
|
||||
"backend/models"
|
||||
"backend/server"
|
||||
"backend/stats"
|
||||
"backend/utils"
|
||||
"flag"
|
||||
"fmt"
|
||||
@@ -109,11 +110,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{"*"},
|
||||
AllowOrigins: allowOrigins,
|
||||
AllowMethods: []string{"POST", "GET", "DELETE", "OPTIONS"},
|
||||
AllowHeaders: []string{"Origin", "Content-Type"},
|
||||
ExposeHeaders: []string{"Content-Length"},
|
||||
@@ -122,6 +120,10 @@ func main() {
|
||||
}))
|
||||
|
||||
//set logger for AuthMiddleware
|
||||
s.Routes.Use(func(c *gin.Context) {
|
||||
c.Set("logger", logger)
|
||||
c.Next()
|
||||
})
|
||||
accessHandler.SetMiddlewareLogger(s.Routes)
|
||||
api := s.Routes.Group("/api")
|
||||
//set routes
|
||||
@@ -139,6 +141,7 @@ func main() {
|
||||
role.GET("/members", dbHandler.GetMember)
|
||||
auth.GET("/events", dbHandler.GetEvent)
|
||||
auth.GET("/groups", dbHandler.GetGroup)
|
||||
auth.POST("/stats", stats.GetStats)
|
||||
|
||||
auth.GET("/users", accessHandler.GetUser)
|
||||
auth.GET("/roles", accessHandler.GetRole)
|
||||
|
||||
54
backend/stats/stats.go
Normal file
54
backend/stats/stats.go
Normal file
@@ -0,0 +1,54 @@
|
||||
package stats
|
||||
|
||||
import (
|
||||
"backend/utils"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"gitea.tecamino.com/paadi/tecamino-logger/logging"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type Stats struct {
|
||||
Database string `json:"database,omitempty"`
|
||||
DatabaseSize int64 `json:"databaseSize,omitempty"`
|
||||
}
|
||||
|
||||
func GetStats(c *gin.Context) {
|
||||
middlewareData, err := utils.GetMiddlewareData(c, "logger")
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{
|
||||
"error": err.Error(),
|
||||
})
|
||||
}
|
||||
|
||||
logger, ok := middlewareData.(*logging.Logger)
|
||||
if !ok {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{
|
||||
"error": "middleware logger for state not defined",
|
||||
})
|
||||
return
|
||||
}
|
||||
var stats Stats
|
||||
err = c.BindJSON(&stats)
|
||||
if err != nil {
|
||||
logger.Error("GetStats", err)
|
||||
c.JSON(http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
f, err := os.Stat(stats.Database)
|
||||
if err != nil {
|
||||
logger.Error("GetStats", err)
|
||||
c.JSON(http.StatusInternalServerError, nil)
|
||||
return
|
||||
}
|
||||
|
||||
var returnStats = Stats{
|
||||
DatabaseSize: f.Size(),
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"data": returnStats,
|
||||
})
|
||||
}
|
||||
28
backend/utils/middleware.go
Normal file
28
backend/utils/middleware.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package utils
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func SetMiddlewareData(r *gin.Engine, key string, data any) {
|
||||
//set logger for middleware
|
||||
r.Use(func(c *gin.Context) {
|
||||
c.Set(key, data)
|
||||
c.Next()
|
||||
})
|
||||
}
|
||||
|
||||
func GetMiddlewareData(c *gin.Context, key string) (any, error) {
|
||||
// Retrieve logger from Gin context
|
||||
data, ok := c.Get("logger")
|
||||
if !ok {
|
||||
log.Fatal("middleware logger not set — use SetMiddlewareLogger first")
|
||||
c.AbortWithStatusJSON(http.StatusInternalServerError, http.StatusInternalServerError)
|
||||
return nil, fmt.Errorf("middleware key '%s'not set ", key)
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
225
package-lock.json
generated
225
package-lock.json
generated
@@ -1,24 +1,24 @@
|
||||
{
|
||||
"name": "lightcontrol",
|
||||
"version": "1.0.1",
|
||||
"version": "1.2.1",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "lightcontrol",
|
||||
"version": "1.0.1",
|
||||
"version": "1.2.1",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@capacitor-community/sqlite": "^7.0.1",
|
||||
"@quasar/extras": "^1.16.4",
|
||||
"@quasar/extras": "^1.17.0",
|
||||
"axios": "^1.10.0",
|
||||
"js-yaml": "^4.1.0",
|
||||
"jwt-decode": "^4.0.0",
|
||||
"pinia": "^3.0.3",
|
||||
"quasar": "^2.16.0",
|
||||
"vue": "^3.4.18",
|
||||
"quasar": "^2.18.6",
|
||||
"vue": "^3.5.27",
|
||||
"vue-i18n": "^11.1.12",
|
||||
"vue-router": "^4.0.12",
|
||||
"vue-router": "^4.6.4",
|
||||
"vue3-touch-events": "^5.0.13",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"zxcvbn": "^4.4.2"
|
||||
@@ -61,30 +61,30 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/helper-string-parser": {
|
||||
"version": "7.25.9",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
|
||||
"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
|
||||
"version": "7.27.1",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
|
||||
"integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/helper-validator-identifier": {
|
||||
"version": "7.25.9",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
|
||||
"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
|
||||
"version": "7.28.5",
|
||||
"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
|
||||
"integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/parser": {
|
||||
"version": "7.27.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
|
||||
"integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
|
||||
"version": "7.29.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
|
||||
"integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/types": "^7.27.0"
|
||||
"@babel/types": "^7.29.0"
|
||||
},
|
||||
"bin": {
|
||||
"parser": "bin/babel-parser.js"
|
||||
@@ -94,13 +94,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@babel/types": {
|
||||
"version": "7.27.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
|
||||
"integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
|
||||
"version": "7.29.0",
|
||||
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
|
||||
"integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/helper-string-parser": "^7.25.9",
|
||||
"@babel/helper-validator-identifier": "^7.25.9"
|
||||
"@babel/helper-string-parser": "^7.27.1",
|
||||
"@babel/helper-validator-identifier": "^7.28.5"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.9.0"
|
||||
@@ -1064,9 +1064,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@jridgewell/sourcemap-codec": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
|
||||
"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
|
||||
"version": "1.5.5",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
|
||||
"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@jridgewell/trace-mapping": {
|
||||
@@ -1231,9 +1231,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@quasar/extras": {
|
||||
"version": "1.16.17",
|
||||
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.16.17.tgz",
|
||||
"integrity": "sha512-4aX9XU/oj1+8O2C7LQCgywmoIw7suyUEZMPFFLWI61f21mF55VOsMdLCBhjeFgL5U4EWy079mfOR6/J8thi/ag==",
|
||||
"version": "1.17.0",
|
||||
"resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.17.0.tgz",
|
||||
"integrity": "sha512-KqAHdSJfIDauiR1nJ8rqHWT0diqD0QradZKoVIZJAilHAvgwyPIY7MbyR2z4RIMkUIMUSqBZcbshMpEw+9A30w==",
|
||||
"license": "MIT",
|
||||
"funding": {
|
||||
"type": "github",
|
||||
@@ -2130,53 +2130,65 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-core": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
|
||||
"integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz",
|
||||
"integrity": "sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/parser": "^7.25.3",
|
||||
"@vue/shared": "3.5.13",
|
||||
"entities": "^4.5.0",
|
||||
"@babel/parser": "^7.28.5",
|
||||
"@vue/shared": "3.5.27",
|
||||
"entities": "^7.0.0",
|
||||
"estree-walker": "^2.0.2",
|
||||
"source-map-js": "^1.2.0"
|
||||
"source-map-js": "^1.2.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-core/node_modules/entities": {
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
|
||||
"integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=0.12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/fb55/entities?sponsor=1"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-dom": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
|
||||
"integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz",
|
||||
"integrity": "sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/compiler-core": "3.5.13",
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/compiler-core": "3.5.27",
|
||||
"@vue/shared": "3.5.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-sfc": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
|
||||
"integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz",
|
||||
"integrity": "sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@babel/parser": "^7.25.3",
|
||||
"@vue/compiler-core": "3.5.13",
|
||||
"@vue/compiler-dom": "3.5.13",
|
||||
"@vue/compiler-ssr": "3.5.13",
|
||||
"@vue/shared": "3.5.13",
|
||||
"@babel/parser": "^7.28.5",
|
||||
"@vue/compiler-core": "3.5.27",
|
||||
"@vue/compiler-dom": "3.5.27",
|
||||
"@vue/compiler-ssr": "3.5.27",
|
||||
"@vue/shared": "3.5.27",
|
||||
"estree-walker": "^2.0.2",
|
||||
"magic-string": "^0.30.11",
|
||||
"postcss": "^8.4.48",
|
||||
"source-map-js": "^1.2.0"
|
||||
"magic-string": "^0.30.21",
|
||||
"postcss": "^8.5.6",
|
||||
"source-map-js": "^1.2.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-ssr": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
|
||||
"integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz",
|
||||
"integrity": "sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/compiler-dom": "3.5.13",
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/compiler-dom": "3.5.27",
|
||||
"@vue/shared": "3.5.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/compiler-vue2": {
|
||||
@@ -2287,53 +2299,53 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/reactivity": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
|
||||
"integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.27.tgz",
|
||||
"integrity": "sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/shared": "3.5.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/runtime-core": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
|
||||
"integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.27.tgz",
|
||||
"integrity": "sha512-fxVuX/fzgzeMPn/CLQecWeDIFNt3gQVhxM0rW02Tvp/YmZfXQgcTXlakq7IMutuZ/+Ogbn+K0oct9J3JZfyk3A==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/reactivity": "3.5.13",
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/reactivity": "3.5.27",
|
||||
"@vue/shared": "3.5.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/runtime-dom": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
|
||||
"integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz",
|
||||
"integrity": "sha512-/QnLslQgYqSJ5aUmb5F0z0caZPGHRB8LEAQ1s81vHFM5CBfnun63rxhvE/scVb/j3TbBuoZwkJyiLCkBluMpeg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/reactivity": "3.5.13",
|
||||
"@vue/runtime-core": "3.5.13",
|
||||
"@vue/shared": "3.5.13",
|
||||
"csstype": "^3.1.3"
|
||||
"@vue/reactivity": "3.5.27",
|
||||
"@vue/runtime-core": "3.5.27",
|
||||
"@vue/shared": "3.5.27",
|
||||
"csstype": "^3.2.3"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/server-renderer": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
|
||||
"integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.27.tgz",
|
||||
"integrity": "sha512-qOz/5thjeP1vAFc4+BY3Nr6wxyLhpeQgAE/8dDtKo6a6xdk+L4W46HDZgNmLOBUDEkFXV3G7pRiUqxjX0/2zWA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/compiler-ssr": "3.5.13",
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/compiler-ssr": "3.5.27",
|
||||
"@vue/shared": "3.5.27"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vue": "3.5.13"
|
||||
"vue": "3.5.27"
|
||||
}
|
||||
},
|
||||
"node_modules/@vue/shared": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
|
||||
"integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz",
|
||||
"integrity": "sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/abort-controller": {
|
||||
@@ -3370,9 +3382,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/csstype": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
|
||||
"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
|
||||
"version": "3.2.3",
|
||||
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
|
||||
"integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/de-indent": {
|
||||
@@ -3618,6 +3630,7 @@
|
||||
"version": "4.5.0",
|
||||
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
|
||||
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
|
||||
"dev": true,
|
||||
"license": "BSD-2-Clause",
|
||||
"engines": {
|
||||
"node": ">=0.12"
|
||||
@@ -5378,12 +5391,12 @@
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/magic-string": {
|
||||
"version": "0.30.17",
|
||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
|
||||
"integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
|
||||
"version": "0.30.21",
|
||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
||||
"integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@jridgewell/sourcemap-codec": "^1.5.0"
|
||||
"@jridgewell/sourcemap-codec": "^1.5.5"
|
||||
}
|
||||
},
|
||||
"node_modules/math-intrinsics": {
|
||||
@@ -6037,9 +6050,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/postcss": {
|
||||
"version": "8.5.3",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
|
||||
"integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
|
||||
"version": "8.5.6",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
|
||||
"integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
@@ -6056,7 +6069,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"nanoid": "^3.3.8",
|
||||
"nanoid": "^3.3.11",
|
||||
"picocolors": "^1.1.1",
|
||||
"source-map-js": "^1.2.1"
|
||||
},
|
||||
@@ -6187,9 +6200,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/quasar": {
|
||||
"version": "2.18.1",
|
||||
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.18.1.tgz",
|
||||
"integrity": "sha512-db/P64Mzpt1uXJ0MapaG+IYJQ9hHDb5KtTCoszwC78DR7sA+Uoj7nBW2EytwYykIExEmqavOvKrdasTvqhkgEg==",
|
||||
"version": "2.18.6",
|
||||
"resolved": "https://registry.npmjs.org/quasar/-/quasar-2.18.6.tgz",
|
||||
"integrity": "sha512-ZlK+vJXOBPSFDCNQDBDNwSI+AHoqaFPxK8ve6mhsYLhMKWI5b8zsGY9VU1xYjngO2aBvU4fvGWXy4tTbzrBk8Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 10.18.1",
|
||||
@@ -8122,16 +8135,16 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/vue": {
|
||||
"version": "3.5.13",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
|
||||
"integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
|
||||
"version": "3.5.27",
|
||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz",
|
||||
"integrity": "sha512-aJ/UtoEyFySPBGarREmN4z6qNKpbEguYHMmXSiOGk69czc+zhs0NF6tEFrY8TZKAl8N/LYAkd4JHVd5E/AsSmw==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/compiler-dom": "3.5.13",
|
||||
"@vue/compiler-sfc": "3.5.13",
|
||||
"@vue/runtime-dom": "3.5.13",
|
||||
"@vue/server-renderer": "3.5.13",
|
||||
"@vue/shared": "3.5.13"
|
||||
"@vue/compiler-dom": "3.5.27",
|
||||
"@vue/compiler-sfc": "3.5.27",
|
||||
"@vue/runtime-dom": "3.5.27",
|
||||
"@vue/server-renderer": "3.5.27",
|
||||
"@vue/shared": "3.5.27"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"typescript": "*"
|
||||
@@ -8201,9 +8214,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/vue-router": {
|
||||
"version": "4.5.1",
|
||||
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.1.tgz",
|
||||
"integrity": "sha512-ogAF3P97NPm8fJsE4by9dwSYtDwXIY1nFY9T6DyQnGHd1E2Da94w9JIolpe42LJGIl0DwOHBi8TcRPlPGwbTtw==",
|
||||
"version": "4.6.4",
|
||||
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz",
|
||||
"integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@vue/devtools-api": "^6.6.4"
|
||||
@@ -8212,7 +8225,7 @@
|
||||
"url": "https://github.com/sponsors/posva"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vue": "^3.2.0"
|
||||
"vue": "^3.5.0"
|
||||
}
|
||||
},
|
||||
"node_modules/vue-tsc": {
|
||||
|
||||
10
package.json
10
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "lightcontrol",
|
||||
"version": "1.1.1",
|
||||
"version": "1.2.4",
|
||||
"description": "A Tecamino App",
|
||||
"productName": "Attendence Records",
|
||||
"author": "A. Zuercher",
|
||||
@@ -16,15 +16,15 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@capacitor-community/sqlite": "^7.0.1",
|
||||
"@quasar/extras": "^1.16.4",
|
||||
"@quasar/extras": "^1.17.0",
|
||||
"axios": "^1.10.0",
|
||||
"js-yaml": "^4.1.0",
|
||||
"jwt-decode": "^4.0.0",
|
||||
"pinia": "^3.0.3",
|
||||
"quasar": "^2.16.0",
|
||||
"vue": "^3.4.18",
|
||||
"quasar": "^2.18.6",
|
||||
"vue": "^3.5.27",
|
||||
"vue-i18n": "^11.1.12",
|
||||
"vue-router": "^4.0.12",
|
||||
"vue-router": "^4.6.4",
|
||||
"vue3-touch-events": "^5.0.13",
|
||||
"vuedraggable": "^4.1.0",
|
||||
"zxcvbn": "^4.4.2"
|
||||
|
||||
@@ -86,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
|
||||
@@ -131,3 +131,28 @@ groupName: Gruppename
|
||||
filterByColumn: Spaltenfilter
|
||||
filterByColumnValue: Spaltenwerte
|
||||
saveAsDefault: Aus Standard spichere
|
||||
day: Tag
|
||||
MondayShort: Mäntig
|
||||
Monday: Mo
|
||||
Tuesday: Zistig
|
||||
TuesdayShort: Di
|
||||
Wednesday: Mittwuch
|
||||
WednesdayShort: Mi
|
||||
Thursday: Donstig
|
||||
ThursdayShort: Do
|
||||
Friday: Fritig
|
||||
FridayShort: Fr
|
||||
Saturday: Samstig
|
||||
SaturdayShort: Sa
|
||||
Sunday: Suntig
|
||||
SundayShort: So
|
||||
currentPassword: Aktuelles Passwort
|
||||
addFirstUser: Füeg erste Admin Benutzer hinzu
|
||||
report: Rapport
|
||||
stats: Statistik
|
||||
databaseSize: Datebank Grössi
|
||||
numberOfMembers: Anzau Mitglieder
|
||||
numberOfEvents: Anzau Veranstautige
|
||||
numberOfResponsibles: Anzau Veratwortläche
|
||||
numberOfGroups: Anzau Gruppe
|
||||
selectDates: Datumuswauh
|
||||
|
||||
@@ -71,7 +71,7 @@ veryWeak: sehr Schwach
|
||||
weak: Schwach
|
||||
fair: Ausreichend
|
||||
good: Gut
|
||||
strong:
|
||||
strong: Stark
|
||||
passwordIsRequired: Password ist erforderlich
|
||||
passwordTooShort: Das Passwort muss mindestens 8 Zeichen lang sein
|
||||
passwordNeedsUppercase: Das Passwort muss mindestens einen Großbuchstaben enthalten
|
||||
@@ -110,8 +110,8 @@ eventAdded: Veranstaltung hinzugefügt
|
||||
userUpdated: Benutzer aktualisiert
|
||||
selectResponsibleOptions: Wähle Verantwortliche Optionen
|
||||
addNewResponsible: Füge neuen Verantwortlichen hinzu
|
||||
responsibleAdded: Veratwortläche hinzuegfüegt
|
||||
responsiblesAdded: Verantwortliche hinzuegfüegt
|
||||
responsibleAdded: Verantwortliche hinzugefügt
|
||||
responsiblesAdded: Verantwortliche hinzugefügt
|
||||
deleteResponsible: Verantwortliche entfernt
|
||||
deleteResponsibles: Verantwortliche entfernt
|
||||
expiration: Ablauf
|
||||
@@ -131,3 +131,28 @@ groupName: Gruppenname
|
||||
filterByColumn: Spaltenfilter
|
||||
filterByColumnValue: Spaltenwerte
|
||||
saveAsDefault: Als Standard speichern
|
||||
day: Tag
|
||||
Monday: Montag
|
||||
MondayShort: Mo
|
||||
Tuesday: Dienstag
|
||||
TuesdayShort: Di
|
||||
Wednesday: Mittwoch
|
||||
WednesdayShort: Mi
|
||||
Thursday: Donnerstag
|
||||
ThursdayShort: Do
|
||||
Friday: Freitag
|
||||
FridayShort: Fr
|
||||
Saturday: Samstag
|
||||
SaturdayShort: Sa
|
||||
Sunday: Sonntag
|
||||
SundayShort: So
|
||||
currentPassword: Aktuelles Passwort
|
||||
addFirstUser: Füge erster Admin Benutzer hinzu
|
||||
report: Rapport
|
||||
stats: Statistik
|
||||
databaseSize: Datenbank Grösse
|
||||
numberOfMembers: Anzahl Mitglieder
|
||||
numberOfEvents: Anzahl Veranstaltungen
|
||||
numberOfResponsibles: Anzahl Verantwortliche
|
||||
numberOfGroups: Anzahl Gruppe
|
||||
selectDates: Datumauswahl
|
||||
|
||||
@@ -131,3 +131,28 @@ groupName: Groupname
|
||||
filterByColumn: Columnfilter
|
||||
filterByColumnValue: Columnvalues
|
||||
saveAsDefault: Save a Default
|
||||
day: Day
|
||||
Monday: Monday
|
||||
MondayShort: Mon
|
||||
Tuesday: Tuesday
|
||||
TuesdayShort: Tue
|
||||
Wednesday: Wednesday
|
||||
WednesdayShort: Wed
|
||||
Thursday: Thursday
|
||||
ThursdayShort: Thur
|
||||
Friday: Friday
|
||||
FridayShort: Fri
|
||||
Saturday: Saturday
|
||||
SaturdayShort: Sat
|
||||
Sunday: Sunday
|
||||
SundayShort: Sun
|
||||
currentPassword: Current Password
|
||||
addFirstUser: Add first Admin User
|
||||
report: Report
|
||||
stats: Statistic
|
||||
databaseSize: Database size
|
||||
numberOfMembers: Amount of Members
|
||||
numberOfEvents: Amount of Events
|
||||
numberOfResponsibles: Amount of Responsibles
|
||||
numberOfGroups: Amount of Groups
|
||||
selectDates: Dateselection
|
||||
|
||||
@@ -1,3 +1,158 @@
|
||||
hello: hola
|
||||
goodbye: adios
|
||||
language: Lengua
|
||||
language: Idioma
|
||||
prename: Nombre
|
||||
lastName: Apellido
|
||||
birthday: Fecha de nacimiento
|
||||
email: Correo electrónico
|
||||
group: Grupo
|
||||
groups: Grupos
|
||||
age: Edad
|
||||
address: Dirección
|
||||
town: Ciudad
|
||||
zipCode: Código postal
|
||||
phone: Teléfono
|
||||
responsible: Responsable
|
||||
firstVisit: Primera visita
|
||||
lastVisit: Última visita
|
||||
search: Buscar
|
||||
noDataAvailable: No hay datos disponibles
|
||||
importCSV: Importar CSV
|
||||
exportCSV: Exportar CSV
|
||||
selectMemberOptions: Seleccionar opciones de miembro
|
||||
addNewMember: Añadir nuevo miembro
|
||||
csvOptions: Opciones CSV
|
||||
delete: Eliminar
|
||||
edit: Editar
|
||||
confirm: Confirmar
|
||||
cancel: Cancelar
|
||||
doYouWantToDelete: ¿Desea eliminar?
|
||||
close: Cerrar
|
||||
loading: Cargando
|
||||
recordsPerPage: «Registros por página:»
|
||||
recordSelected: Registro seleccionado
|
||||
selected: Seleccionado
|
||||
settings: Configuración
|
||||
databaseName: Nombre de la base de datos
|
||||
token: Token
|
||||
login: Iniciar sesión
|
||||
logout: Cerrar sesión
|
||||
user: Usuario
|
||||
password: Contraseña
|
||||
isRequired: Es obligatorio
|
||||
colors: Colores
|
||||
primaryColor: Color principal
|
||||
primaryColorText: Color del texto principal
|
||||
secondaryColor: Color secundario
|
||||
secondaryColorText: Color del texto secundario
|
||||
database: Base de datos
|
||||
general: General
|
||||
setColors: Establecer colores
|
||||
icon: Icono
|
||||
resetColors: Restablecer colores
|
||||
save: Guardar
|
||||
users: Usuarios
|
||||
roles: Roles
|
||||
name: Nombre
|
||||
role: Rol
|
||||
addNewUser: Añadir nuevo usuario
|
||||
expires: Caduca
|
||||
selectUserOptions: Seleccionar opciones de usuario
|
||||
prenameIsRequired: El nombre es obligatorio
|
||||
lastNameIsRequired: El apellido es obligatorio
|
||||
birthdayIsRequired: La fecha de nacimiento es obligatoria
|
||||
userIsRequired: El usuario es obligatorio
|
||||
emailIsRequired: El correo electrónico es obligatorio
|
||||
roleIsRequired: El rol es obligatorio
|
||||
permissions: Permisos
|
||||
selectRoleOptions: Seleccionar opciones de rol
|
||||
selectEventOptions: Seleccionar opciones de evento
|
||||
addNewRole: Añadir nuevo rol
|
||||
addNewEvent: Añadir nuevo evento
|
||||
veryWeak: Muy débil
|
||||
weak: Débil
|
||||
fair: Regular
|
||||
good: Bueno
|
||||
strong: Fuerte
|
||||
passwordIsRequired: Se requiere contraseña
|
||||
passwordTooShort: La contraseña debe tener al menos 8 caracteres
|
||||
passwordNeedsUppercase: La contraseña debe contener al menos una letra mayúscula
|
||||
passwordNeedsLowercase: La contraseña debe contener al menos una letra minúscula
|
||||
passwordNeedsNumber: La contraseña debe contener al menos un número
|
||||
passwordNeedsSpecial: La contraseña debe contener al menos un carácter especial
|
||||
passwordDoNotMatch: La contraseña no coincide
|
||||
read: Leer
|
||||
write: Escribir
|
||||
userSettings: Configuración del usuario
|
||||
members: Miembros
|
||||
attendanceTable: Tabla de asistencia
|
||||
excursionTable: Tabla de excursiones
|
||||
updated: Actualizado
|
||||
events: Eventos
|
||||
eventNameIsRequired: Se requiere el nombre del evento
|
||||
eventName: Nombre del evento
|
||||
attendees: Asistentes
|
||||
now: Ahora
|
||||
addToEvent: Añadir al evento
|
||||
add: Añadir
|
||||
event: Evento
|
||||
dateAndTime: Fecha y hora
|
||||
count: Recuento
|
||||
selectAttendeesOptions: Seleccionar opciones de asistentes
|
||||
addNewAttendees: Añadir nuevo asistente
|
||||
notAllRequiredFieldsFilled: No se han rellenado todos los campos obligatorios
|
||||
memberUpdated: Miembro actualizado
|
||||
membersUpdated: Miembros actualizados
|
||||
deleteAttendee: Asistente eliminado
|
||||
deleteAttendees: Asistentes eliminados
|
||||
deleteRoles: Roles eliminados
|
||||
attendeeAdded: Asistente añadido
|
||||
attendeesAdded: Asistentes añadidos
|
||||
eventAdded: Evento añadido
|
||||
userUpdated: Usuario actualizado
|
||||
selectResponsibleOptions: Seleccionar opciones responsables
|
||||
addNewResponsible: Añadir responsable
|
||||
responsibleAdded: Responsable añadido
|
||||
responsiblesAdded: Responsables añadidos
|
||||
deleteResponsible: Responsable eliminado
|
||||
deleteResponsibles: Responsables eliminados
|
||||
expiration: Caducidad
|
||||
never: Nunca
|
||||
responsibles: Responsables
|
||||
comment: Comentario
|
||||
dark_mode: Modo oscuro
|
||||
light_mode: Modo claro
|
||||
import: Importar
|
||||
export: Exportar
|
||||
changePassword: Cambiar contraseña
|
||||
noneAttendees: Asistentes ausentes
|
||||
addNewgroup: Nuevo grupo
|
||||
selectgroupOptions: Seleccionar opciones de grupo
|
||||
groupNameIsRequired: Se requiere nombre de grupo
|
||||
groupName: Nombre de grupo
|
||||
filterByColumn: Filtro de columna
|
||||
filterByColumnValue: Valores de columna
|
||||
saveAsDefault: Guardar un valor predeterminado
|
||||
day: Día
|
||||
Monday: Lunes
|
||||
MondayShort: Lu
|
||||
Tuesday: Martes
|
||||
TuesdayShort: Ma
|
||||
Wednesday: Miércoles
|
||||
WednesdayShort: Mi
|
||||
Thursday: Jueves
|
||||
ThursdayShort: Ju
|
||||
Friday: Viernes
|
||||
FridayShort: Vi
|
||||
Saturday: Sábado
|
||||
SaturdayShort: Sá
|
||||
Sunday: Domingo
|
||||
Sunday: Do
|
||||
currentPassword: Contraseña actual
|
||||
addFirstUser: Añadir primer usuario administrador
|
||||
report: Informe
|
||||
stats: Estadísticas
|
||||
databaseSize: Tamaño de la base de datos
|
||||
numberOfMembers: Número de miembros
|
||||
numberOfEvents: Cantidad de eventos
|
||||
numberOfResponsibles: Número de responsables
|
||||
numberOfGroups: Número de grupos
|
||||
selectDates: Selección de fecha
|
||||
|
||||
@@ -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));
|
||||
})
|
||||
|
||||
@@ -14,8 +14,12 @@ export default boot(({ app, router }) => {
|
||||
|
||||
const settings = getLocalSettings();
|
||||
|
||||
logo.value = settings.icon ?? logo.value;
|
||||
appName.value = settings.appName ?? appName.value;
|
||||
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');
|
||||
|
||||
@@ -8,6 +8,9 @@ export default boot(async ({ router }) => {
|
||||
// load user
|
||||
try {
|
||||
const { data } = await appApi.get('/login/me');
|
||||
userStore.setFirstLogin(data.newDatabase);
|
||||
|
||||
data.role.role = data.role;
|
||||
await userStore.setUser(data);
|
||||
} catch {
|
||||
/* ignore error */
|
||||
@@ -34,7 +37,7 @@ export default boot(async ({ router }) => {
|
||||
// Save the route after every successful navigation
|
||||
router.afterEach((to) => {
|
||||
// Don't save login page as "last route"
|
||||
if (to.path !== '/login' && to.path !== '/') {
|
||||
if (to.path !== '/login' && to.path !== '/firstlogin' && to.path !== '/') {
|
||||
setLocalLastRoute(to.fullPath);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
<template>
|
||||
<DialogFrame ref="dialog" :header-title="localTitle">
|
||||
<div class="row justify-center">
|
||||
<q-select
|
||||
<SearchableSelect
|
||||
class="q-mx-xl"
|
||||
dense
|
||||
autofocus
|
||||
:label="$t('event')"
|
||||
filled
|
||||
@@ -12,7 +14,7 @@
|
||||
@keyup.enter="addAttendees"
|
||||
map-options
|
||||
emit-value
|
||||
></q-select>
|
||||
></SearchableSelect>
|
||||
</div>
|
||||
<div class="row justify-center">
|
||||
<q-btn class="q-ma-md" color="primary" no-caps @click="addAttendees">{{ localTitle }}</q-btn>
|
||||
@@ -40,6 +42,7 @@ import type { Members } from 'src/vueLib/models/member';
|
||||
import EditAllDialog from 'src/components/EventEditAllDialog.vue';
|
||||
import { useAttendeesTable } from 'src/vueLib/tables/attendees/AttendeesTable';
|
||||
import { useEventTable } from 'src/vueLib/tables/events/EventsTable';
|
||||
import SearchableSelect from 'src/vueLib/general/SearchableSelect .vue';
|
||||
|
||||
const dialog = ref();
|
||||
const newEventRef = ref();
|
||||
@@ -71,7 +74,7 @@ function open(title: string, members: Members) {
|
||||
appApi
|
||||
.get('events')
|
||||
.then((resp) => {
|
||||
events.value.push(...resp.data);
|
||||
events.value.push(...resp.data.map((e: Event) => (e.name = e.name + ' (' + e.date + ')')));
|
||||
})
|
||||
.catch((err) => {
|
||||
NotifyResponse(err, 'error');
|
||||
@@ -105,7 +108,7 @@ async function addAttendees() {
|
||||
NotifyResponse(err, 'error');
|
||||
});
|
||||
|
||||
await updateAttendees();
|
||||
await updateAttendees(0);
|
||||
updateEvents();
|
||||
}
|
||||
|
||||
|
||||
78
src/components/DateDaySelect.vue
Normal file
78
src/components/DateDaySelect.vue
Normal file
@@ -0,0 +1,78 @@
|
||||
<template>
|
||||
<div class="q-gutter-sm">
|
||||
<h6 class="text-center text-bold q-ma-md text-primary">{{ props.title }}</h6>
|
||||
<div class="row">
|
||||
<q-checkbox
|
||||
style="min-width: 75px"
|
||||
dense
|
||||
v-for="opt in weekdayOptions"
|
||||
:key="opt.value"
|
||||
v-model="selectedWeekdays"
|
||||
:val="opt.value"
|
||||
:label="opt.label"
|
||||
/>
|
||||
</div>
|
||||
<div class="row">
|
||||
<q-date v-model="dateRange" range flat />
|
||||
<div>
|
||||
<q-badge color="secondary"> Total dates selected: {{ filteredDates.length }} </q-badge>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { date } from 'quasar';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
|
||||
const props = defineProps({
|
||||
title: String,
|
||||
});
|
||||
|
||||
const startDate = new Date();
|
||||
|
||||
// Initial range (format: YYYY/MM/DD)
|
||||
const dateRange = ref();
|
||||
const selectedWeekdays = ref([0, 3]); // Default to weekdays
|
||||
|
||||
onMounted(() => {
|
||||
dateRange.value = date.formatDate(startDate, 'YYYY/MM/DD');
|
||||
});
|
||||
|
||||
const weekdayOptions = [
|
||||
{ label: i18n.global.t('MondayShort'), value: 1 },
|
||||
{ label: i18n.global.t('TuesdayShort'), value: 2 },
|
||||
{ label: i18n.global.t('WednesdayShort'), value: 3 },
|
||||
{ label: i18n.global.t('ThursdayShort'), value: 4 },
|
||||
{ label: i18n.global.t('FridayShort'), value: 5 },
|
||||
{ label: i18n.global.t('SaturdayShort'), value: 6 },
|
||||
{ label: i18n.global.t('SundayShort'), value: 0 },
|
||||
];
|
||||
|
||||
// The Logic: Calculate all specific dates within the range that match weekdays
|
||||
const filteredDates = computed(() => {
|
||||
if (!dateRange.value) {
|
||||
return [];
|
||||
} else if (typeof dateRange.value === 'string') {
|
||||
const current = new Date(dateRange.value);
|
||||
if (current !== undefined && selectedWeekdays.value.includes(current.getDay())) {
|
||||
return [date.formatDate(current, 'YYYY/MM/DD')];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
const end = new Date(dateRange.value.to);
|
||||
const result = [];
|
||||
|
||||
let current = new Date(dateRange.value.from);
|
||||
|
||||
while (current <= end) {
|
||||
if (selectedWeekdays.value.includes(current.getDay())) {
|
||||
result.push(date.formatDate(current, 'YYYY/MM/DD'));
|
||||
}
|
||||
current = date.addToDate(current, { days: 1 });
|
||||
}
|
||||
return result;
|
||||
});
|
||||
</script>
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<DialogFrame ref="dialog" :header-title="'Edit ' + localTitle">
|
||||
<DialogFrame ref="dialog" :header-title="$t('edit') + ' ' + localTitle">
|
||||
<div class="row justify-center">
|
||||
<q-input autofocus :label="localTitle" filled v-model="value" @keyup.enter="save">
|
||||
<template
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<DialogFrame
|
||||
ref="dialog"
|
||||
:header-title="newEvent ? $t('addNewEvent') : 'Edit ' + localEvent.name"
|
||||
:header-title="newEvent ? $t('addNewEvent') : $t('edit') + ' ' + localEvent.name"
|
||||
:height="250"
|
||||
:width="500"
|
||||
>
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
<DialogFrame
|
||||
ref="dialog"
|
||||
:header-title="
|
||||
newMember ? $t('addNewMember') : 'Edit ' + localMember.firstName + ' ' + localMember.lastName
|
||||
newMember
|
||||
? $t('addNewMember')
|
||||
: $t('edit') + ' ' + localMember.firstName + ' ' + localMember.lastName
|
||||
"
|
||||
:height="600"
|
||||
:width="500"
|
||||
@@ -60,19 +62,24 @@
|
||||
filled
|
||||
v-model="localMember.email"
|
||||
></q-input>
|
||||
<q-input
|
||||
<q-select
|
||||
class="q-ml-md col-5"
|
||||
:label="$t('group')"
|
||||
:options="props.group"
|
||||
filled
|
||||
emit-value
|
||||
map-options
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
v-model="localMember.group"
|
||||
></q-input>
|
||||
></q-select>
|
||||
<q-select
|
||||
class="q-ml-md col-5"
|
||||
:label="$t('responsible')"
|
||||
filled
|
||||
:options="props.responsibles"
|
||||
:option-label="(opt) => opt.firstName + ' ' + opt.lastName"
|
||||
v-model="localMember.responsiblePerson"
|
||||
v-model="localMember.responsible"
|
||||
></q-select>
|
||||
<q-input
|
||||
v-if="!newMember"
|
||||
@@ -100,9 +107,10 @@
|
||||
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
|
||||
import { type PropType, ref } from 'vue';
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import type { Member, Members } from 'src/vueLib/models/member';
|
||||
import type { Member } from 'src/vueLib/models/member';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import type { Responsibles } from 'src/vueLib/models/responsible';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const dialog = ref();
|
||||
@@ -116,7 +124,10 @@ const localMember = ref<Member>({
|
||||
|
||||
const props = defineProps({
|
||||
responsibles: {
|
||||
type: Object as PropType<Members>,
|
||||
type: Object as PropType<Responsibles>,
|
||||
},
|
||||
group: {
|
||||
type: Array,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<DialogFrame
|
||||
ref="dialog"
|
||||
:header-title="newRole ? $t('addNewRole') : 'Edit ' + localRole.role"
|
||||
:header-title="newRole ? $t('addNewRole') : $t('edit') + ' ' + localRole.role"
|
||||
:height="700"
|
||||
:width="700"
|
||||
>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<DialogFrame
|
||||
ref="dialog"
|
||||
:header-title="newUser ? $t('addNewUser') : 'Edit ' + localUser.user"
|
||||
:header-title="newUser ? $t('addNewUser') : $t('edit') + ' ' + localUser.user"
|
||||
:height="600"
|
||||
:width="500"
|
||||
>
|
||||
@@ -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,7 +32,7 @@
|
||||
filled
|
||||
:options="props.roles"
|
||||
:rules="[(val) => !!val || $t('roleIsRequired')]"
|
||||
v-model="localUser.role"
|
||||
v-model="role"
|
||||
></q-select>
|
||||
<q-input
|
||||
class="col-5 q-mt-xl"
|
||||
@@ -109,29 +53,22 @@
|
||||
<script setup lang="ts">
|
||||
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
|
||||
import { ref } from 'vue';
|
||||
import zxcvbn from 'zxcvbn';
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import type { User } from 'src/vueLib/models/users';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { validateQForm } from 'src/vueLib/utils/validation';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import { DefaultSettings } from 'src/vueLib/models/settings';
|
||||
import EnterNewPassword from 'src/vueLib/login/EnterNewPassword.vue';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const dialog = ref();
|
||||
const form = ref();
|
||||
const newUser = ref(false);
|
||||
const showPassword1 = ref(false);
|
||||
const 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: '',
|
||||
});
|
||||
|
||||
const props = defineProps({
|
||||
@@ -155,7 +92,6 @@ async function open(user: User | null) {
|
||||
localUser.value = {
|
||||
user: '',
|
||||
email: '',
|
||||
role: '',
|
||||
};
|
||||
newUser.value = true;
|
||||
}
|
||||
@@ -164,47 +100,6 @@ async function open(user: User | null) {
|
||||
await validateQForm(form.value);
|
||||
}
|
||||
|
||||
function checkStrength() {
|
||||
const result = zxcvbn(localUser.value.password || '');
|
||||
strengthValue.value = (result.score + 1) / 5;
|
||||
const levels = [
|
||||
i18n.global.t('veryWeak'),
|
||||
i18n.global.t('weak'),
|
||||
i18n.global.t('fair'),
|
||||
i18n.global.t('good'),
|
||||
i18n.global.t('strong'),
|
||||
];
|
||||
const colors = ['red', 'orange', 'yellow', 'light-green', 'green'];
|
||||
const icon = ['lock', 'warning', 'error_outline', 'check_circle_outline', 'verified_user'];
|
||||
|
||||
strengthLabel.value = levels[result.score] || i18n.global.t('veryWeak');
|
||||
strengthColor.value = colors[result.score] || 'grey';
|
||||
strengthIcon.value = icon[result.score] || 'lock';
|
||||
}
|
||||
|
||||
function validatePassword(): string | boolean {
|
||||
if (!localUser.value.password) return i18n.global.t('passwordIsRequired');
|
||||
|
||||
if (localUser.value.password.length < 8) {
|
||||
return i18n.global.t('passwordTooShort');
|
||||
} else if (!/[A-Z]/.test(localUser.value.password)) {
|
||||
return i18n.global.t('passwordNeedsUppercase');
|
||||
} else if (!/[a-z]/.test(localUser.value.password)) {
|
||||
return i18n.global.t('passwordNeedsLowercase');
|
||||
} else if (!/[0-9]/.test(localUser.value.password)) {
|
||||
return i18n.global.t('passwordNeedsNumber');
|
||||
} else if (!/[!@#$%^&*(),.?":{}|<>]/.test(localUser.value.password)) {
|
||||
return i18n.global.t('passwordNeedsSpecial');
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function checkSamePassword(): string | boolean {
|
||||
if (localUser.value.password === passwordCheck.value) return true;
|
||||
return i18n.global.t('passwordDoNotMatch');
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!(await validateQForm(form.value))) {
|
||||
NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
|
||||
@@ -216,6 +111,7 @@ async function save() {
|
||||
localUser.value.settings = DefaultSettings();
|
||||
}
|
||||
|
||||
localUser.value.role = { role: role.value || '', permissions: [] };
|
||||
appApi
|
||||
.post(query, JSON.stringify(localUser.value))
|
||||
.then(() => {
|
||||
|
||||
@@ -63,6 +63,22 @@
|
||||
>
|
||||
<q-item-section>{{ $t('groups') }}</q-item-section>
|
||||
</q-item>
|
||||
<q-item v-if="!autorized" to="/login" exact clickable v-ripple @click="closeDrawer">
|
||||
<q-item-section>{{ $t('login') }}</q-item-section>
|
||||
</q-item>
|
||||
<!-- <q-item
|
||||
v-if="autorized || user.isPermittedTo('members', 'read')"
|
||||
to="/report"
|
||||
exact
|
||||
clickable
|
||||
v-ripple
|
||||
@click="closeDrawer"
|
||||
>
|
||||
<q-item-section> {{ $t('report') }}</q-item-section>
|
||||
</q-item> -->
|
||||
<q-item v-if="autorized" to="/stats" exact clickable v-ripple @click="closeDrawer">
|
||||
<q-item-section> {{ $t('stats') }}</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-drawer>
|
||||
<q-page-container>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Dark } from 'quasar';
|
||||
import type { Settings } from 'src/vueLib/models/settings';
|
||||
import { appName, databaseName, type Settings } from 'src/vueLib/models/settings';
|
||||
import { updateOrAddObject } from 'src/vueLib/utils/utils';
|
||||
import { ref } from 'vue';
|
||||
|
||||
@@ -14,10 +14,20 @@ export function setLocalSettings(settings: Settings) {
|
||||
}
|
||||
|
||||
export function getLocalSettings(): Settings {
|
||||
let name = localStorage.getItem('appName');
|
||||
if (name === undefined || name === 'undefined') {
|
||||
name = appName.value;
|
||||
}
|
||||
|
||||
let db = localStorage.getItem('databaseName');
|
||||
if (db === undefined || db === 'undefined') {
|
||||
db = databaseName.value;
|
||||
}
|
||||
|
||||
return <Settings>{
|
||||
icon: localStorage.getItem('icon'),
|
||||
appName: localStorage.getItem('appName'),
|
||||
databaseName: localStorage.getItem('databaseName'),
|
||||
appName: name,
|
||||
databaseName: db,
|
||||
primaryColor: localStorage.getItem('primaryColor'),
|
||||
primaryColorText: localStorage.getItem('primaryColorText'),
|
||||
secondaryColor: localStorage.getItem('secondaryColor'),
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('events') }}</h4>
|
||||
|
||||
<SiteTitle :title="$t('events')" />
|
||||
<EventsTable />
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
import EventsTable from 'src/vueLib/tables/events/EventsTable.vue';
|
||||
</script>
|
||||
|
||||
82
src/pages/FirstLogin.vue
Normal file
82
src/pages/FirstLogin.vue
Normal file
@@ -0,0 +1,82 @@
|
||||
<template>
|
||||
<SiteTitle :title="$t('addFirstUser')" />
|
||||
<div :class="$q.screen.width > 600 ? 'q-ma-xl q-pa-xs' : 'q-ma-none q-pa-none'">
|
||||
<q-card :class="$q.screen.width > 600 ? 'q-ma-xl q-pa-xl' : 'q-gutter-md'">
|
||||
<q-form ref="form">
|
||||
<div class="q-pt-md">
|
||||
<div class="row justify-center q-gutter-md">
|
||||
<q-input
|
||||
class="col-6 required"
|
||||
:label="$t('user')"
|
||||
filled
|
||||
:lazy-rules="false"
|
||||
:rules="[(val) => !!val || $t('userIsRequired')]"
|
||||
v-model="localUser.user"
|
||||
autofocus
|
||||
></q-input>
|
||||
<q-input
|
||||
class="col-6 required"
|
||||
:label="$t('email')"
|
||||
filled
|
||||
:lazy-rules="false"
|
||||
:rules="[(val) => !!val || $t('emailIsRequired')]"
|
||||
v-model="localUser.email"
|
||||
></q-input>
|
||||
<EnterNewPassword class="col-6 required" v-model:password="localUser.password!" />
|
||||
</div>
|
||||
<div class="row justify-center">
|
||||
<q-btn class="q-ma-md" color="primary" no-caps @click="save">{{ $t('save') }}</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
</q-form>
|
||||
</q-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
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';
|
||||
import { defaultPermissions } from 'src/vueLib/checkboxes/permissions';
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const form = ref();
|
||||
const localUser = ref<User>({
|
||||
user: '',
|
||||
email: '',
|
||||
});
|
||||
|
||||
async function save() {
|
||||
if (!(await validateQForm(form.value))) {
|
||||
NotifyResponse(i18n.global.t('notAllRequiredFieldsFilled'), 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
localUser.value.role = { role: 'admin', permissions: defaultPermissions };
|
||||
localUser.value.role.permissions.forEach((p) => (p.permission = 31));
|
||||
localUser.value.settings = DefaultSettings();
|
||||
|
||||
await appApi
|
||||
.post('users/add', JSON.stringify(localUser.value))
|
||||
.then(() => {
|
||||
window.location.reload();
|
||||
})
|
||||
.catch((err) => {
|
||||
NotifyResponse(err, 'error');
|
||||
return;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.required .q-field__label::after {
|
||||
content: ' *';
|
||||
color: red;
|
||||
}
|
||||
</style>
|
||||
@@ -1,10 +1,11 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('groups') }}</h4>
|
||||
<SiteTitle :title="$t('groups')" />
|
||||
<GroupTable />
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
import GroupTable from 'src/vueLib/tables/group/GroupTable.vue';
|
||||
</script>
|
||||
|
||||
@@ -15,7 +15,7 @@ const router = useRouter();
|
||||
const userStore = useUserStore();
|
||||
|
||||
onMounted(() => {
|
||||
if (userStore.user?.username !== '' && userStore.user?.role !== '') {
|
||||
if (userStore.user?.username !== '' && userStore.user?.role.role !== '') {
|
||||
forwardToPage().catch((err) => console.error(err));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('members') }}</h4>
|
||||
<MembersTable />
|
||||
<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>
|
||||
|
||||
36
src/pages/ReportPage.vue
Normal file
36
src/pages/ReportPage.vue
Normal file
@@ -0,0 +1,36 @@
|
||||
<template>
|
||||
<div class="rows">
|
||||
<div class="row justify-end">
|
||||
<div class="column">
|
||||
<DateDaySelect title="hjgjh" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<q-btn @click="openDateSelect">Hallo</q-btn>
|
||||
<DialogFrame :header-title="$t('selectDates')" :width="350" :height="500" ref="dateSelect">
|
||||
<DateDaySelect :title="$t('selectDates')" />
|
||||
<q-btn color="primary" no-caps>{{ $t('apply') }}</q-btn>
|
||||
</DialogFrame>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import DateDaySelect from 'src/components/DateDaySelect.vue';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
|
||||
|
||||
const dateSelect = ref();
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
onMounted(() => {
|
||||
appApi
|
||||
.get('events')
|
||||
.then((resp) => console.log(1, resp))
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
});
|
||||
|
||||
function openDateSelect() {
|
||||
dateSelect.value?.open();
|
||||
}
|
||||
</script>
|
||||
@@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('responsibles') }}</h4>
|
||||
|
||||
<SiteTitle :title="$t('responsibles')" />
|
||||
<ResponsibleTable />
|
||||
</q-page>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
import ResponsibleTable from 'src/vueLib/tables/responsible/ResponsibleTable.vue';
|
||||
</script>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('userSettings') }}</h4>
|
||||
|
||||
<SiteTitle :title="$t('userSettings')" />
|
||||
<div class="text-h2 flex flex-center">
|
||||
<q-card class="q-gutter-md">
|
||||
<div>
|
||||
@@ -152,6 +151,7 @@ import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { type Settings } from 'src/vueLib/models/settings';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import { setLocalSettings } from 'src/localstorage/localStorage';
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const colorGroup = ref(false);
|
||||
@@ -194,6 +194,7 @@ function save() {
|
||||
setLocalSettings(settings);
|
||||
|
||||
const tempuser = user.user;
|
||||
|
||||
if (tempuser) {
|
||||
tempuser.settings = settings;
|
||||
}
|
||||
|
||||
116
src/pages/StatsPage.vue
Normal file
116
src/pages/StatsPage.vue
Normal file
@@ -0,0 +1,116 @@
|
||||
<template>
|
||||
<site-title :title="$t('stats')" />
|
||||
<q-card class="q-ma-md">
|
||||
<q-card-section>
|
||||
<div class="row q-ma-md q-gutter-md">
|
||||
<q-card class="row col-auto">
|
||||
<div class="col">
|
||||
<h5 class="text-primary q-ma-md">{{ i18n.global.t('database') }}</h5>
|
||||
<q-card-section>
|
||||
<div class="column q-gutter-y-sm">
|
||||
<div class="row items-center">
|
||||
<p class="text-bold" style="min-width: 180px">
|
||||
{{ i18n.global.t('databaseSize') }}:
|
||||
</p>
|
||||
<p class="q-ml-md">{{ stats }}</p>
|
||||
</div>
|
||||
<div class="row items-center">
|
||||
<p class="text-bold" style="min-width: 180px">
|
||||
{{ i18n.global.t('numberOfMembers') }}:
|
||||
</p>
|
||||
<p class="q-ml-md">{{ amounts?.members }}</p>
|
||||
</div>
|
||||
<div class="row items-center">
|
||||
<p class="text-bold" style="min-width: 180px">
|
||||
{{ i18n.global.t('numberOfEvents') }}:
|
||||
</p>
|
||||
<p class="q-ml-md">{{ amounts?.events }}</p>
|
||||
</div>
|
||||
<div class="row items-center">
|
||||
<p class="text-bold" style="min-width: 180px">
|
||||
{{ i18n.global.t('numberOfResponsibles') }}:
|
||||
</p>
|
||||
<p class="q-ml-md">{{ amounts?.responsibles }}</p>
|
||||
</div>
|
||||
<div class="row items-center">
|
||||
<p class="text-bold" style="min-width: 180px">
|
||||
{{ i18n.global.t('numberOfGroups') }}:
|
||||
</p>
|
||||
<p class="q-ml-md">{{ amounts?.groups }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { databaseName } from 'src/vueLib/models/settings';
|
||||
import { onMounted, ref } from 'vue';
|
||||
|
||||
const stats = ref();
|
||||
const amounts = ref<{
|
||||
members: number;
|
||||
events: number;
|
||||
responsibles: number;
|
||||
groups: number;
|
||||
}>({
|
||||
members: 0,
|
||||
events: 0,
|
||||
responsibles: 0,
|
||||
groups: 0,
|
||||
});
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
onMounted(async () => {
|
||||
stats.value = await appApi
|
||||
.post('/stats', { database: databaseName.value })
|
||||
.then((resp) => {
|
||||
if ((resp.data.databaseSize as number) >= 1000000000) {
|
||||
return (resp.data.data.databaseSize / 1000000000).toFixed(2) + ' GB';
|
||||
} else if ((resp.data.data.databaseSize as number) >= 1000000) {
|
||||
return (resp.data.data.databaseSize / 1000000).toFixed(2) + ' MB';
|
||||
} else if ((resp.data.data.databaseSize as number) >= 1000) {
|
||||
return (resp.data.data.databaseSize / 1000).toFixed(2) + ' kB';
|
||||
}
|
||||
return resp.data.data.databaseSize + ' B';
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
|
||||
amounts.value.members = await appApi
|
||||
.get('/members')
|
||||
.then((resp) => {
|
||||
return resp.data.length;
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
|
||||
amounts.value.events = await appApi
|
||||
.get('/events')
|
||||
.then((resp) => {
|
||||
return resp.data.length;
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
|
||||
amounts.value.responsibles = await appApi
|
||||
.get('responsible')
|
||||
.then((resp) => {
|
||||
return resp.data.length;
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
|
||||
amounts.value.groups = await appApi
|
||||
.get('/groups')
|
||||
.then((resp) => {
|
||||
return resp.data.length;
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
});
|
||||
</script>
|
||||
@@ -1,33 +1,30 @@
|
||||
<template>
|
||||
<h4 class="text-primary text-bold text-center">{{ $t('userSettings') }}</h4>
|
||||
<SiteTitle :title="$t('userSettings')" />
|
||||
<div class="q-gutter-y-md">
|
||||
<q-card>
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
dense
|
||||
class="taxt-grey"
|
||||
active-color="primary"
|
||||
indicator-color="primary"
|
||||
align="justify"
|
||||
narrow-indicator
|
||||
>
|
||||
<q-tab name="users" no-caps :label="$t('users')" />
|
||||
<q-tab name="roles" no-caps :label="$t('roles')" />
|
||||
</q-tabs>
|
||||
<q-separator />
|
||||
|
||||
<div class="q-pa-md">
|
||||
<div class="q-gutter-y-md">
|
||||
<q-card>
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
dense
|
||||
class="taxt-grey"
|
||||
active-color="primary"
|
||||
indicator-color="primary"
|
||||
align="justify"
|
||||
narrow-indicator
|
||||
>
|
||||
<q-tab name="users" no-caps :label="$t('users')" />
|
||||
<q-tab name="roles" no-caps :label="$t('roles')" />
|
||||
</q-tabs>
|
||||
<q-separator />
|
||||
|
||||
<q-tab-panels v-model="tab" animated>
|
||||
<q-tab-panel name="users">
|
||||
<UserTable />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="roles">
|
||||
<RoleTable />
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</div>
|
||||
<q-tab-panels v-model="tab" animated>
|
||||
<q-tab-panel name="users" style="padding: 0px">
|
||||
<UserTable />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="roles" style="padding: 0px">
|
||||
<RoleTable />
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -35,6 +32,7 @@
|
||||
import { ref } from 'vue';
|
||||
import UserTable from 'src/vueLib/tables/users/UserTable.vue';
|
||||
import RoleTable from 'src/vueLib/tables/roles/RoleTable.vue';
|
||||
import SiteTitle from 'src/vueLib/general/SiteTitle.vue';
|
||||
|
||||
const tab = ref('users');
|
||||
</script>
|
||||
|
||||
@@ -17,6 +17,8 @@ import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
* with the Router instance.
|
||||
*/
|
||||
|
||||
export let routerInstance: ReturnType<typeof createRouter>;
|
||||
|
||||
export default defineRouter(function (/* { store, ssrContext } */) {
|
||||
const createHistory = process.env.SERVER
|
||||
? createMemoryHistory
|
||||
@@ -34,16 +36,27 @@ export default defineRouter(function (/* { store, ssrContext } */) {
|
||||
history: createHistory(process.env.VUE_ROUTER_BASE),
|
||||
});
|
||||
|
||||
routerInstance = Router;
|
||||
|
||||
Router.beforeEach((to, from, next) => {
|
||||
const userStore = useUserStore();
|
||||
|
||||
const isLoggedIn = userStore.isAuthenticated;
|
||||
if (to.meta.requiresAuth && !isLoggedIn) {
|
||||
if (!userStore.$state.firstLogin && to.path === '/firstlogin') {
|
||||
next('/login');
|
||||
} else if (userStore.$state.firstLogin && to.path !== '/firstlogin') {
|
||||
next('/firstlogin');
|
||||
} else if (to.meta.requiresAuth && !isLoggedIn) {
|
||||
next('/login');
|
||||
} else if (
|
||||
to.meta.requiresAdmin &&
|
||||
!userStore.isPermittedTo(to.path.replace('/', ''), 'read')
|
||||
) {
|
||||
next('/');
|
||||
if (to.meta.noBackendAdmin) {
|
||||
next();
|
||||
} else {
|
||||
next('/');
|
||||
}
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
|
||||
@@ -9,6 +9,10 @@ const routes: RouteRecordRaw[] = [
|
||||
path: '',
|
||||
component: () => import('pages/LoginPage.vue'),
|
||||
},
|
||||
{
|
||||
path: 'firstlogin',
|
||||
component: () => import('pages/FirstLogin.vue'),
|
||||
},
|
||||
{
|
||||
path: 'login',
|
||||
component: () => import('pages/LoginPage.vue'),
|
||||
@@ -25,14 +29,24 @@ const routes: RouteRecordRaw[] = [
|
||||
},
|
||||
{
|
||||
path: 'responsible',
|
||||
component: () => import('pages/ResponsibleTable.vue'),
|
||||
component: () => import('src/pages/ResponsibleTable.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true },
|
||||
},
|
||||
{
|
||||
path: 'group',
|
||||
component: () => import('pages/GroupTable.vue'),
|
||||
component: () => import('src/pages/GroupTable.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true },
|
||||
},
|
||||
{
|
||||
path: 'report',
|
||||
component: () => import('src/pages/ReportPage.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: false },
|
||||
},
|
||||
{
|
||||
path: 'stats',
|
||||
component: () => import('src/pages/StatsPage.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true, noBackendAdmin: true },
|
||||
},
|
||||
{
|
||||
path: 'settings',
|
||||
component: () => import('pages/SettingsPage.vue'),
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<q-separator color="black" />
|
||||
|
||||
<!-- Content Slot -->
|
||||
<div class="scrollArea">
|
||||
<div class="scrollArea" :style="'padding: ' + props.innerPadding + 'px'">
|
||||
<slot />
|
||||
</div>
|
||||
|
||||
@@ -48,6 +48,7 @@ const props = defineProps({
|
||||
headerTitle: { type: String, default: '' },
|
||||
width: { type: Number, default: 400 },
|
||||
height: { type: Number, default: 250 },
|
||||
innerPadding: { type: Number, default: 16 },
|
||||
});
|
||||
|
||||
// Fullscreen toggle
|
||||
@@ -153,7 +154,6 @@ const cardStyle = computed(() => {
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
overflow-y: auto;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
/* Resize handle in bottom right */
|
||||
|
||||
115
src/vueLib/general/SearchableSelect .vue
Normal file
115
src/vueLib/general/SearchableSelect .vue
Normal file
@@ -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>
|
||||
12
src/vueLib/general/SiteTitle.vue
Normal file
12
src/vueLib/general/SiteTitle.vue
Normal file
@@ -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>
|
||||
85
src/vueLib/login/ChangePassword.vue
Normal file
85
src/vueLib/login/ChangePassword.vue
Normal file
@@ -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>
|
||||
129
src/vueLib/login/EnterNewPassword.vue
Normal file
129
src/vueLib/login/EnterNewPassword.vue
Normal file
@@ -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>
|
||||
@@ -4,6 +4,7 @@ import { useNotify } from '../general/useNotify';
|
||||
import type { Settings } from '../models/settings';
|
||||
import { appName, logo } from '../models/settings';
|
||||
import { clearLocalStorage, setLocalSettings } from 'src/localstorage/localStorage';
|
||||
import { routerInstance } from 'src/router';
|
||||
|
||||
const refreshTime = 10000;
|
||||
let intervalId: ReturnType<typeof setInterval> | null = null;
|
||||
@@ -17,8 +18,12 @@ export function useLogin() {
|
||||
await appApi.post('/login', { user, password }).then((resp) => {
|
||||
const sets = resp.data.settings as Settings;
|
||||
|
||||
logo.value = sets.icon;
|
||||
appName.value = sets.appName;
|
||||
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);
|
||||
@@ -28,7 +33,11 @@ export function useLogin() {
|
||||
|
||||
const resp = await appApi.get('/login/me');
|
||||
await userStore
|
||||
.setUser({ id: resp.data.id, username: resp.data.user, role: resp.data.role })
|
||||
.setUser({
|
||||
id: resp.data.id,
|
||||
username: resp.data.user,
|
||||
role: { role: resp.data.role, permissions: [] },
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
|
||||
startRefreshInterval();
|
||||
@@ -47,6 +56,7 @@ export function useLogin() {
|
||||
userStore.clearUser();
|
||||
clearLocalStorage();
|
||||
stopRefreshInterval();
|
||||
await routerInstance.push('/login');
|
||||
}
|
||||
|
||||
async function refresh() {
|
||||
@@ -57,7 +67,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();
|
||||
|
||||
@@ -12,6 +12,7 @@ const { NotifyResponse } = useNotify();
|
||||
export const useUserStore = defineStore('user', {
|
||||
state: (): UserState => ({
|
||||
user: null,
|
||||
firstLogin: false,
|
||||
}),
|
||||
getters: {
|
||||
isAuthenticated: (state: UserState): boolean => {
|
||||
@@ -20,7 +21,7 @@ export const useUserStore = defineStore('user', {
|
||||
|
||||
isAuthorizedAs: (state: UserState) => {
|
||||
return (roles: string[]) => {
|
||||
return state.user !== null && roles.includes(state.user.role);
|
||||
return state.user !== null && roles.includes(state.user.role?.role);
|
||||
};
|
||||
},
|
||||
isPermittedTo: (state: UserState) => {
|
||||
@@ -42,11 +43,14 @@ export const useUserStore = defineStore('user', {
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
setFirstLogin(b: boolean) {
|
||||
this.firstLogin = b;
|
||||
},
|
||||
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;
|
||||
})
|
||||
|
||||
@@ -3,6 +3,8 @@ import type { Members } from './member';
|
||||
export interface Event {
|
||||
id: number;
|
||||
name: string;
|
||||
date?: string;
|
||||
day?: string;
|
||||
attendees: Members;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
import type { Group } from './group';
|
||||
import type { Responsible } from './responsible';
|
||||
|
||||
export interface Member {
|
||||
id: number;
|
||||
memberId?: number;
|
||||
responsibleId?: number | undefined;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
birthday?: string;
|
||||
@@ -10,8 +15,8 @@ export interface Member {
|
||||
zip?: string;
|
||||
phone?: string;
|
||||
email?: string;
|
||||
group?: string;
|
||||
responsiblePerson?: Member;
|
||||
group?: Group;
|
||||
responsible?: Responsible;
|
||||
firstVisit?: string;
|
||||
lastVisit?: string;
|
||||
}
|
||||
|
||||
9
src/vueLib/models/responsible.ts
Normal file
9
src/vueLib/models/responsible.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import type { Member } from './member';
|
||||
|
||||
export interface Responsible {
|
||||
id: number;
|
||||
memberId: number;
|
||||
member: Member;
|
||||
}
|
||||
|
||||
export type Responsibles = Responsible[];
|
||||
@@ -1,14 +1,17 @@
|
||||
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;
|
||||
newDatabase?: boolean;
|
||||
}
|
||||
|
||||
export interface UserState {
|
||||
user: User | null;
|
||||
firstLogin: boolean;
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import type { Role } from './roles';
|
||||
import type { Settings } from './settings';
|
||||
|
||||
export interface User {
|
||||
id?: number;
|
||||
user: string;
|
||||
email: string;
|
||||
role: string;
|
||||
role?: Role;
|
||||
expiration?: string;
|
||||
password?: string;
|
||||
newPassword?: string;
|
||||
settings?: Settings;
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -1,102 +1,104 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
:title="$t('attendees')"
|
||||
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="attendees"
|
||||
:columns="columns"
|
||||
row-key="id"
|
||||
v-model:pagination="pagination"
|
||||
:loading="loading"
|
||||
:filter="filter"
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
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="person"
|
||||
@click="openAllValueDialog"
|
||||
><q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
|
||||
<q-tooltip>{{ $t('addNewAttendees') }}</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-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
:title="$t('attendees')"
|
||||
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="attendees"
|
||||
: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"
|
||||
>
|
||||
<!--top left of event table-->
|
||||
<template v-slot:top-left>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('events', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="person"
|
||||
@click="openAttendanceDialog"
|
||||
><q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
|
||||
<q-tooltip>{{ $t('addNewAttendees') }}</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('selectAttendeesOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
<q-tooltip>{{ $t('selectAttendeesOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<template v-slot:body-cell="props">
|
||||
<q-td 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
|
||||
}}</q-badge></q-btn
|
||||
>
|
||||
</q-td>
|
||||
<q-td v-else :props="props">
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('events', 'delete')"
|
||||
flat
|
||||
dense
|
||||
@click="openRemoveDialog(props.row)"
|
||||
color="negative"
|
||||
icon="delete"
|
||||
/>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
<DialogFrame ref="memberTableDialog" :header-title="$t('members')" :width="700" :height="500">
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
|
||||
{{ $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>
|
||||
<q-icon name="search" />
|
||||
</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.attendees.length
|
||||
}}</q-badge></q-btn
|
||||
>
|
||||
</q-td>
|
||||
<q-td v-else :props="props">
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('events', 'delete')"
|
||||
flat
|
||||
dense
|
||||
@click="openRemoveDialog(props.row)"
|
||||
color="negative"
|
||||
icon="delete"
|
||||
/>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
<DialogFrame ref="attendanceDialog" :header-title="$t('members')" :width="700" :height="500">
|
||||
<MembersTable
|
||||
add-attendees
|
||||
:compare-members="attendees"
|
||||
v-on:update-event="updateTable"
|
||||
v-on:update-event="(val) => updateTable(val)"
|
||||
:event-id="localEvent?.id ?? 0"
|
||||
/>
|
||||
</DialogFrame>
|
||||
@@ -115,6 +117,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
//imports
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import { onMounted, type PropType, ref } from 'vue';
|
||||
import type { Members } from 'src/vueLib/models/member';
|
||||
@@ -127,21 +130,24 @@ import type { Event } from 'src/vueLib/models/event';
|
||||
import MembersTable from '../members/MembersTable.vue';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
|
||||
export interface AttendeesDialog {
|
||||
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 attendanceDialog = ref();
|
||||
const okDialog = ref();
|
||||
const deleteText = ref('');
|
||||
const selectOption = ref(false);
|
||||
@@ -151,16 +157,15 @@ const openSubmenu = ref(false);
|
||||
const filter = ref('');
|
||||
const user = useUserStore();
|
||||
|
||||
const { attendees, pagination, loading, columns, updateAttendees } = useAttendeesTable();
|
||||
|
||||
// load at page mount
|
||||
onMounted(() => {
|
||||
localEvent.value = props.event;
|
||||
attendees.value = props.event.attendees ?? [];
|
||||
});
|
||||
|
||||
//opens dialog for one value
|
||||
function openAllValueDialog() {
|
||||
memberTableDialog.value?.open();
|
||||
//opens attendance dialog
|
||||
function openAttendanceDialog() {
|
||||
attendanceDialog.value?.open();
|
||||
}
|
||||
|
||||
//opens remove dialog
|
||||
@@ -174,10 +179,11 @@ function openRemoveDialog(...attendees: Members) {
|
||||
} else {
|
||||
deleteText.value = String(attendees.length) + ' ' + i18n.global.t('attendees');
|
||||
}
|
||||
|
||||
okDialog.value?.open(attendees);
|
||||
}
|
||||
|
||||
//remove Attendees from database
|
||||
//remove attendees from database
|
||||
async function removeAttendees(...removeAttendees: Members) {
|
||||
if (!localEvent.value) {
|
||||
NotifyResponse('event is empty', 'error');
|
||||
@@ -200,27 +206,17 @@ async function removeAttendees(...removeAttendees: Members) {
|
||||
.finally(() => {
|
||||
loading.value = false;
|
||||
});
|
||||
await updateAttendees();
|
||||
emit('update');
|
||||
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);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@keyframes blink-yellow {
|
||||
0%,
|
||||
100% {
|
||||
background-color: yellow;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.bigger-table-text .q-table__middle td {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
<template>
|
||||
<DialogFrame ref="dialog" :header-title="$t('attendees')" :width="700" :height="600">
|
||||
<DialogFrame
|
||||
ref="dialog"
|
||||
:header-title="$t('attendees')"
|
||||
:width="700"
|
||||
:height="600"
|
||||
:inner-padding="0"
|
||||
>
|
||||
<q-card>
|
||||
<!-- tabs declaration in header-->
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
dense
|
||||
@@ -10,21 +17,37 @@
|
||||
align="justify"
|
||||
narrow-indicator
|
||||
>
|
||||
<q-tab no-caps name="attendance" :label="$t('attendees')" />
|
||||
<q-tab no-caps name="noneAttendees" :label="$t('noneAttendees')" />
|
||||
<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">
|
||||
<AttendeesTable :event="localEvent!" v-on:update="updateTable" />
|
||||
<q-tab-panel name="attendance" style="padding: 0px">
|
||||
<AttendeesTable
|
||||
:event="localEvent!"
|
||||
:event-array="eA"
|
||||
v-on:update="(val) => updateTable(val)"
|
||||
/>
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="noneAttendees">
|
||||
<!--tab of missing attenting members-->
|
||||
<q-tab-panel name="noneAttendees" style="padding: 0px">
|
||||
<MembersTable
|
||||
add-attendees
|
||||
:compare-members="attendees"
|
||||
v-on:update-event="updateTable"
|
||||
v-on:update-event="(val) => updateTable(val)"
|
||||
:event-id="localEvent?.id ?? 0"
|
||||
/>
|
||||
</q-tab-panel>
|
||||
@@ -34,28 +57,68 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
// imports
|
||||
import AttendeesTable from './AttendeesTable.vue';
|
||||
import MembersTable from '../members/MembersTable.vue';
|
||||
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
|
||||
import type { Event } from 'src/vueLib/models/event';
|
||||
import { ref } from 'vue';
|
||||
import { useAttendeesTable } from './AttendeesTable';
|
||||
import { useMemberTable } from '../members/MembersTable';
|
||||
import { getLocalPageDefaults } from 'src/localstorage/localStorage';
|
||||
|
||||
//use constants and function of imports
|
||||
const { attendees, updateAttendees } = useAttendeesTable();
|
||||
const { setNewFilter, filteredMembers, updateMembers } = useMemberTable();
|
||||
|
||||
// declare emits
|
||||
const emit = defineEmits(['update']);
|
||||
|
||||
// declarations
|
||||
const dialog = ref();
|
||||
const localEvent = ref<Event>();
|
||||
const missingAttendanceAmount = ref(0);
|
||||
const attendanceAmount = ref(0);
|
||||
const eA = ref(0);
|
||||
const tab = ref('attendance');
|
||||
const { attendees, updateAttendees } = useAttendeesTable();
|
||||
|
||||
const open = (event: Event) => {
|
||||
// opens attendace dialog of event
|
||||
const open = async (eventArray: number, event: Event) => {
|
||||
// local declarations
|
||||
localEvent.value = event;
|
||||
attendees.value = event.attendees ?? [];
|
||||
attendanceAmount.value = event.attendees.length ?? [];
|
||||
eA.value = eventArray;
|
||||
|
||||
// get attendance
|
||||
await updateAttendees(eventArray);
|
||||
//get missing attendance from member updateTable
|
||||
await updateMembers(event.attendees);
|
||||
|
||||
// set custom filter
|
||||
const defaults = getLocalPageDefaults('attendance');
|
||||
setNewFilter(defaults?.filteredColumn || '', ...(defaults?.filteredValue ?? []));
|
||||
|
||||
// set amount of missing attendace
|
||||
missingAttendanceAmount.value = filteredMembers.value.length;
|
||||
|
||||
//open atttendance dialog
|
||||
dialog.value.open();
|
||||
};
|
||||
|
||||
async function updateTable() {
|
||||
await updateAttendees();
|
||||
//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');
|
||||
}
|
||||
|
||||
|
||||
31
src/vueLib/tables/components/ClickableComponent.vue
Normal file
31
src/vueLib/tables/components/ClickableComponent.vue
Normal file
@@ -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>
|
||||
64
src/vueLib/tables/components/FilterSelect.vue
Normal file
64
src/vueLib/tables/components/FilterSelect.vue
Normal file
@@ -0,0 +1,64 @@
|
||||
<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, ref, watch } from 'vue';
|
||||
|
||||
// initialized only after first mount
|
||||
const isMounted = ref(false);
|
||||
|
||||
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),
|
||||
});
|
||||
|
||||
//reset column option
|
||||
watch(
|
||||
() => props.columnFilter,
|
||||
() => {
|
||||
if (!isMounted.value) {
|
||||
isMounted.value = true;
|
||||
return;
|
||||
}
|
||||
emit('update:columnOption', []); // reset properly
|
||||
},
|
||||
);
|
||||
|
||||
const columnOption = computed({
|
||||
get: () => props.columnOption,
|
||||
set: (v) => emit('update:columnOption', v),
|
||||
});
|
||||
</script>
|
||||
18
src/vueLib/tables/components/IconComponent.vue
Normal file
18
src/vueLib/tables/components/IconComponent.vue
Normal file
@@ -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>
|
||||
45
src/vueLib/tables/components/MenuComponent.vue
Normal file
45
src/vueLib/tables/components/MenuComponent.vue
Normal file
@@ -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>
|
||||
26
src/vueLib/tables/components/SearchableInput.vue
Normal file
26
src/vueLib/tables/components/SearchableInput.vue
Normal file
@@ -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>
|
||||
53
src/vueLib/tables/components/SearchableSelect.vue
Normal file
53
src/vueLib/tables/components/SearchableSelect.vue
Normal file
@@ -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>
|
||||
48
src/vueLib/tables/components/TopButtonGroup.vue
Normal file
48
src/vueLib/tables/components/TopButtonGroup.vue
Normal file
@@ -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>
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
>
|
||||
<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
|
||||
: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)"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
@@ -158,6 +128,8 @@ import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import AttendeesTableDialog from '../attendees/AttendeesTableDialog.vue';
|
||||
import type { Members } from 'src/vueLib/models/member';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import SearchableInput from '../components/SearchableInput.vue';
|
||||
import TopButtonGroup from '../components/TopButtonGroup.vue';
|
||||
|
||||
export interface EventDialog {
|
||||
getSelected: () => Events;
|
||||
@@ -217,8 +189,8 @@ function openRemoveDialog(...Events: Events) {
|
||||
okDialog.value?.open(Events);
|
||||
}
|
||||
|
||||
function openAttendees(attendees: Members | null) {
|
||||
attendeesDialog.value.open(attendees);
|
||||
function openAttendees(eventArray: number, attendees: Members | null) {
|
||||
attendeesDialog.value.open(eventArray, attendees);
|
||||
}
|
||||
|
||||
//remove Event from database
|
||||
@@ -243,20 +215,6 @@ function removeEvent(...removeEvents: Events) {
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@keyframes blink-yellow {
|
||||
0%,
|
||||
100% {
|
||||
background-color: yellow;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.blink-yellow {
|
||||
animation: blink-yellow 1.5s step-start 6 !important;
|
||||
}
|
||||
|
||||
.bigger-table-text .q-table__middle td {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ import { ref, computed } from 'vue';
|
||||
import type { Members } from 'src/vueLib/models/member';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { i18n } from 'boot/lang';
|
||||
import ClickableComponent from '../components/ClickableComponent.vue';
|
||||
import MenuComponent from '../components/MenuComponent.vue';
|
||||
|
||||
export function useGroupTable() {
|
||||
const groups = ref<Members>([]);
|
||||
@@ -21,8 +23,16 @@ export function useGroupTable() {
|
||||
label: i18n.global.t('name'),
|
||||
field: 'name',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'option',
|
||||
align: 'center' as const,
|
||||
label: '',
|
||||
field: 'option',
|
||||
icon: 'option',
|
||||
component: MenuComponent,
|
||||
},
|
||||
{ name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
|
||||
]);
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
@@ -19,30 +19,20 @@
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
dense
|
||||
class="bigger-table-text"
|
||||
>
|
||||
<template v-slot:top-left>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('group', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openGroupDialog()"
|
||||
>
|
||||
<q-tooltip>{{ $t('addNewgroup') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('group', 'write') || user.isPermittedTo('group', 'delete')"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
<q-tooltip>{{ $t('selectgroupOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<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">
|
||||
@@ -60,49 +50,35 @@
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- top right of table-->
|
||||
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<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('group', 'write') ? 'cursor: pointer' : ''"
|
||||
@click="
|
||||
user.isPermittedTo('group', 'write') && openGroupDialog(props.col.label, props.row)
|
||||
"
|
||||
>
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
<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 + ' (' + getAmount(props.row.name) + ')'"
|
||||
/>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('group', 'write') || user.isPermittedTo('group', '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('group', 'delete')"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(props.row)"
|
||||
class="text-negative"
|
||||
title="zu"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</q-td>
|
||||
<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="600" :width="500">
|
||||
<DialogFrame ref="groupDialog" :header-title="$t('addNewgroup')" :height="250" :width="350">
|
||||
<q-form ref="form">
|
||||
<div class="row justify-center q-gutter-md">
|
||||
<q-input
|
||||
@@ -144,10 +120,10 @@ 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';
|
||||
|
||||
export interface groupDialog {
|
||||
getSelected: () => Groups;
|
||||
}
|
||||
import SearchableInput from '../components/SearchableInput.vue';
|
||||
import TopButtonGroup from '../components/TopButtonGroup.vue';
|
||||
import { getAllMembers } from '../members/MembersTable';
|
||||
import type { Members } from 'src/vueLib/models/member';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const groupDialog = ref();
|
||||
@@ -161,13 +137,16 @@ const selected = ref<Groups>([]);
|
||||
const openSubmenu = ref(false);
|
||||
const filter = ref('');
|
||||
const user = useUserStore();
|
||||
const members = ref<Members>([]);
|
||||
|
||||
const { groups, pagination, loading, columns, updateGroups } = useGroupTable();
|
||||
|
||||
//load on mounting page
|
||||
onMounted(() => {
|
||||
onMounted(async () => {
|
||||
loading.value = true;
|
||||
|
||||
members.value = await getAllMembers();
|
||||
|
||||
appApi
|
||||
.post('database/open', { dbPath: databaseName.value, create: true })
|
||||
.then(() => {
|
||||
@@ -242,19 +221,14 @@ async function save() {
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
}
|
||||
|
||||
function getAmount(name: string) {
|
||||
const amount = members.value.filter((e) => e.group?.name == name);
|
||||
return amount.length;
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@keyframes blink-yellow {
|
||||
0%,
|
||||
100% {
|
||||
background-color: yellow;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.bigger-table-text .q-table__middle td {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,10 @@ import { i18n } from 'boot/lang';
|
||||
import { useResponsibleTable } from '../responsible/ResponsibleTable';
|
||||
import { appName } from 'src/vueLib/models/settings';
|
||||
import { useGroupTable } from '../group/GroupTable';
|
||||
import IconComponent from '../components/IconComponent.vue';
|
||||
import SearchableSelectComponent from '../components/SearchableSelect.vue';
|
||||
import ClickableComponent from '../components/ClickableComponent.vue';
|
||||
import MenuComponent from '../components/MenuComponent.vue';
|
||||
|
||||
export function useMemberTable() {
|
||||
const allMembers = ref<Members>([]);
|
||||
@@ -16,7 +20,7 @@ export function useMemberTable() {
|
||||
keys: string[];
|
||||
}[]
|
||||
>();
|
||||
const { responsibles, updateResponsibles } = useResponsibleTable();
|
||||
const { responsibles, responsibleMember, updateResponsibles } = useResponsibleTable();
|
||||
const { groups, updateGroups } = useGroupTable();
|
||||
|
||||
const pagination = ref({
|
||||
@@ -40,21 +44,30 @@ export function useMemberTable() {
|
||||
phone: true,
|
||||
email: true,
|
||||
group: true,
|
||||
responsiblePerson: true,
|
||||
responsible: true,
|
||||
firstVisit: true,
|
||||
lastVisit: true,
|
||||
option: true,
|
||||
test: true,
|
||||
});
|
||||
|
||||
const columns = computed(() =>
|
||||
[
|
||||
{ name: 'cake', align: 'center' as const, label: '', field: 'cake', icon: 'cake' },
|
||||
{
|
||||
name: 'cake',
|
||||
align: 'center' as const,
|
||||
label: '',
|
||||
field: 'cake',
|
||||
icon: 'cake',
|
||||
component: IconComponent,
|
||||
},
|
||||
{
|
||||
name: 'firstName',
|
||||
align: 'left' as const,
|
||||
label: i18n.global.t('prename'),
|
||||
field: 'firstName',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'lastName',
|
||||
@@ -62,6 +75,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('lastName'),
|
||||
field: 'lastName',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'birthday',
|
||||
@@ -69,6 +83,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('birthday'),
|
||||
field: 'birthday',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'age',
|
||||
@@ -76,6 +91,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('age'),
|
||||
field: 'age',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'comment',
|
||||
@@ -83,6 +99,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('comment'),
|
||||
field: 'comment',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'address',
|
||||
@@ -90,6 +107,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('address'),
|
||||
field: 'address',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'town',
|
||||
@@ -97,6 +115,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('town'),
|
||||
field: 'town',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'zip',
|
||||
@@ -104,6 +123,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('zipCode'),
|
||||
field: 'zip',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'phone',
|
||||
@@ -111,6 +131,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('phone'),
|
||||
field: 'phone',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'email',
|
||||
@@ -118,6 +139,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('email'),
|
||||
field: 'email',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'group',
|
||||
@@ -125,13 +147,15 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('group'),
|
||||
field: 'group',
|
||||
sortable: true,
|
||||
component: SearchableSelectComponent,
|
||||
},
|
||||
{
|
||||
name: 'responsiblePerson',
|
||||
name: 'responsible',
|
||||
align: 'left' as const,
|
||||
label: i18n.global.t('responsible'),
|
||||
field: 'responsiblePerson',
|
||||
field: 'responsible',
|
||||
sortable: true,
|
||||
component: SearchableSelectComponent,
|
||||
},
|
||||
{
|
||||
name: 'firstVisit',
|
||||
@@ -139,6 +163,7 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('firstVisit'),
|
||||
field: 'firstVisit',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'lastVisit',
|
||||
@@ -146,8 +171,16 @@ export function useMemberTable() {
|
||||
label: i18n.global.t('lastVisit'),
|
||||
field: 'lastVisit',
|
||||
sortable: true,
|
||||
component: ClickableComponent,
|
||||
},
|
||||
{
|
||||
name: 'option',
|
||||
align: 'center' as const,
|
||||
label: '',
|
||||
field: 'option',
|
||||
icon: 'option',
|
||||
component: MenuComponent,
|
||||
},
|
||||
{ name: 'option', align: 'center' as const, label: '', field: 'option', icon: 'option' },
|
||||
].filter((c) => enabledColumns.value[c.name]),
|
||||
);
|
||||
|
||||
@@ -225,11 +258,13 @@ export function useMemberTable() {
|
||||
return;
|
||||
}
|
||||
allMembers.value.forEach((member) => {
|
||||
if (!responsibles.value.some((r) => r.id === member.responsiblePerson?.id)) {
|
||||
delete member.responsiblePerson;
|
||||
// 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));
|
||||
}
|
||||
});
|
||||
@@ -241,8 +276,9 @@ export function useMemberTable() {
|
||||
.finally(() => {
|
||||
loading.value = false;
|
||||
//filter same members out so list is shorter
|
||||
filteredMembers.value = allMembers.value;
|
||||
if (filter) {
|
||||
filteredMembers.value = allMembers.value.filter(
|
||||
filteredMembers.value = filteredMembers.value.filter(
|
||||
(m1) =>
|
||||
!filter.some((m2) => {
|
||||
if (filterbyName) {
|
||||
@@ -256,7 +292,7 @@ export function useMemberTable() {
|
||||
//second filter
|
||||
const list = filterList.value ?? [];
|
||||
if (filterList.value && filterList.value.length > 0) {
|
||||
filteredMembers.value = allMembers.value.filter((member) =>
|
||||
filteredMembers.value = filteredMembers.value.filter((member) =>
|
||||
list.every((filterItem) => {
|
||||
const keys = filterItem.keys ?? [];
|
||||
if (keys.includes('null')) return true;
|
||||
@@ -270,6 +306,11 @@ export function useMemberTable() {
|
||||
if (typeof value === 'number') {
|
||||
return keys.includes(value.toString());
|
||||
}
|
||||
if (typeof value === 'object') {
|
||||
if ('name' in value) {
|
||||
return keys.includes(value.name);
|
||||
}
|
||||
}
|
||||
if (typeof value === 'string') {
|
||||
return keys.includes(value);
|
||||
}
|
||||
@@ -278,7 +319,6 @@ export function useMemberTable() {
|
||||
);
|
||||
return;
|
||||
}
|
||||
filteredMembers.value = allMembers.value;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -314,9 +354,14 @@ export function useMemberTable() {
|
||||
exportableColumns
|
||||
.map((col) => {
|
||||
const value = member[col.field];
|
||||
// handle nested objects (e.g. responsiblePerson)
|
||||
// handle nested objects (e.g. responsible)
|
||||
if (typeof value === 'object' && value !== null) {
|
||||
if ('firstName' in value && 'lastName' in value)
|
||||
if (
|
||||
'firstName' in value &&
|
||||
'lastName' in value &&
|
||||
typeof value.firstName === 'string' &&
|
||||
typeof value.lastName === 'string'
|
||||
)
|
||||
return `"${value.firstName} ${value.lastName}"`;
|
||||
return `"${JSON.stringify(value)}"`;
|
||||
}
|
||||
@@ -344,6 +389,7 @@ export function useMemberTable() {
|
||||
allMembers,
|
||||
filteredMembers,
|
||||
responsibles,
|
||||
responsibleMember,
|
||||
groups,
|
||||
pagination,
|
||||
columns,
|
||||
@@ -356,3 +402,27 @@ export function useMemberTable() {
|
||||
exportCsv,
|
||||
};
|
||||
}
|
||||
|
||||
export async function getAllMembers(): Promise<Members> {
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
const allMembers = ref<Members>([]);
|
||||
|
||||
await appApi
|
||||
.get('members')
|
||||
.then((resp) => {
|
||||
if (resp.data === null) {
|
||||
return [];
|
||||
}
|
||||
allMembers.value = resp.data as Members;
|
||||
if (allMembers.value === null) {
|
||||
return [];
|
||||
}
|
||||
})
|
||||
|
||||
.catch((err) => {
|
||||
NotifyResponse(err, 'error');
|
||||
});
|
||||
|
||||
return allMembers.value;
|
||||
}
|
||||
|
||||
@@ -1,224 +1,169 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Members"
|
||||
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="filteredMembers"
|
||||
:columns="columns"
|
||||
row-key="id"
|
||||
v-model:pagination="pagination"
|
||||
:loading="loading"
|
||||
:filter="filter"
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
class="bigger-table-text"
|
||||
>
|
||||
<template v-slot:top-left>
|
||||
<div>
|
||||
<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', 'import')"
|
||||
dense
|
||||
flat
|
||||
icon="upload"
|
||||
@click="openUploadDialog"
|
||||
>
|
||||
<q-tooltip>{{ $t('importCSV') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('members', 'export')"
|
||||
dense
|
||||
flat
|
||||
icon="download"
|
||||
@click="exportCsv"
|
||||
>
|
||||
<q-tooltip>{{ $t('exportCSV') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn
|
||||
v-if="inProps.addAttendees || inProps.addResponsible"
|
||||
dense
|
||||
color="grey-7"
|
||||
flat
|
||||
icon="person"
|
||||
@click="addMemberTo"
|
||||
>
|
||||
<q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
|
||||
</q-btn>
|
||||
<q-btn v-else flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item clickable v-close-popup @click="addToEvent" class="text-primary">{{
|
||||
$t('addToEvent')
|
||||
}}</q-item>
|
||||
<q-item
|
||||
v-if="user.isPermittedTo('members', 'delete')"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</div>
|
||||
<q-card flat class="q-pa-sm">
|
||||
<q-select
|
||||
:label="$t('filterByColumn')"
|
||||
dense
|
||||
v-model="selectedColumnFilter"
|
||||
option-label="label"
|
||||
option-value="name"
|
||||
map-options
|
||||
emit-value
|
||||
clearable
|
||||
:options="columns.filter((col) => col.label !== '')"
|
||||
v-on:clear="selectedColumnOptions = []"
|
||||
@update:model-value="
|
||||
filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
|
||||
"
|
||||
class="q-mt-xs"
|
||||
/>
|
||||
<q-select
|
||||
v-if="selectedColumnFilter"
|
||||
:label="$t('filterByColumnValue')"
|
||||
dense
|
||||
v-model="selectedColumnOptions"
|
||||
:options="setColumnOptions(selectedColumnFilter)"
|
||||
class="q-mt-xs"
|
||||
multiple
|
||||
clearable
|
||||
@update:model-value="
|
||||
filterMembers(selectedColumnFilter, ...(selectedColumnOptions || []))
|
||||
"
|
||||
/>
|
||||
</q-card>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="text-weight-bold">
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<template v-slot:body-cell="props">
|
||||
<q-td
|
||||
:props="props"
|
||||
:class="getRowClass(props.row)"
|
||||
:style="user.isPermittedTo('members', 'write') ? 'cursor: pointer' : ''"
|
||||
@click="
|
||||
user.isPermittedTo('members', 'write') &&
|
||||
openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Members"
|
||||
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="filteredMembers"
|
||||
: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"
|
||||
>
|
||||
<!-- top left of table-->
|
||||
<template v-slot:top-left>
|
||||
<div>
|
||||
<TopButtonGroup
|
||||
:permit-add="user.isPermittedTo('members', 'write')"
|
||||
:tool-tip-add="$t('addNewMember')"
|
||||
:permit-select="
|
||||
user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')
|
||||
"
|
||||
>
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<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'"
|
||||
size="md"
|
||||
/>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-group="props">
|
||||
<q-td :props="props">
|
||||
<q-select
|
||||
v-if="groups.length > 0"
|
||||
:readonly="!user.isPermittedTo('members', 'write')"
|
||||
:options="groups"
|
||||
emit-value
|
||||
map-options
|
||||
option-value="name"
|
||||
option-label="name"
|
||||
v-model="props.row.group"
|
||||
@update:model-value="updateMember(props.row)"
|
||||
></q-select>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-responsiblePerson="props">
|
||||
<q-td :props="props">
|
||||
<q-select
|
||||
v-if="responsibles.length > 0"
|
||||
:readonly="!user.isPermittedTo('members', 'write')"
|
||||
:options="responsibles"
|
||||
:option-label="(opt) => opt.firstName + ' ' + opt.lastName"
|
||||
v-model="props.row.responsiblePerson"
|
||||
@update:model-value="updateMember(props.row)"
|
||||
></q-select>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
: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="user.isPermittedTo('members', 'write') || user.isPermittedTo('members', 'delete')"
|
||||
flat
|
||||
v-if="inProps.addAttendees || inProps.addResponsible"
|
||||
dense
|
||||
icon="more_vert"
|
||||
@click="openSubmenu = true"
|
||||
/>
|
||||
<q-menu v-if="openSubmenu" anchor="top right" self="top left">
|
||||
color="grey-7"
|
||||
flat
|
||||
icon="person"
|
||||
@click="addMemberTo"
|
||||
>
|
||||
<q-badge floating transparent color="primary" text-color="primary-text">+</q-badge>
|
||||
<q-tooltip>{{
|
||||
inProps.addAttendees ? $t('addToEvent') : $t('addNewResponsible')
|
||||
}}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn v-else flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item clickable v-close-popup @click="addToEvent" class="text-primary">{{
|
||||
$t('addToEvent')
|
||||
}}</q-item>
|
||||
<q-item
|
||||
v-if="user.isPermittedTo('members', 'write')"
|
||||
v-if="user.isPermittedTo('members', 'delete')"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openAllValueDialog(props.row)"
|
||||
class="text-primary"
|
||||
>{{ $t('edit') }}</q-item
|
||||
>
|
||||
<q-item
|
||||
v-if="
|
||||
user.isPermittedTo('members', 'delete') &&
|
||||
!inProps.addAttendees &&
|
||||
!inProps.addResponsible
|
||||
"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(props.row)"
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
title="zu"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
</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"
|
||||
@update:column-option="filterMembers"
|
||||
/>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="text-weight-bold">
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- top right of table-->
|
||||
<template v-slot:top-right>
|
||||
<SearchableInput v-model="filter" :placeholder="$t('search')" />
|
||||
</template>
|
||||
|
||||
<!-- table body content-->
|
||||
|
||||
<!-- usual cell content -->
|
||||
<template v-slot:body-cell="props">
|
||||
<component
|
||||
:is="props.col.component"
|
||||
:td-props="props"
|
||||
:inClass="getRowClass(props.row)"
|
||||
:permitted="user.isPermittedTo('members', 'write')"
|
||||
:value="props.value"
|
||||
v-on:onClick="openSingleValueDialog(props.col, props.row)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<!-- birthday icon -->
|
||||
<template v-slot:body-cell-cake="props">
|
||||
<component
|
||||
:td-props="props"
|
||||
:is="props.col.component"
|
||||
:inClass="getRowClass(props.row)"
|
||||
size="md"
|
||||
:name="isXDaysBeforeAnnualDate(props.row.birthday, 1) ? 'cake' : ''"
|
||||
color="red"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
|
||||
<!-- group select -->
|
||||
<template v-slot:body-cell-group="props" v-if="groups.length > 0">
|
||||
<component
|
||||
:td-props="props"
|
||||
:is="props.col.component"
|
||||
dense
|
||||
:readonly="!user.isPermittedTo('members', 'write')"
|
||||
:options="groups"
|
||||
emit-value
|
||||
option-label="name"
|
||||
option-value=""
|
||||
v-model="props.row.group"
|
||||
@update:model-value="updateMember(props.row)"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
|
||||
<!-- responsible person select -->
|
||||
<template v-slot:body-cell-responsible="props" v-if="responsibles.length > 0">
|
||||
<component
|
||||
:td-props="props"
|
||||
:is="props.col.component"
|
||||
:read-only="!user.isPermittedTo('members', 'write')"
|
||||
:options="responsibles"
|
||||
:option-label="
|
||||
(opt: Responsible) => (opt.member ? opt.member.firstName + ' ' + opt.member.lastName : '')
|
||||
"
|
||||
option-value="memberId"
|
||||
v-model="props.row.responsible"
|
||||
@update:model-value="updateMember(props.row)"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
|
||||
<!-- option menu -->
|
||||
<template v-slot:body-cell-option="props">
|
||||
<component
|
||||
:td-props="props"
|
||||
:is="props.col.component"
|
||||
:permitEdit="user.isPermittedTo('members', 'write')"
|
||||
:permitDelete="user.isPermittedTo('members', 'delete')"
|
||||
:editFunction="() => openAllValueDialog(props.row)"
|
||||
:removeFunction="() => openRemoveDialog(props.row)"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
</q-table>
|
||||
<EditOneDialog
|
||||
ref="editOneDialog"
|
||||
endpoint="members/edit"
|
||||
@@ -228,6 +173,7 @@
|
||||
<EditAllDialog
|
||||
ref="editAllDialog"
|
||||
:responsibles="responsibles"
|
||||
:group="groups"
|
||||
v-on:update="updateMember"
|
||||
></EditAllDialog>
|
||||
<OkDialog
|
||||
@@ -245,7 +191,7 @@
|
||||
<AddToEvent
|
||||
ref="addToEventDialog"
|
||||
endpoint="events/add/attendees"
|
||||
v-on:update-event="(val) => updateMemberLastVisit(val)"
|
||||
@update-event="updateMemberLastVisit"
|
||||
/>
|
||||
</template>
|
||||
|
||||
@@ -264,6 +210,11 @@ import { databaseName } from 'src/vueLib/models/settings';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import { getLocalPageDefaults, setLocalPageDefaults } from 'src/localstorage/localStorage';
|
||||
import type { Responsible } from 'src/vueLib/models/responsible';
|
||||
import type { QTableColumn } from 'quasar';
|
||||
import SearchableInput from '../components/SearchableInput.vue';
|
||||
import FilterSelect from '../components/FilterSelect.vue';
|
||||
import TopButtonGroup from '../components/TopButtonGroup.vue';
|
||||
|
||||
const inProps = defineProps({
|
||||
addAttendees: { type: Boolean },
|
||||
@@ -324,7 +275,7 @@ onMounted(() => {
|
||||
'email',
|
||||
'address',
|
||||
'phone',
|
||||
'responsiblePerson',
|
||||
'responsible',
|
||||
'firstVisit',
|
||||
'lastVisit',
|
||||
);
|
||||
@@ -338,13 +289,13 @@ onMounted(() => {
|
||||
selectedColumnFilter.value = defaults?.filteredColumn || '';
|
||||
selectedColumnOptions.value = defaults?.filteredValue ?? [];
|
||||
|
||||
// set custom filter
|
||||
setNewFilter(selectedColumnFilter.value, ...selectedColumnOptions.value);
|
||||
|
||||
appApi
|
||||
.post('database/open', { dbPath: databaseName.value, create: true })
|
||||
.then(() => {
|
||||
updateMembers(inProps.compareMembers, inProps.addResponsible).catch((err) =>
|
||||
NotifyResponse(err, 'error'),
|
||||
);
|
||||
updateTable().catch((err) => NotifyResponse(err, 'error'));
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'))
|
||||
|
||||
@@ -353,9 +304,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
|
||||
@@ -389,7 +348,14 @@ 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));
|
||||
.map((v) => {
|
||||
if (typeof v === 'string') {
|
||||
return v;
|
||||
} else if (typeof v === 'object') {
|
||||
const obj = v as Record<string, unknown>;
|
||||
return String(obj['name']);
|
||||
}
|
||||
});
|
||||
|
||||
const selection = [...new Set(values)];
|
||||
|
||||
@@ -401,10 +367,10 @@ function setColumnOptions(columnName: string) {
|
||||
return selection;
|
||||
}
|
||||
|
||||
async function filterMembers(field: string, ...keys: string[]) {
|
||||
setNewFilter(field, ...keys);
|
||||
setLocalPageDefaults(page.value, field, keys);
|
||||
await updateMembers();
|
||||
async function filterMembers() {
|
||||
setNewFilter(selectedColumnFilter.value, ...(selectedColumnOptions.value || []));
|
||||
setLocalPageDefaults(page.value, selectedColumnFilter.value, selectedColumnOptions.value || []);
|
||||
await updateTable();
|
||||
}
|
||||
|
||||
//remove member from database
|
||||
@@ -418,7 +384,7 @@ function removeMember(...removeMembers: Members) {
|
||||
appApi
|
||||
.post('members/delete', { ids: memberIds })
|
||||
.then(() => {
|
||||
updateMembers().catch((err) => NotifyResponse(err, 'error'));
|
||||
updateTable().catch((err) => NotifyResponse(err, 'error'));
|
||||
selected.value = [];
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'))
|
||||
@@ -431,9 +397,11 @@ function updateMember(member: Member | null) {
|
||||
if (!member) NotifyResponse(i18n.global.t('memberUpdated'));
|
||||
appApi
|
||||
.post('/members/edit', [member])
|
||||
.then(() => NotifyResponse(i18n.global.t('memberUpdated')))
|
||||
.then(() => {
|
||||
NotifyResponse(i18n.global.t('memberUpdated'));
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
updateMembers().catch((err) => NotifyResponse(err, 'error'));
|
||||
updateTable().catch((err) => NotifyResponse(err, 'error'));
|
||||
}
|
||||
|
||||
function addToEvent() {
|
||||
@@ -455,7 +423,13 @@ async function addMemberTo() {
|
||||
notificationPlural = 'attendeesAdded';
|
||||
} else if (inProps.addResponsible) {
|
||||
query = 'responsible/add';
|
||||
|
||||
selected.value.forEach((s) => {
|
||||
s.memberId = s.id;
|
||||
s.id = 0;
|
||||
});
|
||||
payload = selected.value;
|
||||
|
||||
notificationSingular = 'responsibleAdded';
|
||||
notificationPlural = 'responsiblesAdded';
|
||||
}
|
||||
@@ -475,8 +449,10 @@ async function addMemberTo() {
|
||||
|
||||
if (inProps.addAttendees) {
|
||||
await updateMemberLastVisit(selected.value);
|
||||
} else {
|
||||
await updateTable();
|
||||
emit('update-event', filteredMembers.value.length);
|
||||
}
|
||||
emit('update-event');
|
||||
}
|
||||
|
||||
async function updateMemberLastVisit(members: Members) {
|
||||
@@ -504,11 +480,12 @@ async function updateMemberLastVisit(members: Members) {
|
||||
}
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
await updateMembers(localCompareMembers.value, inProps.addResponsible)
|
||||
.then(() => localCompareMembers.value?.push(...members))
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
emit('update-event');
|
||||
localCompareMembers.value?.push(...members);
|
||||
await updateTable().catch((err) => NotifyResponse(err, 'error'));
|
||||
emit('update-event', filteredMembers.value.length);
|
||||
}
|
||||
|
||||
defineExpose({ allMembers, filteredMembers });
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
:loading-label="$t('loading')"
|
||||
:rows-per-page-label="$t('recordsPerPage')"
|
||||
:selected-rows-label="(val) => val + ' ' + $t('recordSelected')"
|
||||
:rows="responsibles"
|
||||
:rows="responsibleMember"
|
||||
:columns="columns"
|
||||
row-key="id"
|
||||
v-model:pagination="pagination"
|
||||
@@ -19,33 +19,21 @@
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
dense
|
||||
class="bigger-table-text"
|
||||
>
|
||||
<template v-slot:top-left>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('responsible', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openResponsibleDialog"
|
||||
>
|
||||
<q-tooltip>{{ $t('addNewResponsible') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="
|
||||
user.isPermittedTo('responsible', 'write') ||
|
||||
user.isPermittedTo('responsible', 'delete')
|
||||
"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
<q-tooltip>{{ $t('selectResponsibleOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<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')
|
||||
"
|
||||
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">
|
||||
@@ -63,42 +51,26 @@
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- top right of table-->
|
||||
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<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">
|
||||
{{ 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', 'delete')"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(props.row)"
|
||||
class="text-negative"
|
||||
title="zu"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</q-td>
|
||||
<component
|
||||
:is="props.col.component"
|
||||
:td-props="props"
|
||||
:permitDelete="user.isPermittedTo('responsible', 'delete')"
|
||||
:removeFunction="() => openRemoveDialog(props.row)"
|
||||
>
|
||||
</component>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
@@ -110,7 +82,7 @@
|
||||
>
|
||||
<MembersTable
|
||||
add-responsible
|
||||
:compare-members="responsibles"
|
||||
:compare-members="responsibleMember"
|
||||
v-on:update-event="updateResponsibles"
|
||||
/>
|
||||
</DialogFrame>
|
||||
@@ -132,17 +104,16 @@ import { appApi } from 'src/boot/axios';
|
||||
import { ref, onMounted } from 'vue';
|
||||
import DialogFrame from 'src/vueLib/dialog/DialogFrame.vue';
|
||||
import MembersTable from '../members/MembersTable.vue';
|
||||
import type { Member, Members } from 'src/vueLib/models/member';
|
||||
import type { Members } from 'src/vueLib/models/member';
|
||||
import OkDialog from 'src/components/dialog/OkDialog.vue';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import { useResponsibleTable } from './ResponsibleTable';
|
||||
import { databaseName } from 'src/vueLib/models/settings';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
|
||||
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 responsibleDialog = ref();
|
||||
@@ -154,7 +125,8 @@ const openSubmenu = ref(false);
|
||||
const filter = ref('');
|
||||
const user = useUserStore();
|
||||
|
||||
const { responsibles, pagination, loading, columns, updateResponsibles } = useResponsibleTable();
|
||||
const { responsibleMember, pagination, loading, columns, updateResponsibles } =
|
||||
useResponsibleTable();
|
||||
|
||||
//load on mounting page
|
||||
onMounted(() => {
|
||||
@@ -197,14 +169,14 @@ function openRemoveDialog(...Responsibles: Members) {
|
||||
}
|
||||
|
||||
//remove Responsible from database
|
||||
function removeResponsible(...removeResponsibles: Members) {
|
||||
async function removeResponsible(...removeResponsibles: Responsibles) {
|
||||
const ResponsibleIds: number[] = [];
|
||||
|
||||
removeResponsibles.forEach((Responsible: Member) => {
|
||||
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) => {
|
||||
@@ -216,20 +188,11 @@ function removeResponsible(...removeResponsibles: Members) {
|
||||
.finally(() => {
|
||||
loading.value = false;
|
||||
});
|
||||
await updateResponsibles();
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@keyframes blink-yellow {
|
||||
0%,
|
||||
100% {
|
||||
background-color: yellow;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.bigger-table-text .q-table__middle td {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@@ -1,127 +1,128 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Roles"
|
||||
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="roles"
|
||||
:columns="columns"
|
||||
row-key="id"
|
||||
v-model:pagination="pagination"
|
||||
:loading="loading"
|
||||
:filter="filter"
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
class="bigger-table-text"
|
||||
>
|
||||
<template v-slot:top-left>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openAllValueDialog(null)"
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Roles"
|
||||
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="roles"
|
||||
: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>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openAllValueDialog(null)"
|
||||
>
|
||||
<q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
<q-tooltip>{{ $t('selectRoleOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
<q-tooltip>{{ $t('addNewRole') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
<q-tooltip>{{ $t('selectRoleOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<template v-slot:body-cell="props">
|
||||
<q-td
|
||||
:props="props"
|
||||
:disable="!autorized(props.row)"
|
||||
:style="
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md 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">
|
||||
<q-td
|
||||
:props="props"
|
||||
:disable="!autorized(props.row)"
|
||||
:style="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'cursor: pointer'
|
||||
: ''
|
||||
"
|
||||
@click="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
: ''
|
||||
"
|
||||
>
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-permissions="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
:disable="!autorized(props.row) || !user.isPermittedTo('userSettings', 'write')"
|
||||
flat
|
||||
dense
|
||||
icon="rule"
|
||||
:color="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'cursor: pointer'
|
||||
: ''
|
||||
? 'secondary'
|
||||
: 'grey'
|
||||
"
|
||||
@click="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
: ''
|
||||
user.isPermittedTo('userSettings', 'write') &&
|
||||
openAllValueDialog(props.row, 'permissions')
|
||||
"
|
||||
>
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-permissions="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
:disable="!autorized(props.row) || !user.isPermittedTo('userSettings', 'write')"
|
||||
flat
|
||||
dense
|
||||
icon="rule"
|
||||
:color="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'secondary'
|
||||
: 'grey'
|
||||
"
|
||||
@click="
|
||||
user.isPermittedTo('userSettings', 'write') &&
|
||||
openAllValueDialog(props.row, 'permissions')
|
||||
"
|
||||
>
|
||||
<q-tooltip> {{ $t('permissions') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'delete')"
|
||||
:disable="!autorized(props.row)"
|
||||
flat
|
||||
dense
|
||||
icon="delete"
|
||||
color="negative"
|
||||
@click="openRemoveDialog(props.row)"
|
||||
>
|
||||
<q-tooltip> {{ $t('delete') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
<q-tooltip> {{ $t('permissions') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'delete')"
|
||||
:disable="!autorized(props.row)"
|
||||
flat
|
||||
dense
|
||||
icon="delete"
|
||||
color="negative"
|
||||
@click="openRemoveDialog(props.row)"
|
||||
>
|
||||
<q-tooltip> {{ $t('delete') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
<EditOneDialog
|
||||
ref="editOneDialog"
|
||||
endpoint="roles/update"
|
||||
@@ -154,6 +155,7 @@ import { useRoleTable } from './RoleTable';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import { QTable } from 'quasar';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import SearchableInput from '../components/SearchableInput.vue';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const editOneDialog = ref();
|
||||
@@ -232,16 +234,6 @@ function removeRole(...removeRoles: Roles) {
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@keyframes blink-yellow {
|
||||
0%,
|
||||
100% {
|
||||
background-color: yellow;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.blink-yellow {
|
||||
animation: blink-yellow 1.5s step-start 6 !important;
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -1,133 +1,148 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Users"
|
||||
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="users"
|
||||
:columns="columns"
|
||||
row-key="id"
|
||||
v-model:pagination="pagination"
|
||||
:loading="loading"
|
||||
:filter="filter"
|
||||
:selection="selectOption ? 'multiple' : 'none'"
|
||||
v-model:selected="selected"
|
||||
binary-state-sort
|
||||
class="bigger-table-text"
|
||||
>
|
||||
<template v-slot:top-left>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openAllValueDialog(null)"
|
||||
>
|
||||
<q-tooltip>{{ $t('addNewUser') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
<q-tooltip>{{ $t('selectUserOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md text-weight-bold">
|
||||
{{ $t('selected') }}: {{ selected.length }}
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:top-right>
|
||||
<q-input filled dense debounce="300" v-model="filter" :placeholder="$t('search')">
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<template v-slot:body-cell="props">
|
||||
<q-td
|
||||
:props="props"
|
||||
:style="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'cursor: pointer'
|
||||
: ''
|
||||
"
|
||||
@click="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
: ''
|
||||
"
|
||||
<q-table
|
||||
flat
|
||||
bordered
|
||||
ref="tableRef"
|
||||
title="Users"
|
||||
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="users"
|
||||
: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>
|
||||
<q-btn-group push flat style="color: grey">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
icon="add"
|
||||
@click="openAllValueDialog(null)"
|
||||
>
|
||||
{{ props.value }}
|
||||
</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"
|
||||
@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)
|
||||
: ''
|
||||
"
|
||||
<q-tooltip>{{ $t('addNewUser') }}</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'write')"
|
||||
dense
|
||||
flat
|
||||
style="color: grey"
|
||||
:icon="selectOption ? 'check_box' : 'check_box_outline_blank'"
|
||||
@click="selectOption = !selectOption"
|
||||
>
|
||||
{{ props.value === 'never' ? $t('never') : props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'delete')"
|
||||
:disable="!autorized(props.row)"
|
||||
flat
|
||||
dense
|
||||
icon="delete"
|
||||
color="negative"
|
||||
@click="openRemoveDialog(props.row)"
|
||||
<q-tooltip>{{ $t('selectUserOptions') }}</q-tooltip>
|
||||
</q-btn>
|
||||
</q-btn-group>
|
||||
<div v-if="selectOption && selected.length > 0">
|
||||
<q-btn flat dense icon="more_vert" @click="openSubmenu = true" />
|
||||
<q-menu v-if="openSubmenu" anchor="bottom middle" self="top middle">
|
||||
<q-item
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="openRemoveDialog(...selected)"
|
||||
class="text-negative"
|
||||
>{{ $t('delete') }}</q-item
|
||||
>
|
||||
<q-tooltip> {{ $t('delete') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
</div>
|
||||
</q-menu>
|
||||
</div>
|
||||
<div v-if="selectOption && selected.length > 0" class="q-ml-md 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">
|
||||
<q-td
|
||||
:props="props"
|
||||
:style="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'cursor: pointer'
|
||||
: ''
|
||||
"
|
||||
@click="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
: ''
|
||||
"
|
||||
>
|
||||
{{ props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-newPassword="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="autorized(props.row) && currentUser.id === props.row.id"
|
||||
flat
|
||||
dense
|
||||
no-caps
|
||||
color="primary"
|
||||
:label="$t('changePassword')"
|
||||
@click="openPwdDialog(props.row)"
|
||||
></q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-role="props">
|
||||
<q-td :props="props">
|
||||
<q-select
|
||||
:readonly="!user.isPermittedTo('userSettings', 'write') || !autorized(props.row)"
|
||||
dense
|
||||
v-model="props.row.role"
|
||||
:options="localRoles"
|
||||
option-label="role"
|
||||
@update:model-value="updateUser(props.row)"
|
||||
></q-select>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-expiration="props">
|
||||
<q-td
|
||||
:props="props"
|
||||
:style="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? 'cursor: pointer'
|
||||
: ''
|
||||
"
|
||||
@click="
|
||||
autorized(props.row) && user.isPermittedTo('userSettings', 'write')
|
||||
? openSingleValueDialog(props.col.label, props.col.name, props.row)
|
||||
: ''
|
||||
"
|
||||
>
|
||||
{{ props.value === 'never' ? $t('never') : props.value }}
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-option="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
v-if="user.isPermittedTo('userSettings', 'delete')"
|
||||
:disable="!autorized(props.row)"
|
||||
flat
|
||||
dense
|
||||
icon="delete"
|
||||
color="negative"
|
||||
@click="openRemoveDialog(props.row)"
|
||||
>
|
||||
<q-tooltip> {{ $t('delete') }} </q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
<EditOneDialog
|
||||
ref="editOneDialog"
|
||||
query-id
|
||||
@@ -145,6 +160,7 @@
|
||||
button-ok-color="red"
|
||||
v-on:update-confirm="(val) => removeUser(...val)"
|
||||
></OkDialog>
|
||||
<ChangePassword ref="changePwdDialog" v-on:update:password="changePassword" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
@@ -159,6 +175,8 @@ import { useUserTable } from './UserTable';
|
||||
import { roles, useRoleTable } from '../roles/RoleTable';
|
||||
import { i18n } from 'src/boot/lang';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import ChangePassword from 'src/vueLib/login/ChangePassword.vue';
|
||||
import SearchableInput from '../components/SearchableInput.vue';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
const editOneDialog = ref();
|
||||
@@ -176,6 +194,7 @@ const currentUser = ref();
|
||||
const { users, pagination, loading, columns, updateUsers } = useUserTable();
|
||||
const { updateRoles } = useRoleTable();
|
||||
const user = useUserStore();
|
||||
const changePwdDialog = ref();
|
||||
|
||||
//load on mounting page
|
||||
onMounted(() => {
|
||||
@@ -201,6 +220,22 @@ 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) {
|
||||
if (user.password == user.newPassword) {
|
||||
NotifyResponse(i18n.global.t('samePasswordEntered'), 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
await appApi.post('/users/new/password', user).catch((err) => console.error(err));
|
||||
changePwdDialog.value.close();
|
||||
}
|
||||
|
||||
//opens remove dialog
|
||||
function openRemoveDialog(...users: Users) {
|
||||
if (users.length === 1) {
|
||||
@@ -245,20 +280,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user