Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 9 Pull requests Projects Releases 8 Packages Wiki Activity Actions

patches v1.0.2 #37

Merged
jkeffects merged 7 commits from develop into main 2025-01-13 10:22:31 +00:00
Conversation 0 Commits 7 Files changed 79 +130 -114
5 changed files with 130 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 22359c3bea - Show all commits

202
public/ChartDB(administration-db).json
View file

@ -1,8 +1,8 @@
{ {
"id": "0", "id": "0",
"name": "administration-db", "name": "administration-db",
"createdAt": "2025-01-08T15:50:20.331Z", "createdAt": "2025-01-12T13:30:56.612Z",
"updatedAt": "2025-01-08T15:50:20.331Z", "updatedAt": "2025-01-12T13:30:56.612Z",
"databaseType": "mariadb", "databaseType": "mariadb",
"tables": [ "tables": [
{ {
@ -1291,6 +1291,18 @@
}, },
{ {
"id": "101", "id": "101",
"name": "postalCode",
"type": {
"name": "varchar",
"id": "varchar"
},
"unique": false,
"nullable": true,
"primaryKey": false,
"createdAt": 1736688552836
},
{
"id": "102",
"name": "city", "name": "city",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1305,7 +1317,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "102", "id": "103",
"name": "street", "name": "street",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1320,7 +1332,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "103", "id": "104",
"name": "streetNumber", "name": "streetNumber",
"type": { "type": {
"id": "int", "id": "int",
@ -1333,7 +1345,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "104", "id": "105",
"name": "streetNumberAddition", "name": "streetNumberAddition",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1348,7 +1360,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "105", "id": "106",
"name": "typeId", "name": "typeId",
"type": { "type": {
"id": "int", "id": "int",
@ -1360,7 +1372,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "106", "id": "107",
"name": "memberId", "name": "memberId",
"type": { "type": {
"id": "int", "id": "int",
@ -1372,7 +1384,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "107", "id": "108",
"name": "isSMSAlarming", "name": "isSMSAlarming",
"type": { "type": {
"id": "tinyint", "id": "tinyint",
@ -1387,7 +1399,7 @@
], ],
"indexes": [ "indexes": [
{ {
"id": "108", "id": "109",
"name": "PRIMARY", "name": "PRIMARY",
"unique": true, "unique": true,
"fieldIds": [ "fieldIds": [
@ -1396,20 +1408,20 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "109", "id": "110",
"name": "FK_21994db635b47e07f45b2686a51", "name": "FK_21994db635b47e07f45b2686a51",
"unique": false, "unique": false,
"fieldIds": [ "fieldIds": [
"105" "106"
], ],
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "110", "id": "111",
"name": "FK_fc5f59e5c9aafdedd25ed8ed36e", "name": "FK_fc5f59e5c9aafdedd25ed8ed36e",
"unique": false, "unique": false,
"fieldIds": [ "fieldIds": [
"106" "107"
], ],
"createdAt": 1734524896260 "createdAt": 1734524896260
} }
@ -1421,14 +1433,14 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "111", "id": "112",
"name": "member_qualifications", "name": "member_qualifications",
"schema": "administration", "schema": "administration",
"x": -250.37357560579426, "x": -250.37357560579426,
"y": 82.72883357238302, "y": 82.72883357238302,
"fields": [ "fields": [
{ {
"id": "112", "id": "113",
"name": "id", "name": "id",
"type": { "type": {
"id": "int", "id": "int",
@ -1440,7 +1452,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "113", "id": "114",
"name": "note", "name": "note",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1455,7 +1467,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "114", "id": "115",
"name": "start", "name": "start",
"type": { "type": {
"id": "date", "id": "date",
@ -1467,7 +1479,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "115", "id": "116",
"name": "end", "name": "end",
"type": { "type": {
"id": "date", "id": "date",
@ -1480,7 +1492,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "116", "id": "117",
"name": "terminationReason", "name": "terminationReason",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1495,7 +1507,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "117", "id": "118",
"name": "memberId", "name": "memberId",
"type": { "type": {
"id": "int", "id": "int",
@ -1507,7 +1519,7 @@
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "118", "id": "119",
"name": "qualificationId", "name": "qualificationId",
"type": { "type": {
"id": "int", "id": "int",
@ -1521,31 +1533,31 @@
], ],
"indexes": [ "indexes": [
{ {
"id": "119", "id": "120",
"name": "PRIMARY", "name": "PRIMARY",
"unique": true, "unique": true,
"fieldIds": [ "fieldIds": [
"112" "113"
],
"createdAt": 1734524896259
},
{
"id": "120",
"name": "FK_98b70e687c35709d2f01b3d7d74",
"unique": false,
"fieldIds": [
"117"
], ],
"createdAt": 1734524896259 "createdAt": 1734524896259
}, },
{ {
"id": "121", "id": "121",
"name": "FK_dbebe53df1caa0b6715a220b0ea", "name": "FK_98b70e687c35709d2f01b3d7d74",
"unique": false, "unique": false,
"fieldIds": [ "fieldIds": [
"118" "118"
], ],
"createdAt": 1734524896259 "createdAt": 1734524896259
},
{
"id": "122",
"name": "FK_dbebe53df1caa0b6715a220b0ea",
"unique": false,
"fieldIds": [
"119"
],
"createdAt": 1734524896259
} }
], ],
"color": "#ff6b8a", "color": "#ff6b8a",
@ -1555,14 +1567,14 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "122", "id": "123",
"name": "executive_position", "name": "executive_position",
"schema": "administration", "schema": "administration",
"x": -542.0601569820527, "x": -542.0601569820527,
"y": 474.7348899814151, "y": 474.7348899814151,
"fields": [ "fields": [
{ {
"id": "123", "id": "124",
"name": "id", "name": "id",
"type": { "type": {
"id": "int", "id": "int",
@ -1574,7 +1586,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "124", "id": "125",
"name": "position", "name": "position",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1590,11 +1602,11 @@
], ],
"indexes": [ "indexes": [
{ {
"id": "125", "id": "126",
"name": "PRIMARY", "name": "PRIMARY",
"unique": true, "unique": true,
"fieldIds": [ "fieldIds": [
"123" "124"
], ],
"createdAt": 1734524896260 "createdAt": 1734524896260
} }
@ -1606,14 +1618,14 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "126", "id": "127",
"name": "qualification", "name": "qualification",
"schema": "administration", "schema": "administration",
"x": -568.0578068648438, "x": -568.0578068648438,
"y": 192.56221408776412, "y": 192.56221408776412,
"fields": [ "fields": [
{ {
"id": "127", "id": "128",
"name": "id", "name": "id",
"type": { "type": {
"id": "int", "id": "int",
@ -1625,7 +1637,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "128", "id": "129",
"name": "qualification", "name": "qualification",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1639,7 +1651,7 @@
"createdAt": 1734524896260 "createdAt": 1734524896260
}, },
{ {
"id": "129", "id": "130",
"name": "description", "name": "description",
"type": { "type": {
"id": "varchar", "id": "varchar",
@ -1656,11 +1668,11 @@
], ],
"indexes": [ "indexes": [
{ {
"id": "130", "id": "131",
"name": "PRIMARY", "name": "PRIMARY",
"unique": true, "unique": true,
"fieldIds": [ "fieldIds": [
"127" "128"
], ],
"createdAt": 1734524896260 "createdAt": 1734524896260
} }
@ -1674,28 +1686,14 @@
], ],
"relationships": [ "relationships": [
{ {
"id": "131", "id": "132",
"name": "FK_1fd52c8f109123e5a2c67dc2c83", "name": "FK_1fd52c8f109123e5a2c67dc2c83",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
"sourceTableId": "1", "sourceTableId": "1",
"targetTableId": "122", "targetTableId": "123",
"sourceFieldId": "7", "sourceFieldId": "7",
"targetFieldId": "123", "targetFieldId": "124",
"sourceCardinality": "many",
"targetCardinality": "one",
"createdAt": 1734524896262,
"diagramId": "7gb18czobyir"
},
{
"id": "132",
"name": "FK_21994db635b47e07f45b2686a51",
"sourceSchema": "administration",
"targetSchema": "administration",
"sourceTableId": "96",
"targetTableId": "71",
"sourceFieldId": "105",
"targetFieldId": "72",
"sourceCardinality": "many", "sourceCardinality": "many",
"targetCardinality": "one", "targetCardinality": "one",
"createdAt": 1734524896262, "createdAt": 1734524896262,
@ -1703,6 +1701,20 @@
}, },
{ {
"id": "133", "id": "133",
"name": "FK_21994db635b47e07f45b2686a51",
"sourceSchema": "administration",
"targetSchema": "administration",
"sourceTableId": "96",
"targetTableId": "71",
"sourceFieldId": "106",
"targetFieldId": "72",
"sourceCardinality": "many",
"targetCardinality": "one",
"createdAt": 1734524896262,
"diagramId": "7gb18czobyir"
},
{
"id": "134",
"name": "FK_2912b056a5d0b7977360a986164", "name": "FK_2912b056a5d0b7977360a986164",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
@ -1716,7 +1728,7 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "134", "id": "135",
"name": "FK_3b4b41597707b13086e71727422", "name": "FK_3b4b41597707b13086e71727422",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
@ -1730,13 +1742,13 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "135", "id": "136",
"name": "FK_98b70e687c35709d2f01b3d7d74", "name": "FK_98b70e687c35709d2f01b3d7d74",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
"sourceTableId": "111", "sourceTableId": "112",
"targetTableId": "60", "targetTableId": "60",
"sourceFieldId": "117", "sourceFieldId": "118",
"targetFieldId": "61", "targetFieldId": "61",
"sourceCardinality": "many", "sourceCardinality": "many",
"targetCardinality": "one", "targetCardinality": "one",
@ -1744,7 +1756,7 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "136", "id": "137",
"name": "FK_a47e04bfd3671d8a375d1896d25", "name": "FK_a47e04bfd3671d8a375d1896d25",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
@ -1758,7 +1770,7 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "137", "id": "138",
"name": "FK_ba47b44c2ddf34c1bcc75df6675", "name": "FK_ba47b44c2ddf34c1bcc75df6675",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
@ -1772,21 +1784,21 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "138", "id": "139",
"name": "FK_dbebe53df1caa0b6715a220b0ea", "name": "FK_dbebe53df1caa0b6715a220b0ea",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
"sourceTableId": "111", "sourceTableId": "112",
"targetTableId": "126", "targetTableId": "127",
"sourceFieldId": "118", "sourceFieldId": "119",
"targetFieldId": "127", "targetFieldId": "128",
"sourceCardinality": "many", "sourceCardinality": "many",
"targetCardinality": "one", "targetCardinality": "one",
"createdAt": 1734524896262, "createdAt": 1734524896262,
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "139", "id": "140",
"name": "FK_e9fd4d37c4ac0fb08bd6eeeda3c", "name": "FK_e9fd4d37c4ac0fb08bd6eeeda3c",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
@ -1800,13 +1812,13 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "140", "id": "141",
"name": "FK_fc5f59e5c9aafdedd25ed8ed36e", "name": "FK_fc5f59e5c9aafdedd25ed8ed36e",
"sourceSchema": "administration", "sourceSchema": "administration",
"targetSchema": "administration", "targetSchema": "administration",
"sourceTableId": "96", "sourceTableId": "96",
"targetTableId": "60", "targetTableId": "60",
"sourceFieldId": "106", "sourceFieldId": "107",
"targetFieldId": "61", "targetFieldId": "61",
"sourceCardinality": "many", "sourceCardinality": "many",
"targetCardinality": "one", "targetCardinality": "one",
@ -1816,7 +1828,7 @@
], ],
"dependencies": [ "dependencies": [
{ {
"id": "141", "id": "142",
"schema": "administration", "schema": "administration",
"tableId": "60", "tableId": "60",
"dependentSchema": "administration", "dependentSchema": "administration",
@ -1825,36 +1837,27 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "142", "id": "143",
"schema": "administration", "schema": "administration",
"tableId": "126", "tableId": "127",
"dependentSchema": "administration", "dependentSchema": "administration",
"dependentTableId": "86", "dependentTableId": "86",
"createdAt": 1734524897266, "createdAt": 1734524897266,
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "143", "id": "144",
"schema": "administration", "schema": "administration",
"tableId": "111", "tableId": "112",
"dependentSchema": "administration", "dependentSchema": "administration",
"dependentTableId": "86", "dependentTableId": "86",
"createdAt": 1734524897267, "createdAt": 1734524897267,
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{
"id": "144",
"schema": "administration",
"tableId": "60",
"dependentSchema": "administration",
"dependentTableId": "11",
"createdAt": 1734524897283,
"diagramId": "7gb18czobyir"
},
{ {
"id": "145", "id": "145",
"schema": "administration", "schema": "administration",
"tableId": "1", "tableId": "60",
"dependentSchema": "administration", "dependentSchema": "administration",
"dependentTableId": "11", "dependentTableId": "11",
"createdAt": 1734524897283, "createdAt": 1734524897283,
@ -1863,6 +1866,15 @@
{ {
"id": "146", "id": "146",
"schema": "administration", "schema": "administration",
"tableId": "1",
"dependentSchema": "administration",
"dependentTableId": "11",
"createdAt": 1734524897283,
"diagramId": "7gb18czobyir"
},
{
"id": "147",
"schema": "administration",
"tableId": "60", "tableId": "60",
"dependentSchema": "administration", "dependentSchema": "administration",
"dependentTableId": "21", "dependentTableId": "21",
@ -1870,7 +1882,7 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "147", "id": "148",
"schema": "administration", "schema": "administration",
"tableId": "56", "tableId": "56",
"dependentSchema": "administration", "dependentSchema": "administration",
@ -1879,7 +1891,7 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "148", "id": "149",
"schema": "administration", "schema": "administration",
"tableId": "35", "tableId": "35",
"dependentSchema": "administration", "dependentSchema": "administration",
@ -1888,16 +1900,16 @@
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "149", "id": "150",
"schema": "administration", "schema": "administration",
"tableId": "122", "tableId": "123",
"dependentSchema": "administration", "dependentSchema": "administration",
"dependentTableId": "11", "dependentTableId": "11",
"createdAt": 1734524897283, "createdAt": 1734524897283,
"diagramId": "7gb18czobyir" "diagramId": "7gb18czobyir"
}, },
{ {
"id": "150", "id": "151",
"schema": "administration", "schema": "administration",
"tableId": "60", "tableId": "60",
"dependentSchema": "administration", "dependentSchema": "administration",

BIN
public/administration-db.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 KiB

After

Width:  |  Height:  |  Size: 650 KiB

2
public/administration-db.svg
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 MiB

After

Width:  |  Height:  |  Size: 11 MiB

24
src/stores/admin/navigation.ts
View file

@ -98,30 +98,32 @@ export const useNavigationStore = defineStore("navigation", {
settings: { settings: {
mainTitle: "Einstellungen", mainTitle: "Einstellungen",
main: [ main: [
...(abilityStore.can("read", "settings", "qualification") { key: "divider1", title: "Mitgliederdaten" },
? [{ key: "qualification", title: "Qualifikationen" }]
: []),
...(abilityStore.can("read", "settings", "award") ? [{ key: "award", title: "Auszeichnungen" }] : []), ...(abilityStore.can("read", "settings", "award") ? [{ key: "award", title: "Auszeichnungen" }] : []),
...(abilityStore.can("read", "settings", "executive_position")
? [{ key: "executive_position", title: "Vereinsämter" }]
: []),
...(abilityStore.can("read", "settings", "communication_type") ...(abilityStore.can("read", "settings", "communication_type")
? [{ key: "communication_type", title: "Kommunikationsarten" }] ? [{ key: "communication_type", title: "Kommunikationsarten" }]
: []), : []),
...(abilityStore.can("read", "settings", "membership_status") ...(abilityStore.can("read", "settings", "membership_status")
? [{ key: "membership_status", title: "Mitgliedsstatus" }] ? [{ key: "membership_status", title: "Mitgliedsstatus" }]
: []), : []),
...(abilityStore.can("read", "settings", "calendar_type") ...(abilityStore.can("read", "settings", "qualification")
? [{ key: "calendar_type", title: "Terminarten" }] ? [{ key: "qualification", title: "Qualifikationen" }]
: []),
...(abilityStore.can("read", "settings", "executive_position")
? [{ key: "executive_position", title: "Vereinsämter" }]
: []),
{ key: "divider2", title: "Einstellungen" },
...(abilityStore.can("read", "settings", "newsletter_config")
? [{ key: "newsletter_config", title: "Newsletter Konfiguration" }]
: []), : []),
...(abilityStore.can("read", "settings", "query") ? [{ key: "query_store", title: "Query Store" }] : []),
...(abilityStore.can("read", "settings", "template") ? [{ key: "template", title: "Templates" }] : []), ...(abilityStore.can("read", "settings", "template") ? [{ key: "template", title: "Templates" }] : []),
...(abilityStore.can("read", "settings", "template_usage") ...(abilityStore.can("read", "settings", "template_usage")
? [{ key: "template_usage", title: "Template-Verwendung" }] ? [{ key: "template_usage", title: "Template-Verwendung" }]
: []), : []),
...(abilityStore.can("read", "settings", "newsletter_config") ...(abilityStore.can("read", "settings", "calendar_type")
? [{ key: "newsletter_config", title: "Newsletter Konfiguration" }] ? [{ key: "calendar_type", title: "Terminarten" }]
: []), : []),
...(abilityStore.can("read", "settings", "query") ? [{ key: "query_store", title: "Query Store" }] : []),
], ],
}, },
user: { user: {

16
src/views/admin/View.vue
View file

@ -16,13 +16,15 @@
/> />
</template> </template>
<template #list> <template #list>
<RoutingLink <div v-for="item in activeNavigationObject.main" :key="item.key">
v-for="item in activeNavigationObject.main" <RoutingLink
:key="item.key" v-if="!item.key.includes('divider')"
:title="item.title" :title="item.title"
:link="{ name: `admin-${activeNavigation}-${item.key}` }" :link="{ name: `admin-${activeNavigation}-${item.key}` }"
:active="activeLink == item.key" :active="activeLink == item.key"
/> />
<p v-else class="pt-4 border-b border-gray-300">{{ item.title }}</p>
</div>
</template> </template>
</SidebarTemplate> </SidebarTemplate>
</template> </template>