Compare commits

..

20 Commits

Author SHA1 Message Date
160124a184 fix for #68
Some checks failed
Build and Push Docker Images / build-backend (push) Failing after 1m28s
Build and Push Docker Images / build-frontend (push) Successful in 1m12s
2026-01-20 13:55:10 +01:00
26dad422ec added size column 2026-01-17 16:04:39 +01:00
e59cbade53 Webdav 2026-01-17 16:04:32 +01:00
6423886930 added webdav server 2026-01-17 15:15:34 +01:00
6adf09faa0 DB Change con string 2026-01-17 15:15:26 +01:00
d7f3920763 Cors Change 2026-01-17 15:15:06 +01:00
3af92ebf71 #16 Added Move Up 2026-01-17 12:55:39 +01:00
5ab90830a0 Redone Files Index, #16 Added Drag and Drop for Files 2026-01-17 12:36:28 +01:00
4f72919269 #64 Fix
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 16s
Build and Push Docker Images / build-frontend (push) Successful in 1m8s
2026-01-16 13:14:09 +01:00
f2c9dcc900 #64 Fix
Some checks failed
Build and Push Docker Images / build-backend (push) Successful in 16s
Build and Push Docker Images / build-frontend (push) Failing after 35s
2026-01-16 13:11:54 +01:00
b4ec792cc0 Diasbled Label Test Card
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 16s
Build and Push Docker Images / build-frontend (push) Successful in 1m7s
2026-01-15 19:09:26 +01:00
9b3f48defe Added Calculator 2026-01-15 19:08:26 +01:00
5edc90bd4d Fix #8
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 16s
Build and Push Docker Images / build-frontend (push) Successful in 1m8s
2026-01-15 18:45:35 +01:00
d140251aa0 Fix #7 Added Month Markings, Range Select 2026-01-15 18:45:25 +01:00
e7fb2df5c7 Added Debouncing #36
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 17s
Build and Push Docker Images / build-frontend (push) Successful in 1m8s
2026-01-15 18:19:05 +01:00
f27fd3f6da Fix TS
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 29s
Build and Push Docker Images / build-frontend (push) Successful in 15s
2026-01-15 18:07:58 +01:00
d3e2b106af Storno Fix createddocument link. Added Disable and Tooltip for Storno Button
Some checks failed
Build and Push Docker Images / build-backend (push) Failing after 29s
Build and Push Docker Images / build-frontend (push) Successful in 1m8s
2026-01-15 18:05:44 +01:00
769d2059ca Redone Search to inluce more Columns #36
TODO: Spalten nachpflegen
2026-01-15 18:05:14 +01:00
53349fae83 Fix Link Buttons Added New link buttons
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 16s
Build and Push Docker Images / build-frontend (push) Successful in 1m7s
2026-01-15 13:38:01 +01:00
d8eb1559c8 Update Problem bei #54
All checks were successful
Build and Push Docker Images / build-backend (push) Successful in 31s
Build and Push Docker Images / build-frontend (push) Successful in 16s
2026-01-15 13:18:58 +01:00
25 changed files with 1601 additions and 1444 deletions

View File

@@ -2,18 +2,37 @@
name: 🐛 Bug Report name: 🐛 Bug Report
about: Erstelle einen Bericht, um uns zu helfen, das Projekt zu verbessern. about: Erstelle einen Bericht, um uns zu helfen, das Projekt zu verbessern.
title: '[BUG] ' title: '[BUG] '
labels: Problem labels: bug
assignees: '' assignees: ''
--- ---
**Beschreibung** **Beschreibung**
Eine klare und prägnante Beschreibung des Fehlers.
**Reproduktion** **Reproduktion**
Schritte, um den Fehler zu reproduzieren:
Entweder:
1. Gehe zu '...'
2. Klicke auf '...'
3. Scrolle runter zu '...'
4. Siehe Fehler
Oder Link zur Seite
**Erwartetes Verhalten**
Eine klare Beschreibung dessen, was du erwartet hast.
**Screenshots** **Screenshots**
Falls zutreffend, füge hier Screenshots oder Gifs hinzu, um das Problem zu verdeutlichen.
**Achtung: Achte bitte auf Datenschutz deiner Daten sowie der Daten deiner Kunden. Sollten ein Screenshot nur mit Daten möglich sein, schwärze diese bitte vor dem Upload.** **Achtung: Achte bitte auf Datenschutz deiner Daten sowie der Daten deiner Kunden. Sollten ein Screenshot nur mit Daten möglich sein, schwärze diese bitte vor dem Upload.**
**Umgebung:**
- Betriebssystem: [z.B. Windows, macOS, Linux]
- Browser / Version (falls relevant): [z.B. Chrome 120]
- Projekt-Version: [z.B. v1.0.2]
**Zusätzlicher Kontext**
Füge hier alle anderen Informationen zum Problem hinzu.

View File

@@ -2,16 +2,19 @@
name: ✨ Feature Request name: ✨ Feature Request
about: Schlage eine Idee für dieses Projekt vor. about: Schlage eine Idee für dieses Projekt vor.
title: '[FEATURE] ' title: '[FEATURE] '
labels: Funktionswunsch labels: enhancement
assignees: '' assignees: ''
--- ---
**Ist dein Feature-Wunsch mit einem Problem verbunden?** **Ist dein Feature-Wunsch mit einem Problem verbunden?**
Eine klare Beschreibung des Problems (z.B. "Ich bin immer genervt, wenn...").
**Lösungsvorschlag** **Lösungsvorschlag**
Eine klare Beschreibung dessen, was du dir wünschst und wie es funktionieren soll.
**Alternativen** **Alternativen**
Hast du über alternative Lösungen oder Workarounds nachgedacht?
**Zusätzlicher Kontext**
Hier ist Platz für weitere Informationen, Skizzen oder Beispiele von anderen Tools.

View File

@@ -1,13 +1,26 @@
import { drizzle } from "drizzle-orm/node-postgres" // src/db/index.ts
import { Pool } from "pg" import { drizzle } from "drizzle-orm/node-postgres";
import {secrets} from "../src/utils/secrets"; import { Pool } from "pg";
import * as schema from "./schema" import * as schema from "./schema";
console.log("[DB INIT] 1. Suche Connection String...");
// Checken woher die URL kommt
let connectionString = process.env.DATABASE_URL;
if (connectionString) {
console.log("[DB INIT] -> Gefunden in process.env.DATABASE_URL");
} else {
console.error("[DB INIT] ❌ KEIN CONNECTION STRING GEFUNDEN! .env nicht geladen?");
}
export const pool = new Pool({ export const pool = new Pool({
connectionString: secrets.DATABASE_URL, connectionString,
max: 10, // je nach Last max: 10,
}) });
export const db = drizzle(pool , {schema}) // TEST: Ist die DB wirklich da?
pool.query('SELECT NOW()')
.then(res => console.log(`[DB INIT] ✅ VERBINDUNG ERFOLGREICH! Zeit auf DB: ${res.rows[0].now}`))
.catch(err => console.error(`[DB INIT] ❌ VERBINDUNGSFEHLER:`, err.message));
export const db = drizzle(pool, { schema });

View File

@@ -73,6 +73,7 @@ export const files = pgTable("files", {
createdBy: uuid("created_by").references(() => authUsers.id), createdBy: uuid("created_by").references(() => authUsers.id),
authProfile: uuid("auth_profile").references(() => authProfiles.id), authProfile: uuid("auth_profile").references(() => authProfiles.id),
size: bigint("size", { mode: "number" }),
}) })
export type File = typeof files.$inferSelect export type File = typeof files.$inferSelect

View File

@@ -14,7 +14,7 @@ export const hourrates = pgTable("hourrates", {
name: text("name").notNull(), name: text("name").notNull(),
purchasePrice: doublePrecision("purchasePrice").notNull(), purchase_price: doublePrecision("purchasePrice").notNull(),
sellingPrice: doublePrecision("sellingPrice").notNull(), sellingPrice: doublePrecision("sellingPrice").notNull(),
archived: boolean("archived").notNull().default(false), archived: boolean("archived").notNull().default(false),

View File

@@ -5,6 +5,8 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"dev": "tsx watch src/index.ts", "dev": "tsx watch src/index.ts",
"fill": "ts-node src/webdav/fill-file-sizes.ts",
"dev:dav": "tsx watch src/webdav/server.ts",
"build": "tsc", "build": "tsc",
"start": "node dist/src/index.js", "start": "node dist/src/index.js",
"schema:index": "ts-node scripts/generate-schema-index.ts" "schema:index": "ts-node scripts/generate-schema-index.ts"
@@ -48,6 +50,7 @@
"pg": "^8.16.3", "pg": "^8.16.3",
"pngjs": "^7.0.0", "pngjs": "^7.0.0",
"sharp": "^0.34.5", "sharp": "^0.34.5",
"webdav-server": "^2.6.2",
"xmlbuilder": "^15.1.1", "xmlbuilder": "^15.1.1",
"zpl-image": "^0.2.0", "zpl-image": "^0.2.0",
"zpl-renderer-js": "^2.0.2" "zpl-renderer-js": "^2.0.2"

View File

@@ -52,6 +52,7 @@ import {loadSecrets, secrets} from "./utils/secrets";
import {initMailer} from "./utils/mailer" import {initMailer} from "./utils/mailer"
import {initS3} from "./utils/s3"; import {initS3} from "./utils/s3";
//Services //Services
import servicesPlugin from "./plugins/services"; import servicesPlugin from "./plugins/services";

View File

@@ -14,8 +14,9 @@ export default fp(async (server: FastifyInstance) => {
"https://app.fedeo.de", // dein Nuxt-Frontend "https://app.fedeo.de", // dein Nuxt-Frontend
"capacitor://localhost", // dein Nuxt-Frontend "capacitor://localhost", // dein Nuxt-Frontend
], ],
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"], methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS",
allowedHeaders: ["Content-Type", "Authorization", "Context", "X-Public-Pin"], "PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK", "UNLOCK"],
allowedHeaders: ["Content-Type", "Authorization", "Context", "X-Public-Pin","Depth", "Overwrite", "Destination", "Lock-Token", "If"],
exposedHeaders: ["Authorization", "Content-Disposition", "Content-Type", "Content-Length"], // optional, falls du ihn auch auslesen willst exposedHeaders: ["Authorization", "Content-Disposition", "Content-Type", "Content-Length"], // optional, falls du ihn auch auslesen willst
credentials: true, // wichtig, falls du Cookies nutzt credentials: true, // wichtig, falls du Cookies nutzt
}); });

View File

@@ -10,30 +10,23 @@ import {
or or
} from "drizzle-orm" } from "drizzle-orm"
import { resourceConfig } from "../../utils/resource.config"; import { resourceConfig } from "../../utils/resource.config";
import { useNextNumberRangeNumber } from "../../utils/functions"; import { useNextNumberRangeNumber } from "../../utils/functions";
import {stafftimeentries} from "../../../db/schema";
// ------------------------------------------------------------- // -------------------------------------------------------------
// SQL Volltextsuche auf mehreren Feldern // SQL Suche auf mehreren Feldern (Haupttabelle + Relationen)
// ------------------------------------------------------------- // -------------------------------------------------------------
function buildSearchCondition(columns: any[], search: string) {
function buildSearchCondition(table: any, columns: string[], search: string) {
if (!search || !columns.length) return null if (!search || !columns.length) return null
const term = `%${search.toLowerCase()}%` const term = `%${search.toLowerCase()}%`
const conditions = columns const conditions = columns
.map((colName) => table[colName])
.filter(Boolean) .filter(Boolean)
.map((col) => ilike(col, term)) .map((col) => ilike(col, term))
if (conditions.length === 0) return null if (conditions.length === 0) return null
// @ts-ignore
return or(...conditions) return or(...conditions)
} }
@@ -55,95 +48,85 @@ export default async function resourceRoutes(server: FastifyInstance) {
} }
const { resource } = req.params as { resource: string } const { resource } = req.params as { resource: string }
const table = resourceConfig[resource].table const config = resourceConfig[resource]
const table = config.table
// WHERE-Basis
let whereCond: any = eq(table.tenant, tenantId) let whereCond: any = eq(table.tenant, tenantId)
let q = server.db.select().from(table).$dynamic()
const searchCols: any[] = (config.searchColumns || []).map(c => table[c])
if (config.mtoLoad) {
config.mtoLoad.forEach(rel => {
const relConfig = resourceConfig[rel + "s"] || resourceConfig[rel]
if (relConfig) {
const relTable = relConfig.table
// FIX: Nur joinen, wenn es keine Self-Reference ist (verhindert ERROR 42712)
if (relTable !== table) {
// @ts-ignore
q = q.leftJoin(relTable, eq(table[rel], relTable.id))
if (relConfig.searchColumns) {
relConfig.searchColumns.forEach(c => {
if (relTable[c]) searchCols.push(relTable[c])
})
}
}
}
})
}
// 🔍 SQL Search
if (search) { if (search) {
const searchCond = buildSearchCondition( const searchCond = buildSearchCondition(searchCols, search.trim())
table, if (searchCond) whereCond = and(whereCond, searchCond)
resourceConfig[resource].searchColumns,
search.trim()
)
if (searchCond) {
whereCond = and(whereCond, searchCond)
}
} }
// Base Query q = q.where(whereCond)
let q = server.db.select().from(table).where(whereCond)
// Sortierung
if (sort) { if (sort) {
const col = (table as any)[sort] const col = (table as any)[sort]
if (col) { if (col) {
//@ts-ignore q = ascQuery === "true" ? q.orderBy(asc(col)) : q.orderBy(desc(col))
q = ascQuery === "true"
? q.orderBy(asc(col))
: q.orderBy(desc(col))
} }
} }
const queryData = await q const queryData = await q
// Transformation: Falls Joins genutzt wurden, das Hauptobjekt extrahieren
const rows = queryData.map(r => r[resource] || r.table || r);
// RELATION LOADING (MANY-TO-ONE) // RELATION LOADING
let data = [...rows]
let ids = {} if(config.mtoLoad) {
let lists = {} let ids: any = {}
let maps = {} let lists: any = {}
let data = [...queryData] let maps: any = {}
config.mtoLoad.forEach(rel => {
if(resourceConfig[resource].mtoLoad) { ids[rel] = [...new Set(rows.map(r => r[rel]).filter(Boolean))];
resourceConfig[resource].mtoLoad.forEach(relation => {
ids[relation] = [...new Set(queryData.map(r => r[relation]).filter(Boolean))];
}) })
for await (const rel of config.mtoLoad) {
for await (const relation of resourceConfig[resource].mtoLoad ) { const relConf = resourceConfig[rel + "s"] || resourceConfig[rel];
console.log(relation) const relTab = relConf.table
lists[relation] = ids[relation].length ? await server.db.select().from(resourceConfig[relation + "s"].table).where(inArray(resourceConfig[relation + "s"].table.id, ids[relation])) : [] lists[rel] = ids[rel].length ? await server.db.select().from(relTab).where(inArray(relTab.id, ids[rel])) : []
maps[rel] = Object.fromEntries(lists[rel].map((i: any) => [i.id, i]));
} }
data = rows.map(row => {
resourceConfig[resource].mtoLoad.forEach(relation => { let toReturn = { ...row }
maps[relation] = Object.fromEntries(lists[relation].map(i => [i.id, i])); config.mtoLoad.forEach(rel => {
toReturn[rel] = row[rel] ? maps[rel][row[rel]] : null
}) })
data = queryData.map(row => {
let toReturn = {
...row
}
resourceConfig[resource].mtoLoad.forEach(relation => {
toReturn[relation] = row[relation] ? maps[relation][row[relation]] : null
})
return toReturn return toReturn
}); });
} }
if(resourceConfig[resource].mtmListLoad) { if(config.mtmListLoad) {
for await (const relation of resourceConfig[resource].mtmListLoad) { for await (const relation of config.mtmListLoad) {
console.log(relation) const relTable = resourceConfig[relation].table
console.log(resource.substring(0,resource.length-1)) const parentKey = resource.substring(0, resource.length - 1)
const relationRows = await server.db.select().from(relTable).where(inArray(relTable[parentKey], data.map(i => i.id)))
const relationRows = await server.db.select().from(resourceConfig[relation].table).where(inArray(resourceConfig[relation].table[resource.substring(0,resource.length-1)],data.map(i => i.id))) data = data.map(row => ({
...row,
console.log(relationRows.length) [relation]: relationRows.filter(i => i[parentKey] === row.id)
}))
data = data.map(row => {
let toReturn = {
...row
}
toReturn[relation] = relationRows.filter(i => i[resource.substring(0,resource.length-1)] === row.id)
return toReturn
})
} }
} }
@@ -155,212 +138,130 @@ export default async function resourceRoutes(server: FastifyInstance) {
} }
}) })
// ------------------------------------------------------------- // -------------------------------------------------------------
// PAGINATED LIST // PAGINATED LIST
// ------------------------------------------------------------- // -------------------------------------------------------------
server.get("/resource/:resource/paginated", async (req, reply) => { server.get("/resource/:resource/paginated", async (req, reply) => {
try { try {
const tenantId = req.user?.tenant_id; const tenantId = req.user?.tenant_id;
if (!tenantId) { if (!tenantId) return reply.code(400).send({ error: "No tenant selected" });
return reply.code(400).send({ error: "No tenant selected" });
}
const { resource } = req.params as { resource: string }; const { resource } = req.params as { resource: string };
const config = resourceConfig[resource];
const table = config.table;
const { queryConfig } = req; const { queryConfig } = req;
const { const { pagination, sort, filters } = queryConfig;
pagination, const { search, distinctColumns } = req.query as { search?: string; distinctColumns?: string; };
sort,
filters,
paginationDisabled
} = queryConfig;
const { search, distinctColumns } = req.query as {
search?: string;
distinctColumns?: string;
};
let table = resourceConfig[resource].table
let whereCond: any = eq(table.tenant, tenantId); let whereCond: any = eq(table.tenant, tenantId);
const searchCols: any[] = (config.searchColumns || []).map(c => table[c]);
let countQuery = server.db.select({ value: count(table.id) }).from(table).$dynamic();
let mainQuery = server.db.select().from(table).$dynamic();
if (config.mtoLoad) {
config.mtoLoad.forEach(rel => {
const relConfig = resourceConfig[rel + "s"] || resourceConfig[rel];
if (relConfig) {
const relTable = relConfig.table;
// FIX: Self-Reference Check
if (relTable !== table) {
countQuery = countQuery.leftJoin(relTable, eq(table[rel], relTable.id));
// @ts-ignore
mainQuery = mainQuery.leftJoin(relTable, eq(table[rel], relTable.id));
if (relConfig.searchColumns) {
relConfig.searchColumns.forEach(c => {
if (relTable[c]) searchCols.push(relTable[c]);
});
}
}
}
});
}
if (search) { if (search) {
const searchCond = buildSearchCondition( const searchCond = buildSearchCondition(searchCols, search.trim());
table, if (searchCond) whereCond = and(whereCond, searchCond);
resourceConfig[resource].searchColumns,
search.trim()
)
if (searchCond) {
whereCond = and(whereCond, searchCond)
}
} }
if (filters) { if (filters) {
for (const [key, val] of Object.entries(filters)) { for (const [key, val] of Object.entries(filters)) {
const col = (table as any)[key]; const col = (table as any)[key];
if (!col) continue; if (!col) continue;
whereCond = Array.isArray(val) ? and(whereCond, inArray(col, val)) : and(whereCond, eq(col, val as any));
if (Array.isArray(val)) {
whereCond = and(whereCond, inArray(col, val));
} else {
whereCond = and(whereCond, eq(col, val as any));
}
} }
} }
// ----------------------------------------------- const totalRes = await countQuery.where(whereCond);
// COUNT (for pagination)
// -----------------------------------------------
const totalRes = await server.db
.select({ value: count(table.id) })
.from(table)
.where(whereCond);
const total = Number(totalRes[0]?.value ?? 0); const total = Number(totalRes[0]?.value ?? 0);
// -----------------------------------------------
// DISTINCT VALUES (regardless of pagination)
// -----------------------------------------------
const distinctValues: Record<string, any[]> = {};
if (distinctColumns) {
for (const colName of distinctColumns.split(",").map(c => c.trim())) {
const col = (table as any)[colName];
if (!col) continue;
const rows = await server.db
.select({ v: col })
.from(table)
.where(eq(table.tenant, tenantId));
const values = rows
.map(r => r.v)
.filter(v => v != null && v !== "");
distinctValues[colName] = [...new Set(values)].sort();
}
}
// PAGINATION
const offset = pagination?.offset ?? 0; const offset = pagination?.offset ?? 0;
const limit = pagination?.limit ?? 100; const limit = pagination?.limit ?? 100;
// SORTING mainQuery = mainQuery.where(whereCond).offset(offset).limit(limit);
let orderField: any = null;
let direction: "asc" | "desc" = "asc";
if (sort?.length > 0) { if (sort?.length > 0) {
const s = sort[0]; const s = sort[0];
const col = (table as any)[s.field]; const col = (table as any)[s.field];
if (col) { if (col) {
orderField = col; mainQuery = s.direction === "asc" ? mainQuery.orderBy(asc(col)) : mainQuery.orderBy(desc(col));
direction = s.direction === "asc" ? "asc" : "desc";
} }
} }
// MAIN QUERY (Paginated) const rawRows = await mainQuery;
let q = server.db // Transformation für Drizzle Joins
.select() let rows = rawRows.map(r => r[resource] || r.table || r);
.from(table)
.where(whereCond)
.offset(offset)
.limit(limit);
if (orderField) { const distinctValues: Record<string, any[]> = {};
//@ts-ignore if (distinctColumns) {
q = direction === "asc" for (const colName of distinctColumns.split(",").map(c => c.trim())) {
? q.orderBy(asc(orderField)) const col = (table as any)[colName];
: q.orderBy(desc(orderField)); if (!col) continue;
const dRows = await server.db.select({ v: col }).from(table).where(eq(table.tenant, tenantId));
distinctValues[colName] = [...new Set(dRows.map(r => r.v).filter(v => v != null && v !== ""))].sort();
}
} }
const rows = await q; let data = [...rows];
if (config.mtoLoad) {
if (!rows.length) { let ids: any = {};
return { let lists: any = {};
data: [], let maps: any = {};
queryConfig: { config.mtoLoad.forEach(rel => {
...queryConfig, ids[rel] = [...new Set(rows.map(r => r[rel]).filter(Boolean))];
total, });
totalPages: 0, for await (const rel of config.mtoLoad) {
distinctValues const relConf = resourceConfig[rel + "s"] || resourceConfig[rel];
const relTab = relConf.table;
lists[rel] = ids[rel].length ? await server.db.select().from(relTab).where(inArray(relTab.id, ids[rel])) : [];
maps[rel] = Object.fromEntries(lists[rel].map((i: any) => [i.id, i]));
} }
};
}
let data = [...rows]
//Many to One
if(resourceConfig[resource].mtoLoad) {
let ids = {}
let lists = {}
let maps = {}
resourceConfig[resource].mtoLoad.forEach(relation => {
ids[relation] = [...new Set(rows.map(r => r[relation]).filter(Boolean))];
})
for await (const relation of resourceConfig[resource].mtoLoad ) {
lists[relation] = ids[relation].length ? await server.db.select().from(resourceConfig[relation + "s"].table).where(inArray(resourceConfig[relation + "s"].table.id, ids[relation])) : []
}
resourceConfig[resource].mtoLoad.forEach(relation => {
maps[relation] = Object.fromEntries(lists[relation].map(i => [i.id, i]));
})
data = rows.map(row => { data = rows.map(row => {
let toReturn = { let toReturn = { ...row };
...row config.mtoLoad.forEach(rel => {
} toReturn[rel] = row[rel] ? maps[rel][row[rel]] : null;
});
resourceConfig[resource].mtoLoad.forEach(relation => { return toReturn;
toReturn[relation] = row[relation] ? maps[relation][row[relation]] : null
})
return toReturn
}); });
} }
if(resourceConfig[resource].mtmListLoad) { if (config.mtmListLoad) {
for await (const relation of resourceConfig[resource].mtmListLoad) { for await (const relation of config.mtmListLoad) {
console.log(relation) const relTable = resourceConfig[relation].table;
const parentKey = resource.substring(0, resource.length - 1);
const relationRows = await server.db.select().from(resourceConfig[relation].table).where(inArray(resourceConfig[relation].table[resource.substring(0,resource.length-1)],data.map(i => i.id))) const relationRows = await server.db.select().from(relTable).where(inArray(relTable[parentKey], data.map(i => i.id)));
data = data.map(row => ({
console.log(relationRows) ...row,
[relation]: relationRows.filter(i => i[parentKey] === row.id)
data = data.map(row => { }));
let toReturn = {
...row
}
toReturn[relation] = relationRows.filter(i => i[resource.substring(0,resource.length-1)] === row.id)
return toReturn
})
} }
} }
// -----------------------------------------------
// RETURN DATA
// -----------------------------------------------
return { return {
data, data,
queryConfig: { queryConfig: { ...queryConfig, total, totalPages: Math.ceil(total / limit), distinctValues }
...queryConfig,
total,
totalPages: Math.ceil(total / limit),
distinctValues
}
}; };
} catch (err) { } catch (err) {
@@ -369,9 +270,8 @@ export default async function resourceRoutes(server: FastifyInstance) {
} }
}); });
// ------------------------------------------------------------- // -------------------------------------------------------------
// DETAIL (mit JOINS) // DETAIL
// ------------------------------------------------------------- // -------------------------------------------------------------
server.get("/resource/:resource/:id/:no_relations?", async (req, reply) => { server.get("/resource/:resource/:id/:no_relations?", async (req, reply) => {
try { try {
@@ -391,40 +291,32 @@ export default async function resourceRoutes(server: FastifyInstance) {
if (!projRows.length) if (!projRows.length)
return reply.code(404).send({ error: "Resource not found" }) return reply.code(404).send({ error: "Resource not found" })
// ------------------------------------ let data = { ...projRows[0] }
// LOAD RELATIONS
// ------------------------------------
let ids = {}
let lists = {}
let maps = {}
let data = {
...projRows[0]
}
if (!no_relations) { if (!no_relations) {
if (resourceConfig[resource].mtoLoad) { if (resourceConfig[resource].mtoLoad) {
for await (const relation of resourceConfig[resource].mtoLoad) { for await (const relation of resourceConfig[resource].mtoLoad) {
if (data[relation]) { if (data[relation]) {
data[relation] = (await server.db.select().from(resourceConfig[relation + "s"].table).where(eq(resourceConfig[relation + "s"].table.id, data[relation])))[0] const relConf = resourceConfig[relation + "s"] || resourceConfig[relation];
const relTable = relConf.table
const relData = await server.db.select().from(relTable).where(eq(relTable.id, data[relation]))
data[relation] = relData[0] || null
} }
} }
} }
if (resourceConfig[resource].mtmLoad) { if (resourceConfig[resource].mtmLoad) {
for await (const relation of resourceConfig[resource].mtmLoad) { for await (const relation of resourceConfig[resource].mtmLoad) {
console.log(relation) const relTable = resourceConfig[relation].table
data[relation] = await server.db.select().from(resourceConfig[relation].table).where(eq(resourceConfig[relation].table[resource.substring(0,resource.length - 1)],id)) const parentKey = resource.substring(0, resource.length - 1)
data[relation] = await server.db.select().from(relTable).where(eq(relTable[parentKey], id))
} }
} }
} }
return data return data
} catch (err) { } catch (err) {
console.error("ERROR /resource/projects/:id", err) console.error("ERROR /resource/:resource/:id", err)
return reply.code(500).send({ error: "Internal Server Error" }) return reply.code(500).send({ error: "Internal Server Error" })
} }
}) })
@@ -432,132 +324,59 @@ export default async function resourceRoutes(server: FastifyInstance) {
// Create // Create
server.post("/resource/:resource", async (req, reply) => { server.post("/resource/:resource", async (req, reply) => {
try { try {
if (!req.user?.tenant_id) { if (!req.user?.tenant_id) return reply.code(400).send({ error: "No tenant selected" });
return reply.code(400).send({error: "No tenant selected"});
}
const { resource } = req.params as { resource: string }; const { resource } = req.params as { resource: string };
const body = req.body as Record<string, any>; const body = req.body as Record<string, any>;
const config = resourceConfig[resource];
const table = config.table;
const table = resourceConfig[resource].table let createData = { ...body, tenant: req.user.tenant_id, archived: false };
let createData = { if (config.numberRangeHolder && !body[config.numberRangeHolder]) {
...body,
tenant: req.user.tenant_id,
archived: false, // Standardwert
}
console.log(resourceConfig[resource].numberRangeHolder)
if (resourceConfig[resource].numberRangeHolder && !body[resourceConfig[resource]]) {
const result = await useNextNumberRangeNumber(server, req.user.tenant_id, resource) const result = await useNextNumberRangeNumber(server, req.user.tenant_id, resource)
console.log(result) createData[config.numberRangeHolder] = result.usedNumber
createData[resourceConfig[resource].numberRangeHolder] = result.usedNumber
}
const normalizeDate = (val: any) => {
const d = new Date(val)
return isNaN(d.getTime()) ? null : d
} }
const normalizeDate = (val: any) => { const d = new Date(val); return isNaN(d.getTime()) ? null : d; }
Object.keys(createData).forEach((key) => { Object.keys(createData).forEach((key) => {
if (key.toLowerCase().includes("date") && key !== "deliveryDateType") createData[key] = normalizeDate(createData[key]) if (key.toLowerCase().includes("date") && key !== "deliveryDateType") createData[key] = normalizeDate(createData[key])
}) })
const [created] = await server.db const [created] = await server.db.insert(table).values(createData).returning()
.insert(table)
.values(createData)
.returning()
/*await insertHistoryItem(server, {
entity: resource,
entityId: data.id,
action: "created",
created_by: req.user.user_id,
tenant_id: req.user.tenant_id,
oldVal: null,
newVal: data,
text: `${dataType.labelSingle} erstellt`,
});*/
return created; return created;
} catch (error) { } catch (error) {
console.log(error) console.error(error);
reply.status(500) reply.status(500);
} }
}); });
// UPDATE (inkl. Soft-Delete/Archive) // Update
server.put("/resource/:resource/:id", async (req, reply) => { server.put("/resource/:resource/:id", async (req, reply) => {
try { try {
const { resource, id } = req.params as { resource: string; id: string } const { resource, id } = req.params as { resource: string; id: string }
const body = req.body as Record<string, any> const body = req.body as Record<string, any>
const tenantId = req.user?.tenant_id
const userId = req.user?.user_id
const tenantId = (req.user as any)?.tenant_id if (!tenantId || !userId) return reply.code(401).send({ error: "Unauthorized" })
const userId = (req.user as any)?.user_id
if (!tenantId || !userId) {
return reply.code(401).send({error: "Unauthorized"})
}
const table = resourceConfig[resource].table const table = resourceConfig[resource].table
const normalizeDate = (val: any) => { const d = new Date(val); return isNaN(d.getTime()) ? null : d; }
//TODO: HISTORY
const normalizeDate = (val: any) => {
const d = new Date(val)
return isNaN(d.getTime()) ? null : d
}
let data = { ...body, updated_at: new Date().toISOString(), updated_by: userId } let data = { ...body, updated_at: new Date().toISOString(), updated_by: userId }
//@ts-ignore //@ts-ignore
delete data.updatedBy delete data.updatedBy; delete data.updatedAt;
//@ts-ignore
delete data.updatedAt
console.log(data)
Object.keys(data).forEach((key) => { Object.keys(data).forEach((key) => {
console.log(key) if ((key.includes("_at") || key.includes("At") || key.toLowerCase().includes("date")) && key !== "deliveryDateType") {
if(key.includes("_at") || key.includes("At") || key.toLowerCase().includes("date")) {
data[key] = normalizeDate(data[key]) data[key] = normalizeDate(data[key])
} }
}) })
console.log(data) const [updated] = await server.db.update(table).set(data).where(and(eq(table.id, id), eq(table.tenant, tenantId))).returning()
const [updated] = await server.db
.update(table)
.set(data)
.where(and(
eq(table.id, id),
eq(table.tenant, tenantId)))
.returning()
//const diffs = diffObjects(oldItem, newItem);
/*for (const d of diffs) {
await insertHistoryItem(server, {
entity: resource,
entityId: id,
action: d.type,
created_by: userId,
tenant_id: tenantId,
oldVal: d.oldValue ? String(d.oldValue) : null,
newVal: d.newValue ? String(d.newValue) : null,
text: `Feld "${d.label}" ${d.typeLabel}: ${d.oldValue ?? ""} → ${d.newValue ?? ""}`,
});
}*/
return updated return updated
} catch (err) { } catch (err) {
console.log("ERROR /resource/projects/:id", err) console.error(err)
} }
}) })
} }

View File

@@ -36,7 +36,7 @@ import {
export const resourceConfig = { export const resourceConfig = {
projects: { projects: {
searchColumns: ["name"], searchColumns: ["name","customerRef","projectNumber","notes"],
mtoLoad: ["customer","plant","contract","projecttype"], mtoLoad: ["customer","plant","contract","projecttype"],
mtmLoad: ["tasks", "files","createddocuments"], mtmLoad: ["tasks", "files","createddocuments"],
table: projects, table: projects,
@@ -61,6 +61,7 @@ export const resourceConfig = {
}, },
plants: { plants: {
table: plants, table: plants,
searchColumns: ["name"],
mtoLoad: ["customer"], mtoLoad: ["customer"],
mtmLoad: ["projects","tasks","files"], mtmLoad: ["projects","tasks","files"],
}, },

View File

@@ -0,0 +1,74 @@
// scripts/fill-file-sizes.ts
import 'dotenv/config';
import { db } from '../../db';
import { files } from '../../db/schema';
import { eq, isNull } from 'drizzle-orm';
import { HeadObjectCommand } from "@aws-sdk/client-s3";
import { s3, initS3 } from '../utils/s3';
import { loadSecrets, secrets } from '../utils/secrets';
async function migrate() {
console.log("🚀 Starte Migration der Dateigrößen...");
// 1. Setup
await loadSecrets();
await initS3();
// 2. Alle Dateien holen, die noch keine Größe haben (oder alle, um sicherzugehen)
// Wir nehmen erstmal ALLE, um sicherzustellen, dass alles stimmt.
const allFiles = await db.select().from(files);
console.log(`📦 ${allFiles.length} Dateien in der Datenbank gefunden.`);
let successCount = 0;
let errorCount = 0;
// 3. Loop durch alle Dateien
for (const file of allFiles) {
if (!file.path) {
console.log(`⏭️ Überspringe Datei ${file.id} (Kein Pfad)`);
continue;
}
try {
// S3 fragen (HeadObject lädt nur Metadaten, nicht die ganze Datei -> Schnell)
const command = new HeadObjectCommand({
Bucket: secrets.S3_BUCKET, // Oder secrets.S3_BUCKET_NAME je nach deiner Config
Key: file.path
});
const response = await s3.send(command);
const size = response.ContentLength || 0;
// In DB speichern
await db.update(files)
.set({ size: size })
.where(eq(files.id, file.id));
process.stdout.write("."); // Fortschrittsanzeige
successCount++;
} catch (error: any) {
process.stdout.write("X");
// console.error(`\n❌ Fehler bei ${file.path}: ${error.name}`);
// Optional: Wenn Datei in S3 fehlt, könnten wir sie markieren oder loggen
if (error.name === 'NotFound') {
// console.error(` -> Datei existiert nicht im Bucket!`);
}
errorCount++;
}
}
console.log("\n\n------------------------------------------------");
console.log(`✅ Fertig!`);
console.log(`Updated: ${successCount}`);
console.log(`Fehler: ${errorCount} (Meistens Dateien, die im Bucket fehlen)`);
console.log("------------------------------------------------");
process.exit(0);
}
migrate().catch(err => {
console.error("Fataler Fehler:", err);
process.exit(1);
});

View File

@@ -0,0 +1,198 @@
import 'dotenv/config';
import { v2 as webdav } from 'webdav-server';
import { db } from '../../db';
import { tenants, files, folders } from '../../db/schema';
import { Readable } from 'stream';
import { GetObjectCommand, HeadObjectCommand } from "@aws-sdk/client-s3";
import { s3, initS3 } from '../utils/s3';
import { secrets, loadSecrets } from '../utils/secrets';
// ============================================================================
// 1. SETUP
// ============================================================================
const userManager = new webdav.SimpleUserManager();
const user = userManager.addUser('admin', 'admin', true);
const privilegeManager = new webdav.SimplePathPrivilegeManager();
privilegeManager.setRights(user, '/', [ 'all' ]);
const server = new webdav.WebDAVServer({
httpAuthentication: new webdav.HTTPDigestAuthentication(userManager, 'Default realm'),
privilegeManager: privilegeManager,
port: 3200,
headers: {
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Methods': 'GET,POST,PUT,DELETE,OPTIONS,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK',
'Access-Control-Allow-Headers': 'Authorization, Content-Type, Depth, User-Agent, X-Expected-Entity-Length, If-Modified-Since, Cache-Control, Range, Overwrite, Destination',
}
});
// ============================================================================
// 2. CACHE
// ============================================================================
const pathToS3KeyMap = new Map<string, string>();
const pathToSizeMap = new Map<string, number>();
// ============================================================================
// 3. LOGIC
// ============================================================================
async function startServer() {
console.log('------------------------------------------------');
console.log('[WebDAV] Starte Server (Filtered Mode)...');
try {
await loadSecrets();
await initS3();
console.log('[WebDAV] S3 Verbindung OK.');
console.log('[WebDAV] Lade Datenbank...');
const allTenants = await db.select().from(tenants);
const allFolders = await db.select().from(folders);
const allFiles = await db.select().from(files);
// Zähler für Statistik
let hiddenFilesCount = 0;
// --------------------------------------------------------------------
// BUILDER
// --------------------------------------------------------------------
const buildFolderContent = (tenantId: string, parentFolderId: string | null, currentWebDavPath: string) => {
const currentDir: any = {};
// 1. UNTERORDNER
const subFolders = allFolders.filter(f => f.tenant === tenantId && f.parent === parentFolderId);
subFolders.forEach(folder => {
const folderName = folder.name.replace(/\//g, '-');
const nextPath = `${currentWebDavPath}/${folderName}`;
currentDir[folderName] = buildFolderContent(tenantId, folder.id, nextPath);
});
// 2. DATEIEN
const dirFiles = allFiles.filter(f => f.tenant === tenantId && f.folder === parentFolderId);
dirFiles.forEach(file => {
// ============================================================
// ❌ FILTER: DATEIEN OHNE GRÖSSE AUSBLENDEN
// ============================================================
const fileSize = Number(file.size || 0);
if (fileSize <= 0) {
// Datei überspringen, wenn 0 Bytes oder null
hiddenFilesCount++;
return;
}
// ============================================================
// Name bestimmen
let fileName = 'Unbenannt';
if (file.path) fileName = file.path.split('/').pop() || 'Unbenannt';
else if (file.name) fileName = file.name;
// A) Eintrag im WebDAV
currentDir[fileName] = `Ref: ${file.id}`;
// B) Maps füllen
const webDavFullPath = `${currentWebDavPath}/${fileName}`;
if (file.path) {
pathToS3KeyMap.set(webDavFullPath, file.path);
}
// C) Größe setzen (wir wissen jetzt sicher, dass sie > 0 ist)
pathToSizeMap.set(webDavFullPath, fileSize);
});
return currentDir;
};
// --------------------------------------------------------------------
// BAUM ZUSAMMENSETZEN
// --------------------------------------------------------------------
const dbTree: any = {};
allTenants.forEach(tenant => {
const tName = tenant.name.replace(/\//g, '-');
const rootPath = `/${tName}`;
const content = buildFolderContent(tenant.id, null, rootPath);
// Leere Ordner Hinweis (optional)
if (Object.keys(content).length === 0) {
content['(Leer).txt'] = 'Keine gültigen Dateien vorhanden.';
}
dbTree[tName] = content;
});
if (Object.keys(dbTree).length === 0) {
dbTree['Status.txt'] = 'Datenbank leer.';
}
// --------------------------------------------------------------------
// REGISTRIEREN
// --------------------------------------------------------------------
const rootFS = server.rootFileSystem();
rootFS.addSubTree(server.createExternalContext(), dbTree);
// ====================================================================
// OVERRIDE 1: DOWNLOAD
// ====================================================================
(rootFS as any)._openReadStream = async (path: webdav.Path, ctx: any, callback: any) => {
const p = path.toString();
const s3Key = pathToS3KeyMap.get(p);
if (s3Key) {
try {
const command = new GetObjectCommand({ Bucket: secrets.S3_BUCKET, Key: s3Key });
const response = await s3.send(command);
if (response.Body) return callback(null, response.Body as Readable);
} catch (e: any) {
console.error(`[S3 ERROR] ${e.message}`);
return callback(null, Readable.from([`Error: ${e.message}`]));
}
}
return callback(null, Readable.from(['System File']));
};
// ====================================================================
// OVERRIDE 2: SIZE
// ====================================================================
(rootFS as any)._size = async (path: webdav.Path, ctx: any, callback: any) => {
const p = path.toString();
const cachedSize = pathToSizeMap.get(p);
if (cachedSize !== undefined) return callback(null, cachedSize);
// Fallback S3 Check (sollte durch Filter kaum noch vorkommen)
const s3Key = pathToS3KeyMap.get(p);
if (s3Key) {
try {
const command = new HeadObjectCommand({ Bucket: secrets.S3_BUCKET, Key: s3Key });
const response = await s3.send(command);
const realSize = response.ContentLength || 0;
pathToSizeMap.set(p, realSize);
return callback(null, realSize);
} catch (e) {
return callback(null, 0);
}
}
return callback(null, 0);
};
// --------------------------------------------------------------------
// START
// --------------------------------------------------------------------
server.start(() => {
console.log('[WebDAV] 🚀 READY auf http://localhost:3200');
console.log(`[WebDAV] Sichtbare Dateien: ${pathToS3KeyMap.size}`);
console.log(`[WebDAV] Ausgeblendet (0 Bytes): ${hiddenFilesCount}`);
});
} catch (error) {
console.error('[WebDAV] 💥 ERROR:', error);
}
}
startServer();

View File

@@ -0,0 +1,235 @@
<template>
<div
ref="el"
:style="style"
class="fixed z-[999] w-72 bg-white dark:bg-gray-900 shadow-2xl rounded-xl border border-gray-200 dark:border-gray-800 p-4 select-none touch-none"
>
<div class="flex items-center justify-between mb-4 cursor-move border-b pb-2 dark:border-gray-800">
<div class="flex items-center gap-2 text-gray-500">
<UIcon name="i-heroicons-calculator" />
<span class="text-xs font-bold uppercase tracking-wider">Kalkulator</span>
</div>
<div class="flex items-center gap-1">
<UTooltip text="Verlauf">
<UButton
color="gray"
variant="ghost"
:icon="showHistory ? 'i-heroicons-clock-solid' : 'i-heroicons-clock'"
size="xs"
@click="showHistory = !showHistory"
/>
</UTooltip>
<UTooltip text="Schließen (Esc)">
<UButton
color="gray"
variant="ghost"
icon="i-heroicons-x-mark"
size="xs"
@click="store.isOpen = false"
/>
</UTooltip>
</div>
</div>
<div v-if="!showHistory">
<div
class="bg-gray-100 dark:bg-gray-800 p-3 rounded-lg mb-4 text-right border border-gray-200 dark:border-gray-700 cursor-pointer group relative"
@click="copyDisplay"
>
<div class="text-[10px] text-gray-500 h-4 font-mono uppercase tracking-tighter">
Speicher: {{ Number(store.memory).toFixed(2).replace('.', ',') }}
</div>
<div class="text-2xl font-mono truncate tracking-tighter">{{ store.display }}</div>
<div class="absolute inset-0 flex items-center justify-center bg-primary-500/10 opacity-0 group-hover:opacity-100 transition-opacity rounded-lg">
<span class="text-[10px] font-bold text-primary-600 uppercase">
{{ copied ? 'Kopiert!' : 'Klicken zum Kopieren' }}
</span>
</div>
</div>
<div class="grid grid-cols-4 gap-2">
<UTooltip text="Brutto (+19%)"><UButton color="green" variant="soft" block size="xs" @click="applyTax(19)">+19%</UButton></UTooltip>
<UTooltip text="Brutto (+7%)"><UButton color="green" variant="soft" block size="xs" @click="applyTax(7)">+7%</UButton></UTooltip>
<UTooltip text="Netto (-19%)"><UButton color="rose" variant="soft" block size="xs" @click="removeTax(19)">-19%</UButton></UTooltip>
<UTooltip text="Netto (-7%)"><UButton color="rose" variant="soft" block size="xs" @click="removeTax(7)">-7%</UButton></UTooltip>
<UTooltip text="Löschen"><UButton color="gray" variant="ghost" block @click="clear">C</UButton></UTooltip>
<UTooltip text="Speicher +"><UButton color="gray" variant="ghost" block @click="addToSum">M+</UButton></UTooltip>
<UTooltip text="Speicher Reset"><UButton color="gray" variant="ghost" block @click="store.memory = 0">MC</UButton></UTooltip>
<UButton color="primary" variant="soft" @click="setOperator('/')">/</UButton>
<UButton v-for="n in [7, 8, 9]" :key="n" color="white" @click="appendNumber(n)">{{ n }}</UButton>
<UButton color="primary" variant="soft" @click="setOperator('*')">×</UButton>
<UButton v-for="n in [4, 5, 6]" :key="n" color="white" @click="appendNumber(n)">{{ n }}</UButton>
<UButton color="primary" variant="soft" @click="setOperator('-')">-</UButton>
<UButton v-for="n in [1, 2, 3]" :key="n" color="white" @click="appendNumber(n)">{{ n }}</UButton>
<UButton color="primary" variant="soft" @click="setOperator('+')">+</UButton>
<UButton color="white" class="col-span-2" @click="appendNumber(0)">0</UButton>
<UButton color="white" @click="addComma">,</UButton>
<UButton color="primary" block @click="calculate">=</UButton>
</div>
</div>
<div v-else class="h-[270px] flex flex-col animate-in fade-in duration-200">
<div class="flex-1 overflow-y-auto space-y-2 pr-1 custom-scrollbar">
<div v-if="store.history.length === 0" class="text-center text-gray-400 text-xs mt-10 italic">
Keine Berechnungen im Verlauf
</div>
<div
v-for="(item, i) in store.history" :key="i"
class="p-2 bg-gray-50 dark:bg-gray-800 rounded text-right border-l-2 border-primary-500 cursor-pointer hover:bg-primary-50 dark:hover:bg-primary-900/20 transition-colors"
@click="useHistoryItem(item.result)"
>
<div class="text-[10px] text-gray-400">{{ item.expression }} =</div>
<div class="text-sm font-bold">{{ item.result }}</div>
</div>
</div>
<UButton
color="gray"
variant="ghost"
size="xs"
block
class="mt-2"
icon="i-heroicons-trash"
@click="store.history = []"
>
Verlauf leeren
</UButton>
</div>
</div>
</template>
<script setup>
import { useDraggable, useClipboard } from '@vueuse/core'
import { useCalculatorStore } from '~/stores/calculator'
const store = useCalculatorStore()
const { copy, copied } = useClipboard()
const el = ref(null)
const { style } = useDraggable(el, {
initialValue: { x: window.innerWidth - 350, y: 150 },
})
const shouldResetDisplay = ref(false)
const showHistory = ref(false)
const previousValue = ref(null)
const lastOperator = ref(null)
// --- Logik ---
const appendNumber = (num) => {
if (store.display === '0' || shouldResetDisplay.value) {
store.display = String(num)
shouldResetDisplay.value = false
} else {
store.display += String(num)
}
}
const addComma = () => {
if (!store.display.includes(',')) {
store.display += ','
}
}
const setOperator = (op) => {
previousValue.value = parseFloat(store.display.replace(',', '.'))
lastOperator.value = op
shouldResetDisplay.value = true
}
const calculate = () => {
if (lastOperator.value === null) return
const currentVal = parseFloat(store.display.replace(',', '.'))
const prevVal = previousValue.value
let result = 0
switch (lastOperator.value) {
case '+': result = prevVal + currentVal; break
case '-': result = prevVal - currentVal; break
case '*': result = prevVal * currentVal; break
case '/': result = currentVal !== 0 ? prevVal / currentVal : 0; break
}
const expression = `${prevVal} ${lastOperator.value} ${currentVal}`
const resultString = String(Number(result.toFixed(4))).replace('.', ',')
store.addHistory(expression, resultString)
store.display = resultString
lastOperator.value = null
shouldResetDisplay.value = true
}
const clear = () => {
store.display = '0'
previousValue.value = null
lastOperator.value = null
}
const applyTax = (percent) => {
const current = parseFloat(store.display.replace(',', '.'))
store.display = (current * (1 + percent / 100)).toFixed(2).replace('.', ',')
}
const removeTax = (percent) => {
const current = parseFloat(store.display.replace(',', '.'))
store.display = (current / (1 + percent / 100)).toFixed(2).replace('.', ',')
}
const addToSum = () => {
store.memory += parseFloat(store.display.replace(',', '.'))
shouldResetDisplay.value = true
}
const copyDisplay = () => {
copy(store.display)
}
const useHistoryItem = (val) => {
store.display = val
showHistory.value = false
}
// --- Shortcuts ---
defineShortcuts({
'0': () => appendNumber(0),
'1': () => appendNumber(1),
'2': () => appendNumber(2),
'3': () => appendNumber(3),
'4': () => appendNumber(4),
'5': () => appendNumber(5),
'6': () => appendNumber(6),
'7': () => appendNumber(7),
'8': () => appendNumber(8),
'9': () => appendNumber(9),
'comma': addComma,
'plus': () => setOperator('+'),
'minus': () => setOperator('-'),
'enter': { usingInput: true, handler: calculate },
'backspace': () => {
store.display = store.display.length > 1 ? store.display.slice(0, -1) : '0'
},
// Escape schließt nun das Fenster via Store
'escape': {
usingInput: true,
whenever: [computed(() => store.isOpen)],
handler: () => { store.isOpen = false }
}
})
</script>
<style scoped>
.custom-scrollbar::-webkit-scrollbar {
width: 4px;
}
.custom-scrollbar::-webkit-scrollbar-track {
@apply bg-transparent;
}
.custom-scrollbar::-webkit-scrollbar-thumb {
@apply bg-gray-200 dark:bg-gray-700 rounded-full;
}
</style>

View File

@@ -1,10 +1,11 @@
<script setup> <script setup>
const route = useRoute() const route = useRoute()
const auth = useAuthStore() const auth = useAuthStore()
const { has } = usePermission() const { has } = usePermission()
// Lokaler State für den Taschenrechner
const showCalculator = ref(false)
const links = computed(() => { const links = computed(() => {
return [ return [
...(auth.profile?.pinned_on_navigation || []).map(pin => { ...(auth.profile?.pinned_on_navigation || []).map(pin => {
@@ -26,17 +27,13 @@ const links = computed(() => {
} }
}), }),
... false ? [{
label: "Support Tickets",
to: "/support",
icon: "i-heroicons-rectangle-stack",
}] : [],
{ {
id: 'dashboard', id: 'dashboard',
label: "Dashboard", label: "Dashboard",
to: "/", to: "/",
icon: "i-heroicons-home" icon: "i-heroicons-home"
}, { },
{
id: 'historyitems', id: 'historyitems',
label: "Logbuch", label: "Logbuch",
to: "/historyitems", to: "/historyitems",
@@ -53,26 +50,6 @@ const links = computed(() => {
to: "/standardEntity/tasks", to: "/standardEntity/tasks",
icon: "i-heroicons-rectangle-stack" icon: "i-heroicons-rectangle-stack"
}] : [], }] : [],
/*... true ? [{
label: "Plantafel",
to: "/calendar/timeline",
icon: "i-heroicons-calendar-days"
}] : [],
... true ? [{
label: "Kalender",
to: "/calendar/grid",
icon: "i-heroicons-calendar-days"
}] : [],
... true ? [{
label: "Termine",
to: "/standardEntity/events",
icon: "i-heroicons-calendar-days"
}] : [],*/
/*{
label: "Dateien",
to: "/files",
icon: "i-heroicons-document"
},*/
] ]
}, },
{ {
@@ -113,15 +90,7 @@ const links = computed(() => {
to: "/email/new", to: "/email/new",
icon: "i-heroicons-envelope", icon: "i-heroicons-envelope",
disabled: true disabled: true
}/*, { }
label: "Logbücher",
to: "/communication/historyItems",
icon: "i-heroicons-book-open"
}, {
label: "Chats",
to: "/chats",
icon: "i-heroicons-chat-bubble-left"
}*/
] ]
}, },
...(has("customers") || has("vendors") || has("contacts")) ? [{ ...(has("customers") || has("vendors") || has("contacts")) ? [{
@@ -145,7 +114,7 @@ const links = computed(() => {
icon: "i-heroicons-user-group" icon: "i-heroicons-user-group"
}] : [], }] : [],
] ]
},] : [], }] : [],
{ {
label: "Mitarbeiter", label: "Mitarbeiter",
defaultOpen: false, defaultOpen: false,
@@ -156,16 +125,6 @@ const links = computed(() => {
to: "/staff/time", to: "/staff/time",
icon: "i-heroicons-clock", icon: "i-heroicons-clock",
}] : [], }] : [],
/*... has("absencerequests") ? [{
label: "Abwesenheiten",
to: "/standardEntity/absencerequests",
icon: "i-heroicons-document-text"
}] : [],*/
/*{
label: "Fahrten",
to: "/trackingTrips",
icon: "i-heroicons-map"
},*/
] ]
}, },
...[{ ...[{
@@ -210,22 +169,13 @@ const links = computed(() => {
icon: "i-heroicons-puzzle-piece", icon: "i-heroicons-puzzle-piece",
defaultOpen: false, defaultOpen: false,
children: [ children: [
/*{
label: "Vorgänge",
to: "/inventory",
icon: "i-heroicons-square-3-stack-3d"
},{
label: "Bestände",
to: "/inventory/stocks",
icon: "i-heroicons-square-3-stack-3d"
},*/
...has("spaces") ? [{ ...has("spaces") ? [{
label: "Lagerplätze", label: "Lagerplätze",
to: "/standardEntity/spaces", to: "/standardEntity/spaces",
icon: "i-heroicons-square-3-stack-3d" icon: "i-heroicons-square-3-stack-3d"
}] : [], }] : [],
] ]
},] : [], }] : [],
{ {
label: "Stammdaten", label: "Stammdaten",
defaultOpen: false, defaultOpen: false,
@@ -283,7 +233,7 @@ const links = computed(() => {
label: "Projekte", label: "Projekte",
to: "/standardEntity/projects", to: "/standardEntity/projects",
icon: "i-heroicons-clipboard-document-check" icon: "i-heroicons-clipboard-document-check"
},] : [], }] : [],
...has("contracts") ? [{ ...has("contracts") ? [{
label: "Verträge", label: "Verträge",
to: "/standardEntity/contracts", to: "/standardEntity/contracts",
@@ -293,12 +243,7 @@ const links = computed(() => {
label: "Objekte", label: "Objekte",
to: "/standardEntity/plants", to: "/standardEntity/plants",
icon: "i-heroicons-clipboard-document" icon: "i-heroicons-clipboard-document"
},] : [], }] : [],
/*... has("checks") ? [{
label: "Überprüfungen",
to: "/standardEntity/checks",
icon: "i-heroicons-magnifying-glass"
},] : [],*/
{ {
label: "Einstellungen", label: "Einstellungen",
defaultOpen: false, defaultOpen: false,
@@ -308,11 +253,7 @@ const links = computed(() => {
label: "Nummernkreise", label: "Nummernkreise",
to: "/settings/numberRanges", to: "/settings/numberRanges",
icon: "i-heroicons-clipboard-document-list", icon: "i-heroicons-clipboard-document-list",
},/*{ }, {
label: "Rollen",
to: "/roles",
icon: "i-heroicons-key"
},*/{
label: "E-Mail Konten", label: "E-Mail Konten",
to: "/settings/emailaccounts", to: "/settings/emailaccounts",
icon: "i-heroicons-envelope", icon: "i-heroicons-envelope",
@@ -324,11 +265,7 @@ const links = computed(() => {
label: "Textvorlagen", label: "Textvorlagen",
to: "/settings/texttemplates", to: "/settings/texttemplates",
icon: "i-heroicons-clipboard-document-list", icon: "i-heroicons-clipboard-document-list",
},/*{ }, {
label: "Eigene Felder",
to: "/settings/ownfields",
icon: "i-heroicons-clipboard-document-list"
},*/{
label: "Firmeneinstellungen", label: "Firmeneinstellungen",
to: "/settings/tenant", to: "/settings/tenant",
icon: "i-heroicons-building-office", icon: "i-heroicons-building-office",
@@ -342,33 +279,31 @@ const links = computed(() => {
icon: "i-heroicons-clipboard-document-list" icon: "i-heroicons-clipboard-document-list"
} }
] ]
} },
] ]
}) })
// nur Items mit Children → für Accordion
const accordionItems = computed(() => const accordionItems = computed(() =>
links.value.filter(item => Array.isArray(item.children) && item.children.length > 0) links.value.filter(item => Array.isArray(item.children) && item.children.length > 0)
) )
// nur Items ohne Children → als Buttons
const buttonItems = computed(() => const buttonItems = computed(() =>
links.value.filter(item => !item.children || item.children.length === 0) links.value.filter(item => !item.children || item.children.length === 0)
) )
</script> </script>
<template> <template>
<!-- Standalone Buttons -->
<div class="flex flex-col gap-1"> <div class="flex flex-col gap-1">
<UButton <UButton
v-for="item in buttonItems" v-for="item in buttonItems"
:key="item.label" :key="item.label"
:variant="item.pinned ? 'ghost' : 'ghost'" variant="ghost"
:color="(item.to && route.path === item.to) ? 'primary' : (item.pinned ? 'amber' : 'gray')" :color="(item.to && route.path === item.to) ? 'primary' : (item.pinned ? 'amber' : 'gray')"
:icon="item.pinned ? 'i-heroicons-star' : item.icon" :icon="item.pinned ? 'i-heroicons-star' : item.icon"
class="w-full" class="w-full"
:to="item.to" :to="item.to"
:target="item.target" :target="item.target"
@click="item.click ? item.click() : null"
> >
<UIcon <UIcon
v-if="item.pinned" v-if="item.pinned"
@@ -378,8 +313,9 @@ const buttonItems = computed(() =>
{{ item.label }} {{ item.label }}
</UButton> </UButton>
</div> </div>
<UDivider/>
<!-- Accordion für die Items mit Children --> <UDivider class="my-2"/>
<UAccordion <UAccordion
:items="accordionItems" :items="accordionItems"
:multiple="false" :multiple="false"
@@ -387,7 +323,7 @@ const buttonItems = computed(() =>
> >
<template #default="{ item, open }"> <template #default="{ item, open }">
<UButton <UButton
:variant="'ghost'" variant="ghost"
:color="(item.children?.some(c => route.path.includes(c.to))) ? 'primary' : 'gray'" :color="(item.children?.some(c => route.path.includes(c.to))) ? 'primary' : 'gray'"
:icon="item.icon" :icon="item.icon"
class="w-full" class="w-full"
@@ -415,56 +351,13 @@ const buttonItems = computed(() =>
:to="child.to" :to="child.to"
:target="child.target" :target="child.target"
:disabled="child.disabled" :disabled="child.disabled"
@click="child.click ? child.click() : null"
> >
{{ child.label }} {{ child.label }}
</UButton> </UButton>
</div> </div>
</template> </template>
</UAccordion> </UAccordion>
<!-- <UAccordion
:items="links"
:multiple="false"
>
<template #default="{ item, index, open }">
<UButton
:variant="item.pinned ? 'ghost' : 'ghost'"
:color="(item.to && route.path === item.to) || (item.children?.some(c => route.path.includes(c.to))) ? 'primary' : (item.pinned ? 'amber' : 'gray')"
:icon="item.pinned ? 'i-heroicons-star' : item.icon"
class="w-full"
:to="item.to"
:target="item.target"
>
<UIcon
v-if="item.pinned"
:name="item.icon" class="w-5 h-5 me-2" />
{{ item.label }}
<template v-if="item.children" #trailing>
<UIcon
name="i-heroicons-chevron-right-20-solid"
class="w-5 h-5 ms-auto transform transition-transform duration-200"
:class="[open && 'rotate-90']"
/>
</template>
</UButton>
</template>
<template #item="{ item }">
<div class="flex flex-col" v-if="item.children?.length > 0">
<UButton
v-for="child in item.children"
:key="child.label"
variant="ghost"
:color="child.to === route.path ? 'primary' : 'gray'"
:icon="child.icon"
class="ml-4"
:to="child.to"
:target="child.target"
>
{{ child.label }}
</UButton>
</div>
</template>
</UAccordion>-->
<Calculator v-if="showCalculator" v-model="showCalculator"/>
</template> </template>

View File

@@ -7,6 +7,9 @@ const props = defineProps({
pin: { type: String, default: '' } pin: { type: String, default: '' }
}) })
const runtimeConfig = useRuntimeConfig()
const emit = defineEmits(['success']) const emit = defineEmits(['success'])
const { $api } = useNuxtApp() const { $api } = useNuxtApp()
const toast = useToast() const toast = useToast()
@@ -75,7 +78,7 @@ const submit = async () => {
if (props.pin) headers['x-public-pin'] = props.pin if (props.pin) headers['x-public-pin'] = props.pin
// An den Submit-Endpunkt senden (den müssen wir im Backend noch bauen!) // An den Submit-Endpunkt senden (den müssen wir im Backend noch bauen!)
await $fetch(`http://localhost:3100/workflows/submit/${props.token}`, { await $fetch(`${runtimeConfig.public.apiBase}/workflows/submit/${props.token}`, {
method: 'POST', method: 'POST',
body: payload, body: payload,
headers headers
@@ -132,6 +135,7 @@ const submit = async () => {
value-attribute="id" value-attribute="id"
placeholder="Wählen..." placeholder="Wählen..."
searchable searchable
searchable-placeholder="Suchen..."
/> />
</UFormGroup> </UFormGroup>
@@ -147,6 +151,8 @@ const submit = async () => {
option-attribute="name" option-attribute="name"
value-attribute="id" value-attribute="id"
placeholder="Wählen..." placeholder="Wählen..."
searchable
searchable-placeholder="Suchen..."
/> />
</UFormGroup> </UFormGroup>

View File

@@ -1,11 +1,10 @@
<script setup> <script setup>
import MainNav from "~/components/MainNav.vue"; import MainNav from "~/components/MainNav.vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import GlobalMessages from "~/components/GlobalMessages.vue"; import GlobalMessages from "~/components/GlobalMessages.vue";
import TenantDropdown from "~/components/TenantDropdown.vue"; import TenantDropdown from "~/components/TenantDropdown.vue";
import LabelPrinterButton from "~/components/LabelPrinterButton.vue"; import LabelPrinterButton from "~/components/LabelPrinterButton.vue";
import {useCalculatorStore} from '~/stores/calculator'
const dataStore = useDataStore() const dataStore = useDataStore()
const colorMode = useColorMode() const colorMode = useColorMode()
@@ -15,7 +14,7 @@ const route = useRoute()
const auth = useAuthStore() const auth = useAuthStore()
const labelPrinter = useLabelPrinterStore() const labelPrinter = useLabelPrinterStore()
const calculatorStore = useCalculatorStore()
const month = dayjs().format("MM") const month = dayjs().format("MM")
@@ -64,7 +63,6 @@ const actions = [
} }
] ]
const groups = computed(() => [ const groups = computed(() => [
{ {
key: 'actions', key: 'actions',
@@ -72,43 +70,61 @@ const groups = computed(() => [
}, { }, {
key: "customers", key: "customers",
label: "Kunden", label: "Kunden",
commands: dataStore.customers.map(item => { return {id: item.id, label: item.name, to: `/customers/show/${item.id}`}}) commands: dataStore.customers.map(item => {
return {id: item.id, label: item.name, to: `/customers/show/${item.id}`}
})
}, { }, {
key: "vendors", key: "vendors",
label: "Lieferanten", label: "Lieferanten",
commands: dataStore.vendors.map(item => { return {id: item.id, label: item.name, to: `/vendors/show/${item.id}`}}) commands: dataStore.vendors.map(item => {
return {id: item.id, label: item.name, to: `/vendors/show/${item.id}`}
})
}, { }, {
key: "contacts", key: "contacts",
label: "Ansprechpartner", label: "Ansprechpartner",
commands: dataStore.contacts.map(item => { return {id: item.id, label: item.fullName, to: `/contacts/show/${item.id}`}}) commands: dataStore.contacts.map(item => {
return {id: item.id, label: item.fullName, to: `/contacts/show/${item.id}`}
})
}, { }, {
key: "products", key: "products",
label: "Artikel", label: "Artikel",
commands: dataStore.products.map(item => { return {id: item.id, label: item.name, to: `/products/show/${item.id}`}}) commands: dataStore.products.map(item => {
return {id: item.id, label: item.name, to: `/products/show/${item.id}`}
})
}, { }, {
key: "tasks", key: "tasks",
label: "Aufgaben", label: "Aufgaben",
commands: dataStore.tasks.map(item => { return {id: item.id, label: item.name, to: `/tasks/show/${item.id}`}}) commands: dataStore.tasks.map(item => {
return {id: item.id, label: item.name, to: `/tasks/show/${item.id}`}
})
}, { }, {
key: "plants", key: "plants",
label: "Objekte", label: "Objekte",
commands: dataStore.plants.map(item => { return {id: item.id, label: item.name, to: `/plants/show/${item.id}`}}) commands: dataStore.plants.map(item => {
return {id: item.id, label: item.name, to: `/plants/show/${item.id}`}
})
}, { }, {
key: "projects", key: "projects",
label: "Projekte", label: "Projekte",
commands: dataStore.projects.map(item => { return {id: item.id, label: item.name, to: `/projects/show/${item.id}`}}) commands: dataStore.projects.map(item => {
return {id: item.id, label: item.name, to: `/projects/show/${item.id}`}
})
} }
].filter(Boolean)) ].filter(Boolean))
const footerLinks = [
/*{ // --- Footer Links nutzen jetzt den zentralen Calculator Store ---
label: 'Invite people', const footerLinks = computed(() => [
icon: 'i-heroicons-plus', {
to: '/settings/members' label: 'Taschenrechner',
}, */{ icon: 'i-heroicons-calculator',
click: () => calculatorStore.toggle()
},
{
label: 'Hilfe & Info', label: 'Hilfe & Info',
icon: 'i-heroicons-question-mark-circle', icon: 'i-heroicons-question-mark-circle',
click: () => isHelpSlideoverOpen.value = true click: () => isHelpSlideoverOpen.value = true
}] }
])
</script> </script>
@@ -137,17 +153,17 @@ const footerLinks = [
Wartungsarbeiten Wartungsarbeiten
</h1> </h1>
<p class="text-gray-600 dark:text-gray-300 mb-8"> <p class="text-gray-600 dark:text-gray-300 mb-8">
Dieser FEDEO Mandant wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut oder verwende einen anderen Mandanten. Dieser FEDEO Mandant wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut oder verwende einen
anderen Mandanten.
</p> </p>
<div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants"> <div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
{{ tenant.name }} {{ tenant.name }}
<UButton <UButton
:disabled="tenant.locked" :disabled="tenant.locked"
@click="auth.switchTenant(tenant.id)" @click="auth.switchTenant(tenant.id)"
>Wählen</UButton> >Wählen
</UButton>
</div> </div>
</UCard> </UCard>
</UContainer> </UContainer>
</div> </div>
@@ -176,8 +192,6 @@ const footerLinks = [
<p class="text-gray-600 dark:text-gray-300 mb-8"> <p class="text-gray-600 dark:text-gray-300 mb-8">
FEDEO wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut. FEDEO wird derzeit gewartet. Bitte versuche es in einigen Minuten erneut.
</p> </p>
</UCard> </UCard>
</UContainer> </UContainer>
</div> </div>
@@ -204,23 +218,24 @@ const footerLinks = [
Kein Aktives Abonnement für diesen Mandant. Kein Aktives Abonnement für diesen Mandant.
</h1> </h1>
<p class="text-gray-600 dark:text-gray-300 mb-8"> <p class="text-gray-600 dark:text-gray-300 mb-8">
Bitte wenden Sie sich an den FEDEO Support um ein Abonnement zu erhalten oder verwenden Sie einen anderen Mandanten. Bitte wenden Sie sich an den FEDEO Support um ein Abonnement zu erhalten oder verwenden Sie einen anderen
Mandanten.
</p> </p>
<div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants"> <div class="mx-auto text-left flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
{{ tenant.name }} {{ tenant.name }}
<UButton <UButton
:disabled="tenant.locked" :disabled="tenant.locked"
@click="auth.switchTenant(tenant.id)" @click="auth.switchTenant(tenant.id)"
>Wählen</UButton> >Wählen
</UButton>
</div> </div>
</UCard> </UCard>
</UContainer> </UContainer>
</div> </div>
<UDashboardLayout class="safearea" v-else> <UDashboardLayout class="safearea" v-else>
<UDashboardPanel :width="250" :resizable="{ min: 200, max: 300 }" collapsible> <UDashboardPanel :width="250" :resizable="{ min: 200, max: 300 }" collapsible>
<UDashboardNavbar style="margin-top: env(safe-area-inset-top, 10px) !important;" :class="['!border-transparent']" :ui="{ left: 'flex-1' }"> <UDashboardNavbar style="margin-top: env(safe-area-inset-top, 10px) !important;"
:class="['!border-transparent']" :ui="{ left: 'flex-1' }">
<template #left> <template #left>
<TenantDropdown class="w-full"/> <TenantDropdown class="w-full"/>
</template> </template>
@@ -232,21 +247,14 @@ const footerLinks = [
<div class="flex-1"/> <div class="flex-1"/>
<template #footer> <template #footer>
<div class="flex flex-col gap-3 w-full"> <div class="flex flex-col gap-3 w-full">
<UColorModeButton/> <UColorModeButton/>
<LabelPrinterButton/> <LabelPrinterButton/>
<!-- Footer Links -->
<UDashboardSidebarLinks :links="footerLinks"/> <UDashboardSidebarLinks :links="footerLinks"/>
<UDivider class="sticky bottom-0"/> <UDivider class="sticky bottom-0"/>
<UserDropdown style="margin-bottom: env(safe-area-inset-bottom, 10px) !important;"/> <UserDropdown style="margin-bottom: env(safe-area-inset-bottom, 10px) !important;"/>
</div> </div>
@@ -260,10 +268,10 @@ const footerLinks = [
</UDashboardPanel> </UDashboardPanel>
</UDashboardPage> </UDashboardPage>
<HelpSlideover/> <HelpSlideover/>
<Calculator v-if="calculatorStore.isOpen"/>
</UDashboardLayout> </UDashboardLayout>
</div> </div>
@@ -285,21 +293,20 @@ const footerLinks = [
/> />
<div v-if="!auth.activeTenant" class="w-1/2 mx-auto text-center"> <div v-if="!auth.activeTenant" class="w-1/2 mx-auto text-center">
<!-- Tenant Selection -->
<h3 class="text-center font-bold text-2xl mb-5">Kein Aktiver Mandant. Bitte wählen Sie ein Mandant.</h3> <h3 class="text-center font-bold text-2xl mb-5">Kein Aktiver Mandant. Bitte wählen Sie ein Mandant.</h3>
<div class="mx-auto w-1/2 flex flex-row justify-between my-3" v-for="tenant in auth.tenants"> <div class="mx-auto w-1/2 flex flex-row justify-between my-3" v-for="tenant in auth.tenants">
<span class="text-left">{{ tenant.name }}</span> <span class="text-left">{{ tenant.name }}</span>
<UButton <UButton
@click="auth.switchTenant(tenant.id)" @click="auth.switchTenant(tenant.id)"
>Wählen</UButton> >Wählen
</UButton>
</div> </div>
<UButton <UButton
variant="outline" variant="outline"
color="rose" color="rose"
@click="auth.logout()" @click="auth.logout()"
>Abmelden</UButton> >Abmelden
</UButton>
</div> </div>
<div v-else> <div v-else>
<UProgress animation="carousel" class="w-3/4 mx-auto mt-10"/> <UProgress animation="carousel" class="w-3/4 mx-auto mt-10"/>
@@ -308,7 +315,3 @@ const footerLinks = [
</div> </div>
</template> </template>
<style scoped>
</style>

View File

@@ -1,14 +1,9 @@
<script setup> <script setup>
import dayjs from "dayjs"; const {$api, $dayjs} = useNuxtApp()
// Zugriff auf $api und Toast Notification
const { $api } = useNuxtApp()
const toast = useToast() const toast = useToast()
defineShortcuts({ defineShortcuts({
'/': () => { '/': () => document.getElementById("searchinput").focus()
document.getElementById("searchinput").focus()
}
}) })
const tempStore = useTempStore() const tempStore = useTempStore()
@@ -18,238 +13,280 @@ const route = useRoute()
const bankstatements = ref([]) const bankstatements = ref([])
const bankaccounts = ref([]) const bankaccounts = ref([])
const filterAccount = ref([]) const filterAccount = ref([])
// Status für den Lade-Button
const isSyncing = ref(false) const isSyncing = ref(false)
const loadingDocs = ref(true) // Startet im Ladezustand
// Zeitraum-Optionen
const periodOptions = [
{label: 'Aktueller Monat', key: 'current_month'},
{label: 'Letzter Monat', key: 'last_month'},
{label: 'Aktuelles Quartal', key: 'current_quarter'},
{label: 'Letztes Quartal', key: 'last_quarter'},
{label: 'Benutzerdefiniert', key: 'custom'}
]
// Initialisierungswerte
const selectedPeriod = ref(periodOptions[0])
const dateRange = ref({
start: $dayjs().startOf('month').format('YYYY-MM-DD'),
end: $dayjs().endOf('month').format('YYYY-MM-DD')
})
const setupPage = async () => { const setupPage = async () => {
bankstatements.value = (await useEntities("bankstatements").select("*, statementallocations(*)", "date", false)) loadingDocs.value = true
bankaccounts.value = await useEntities("bankaccounts").select() try {
if(bankaccounts.value.length > 0) filterAccount.value = bankaccounts.value const [statements, accounts] = await Promise.all([
useEntities("bankstatements").select("*, statementallocations(*)", "valueDate", false),
useEntities("bankaccounts").select()
])
bankstatements.value = statements
bankaccounts.value = accounts
if (bankaccounts.value.length > 0 && filterAccount.value.length === 0) {
filterAccount.value = bankaccounts.value
} }
// Funktion für den Bankabruf // Erst nach dem Laden der Daten die Store-Werte anwenden
const savedBanking = tempStore.settings?.['banking'] || {}
if (savedBanking.periodKey) {
const found = periodOptions.find(p => p.key === savedBanking.periodKey)
if (found) selectedPeriod.value = found
}
if (savedBanking.range) {
dateRange.value = savedBanking.range
}
} catch (err) {
console.error("Setup Error:", err)
} finally {
loadingDocs.value = false
}
}
// Watcher für Schnellwahlen & Persistenz
watch([selectedPeriod, dateRange], ([newPeriod, newRange], [oldPeriod, oldRange]) => {
const now = $dayjs()
// Nur berechnen, wenn sich die Periode geändert hat
if (newPeriod.key !== oldPeriod?.key) {
switch (newPeriod.key) {
case 'current_month':
dateRange.value = {start: now.startOf('month').format('YYYY-MM-DD'), end: now.endOf('month').format('YYYY-MM-DD')}
break
case 'last_month':
const lastMonth = now.subtract(1, 'month')
dateRange.value = {start: lastMonth.startOf('month').format('YYYY-MM-DD'), end: lastMonth.endOf('month').format('YYYY-MM-DD')}
break
case 'current_quarter':
dateRange.value = {start: now.startOf('quarter').format('YYYY-MM-DD'), end: now.endOf('quarter').format('YYYY-MM-DD')}
break
case 'last_quarter':
const lastQuarter = now.subtract(1, 'quarter')
dateRange.value = {start: lastQuarter.startOf('quarter').format('YYYY-MM-DD'), end: lastQuarter.endOf('quarter').format('YYYY-MM-DD')}
break
}
}
// Speichern im Store
tempStore.modifyBankingPeriod(selectedPeriod.value.key, dateRange.value)
}, { deep: true })
const syncBankStatements = async () => { const syncBankStatements = async () => {
isSyncing.value = true isSyncing.value = true
try { try {
await $api('/api/functions/services/bankstatementsync', {method: 'POST'}) await $api('/api/functions/services/bankstatementsync', {method: 'POST'})
toast.add({title: 'Erfolg', description: 'Bankdaten synchronisiert.', color: 'green'})
toast.add({
title: 'Erfolg',
description: 'Bankdaten wurden erfolgreich synchronisiert.',
icon: 'i-heroicons-check-circle',
color: 'green'
})
// Wichtig: Daten neu laden, damit die neuen Buchungen direkt sichtbar sind
await setupPage() await setupPage()
} catch (error) { } catch (error) {
console.error(error) toast.add({title: 'Fehler', description: 'Fehler beim Abruf.', color: 'red'})
toast.add({
title: 'Fehler',
description: 'Beim Abrufen der Bankdaten ist ein Fehler aufgetreten.',
icon: 'i-heroicons-exclamation-circle',
color: 'red'
})
} finally { } finally {
isSyncing.value = false isSyncing.value = false
} }
} }
const templateColumns = [ const templateColumns = [
{ {key: "account", label: "Konto"},
key: "account", {key: "valueDate", label: "Valuta"},
label: "Konto" {key: "amount", label: "Betrag"},
},{ {key: "openAmount", label: "Offen"},
key: "valueDate", {key: "partner", label: "Name"},
label: "Valuta" {key: "text", label: "Beschreibung"}
},
{
key: "amount",
label: "Betrag"
},
{
key: "openAmount",
label: "Offener Betrag"
},
{
key: "partner",
label: "Name"
},
{
key: "text",
label: "Beschreibung"
}
] ]
const selectedColumns = ref(templateColumns)
const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
const searchString = ref(tempStore.searchStrings["bankstatements"] || '') const searchString = ref(tempStore.searchStrings["bankstatements"] || '')
const selectedFilters = ref(tempStore.filters?.["banking"]?.["main"] || ['Nur offene anzeigen'])
const clearSearchString = () => { const shouldShowMonthDivider = (row, index) => {
tempStore.clearSearchString("bankstatements") if (index === 0) return true;
searchString.value = '' const prevRow = filteredRows.value[index - 1];
return $dayjs(row.valueDate).format('MMMM YYYY') !== $dayjs(prevRow.valueDate).format('MMMM YYYY');
} }
const displayCurrency = (value, currency = "€") => {
return `${Number(value).toFixed(2).replace(".",",")} ${currency}`
}
const calculateOpenSum = (statement) => { const calculateOpenSum = (statement) => {
let startingAmount = 0 const allocated = statement.statementallocations?.reduce((acc, curr) => acc + curr.amount, 0) || 0;
return (statement.amount - allocated).toFixed(2);
statement.statementallocations.forEach(item => {
startingAmount += item.amount
})
return (statement.amount - startingAmount).toFixed(2)
} }
const selectedFilters = ref(tempStore.filters?.["banking"]?.["main"] ? tempStore.filters["banking"]["main"] : ['Nur offene anzeigen'])
const filteredRows = computed(() => { const filteredRows = computed(() => {
let temp = bankstatements.value if (!bankstatements.value.length) return []
if(route.query.filter) { let temp = [...bankstatements.value]
console.log(route.query.filter)
temp = temp.filter(i => JSON.parse(route.query.filter).includes(i.id)) // Filterung nach Datum
} else { if (dateRange.value.start) {
temp = temp.filter(i => $dayjs(i.valueDate).isSameOrAfter($dayjs(dateRange.value.start), 'day'))
}
if (dateRange.value.end) {
temp = temp.filter(i => $dayjs(i.valueDate).isSameOrBefore($dayjs(dateRange.value.end), 'day'))
}
// Status Filter
if (selectedFilters.value.includes("Nur offene anzeigen")) { if (selectedFilters.value.includes("Nur offene anzeigen")) {
temp = temp.filter(i => Number(calculateOpenSum(i)) !== 0) temp = temp.filter(i => Number(calculateOpenSum(i)) !== 0)
} }
if (selectedFilters.value.includes("Nur positive anzeigen")) { if (selectedFilters.value.includes("Nur positive anzeigen")) {
temp = temp.filter(i => i.amount >= 0) temp = temp.filter(i => i.amount >= 0)
} }
if (selectedFilters.value.includes("Nur negative anzeigen")) { if (selectedFilters.value.includes("Nur negative anzeigen")) {
temp = temp.filter(i => i.amount < 0) temp = temp.filter(i => i.amount < 0)
} }
// Konto Filter & Suche
let results = temp.filter(i => filterAccount.value.find(x => x.id === i.account))
if (searchString.value) {
results = useSearch(searchString.value, results)
} }
return useSearch(searchString.value, temp.filter(i => filterAccount.value.find(x => x.id === i.account))) return results.sort((a, b) => $dayjs(b.valueDate).unix() - $dayjs(a.valueDate).unix())
}) })
const displayCurrency = (value) => `${Number(value).toFixed(2).replace(".", ",")}`
onMounted(() => {
setupPage() setupPage()
})
</script> </script>
<template> <template>
<UDashboardNavbar title="Bankbuchungen" :badge="filteredRows.length"> <UDashboardNavbar title="Bankbuchungen" :badge="filteredRows.length">
<template #right> <template #right>
<UButton <UButton
label="Bankabruf" label="Bankabruf"
icon="i-heroicons-arrow-path" icon="i-heroicons-arrow-path"
color="primary"
variant="solid"
:loading="isSyncing" :loading="isSyncing"
@click="syncBankStatements" @click="syncBankStatements"
class="mr-2" class="mr-2"
/> />
<UInput <UInput
id="searchinput" id="searchinput"
name="searchinput"
v-model="searchString" v-model="searchString"
icon="i-heroicons-funnel" icon="i-heroicons-magnifying-glass"
autocomplete="off"
placeholder="Suche..." placeholder="Suche..."
class="hidden lg:block"
@keydown.esc="$event.target.blur()"
@change="tempStore.modifySearchString('bankstatements',searchString)" @change="tempStore.modifySearchString('bankstatements',searchString)"
>
<template #trailing>
<UKbd value="/" />
</template>
</UInput>
<UButton
icon="i-heroicons-x-mark"
variant="outline"
color="rose"
@click="clearSearchString()"
v-if="searchString.length > 0"
/> />
</template> </template>
</UDashboardNavbar> </UDashboardNavbar>
<UDashboardToolbar> <UDashboardToolbar>
<template #left> <template #left>
<div class="flex items-center gap-3">
<USelectMenu <USelectMenu
:options="bankaccounts" :options="bankaccounts"
v-model="filterAccount" v-model="filterAccount"
option-attribute="iban" option-attribute="iban"
multiple multiple
by="id" by="id"
:ui-menu="{ width: 'min-w-max' }" placeholder="Konten"
> class="w-48"
<template #label> />
Konto <UDivider orientation="vertical" class="h-6"/>
</template> <div class="flex items-center gap-2">
</USelectMenu> <USelectMenu
v-model="selectedPeriod"
:options="periodOptions"
class="w-44"
icon="i-heroicons-calendar-days"
/>
<div v-if="selectedPeriod.key === 'custom'" class="flex items-center gap-1">
<UInput type="date" v-model="dateRange.start" size="xs" class="w-32"/>
<UInput type="date" v-model="dateRange.end" size="xs" class="w-32"/>
</div>
<div v-else class="text-xs text-gray-400 hidden sm:block italic">
{{ $dayjs(dateRange.start).format('DD.MM.') }} - {{ $dayjs(dateRange.end).format('DD.MM.YYYY') }}
</div>
</div>
</div>
</template> </template>
<template #right> <template #right>
<USelectMenu <USelectMenu
icon="i-heroicons-adjustments-horizontal-solid" icon="i-heroicons-adjustments-horizontal"
multiple multiple
v-model="selectedFilters" v-model="selectedFilters"
:options="['Nur offene anzeigen','Nur positive anzeigen','Nur negative anzeigen']" :options="['Nur offene anzeigen','Nur positive anzeigen','Nur negative anzeigen']"
:color="selectedFilters.length > 0 ? 'primary' : 'white'"
:ui-menu="{ width: 'min-w-max' }"
@change="tempStore.modifyFilter('banking','main',selectedFilters)" @change="tempStore.modifyFilter('banking','main',selectedFilters)"
> />
<template #label>
Filter
</template>
</USelectMenu>
</template> </template>
</UDashboardToolbar> </UDashboardToolbar>
<UTable
:rows="filteredRows"
:columns="columns"
class="w-full"
:ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
@select="(i) => router.push(`/banking/statements/edit/${i.id}`)"
:empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Buchungen anzuzeigen' }"
>
<template #account-data="{row}"> <div class="overflow-y-auto relative" style="height: calc(100vh - 200px)">
{{row.account ? bankaccounts.find(i => i.id === row.account).iban : ""}} <div v-if="loadingDocs" class="p-20 flex flex-col items-center justify-center">
</template> <UProgress animation="carousel" class="w-1/3 mb-4" />
<template #valueDate-data="{row}"> <span class="text-sm text-gray-500 italic">Bankbuchungen werden geladen...</span>
{{dayjs(row.valueDate).format("DD.MM.YY")}} </div>
</template>
<template #amount-data="{row}"> <table v-else class="w-full text-left border-collapse">
<span <thead class="sticky top-0 bg-white dark:bg-gray-900 z-10 shadow-sm">
v-if="row.amount >= 0" <tr class="text-xs font-semibold text-gray-500 uppercase">
class="text-primary-500" <th v-for="col in templateColumns" :key="col.key" class="p-4 border-b dark:border-gray-800">
>{{String(row.amount.toFixed(2)).replace(".",",")}} </span> {{ col.label }}
<span </th>
v-else-if="row.amount < 0" </tr>
class="text-rose-500" </thead>
>{{String(row.amount.toFixed(2)).replace(".",",")}} </span> <tbody>
</template> <template v-for="(row, index) in filteredRows" :key="row.id">
<template #openAmount-data="{row}"> <tr v-if="shouldShowMonthDivider(row, index)">
{{displayCurrency(calculateOpenSum(row))}} <td colspan="6" class="bg-gray-50 dark:bg-gray-800/50 p-2 pl-4 text-sm font-bold text-primary-600 border-y dark:border-gray-800">
</template> <div class="flex items-center gap-2">
<template #partner-data="{row}"> <UIcon name="i-heroicons-calendar" class="w-4 h-4"/>
<span {{ $dayjs(row.valueDate).format('MMMM YYYY') }}
v-if="row.amount < 0" </div>
</td>
</tr>
<tr
class="hover:bg-gray-50 dark:hover:bg-gray-800/30 cursor-pointer border-b dark:border-gray-800 text-sm group"
@click="router.push(`/banking/statements/edit/${row.id}`)"
> >
{{row.credName}} <td class="p-4 text-[10px] text-gray-400 font-mono truncate max-w-[150px]">
</span> {{ row.account ? bankaccounts.find(i => i.id === row.account)?.iban : "" }}
<span </td>
v-else-if="row.amount > 0" <td class="p-4 whitespace-nowrap">{{ $dayjs(row.valueDate).format("DD.MM.YY") }}</td>
> <td class="p-4 font-semibold">
{{row.debName}} <span :class="row.amount >= 0 ? 'text-green-600 dark:text-green-400' : 'text-rose-600 dark:text-rose-400'">
{{ displayCurrency(row.amount) }}
</span> </span>
</td>
<td class="p-4 text-gray-400 italic text-xs">
{{ Number(calculateOpenSum(row)) !== 0 ? displayCurrency(calculateOpenSum(row)) : '-' }}
</td>
<td class="p-4 truncate max-w-[180px] font-medium">
{{ row.amount < 0 ? row.credName : row.debName }}
</td>
<td class="p-4 text-gray-500 truncate max-w-[350px] text-xs">
{{ row.text }}
</td>
</tr>
</template> </template>
</UTable> <tr v-if="filteredRows.length === 0">
<td colspan="6" class="p-32 text-center text-gray-400">
<div class="flex flex-col items-center">
<UIcon name="i-heroicons-magnifying-glass-circle" class="w-12 h-12 mb-3 opacity-20"/>
<p class="font-medium">Keine Buchungen gefunden</p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<PageLeaveGuard :when="isSyncing"/> <PageLeaveGuard :when="isSyncing"/>
</template> </template>
<style scoped>
</style>

View File

@@ -1387,7 +1387,7 @@ const saveDocument = async (state, resetup = false) => {
endText: itemInfo.value.endText, endText: itemInfo.value.endText,
rows: itemInfo.value.rows, rows: itemInfo.value.rows,
contactPerson: itemInfo.value.contactPerson, contactPerson: itemInfo.value.contactPerson,
linkedDocument: itemInfo.value.linkedDocument, createddocument: itemInfo.value.createddocument,
agriculture: itemInfo.value.agriculture, agriculture: itemInfo.value.agriculture,
letterhead: itemInfo.value.letterhead, letterhead: itemInfo.value.letterhead,
usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices, usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices,

View File

@@ -8,7 +8,6 @@
class="hidden lg:block" class="hidden lg:block"
icon="i-heroicons-funnel" icon="i-heroicons-funnel"
placeholder="Suche..." placeholder="Suche..."
@change="tempStore.modifySearchString('createddocuments',searchString)"
@keydown.esc="$event.target.blur()" @keydown.esc="$event.target.blur()"
> >
<template #trailing> <template #trailing>
@@ -30,22 +29,7 @@
</template> </template>
</UDashboardNavbar> </UDashboardNavbar>
<UDashboardToolbar> <UDashboardToolbar>
<template #right> <template #right>
<!-- <USelectMenu
v-model="selectedColumns"
:options="templateColumns"
by="key"
class="hidden lg:block"
icon="i-heroicons-adjustments-horizontal-solid"
multiple
@change="tempStore.modifyColumns('createddocuments',selectedColumns)"
>
<template #label>
Spalten
</template>
</USelectMenu>-->
<USelectMenu <USelectMenu
v-if="selectableFilters.length > 0" v-if="selectableFilters.length > 0"
v-model="selectedFilters" v-model="selectedFilters"
@@ -157,6 +141,31 @@
<script setup> <script setup>
import dayjs from "dayjs"; import dayjs from "dayjs";
import { ref, computed, watch } from 'vue';
const dataStore = useDataStore()
const tempStore = useTempStore()
const router = useRouter()
const type = "createddocuments"
const dataType = dataStore.dataTypes[type]
const items = ref([])
const selectedItem = ref(0)
const activeTabIndex = ref(0)
// Debounce-Logik für die Suche
const searchString = ref(tempStore.searchStrings['createddocuments'] || '')
const debouncedSearchString = ref(searchString.value)
let debounceTimeout = null
watch(searchString, (newVal) => {
clearTimeout(debounceTimeout)
debounceTimeout = setTimeout(() => {
debouncedSearchString.value = newVal
tempStore.modifySearchString('createddocuments', newVal)
}, 300) // 300ms warten nach dem letzten Tastendruck
})
defineShortcuts({ defineShortcuts({
'/': () => { '/': () => {
@@ -168,10 +177,6 @@ defineShortcuts({
'Enter': { 'Enter': {
usingInput: true, usingInput: true,
handler: () => { handler: () => {
// Zugriff auf das aktuell sichtbare Element basierend auf Tab und Selektion
const currentList = getRowsForTab(selectedTypes.value[activeTabIndex.value]?.key || 'drafts')
// Fallback auf globale Liste falls nötig, aber Logik sollte auf Tab passen
if (filteredRows.value[selectedItem.value]) { if (filteredRows.value[selectedItem.value]) {
router.push(`/createDocument/show/${filteredRows.value[selectedItem.value].id}`) router.push(`/createDocument/show/${filteredRows.value[selectedItem.value].id}`)
} }
@@ -193,17 +198,6 @@ defineShortcuts({
} }
}) })
const dataStore = useDataStore()
const tempStore = useTempStore()
const router = useRouter()
const type = "createddocuments"
const dataType = dataStore.dataTypes[type]
const items = ref([])
const selectedItem = ref(0)
const activeTabIndex = ref(0)
const setupPage = async () => { const setupPage = async () => {
items.value = (await useEntities("createddocuments").select("*, customer(id,name), statementallocations(id,amount),linkedDocument(*)", "documentNumber", true, true)) items.value = (await useEntities("createddocuments").select("*, customer(id,name), statementallocations(id,amount),linkedDocument(*)", "documentNumber", true, true))
} }
@@ -222,10 +216,9 @@ const templateColumns = [
{key: "dueDate", label: "Fällig"} {key: "dueDate", label: "Fällig"}
] ]
// Eigene Spalten für Entwürfe: Referenz raus, Status rein
const draftColumns = [ const draftColumns = [
{key: 'type', label: "Typ"}, {key: 'type', label: "Typ"},
{key: 'state', label: "Status"}, // Status wieder drin {key: 'state', label: "Status"},
{key: 'partner', label: "Kunde"}, {key: 'partner', label: "Kunde"},
{key: "date", label: "Erstellt am"}, {key: "date", label: "Erstellt am"},
{key: "amount", label: "Betrag"} {key: "amount", label: "Betrag"}
@@ -242,31 +235,11 @@ const getColumnsForTab = (tabKey) => {
} }
const templateTypes = [ const templateTypes = [
{ { key: "drafts", label: "Entwürfe" },
key: "drafts", { key: "invoices", label: "Rechnungen" },
label: "Entwürfe" { key: "quotes", label: "Angebote" },
}, { key: "deliveryNotes", label: "Lieferscheine" },
{ { key: "confirmationOrders", label: "Auftragsbestätigungen" }
key: "invoices",
label: "Rechnungen"
},
/*,{
key: "cancellationInvoices",
label: "Stornorechnungen"
},{
key: "advanceInvoices",
label: "Abschlagsrechnungen"
},*/
{
key: "quotes",
label: "Angebote"
}, {
key: "deliveryNotes",
label: "Lieferscheine"
}, {
key: "confirmationOrders",
label: "Auftragsbestätigungen"
}
] ]
const selectedTypes = ref(tempStore.filters["createddocuments"] ? tempStore.filters["createddocuments"] : templateTypes) const selectedTypes = ref(tempStore.filters["createddocuments"] ? tempStore.filters["createddocuments"] : templateTypes)
const types = computed(() => { const types = computed(() => {
@@ -274,10 +247,9 @@ const types = computed(() => {
}) })
const selectItem = (item) => { const selectItem = (item) => {
console.log(item)
if (item.state === "Entwurf") { if (item.state === "Entwurf") {
router.push(`/createDocument/edit/${item.id}`) router.push(`/createDocument/edit/${item.id}`)
} else if (item.state !== "Entwurf") { } else {
router.push(`/createDocument/show/${item.id}`) router.push(`/createDocument/show/${item.id}`)
} }
} }
@@ -286,24 +258,19 @@ const displayCurrency = (value, currency = "€") => {
return `${Number(value).toFixed(2).replace(".", ",")} ${currency}` return `${Number(value).toFixed(2).replace(".", ",")} ${currency}`
} }
const searchString = ref(tempStore.searchStrings['createddocuments'] || '')
const clearSearchString = () => { const clearSearchString = () => {
tempStore.clearSearchString('createddocuments') tempStore.clearSearchString('createddocuments')
searchString.value = '' searchString.value = ''
debouncedSearchString.value = ''
} }
const selectableFilters = ref(dataType.filters.map(i => i.name)) const selectableFilters = ref(dataType.filters.map(i => i.name))
const selectedFilters = ref(dataType.filters.filter(i => i.default).map(i => i.name) || []) const selectedFilters = ref(dataType.filters.filter(i => i.default).map(i => i.name) || [])
const filteredRows = computed(() => { const filteredRows = computed(() => {
let tempItems = items.value.filter(i => types.value.find(x => { let tempItems = items.value.filter(i => types.value.find(x => {
// 1. Draft Tab Logic
if (x.key === 'drafts') return i.state === 'Entwurf' if (x.key === 'drafts') return i.state === 'Entwurf'
// 2. Global Draft Exclusion (drafts shouldn't be in other tabs)
if (i.state === 'Entwurf' && x.key !== 'drafts') return false if (i.state === 'Entwurf' && x.key !== 'drafts') return false
// 3. Normal Type Logic
if (x.key === 'invoices') return ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(i.type) if (x.key === 'invoices') return ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(i.type)
return x.key === i.type return x.key === i.type
})) }))
@@ -324,22 +291,16 @@ const filteredRows = computed(() => {
}) })
} }
tempItems = useSearch(searchString.value, tempItems) // Hier nutzen wir nun den debounced Wert für die lokale Suche
const results = useSearch(debouncedSearchString.value, tempItems.slice().reverse())
return useSearch(searchString.value, tempItems.slice().reverse()) return results
}) })
const getRowsForTab = (tabKey) => { const getRowsForTab = (tabKey) => {
return filteredRows.value.filter(row => { return filteredRows.value.filter(row => {
if (tabKey === 'drafts') { if (tabKey === 'drafts') return row.state === 'Entwurf'
return row.state === 'Entwurf'
}
if (row.state === 'Entwurf') return false if (row.state === 'Entwurf') return false
if (tabKey === 'invoices') return ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(row.type)
if (tabKey === 'invoices') {
return ['invoices', 'advanceInvoices', 'cancellationInvoices'].includes(row.type)
}
return row.type === tabKey return row.type === tabKey
}) })
} }
@@ -350,6 +311,3 @@ const isPaid = (item) => {
return Number(amountPaid.toFixed(2)) === useSum().getCreatedDocumentSum(item, items.value) return Number(amountPaid.toFixed(2)) === useSum().getCreatedDocumentSum(item, items.value)
} }
</script> </script>
<style scoped>
</style>

View File

@@ -17,11 +17,18 @@ const dataStore = useDataStore()
const itemInfo = ref({}) const itemInfo = ref({})
const linkedDocument =ref({}) const linkedDocument =ref({})
const links = ref([])
const setupPage = async () => { const setupPage = async () => {
if(route.params) { if(route.params) {
if(route.params.id) itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id,"*,files(*),linkedDocument(*), statementallocations(bs_id)") if(route.params.id) itemInfo.value = await useEntities("createddocuments").selectSingle(route.params.id,"*,files(*),linkedDocument(*), statementallocations(bs_id)")
console.log(itemInfo.value) if(itemInfo.value.type === "invoices"){
const createddocuments = await useEntities("createddocuments").select()
console.log(createddocuments)
links.value = createddocuments.filter(i => i.createddocument?.id === itemInfo.value.id)
console.log(links.value)
}
linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id) linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id)
} }
@@ -80,17 +87,23 @@ const openBankstatements = () => {
> >
E-Mail E-Mail
</UButton> </UButton>
<UTooltip
v-if="itemInfo.type === 'invoices' || itemInfo.type === 'advanceInvoices'"
:text="links.find(i => i.type === 'cancellationInvoices') ? 'Bereits stoniert' : ''"
>
<UButton <UButton
@click="router.push(`/createDocument/edit/?createddocument=${itemInfo.id}&loadMode=storno`)" @click="router.push(`/createDocument/edit/?createddocument=${itemInfo.id}&loadMode=storno`)"
variant="outline" variant="outline"
color="rose" color="rose"
v-if="itemInfo.type === 'invoices' || itemInfo.type === 'advanceInvoices'" :disabled="links.find(i => i.type === 'cancellationInvoices')"
> >
Stornieren Stornieren
</UButton> </UButton>
</UTooltip>
<UButton <UButton
v-if="itemInfo.project" v-if="itemInfo.project"
@click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)" @click="router.push(`/standardEntity/projects/show/${itemInfo.project?.id}`)"
icon="i-heroicons-link" icon="i-heroicons-link"
variant="outline" variant="outline"
> >
@@ -98,12 +111,36 @@ const openBankstatements = () => {
</UButton> </UButton>
<UButton <UButton
v-if="itemInfo.customer" v-if="itemInfo.customer"
@click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)" @click="router.push(`/standardEntity/customers/show/${itemInfo.customer?.id}`)"
icon="i-heroicons-link" icon="i-heroicons-link"
variant="outline" variant="outline"
> >
Kunde Kunde
</UButton> </UButton>
<UButton
v-if="itemInfo.plant"
@click="router.push(`/standardEntity/plants/show/${itemInfo.plant?.id}`)"
icon="i-heroicons-link"
variant="outline"
>
Objekt
</UButton>
<UButton
v-if="itemInfo.contract"
@click="router.push(`/standardEntity/contracts/show/${itemInfo.contract?.id}`)"
icon="i-heroicons-link"
variant="outline"
>
Vertrag
</UButton>
<UButton
v-if="itemInfo.contact"
@click="router.push(`/standardEntity/contacts/show/${itemInfo.contact?.id}`)"
icon="i-heroicons-link"
variant="outline"
>
Ansprechpartner
</UButton>
<UButton <UButton
v-if="itemInfo.createddocument" v-if="itemInfo.createddocument"
@click="router.push(`/createDocument/show/${itemInfo.createddocument}`)" @click="router.push(`/createDocument/show/${itemInfo.createddocument}`)"

View File

@@ -1,535 +1,338 @@
<script setup> <script setup>
import { ref, computed, watch, onMounted } from 'vue';
import {BlobReader, BlobWriter, ZipWriter} from "@zip.js/zip.js";
import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue"; import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
import DocumentUploadModal from "~/components/DocumentUploadModal.vue"; import DocumentUploadModal from "~/components/DocumentUploadModal.vue";
import dayjs from "dayjs"; import dayjs from "dayjs";
import arraySort from "array-sort";
defineShortcuts({
'+': () => {
//Hochladen
uploadModalOpen.value = true
},
'Enter': {
usingInput: true,
handler: () => {
let entry = renderedFileList.value[selectedFileIndex.value]
if(entry.type === "file") {
showFile(entry.id)
} else if(createFolderModalOpen.value === false && entry.type === "folder") {
changeFolder(currentFolders.value.find(i => i.id === entry.id))
} else if(createFolderModalOpen.value === true) {
createFolder()
}
}
},
'arrowdown': () => {
if(selectedFileIndex.value < renderedFileList.value.length - 1) {
selectedFileIndex.value += 1
} else {
selectedFileIndex.value = 0
}
},
'arrowup': () => {
if(selectedFileIndex.value === 0) {
selectedFileIndex.value = renderedFileList.value.length - 1
} else {
selectedFileIndex.value -= 1
}
}
})
// --- Services & Stores ---
const dataStore = useDataStore() const dataStore = useDataStore()
const tempStore = useTempStore() const tempStore = useTempStore()
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const modal = useModal() const modal = useModal()
const toast = useToast()
const auth = useAuthStore()
const uploadModalOpen = ref(false)
const createFolderModalOpen = ref(false)
const uploadInProgress = ref(false)
const fileUploadFormData = ref({
tags: ["Eingang"],
path: "",
tenant: auth.activeTenant,
folder: null
})
const files = useFiles() const files = useFiles()
const displayMode = ref("list") // --- State ---
const displayModes = ref([{label: 'Liste',key:'list', icon: 'i-heroicons-list-bullet'},{label: 'Kacheln',key:'rectangles', icon: 'i-heroicons-squares-2x2'}])
const documents = ref([]) const documents = ref([])
const folders = ref([]) const folders = ref([])
const filetags = ref([]) const filetags = ref([])
const currentFolder = ref(null) const currentFolder = ref(null)
const loadingDocs = ref(true)
const loadingDocs = ref(false)
const isDragTarget = ref(false)
const loaded = ref(false) const loaded = ref(false)
const displayMode = ref("list")
const displayModes = [
{ label: 'Liste', key: 'list', icon: 'i-heroicons-list-bullet' },
{ label: 'Kacheln', key: 'rectangles', icon: 'i-heroicons-squares-2x2' }
]
const createFolderModalOpen = ref(false)
const createFolderData = ref({ name: '', standardFiletype: null, standardFiletypeIsOptional: true })
const renameModalOpen = ref(false)
const renameData = ref({ id: null, name: '', type: '' })
const selectedFileIndex = ref(0)
const draggedItem = ref(null)
// --- Search & Debounce ---
const searchString = ref(tempStore.searchStrings["files"] || '')
const debouncedSearch = ref(searchString.value)
let debounceTimeout = null
watch(searchString, (val) => {
clearTimeout(debounceTimeout)
debounceTimeout = setTimeout(() => {
debouncedSearch.value = val
tempStore.modifySearchString('files', val)
}, 300)
})
// --- Data Fetching ---
const setupPage = async () => { const setupPage = async () => {
folders.value = await useEntities("folders").select() loadingDocs.value = true
try {
documents.value = await files.selectDocuments() const [fRes, dRes, tRes] = await Promise.all([
useEntities("folders").select(),
filetags.value = await useEntities("filetags").select() files.selectDocuments(),
useEntities("filetags").select()
if(route.query) { ])
if(route.query.folder) { folders.value = fRes || []
currentFolder.value = await useEntities("folders").selectSingle(route.query.folder) documents.value = dRes || []
filetags.value = tRes || []
if (route.query?.folder) {
currentFolder.value = folders.value.find(i => i.id === route.query.folder) || null
} else {
currentFolder.value = null
} }
} } finally {
const dropZone = document.getElementById("drop_zone")
dropZone.ondragover = function (event) {
modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.value.id, type: currentFolder.value.standardFiletype, typeEnabled: currentFolder.value.standardFiletypeIsOptional}, onUploadFinished: () => {
setupPage()
}})
event.preventDefault()
}
dropZone.ondragleave = function (event) {
isDragTarget.value = false
}
dropZone.ondrop = async function (event) {
event.preventDefault()
}
loadingDocs.value = false loadingDocs.value = false
loaded.value = true loaded.value = true
}
setupPage()
const currentFolders = computed(() => {
if(folders.value.length > 0) {
let tempFolders = folders.value.filter(i => currentFolder.value ? i.parent === currentFolder.value.id : !i.parent)
return tempFolders
} else return []
})
const breadcrumbLinks = computed(() => {
if(currentFolder.value) {
let parents = []
const addParent = (parent) => {
parents.push(parent)
if(parent.parent) {
addParent(folders.value.find(i => i.id === parent.parent))
} }
} }
if(currentFolder.value.parent) { onMounted(() => setupPage())
addParent(folders.value.find(i => i.id === currentFolder.value.parent))
// --- Navigation ---
const changeFolder = async (folder) => {
currentFolder.value = folder
await router.push(folder ? `/files?folder=${folder.id}` : `/files`)
} }
return [{ const navigateUp = () => {
label: "Home", if (!currentFolder.value) return
click: () => { const parent = folders.value.find(f => f.id === currentFolder.value.parent)
changeFolder(null) changeFolder(parent || null)
},
icon: "i-heroicons-folder"
},
...parents.map(i => {
return {
label: folders.value.find(x => x.id === i.id).name,
click: () => {
changeFolder(i)
},
icon: "i-heroicons-folder"
} }
}).reverse(),
{
label: currentFolder.value.name,
click: () => {
changeFolder(currentFolder.value)
},
icon: "i-heroicons-folder"
}]
} else { // --- Drag & Drop ---
return [{ const handleDragStart = (entry) => {
label: "Home", draggedItem.value = entry
click: () => {
changeFolder(null)
},
icon: "i-heroicons-folder"
}]
} }
})
const filteredDocuments = computed(() => { const handleDrop = async (targetFolderId) => {
// targetFolderId kann null sein (Root)
if (!draggedItem.value) return
if (draggedItem.value.id === targetFolderId) return
return documents.value.filter(i => currentFolder.value ? i.folder === currentFolder.value.id : !i.folder)
})
const changeFolder = async (newFolder) => {
loadingDocs.value = true loadingDocs.value = true
currentFolder.value = newFolder try {
if (draggedItem.value.type === 'file') {
if(newFolder) { await useEntities("files").update(draggedItem.value.id, { folder: targetFolderId })
fileUploadFormData.value.folder = newFolder.id
await router.push(`/files?folder=${newFolder.id}`)
} else { } else {
fileUploadFormData.value.folder = null await useEntities("folders").update(draggedItem.value.id, { parent: targetFolderId })
await router.push(`/files`) }
toast.add({ title: 'Erfolgreich verschoben', icon: 'i-heroicons-check-circle', color: 'green' })
await setupPage()
} catch (e) {
toast.add({ title: 'Fehler beim Verschieben', color: 'red' })
} finally {
draggedItem.value = null
loadingDocs.value = false
}
} }
setupPage() // --- Breadcrumbs ---
const breadcrumbLinks = computed(() => {
const links = [{ label: "Home", icon: "i-heroicons-home", click: () => changeFolder(null) }]
if (currentFolder.value) {
const path = []
let curr = currentFolder.value
while (curr) {
const folderObj = curr
path.unshift({
label: folderObj.name,
icon: "i-heroicons-folder",
click: () => changeFolder(folderObj)
})
curr = folders.value.find(f => f.id === curr.parent)
} }
return [...links, ...path]
const createFolderData = ref({}) }
const createFolder = async () => { return links
const res = await useEntities("folders").create({
parent: currentFolder.value ? currentFolder.value.id : undefined,
name: createFolderData.value.name,
}) })
createFolderModalOpen.value = false // --- Data Mapping ---
setupPage()
}
const downloadSelected = async () => {
let files = []
files = filteredDocuments.value.filter(i => selectedFiles.value[i.id] === true).map(i => i.path)
await useFiles().downloadFile(undefined,Object.keys(selectedFiles.value))
}
const searchString = ref(tempStore.searchStrings["files"] ||'')
const renderedFileList = computed(() => { const renderedFileList = computed(() => {
let files = filteredDocuments.value.map(i => { // 1. Aktuelle Ordner filtern
return { const folderList = folders.value
label: i.path.split("/")[i.path.split("/").length -1], .filter(i => currentFolder.value ? i.parent === currentFolder.value.id : !i.parent)
id: i.id, .map(i => ({ ...i, label: i.name, type: "folder" }))
type: "file" .sort((a, b) => a.label.localeCompare(b.label))
// 2. Aktuelle Dateien filtern
const fileList = documents.value
.filter(i => currentFolder.value ? i.folder === currentFolder.value.id : !i.folder)
.map(i => ({ ...i, label: i.path.split("/").pop(), type: "file" }))
.sort((a, b) => a.label.localeCompare(b.label))
let combined = [...folderList, ...fileList]
if (debouncedSearch.value) {
combined = useSearch(debouncedSearch.value, combined)
} }
// 3. "Nach oben" (..) einfügen, wenn wir nicht im Root sind und nicht suchen
if (currentFolder.value && !debouncedSearch.value) {
combined.unshift({
id: 'go-up',
label: '..',
type: 'up',
parentId: currentFolder.value.parent || null
})
}
return combined
}) })
arraySort(files, (a,b) => { // --- Actions ---
let aVal = a.path ? a.path.split("/")[a.path.split("/").length -1] : null const createFolder = async () => {
let bVal = b.path ? b.path.split("/")[b.path.split("/").length -1] : null await useEntities("folders").create({
parent: currentFolder.value?.id,
name: createFolderData.value.name
})
createFolderModalOpen.value = false
createFolderData.value = { name: '' }
setupPage()
}
if(aVal && bVal) { const openRenameModal = (entry) => {
return aVal.localeCompare(bVal) renameData.value = { id: entry.id, name: entry.label, type: entry.type }
} else if(!aVal && bVal) { renameModalOpen.value = true
return 1 }
const updateName = async () => {
if (!renameData.value.name) return
loadingDocs.value = true
try {
if (renameData.value.type === 'folder') {
await useEntities("folders").update(renameData.value.id, { name: renameData.value.name })
} else { } else {
return -1 const file = documents.value.find(d => d.id === renameData.value.id)
const pathParts = file.path.split('/')
pathParts[pathParts.length - 1] = renameData.value.name
await useEntities("files").update(renameData.value.id, { path: pathParts.join('/') })
} }
}, {reverse: true}) toast.add({ title: 'Umbenannt', color: 'green' })
setupPage()
if(searchString.value.length > 0) { } finally {
files = useSearch(searchString.value, files) renameModalOpen.value = false
loadingDocs.value = false
} }
let folders = currentFolders.value.map(i => {
return {
label: i.name,
id: i.id,
type: "folder"
} }
})
arraySort(folders, "label")
/*folders.sort(function(a, b) {
// Compare the 2 dates
if (a.name < b.name) return -1;
if (a.name > b.name) return 1;
return 0;
});*/
return [...folders,...files]
})
const selectedFileIndex = ref(0)
const showFile = (fileId) => { const showFile = (fileId) => {
modal.open(DocumentDisplayModal, { modal.open(DocumentDisplayModal, {
documentData: documents.value.find(i => i.id === fileId), documentData: documents.value.find(i => i.id === fileId),
onUpdatedNeeded: setupPage() onUpdatedNeeded: () => setupPage()
}) })
} }
const selectedFiles = ref({});
const selectAll = () => {
if(Object.keys(selectedFiles.value).find(i => selectedFiles.value[i] === true)) {
selectedFiles.value = {}
} else {
selectedFiles.value = Object.fromEntries(filteredDocuments.value.map(i => i.id).map(k => [k,true]))
defineShortcuts({
'/': () => document.getElementById("searchinput")?.focus(),
'Enter': {
usingInput: true,
handler: () => {
const entry = renderedFileList.value[selectedFileIndex.value]
if (!entry) return
if (entry.type === "file") showFile(entry.id)
else if (entry.type === "folder") changeFolder(entry)
else if (entry.type === "up") navigateUp()
} }
} },
'arrowdown': () => { if (selectedFileIndex.value < renderedFileList.value.length - 1) selectedFileIndex.value++ },
const clearSearchString = () => { 'arrowup': () => { if (selectedFileIndex.value > 0) selectedFileIndex.value-- }
tempStore.clearSearchString("files") })
searchString.value = ''
}
</script> </script>
<template> <template>
<UDashboardNavbar title="Dateien">
<UDashboardNavbar
title="Dateien"
>
<template #right> <template #right>
<UInput <UInput id="searchinput" v-model="searchString" icon="i-heroicons-magnifying-glass" placeholder="Suche..." class="w-64" />
id="searchinput"
v-model="searchString"
icon="i-heroicons-funnel"
autocomplete="off"
placeholder="Suche..."
class="hidden lg:block"
@keydown.esc="$event.target.blur()"
@change="tempStore.modifySearchString('files',searchString)"
>
<template #trailing>
<UKbd value="/" />
</template>
</UInput>
<UButton
icon="i-heroicons-x-mark"
variant="outline"
color="rose"
@click="clearSearchString()"
v-if="searchString.length > 0"
/>
</template> </template>
</UDashboardNavbar> </UDashboardNavbar>
<UDashboardToolbar>
<UDashboardToolbar class="sticky top-0 z-30 bg-white dark:bg-gray-900 border-b border-gray-200 dark:border-gray-800">
<template #left> <template #left>
<UBreadcrumb <UBreadcrumb :links="breadcrumbLinks" />
:links="breadcrumbLinks"
/>
</template> </template>
<template #right> <template #right>
<USelectMenu <USelectMenu v-model="displayMode" :options="displayModes" value-attribute="key" class="w-32" :ui-menu="{ zIndex: 'z-50' }">
:options="displayModes"
value-attribute="key"
option-attribute="label"
v-model="displayMode"
:ui-menu="{ width: 'min-w-max'}"
>
<template #label> <template #label>
<UIcon class="w-5 h-5" :name="displayModes.find(i => i.key === displayMode).icon"/> <UIcon :name="displayModes.find(i => i.key === displayMode).icon" class="w-4 h-4" />
<span>{{ displayModes.find(i => i.key === displayMode).label }}</span>
</template> </template>
</USelectMenu> </USelectMenu>
<UButtonGroup size="sm">
<UButton icon="i-heroicons-document-plus" color="primary" @click="modal.open(DocumentUploadModal, { fileData: { folder: currentFolder?.id }, onUploadFinished: setupPage })">Datei</UButton>
<UButton icon="i-heroicons-folder-plus" color="white" @click="createFolderModalOpen = true">Ordner</UButton>
</UButtonGroup>
</template>
</UDashboardToolbar>
<UDashboardPanelContent class="p-0 overflow-y-auto">
<div v-if="!loaded" class="p-10 flex justify-center"><UProgress animation="carousel" class="w-1/2" /></div>
<div v-else>
<div v-if="displayMode === 'list'">
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-800">
<thead class="bg-gray-50 dark:bg-gray-800 sticky top-0 z-20">
<tr>
<th class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold sm:pl-6">Name</th>
<th class="px-3 py-3.5 text-left text-sm font-semibold">Erstellt</th>
<th class="relative py-3.5 pl-3 pr-4 sm:pr-6"></th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200 dark:divide-gray-800 bg-white dark:bg-gray-900">
<tr
v-for="(entry, index) in renderedFileList" :key="entry.id"
:draggable="entry.type !== 'up'"
@dragstart="handleDragStart(entry)"
@dragover.prevent
@drop="entry.type === 'folder' ? handleDrop(entry.id) : (entry.type === 'up' ? handleDrop(entry.parentId) : null)"
class="hover:bg-gray-50 dark:hover:bg-gray-800/50 cursor-pointer transition-colors"
:class="{'bg-primary-50 dark:bg-primary-900/10': index === selectedFileIndex}"
@click="entry.type === 'folder' ? changeFolder(entry) : (entry.type === 'up' ? navigateUp() : showFile(entry.id))"
>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
<div class="flex items-center font-medium">
<UIcon
:name="entry.type === 'up' ? 'i-heroicons-arrow-uturn-left' : (entry.type === 'folder' ? 'i-heroicons-folder-solid' : 'i-heroicons-document-text')"
class="h-5 w-5 mr-3"
:class="entry.type === 'up' ? 'text-orange-500' : (entry.type === 'folder' ? 'text-primary-500' : 'text-gray-400')"
/>
{{ entry.label }}
</div>
</td>
<td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
{{ entry.type !== 'up' ? dayjs(entry.createdAt).format("DD.MM.YY") : '-' }}
</td>
<td class="px-3 text-right" @click.stop>
<UDropdown v-if="entry.type !== 'up'" :items="[[{ label: 'Umbenennen', icon: 'i-heroicons-pencil-square', click: () => openRenameModal(entry) }]]">
<UButton color="gray" variant="ghost" icon="i-heroicons-ellipsis-horizontal" />
</UDropdown>
</td>
</tr>
</tbody>
</table>
</div>
<div v-else class="p-6 grid grid-cols-2 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8 gap-4">
<div
v-for="entry in renderedFileList" :key="entry.id"
:draggable="entry.type !== 'up'"
@dragstart="handleDragStart(entry)"
@dragover.prevent
@drop="entry.type === 'folder' ? handleDrop(entry.id) : (entry.type === 'up' ? handleDrop(entry.parentId) : null)"
class="group relative bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-4 flex flex-col items-center hover:border-primary-500 transition-all cursor-pointer"
@click="entry.type === 'folder' ? changeFolder(entry) : (entry.type === 'up' ? navigateUp() : showFile(entry.id))"
>
<UDropdown v-if="entry.type !== 'up'" :items="[[{ label: 'Umbenennen', icon: 'i-heroicons-pencil-square', click: () => openRenameModal(entry) }]]" class="absolute top-1 right-1 opacity-0 group-hover:opacity-100" @click.stop>
<UButton color="gray" variant="ghost" icon="i-heroicons-ellipsis-vertical" size="xs" />
</UDropdown>
<UIcon
:name="entry.type === 'up' ? 'i-heroicons-arrow-uturn-left' : (entry.type === 'folder' ? 'i-heroicons-folder-solid' : 'i-heroicons-document-text')"
class="w-12 h-12 mb-2"
:class="entry.type === 'up' ? 'text-orange-500' : (entry.type === 'folder' ? 'text-primary-500' : 'text-gray-400')"
/>
<span class="text-xs font-medium text-center truncate w-full">{{ entry.label }}</span>
</div>
</div>
</div>
</UDashboardPanelContent>
<UButton
:disabled="!currentFolder"
@click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id, type: currentFolder.standardFiletype, typeEnabled: currentFolder.standardFiletypeIsOptional}, onUploadFinished: () => {setupPage()}})"
>+ Datei</UButton>
<UButton
@click="createFolderModalOpen = true"
variant="outline"
>+ Ordner</UButton>
<UButton
@click="downloadSelected"
icon="i-heroicons-cloud-arrow-down"
variant="outline"
v-if="Object.keys(selectedFiles).find(i => selectedFiles[i] === true)"
>Herunterladen</UButton>
<UModal v-model="createFolderModalOpen"> <UModal v-model="createFolderModalOpen">
<UCard :ui="{ body: { base: 'space-y-4' } }"> <UCard>
<template #header> <template #header><h3 class="font-bold">Ordner erstellen</h3></template>
<div class="flex items-center justify-between"> <UFormGroup label="Name" required><UInput v-model="createFolderData.name" autofocus @keyup.enter="createFolder" /></UFormGroup>
<h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white"> <template #footer><div class="flex justify-end gap-2"><UButton color="gray" @click="createFolderModalOpen = false">Abbrechen</UButton><UButton color="primary" @click="createFolder">Erstellen</UButton></div></template>
Ordner Erstellen
</h3>
<UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="createFolderModalOpen = false" />
</div>
</template>
<UFormGroup label="Name des Ordners" required>
<UInput
v-model="createFolderData.name"
placeholder="z.B. Rechnungen 2024"
autofocus
/>
</UFormGroup>
<UFormGroup
label="Standard Dateityp"
>
<USelectMenu
v-model="createFolderData.standardFiletype"
:options="filetags"
option-attribute="name"
value-attribute="id"
searchable
searchable-placeholder="Typ suchen..."
placeholder="Kein Standard-Typ"
clear-search-on-close
>
<template #label>
<span v-if="createFolderData.standardFiletype">
{{ filetags.find(t => t.id === createFolderData.standardFiletype)?.name }}
</span>
<span v-else class="text-gray-400">Kein Typ ausgewählt</span>
</template>
</USelectMenu>
</UFormGroup>
<div v-if="createFolderData.standardFiletype">
<UCheckbox
v-model="createFolderData.standardFiletypeIsOptional"
name="isOptional"
label="Dateityp ist optional"
help="Wenn deaktiviert, MUSS der Nutzer beim Upload diesen Typ verwenden."
/>
</div>
<template #footer>
<div class="flex justify-end gap-2">
<UButton color="gray" variant="ghost" @click="createFolderModalOpen = false">
Abbrechen
</UButton>
<UButton @click="createFolder" :disabled="!createFolderData.name">
Erstellen
</UButton>
</div>
</template>
</UCard> </UCard>
</UModal> </UModal>
<UModal v-model="renameModalOpen">
<UCard>
<template #header><h3 class="font-bold">Umbenennen</h3></template>
<UFormGroup label="Neuer Name"><UInput v-model="renameData.name" autofocus @keyup.enter="updateName" /></UFormGroup>
<template #footer><div class="flex justify-end gap-2"><UButton color="gray" @click="renameModalOpen = false">Abbrechen</UButton><UButton color="primary" @click="updateName">Speichern</UButton></div></template>
</UCard>
</UModal>
</template> </template>
</UDashboardToolbar>
<div id="drop_zone" class="h-full scrollList" >
<div v-if="loaded">
<UDashboardPanelContent>
<div v-if="displayMode === 'list'">
<table class="w-full">
<thead>
<tr>
<td>
<UCheckbox
v-if="renderedFileList.find(i => i.type === 'file')"
@change="selectAll"
/>
</td>
<td class="font-bold">Name</td>
<td class="font-bold">Erstellt am</td>
</tr>
</thead>
<tr v-for="(entry,index) in renderedFileList">
<td>
<UCheckbox
v-if="entry.type === 'file'"
v-model="selectedFiles[entry.id]"
/>
</td>
<td>
<UIcon class="mr-1" :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
<a
style="cursor: pointer"
:class="[...index === selectedFileIndex ? ['text-primary', 'text-xl'] : ['dark:text-white','text-black','text-xl']]"
@click="entry.type === 'folder' ? changeFolder(currentFolders.find(i => i.id === entry.id)) : showFile(entry.id)"
>{{entry.label}}</a>
</td>
<td>
<span v-if="entry.type === 'file'" class="text-xl">{{dayjs(documents.find(i => i.id === entry.id).createdAt).format("DD.MM.YY HH:mm")}}</span>
<span v-if="entry.type === 'folder'" class="text-xl">{{dayjs(currentFolders.find(i => i.id === entry.id).createdAt).format("DD.MM.YY HH:mm")}}</span>
</td>
</tr>
</table>
</div>
<div v-else-if="displayMode === 'rectangles'">
<div class="flex flex-row w-full flex-wrap" v-if="currentFolders.length > 0">
<a
class="w-1/6 folderIcon flex flex-col p-5 m-2"
v-for="folder in currentFolders"
@click="changeFolder(folder)"
>
<UIcon
name="i-heroicons-folder"
class="w-20 h-20"
/>
<span class="text-center truncate">{{folder.name}}</span>
</a>
</div>
<UDivider class="my-5" v-if="currentFolder">{{currentFolder.name}}</UDivider>
<UDivider class="my-5" v-else>Ablage</UDivider>
<div v-if="!loadingDocs">
<DocumentList
v-if="filteredDocuments.length > 0"
:documents="filteredDocuments"
@selectDocument="(info) => console.log(info)"
/>
<UAlert
v-else
class="mt-5 w-1/2 mx-auto"
icon="i-heroicons-light-bulb"
title="Keine Dokumente vorhanden"
color="primary"
variant="outline"
/>
</div>
<UProgress
animation="carousel"
v-else
class="w-2/3 my-5 mx-auto"
/>
</div>
</UDashboardPanelContent>
</div>
<UProgress animation="carousel" v-else class="w-5/6 mx-auto mt-5"/>
</div>
</template>
<style scoped>
.folderIcon {
border: 1px solid lightgrey;
border-radius: 10px;
color: dimgrey;
}
.folderIcon:hover {
border: 1px solid #69c350;
color: #69c350;
}
tr:nth-child(odd) {
background-color: rgba(0, 0, 0, 0.05);
}
</style>

View File

@@ -56,7 +56,7 @@
> >
<display-open-tasks/> <display-open-tasks/>
</UDashboardCard> </UDashboardCard>
<UDashboardCard <!-- <UDashboardCard
title="Label Test" title="Label Test"
> >
<UButton <UButton
@@ -70,7 +70,7 @@
> >
Label Drucken Label Drucken
</UButton> </UButton>
</UDashboardCard> </UDashboardCard>-->
</UPageGrid> </UPageGrid>
</UDashboardPanelContent> </UDashboardPanelContent>
</template> </template>

View File

@@ -3,10 +3,16 @@ import duration from 'dayjs/plugin/duration'
import relativeTime from 'dayjs/plugin/relativeTime' import relativeTime from 'dayjs/plugin/relativeTime'
import localizedFormat from 'dayjs/plugin/localizedFormat' import localizedFormat from 'dayjs/plugin/localizedFormat'
import 'dayjs/locale/de' import 'dayjs/locale/de'
import quarterOfYear from 'dayjs/plugin/quarterOfYear'
import isSameOrAfter from "dayjs/plugin/isSameOrAfter"
import isSameOrBefore from "dayjs/plugin/isSameOrBefore"
dayjs.extend(duration) dayjs.extend(duration)
dayjs.extend(relativeTime) dayjs.extend(relativeTime)
dayjs.extend(localizedFormat) dayjs.extend(localizedFormat)
dayjs.extend(quarterOfYear)
dayjs.extend(isSameOrAfter)
dayjs.extend(isSameOrBefore)
dayjs.locale('de') dayjs.locale('de')
export default defineNuxtPlugin(() => { export default defineNuxtPlugin(() => {

View File

@@ -0,0 +1,40 @@
import { defineStore } from 'pinia'
export const useCalculatorStore = defineStore('calculator', () => {
const tempStore = useTempStore()
// Initialisierung aus dem TempStore
const isOpen = ref(false)
const display = computed({
get: () => tempStore.settings?.calculator?.display || '0',
set: (val) => tempStore.modifySettings('calculator', { ...tempStore.settings.calculator, display: val })
})
const memory = computed({
get: () => tempStore.settings?.calculator?.memory || 0,
set: (val) => tempStore.modifySettings('calculator', { ...tempStore.settings.calculator, memory: val })
})
const history = computed({
get: () => tempStore.filters?.calculator?.history || [],
set: (val) => tempStore.modifyFilter('calculator', 'history', val)
})
function toggle() {
isOpen.value = !isOpen.value
}
function addHistory(expression: string, result: string) {
const newHistory = [{ expression, result }, ...history.value].slice(0, 10)
history.value = newHistory
}
return {
isOpen,
display,
memory,
history,
toggle,
addHistory
}
})

View File

@@ -2,7 +2,6 @@ import {defineStore} from 'pinia'
// @ts-ignore // @ts-ignore
export const useTempStore = defineStore('temp', () => { export const useTempStore = defineStore('temp', () => {
const auth = useAuthStore() const auth = useAuthStore()
const searchStrings = ref({}) const searchStrings = ref({})
@@ -27,10 +26,10 @@ export const useTempStore = defineStore('temp', () => {
} }
function setStoredTempConfig(config) { function setStoredTempConfig(config) {
searchStrings.value = config.searchStrings searchStrings.value = config.searchStrings || {}
columns.value = config.columns columns.value = config.columns || {}
pages.value = config.pages pages.value = config.pages || {}
settings.value = config.settings settings.value = config.settings || {}
filters.value = config.filters || {} filters.value = config.filters || {}
} }
@@ -46,7 +45,6 @@ export const useTempStore = defineStore('temp', () => {
function modifyFilter(domain, type, input) { function modifyFilter(domain, type, input) {
if (!filters.value[domain]) filters.value[domain] = {} if (!filters.value[domain]) filters.value[domain] = {}
filters.value[domain][type] = input filters.value[domain][type] = input
storeTempConfig() storeTempConfig()
} }
@@ -66,6 +64,15 @@ export const useTempStore = defineStore('temp', () => {
storeTempConfig() storeTempConfig()
} }
// Spezifisch für das Banking-Datum
function modifyBankingPeriod(periodKey, range) {
if (!settings.value['banking']) settings.value['banking'] = {}
settings.value['banking'].periodKey = periodKey
settings.value['banking'].range = range
storeTempConfig()
}
return { return {
setStoredTempConfig, setStoredTempConfig,
@@ -79,8 +86,7 @@ export const useTempStore = defineStore('temp', () => {
modifyPages, modifyPages,
pages, pages,
modifySettings, modifySettings,
modifyBankingPeriod, // Neue Funktion exportiert
settings settings
} }
}) })