matthias/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sync): add Sachbearbeiter to dienstgrad constraint; add catalog browser dialog for external order position

Browse Source
This commit is contained in:
Matthias Hochmeister
2026-04-15 18:05:39 +02:00
parent 9586822a32
commit 67fd0878ce
5 changed files with 486 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
backend/src/services/member.service.ts
View File

@@ -163,31 +163,57 @@ class MemberService {
}
const whereClause = `WHERE ${conditions.join(' AND ')}`;
const offset = (page - 1) * pageSize;
const fetchAll = pageSize === 0;
const dataQuery = `
SELECT
u.id,
u.name,
u.given_name,
u.family_name,
u.email,
u.profile_picture_url,
u.is_active,
mp.id AS profile_id,
mp.fdisk_standesbuch_nr,
mp.dienstgrad,
mp.funktion,
mp.status,
mp.eintrittsdatum,
mp.telefon_mobil
FROM users u
LEFT JOIN mitglieder_profile mp ON mp.user_id = u.id
${whereClause}
ORDER BY u.family_name ASC NULLS LAST, u.given_name ASC NULLS LAST
LIMIT $${paramIdx} OFFSET $${paramIdx + 1}
`;
values.push(pageSize, offset);
let dataQuery: string;
if (fetchAll) {
dataQuery = `
SELECT
u.id,
u.name,
u.given_name,
u.family_name,
u.email,
u.profile_picture_url,
u.is_active,
mp.id AS profile_id,
mp.fdisk_standesbuch_nr,
mp.dienstgrad,
mp.funktion,
mp.status,
mp.eintrittsdatum,
mp.telefon_mobil
FROM users u
LEFT JOIN mitglieder_profile mp ON mp.user_id = u.id
${whereClause}
ORDER BY u.family_name ASC NULLS LAST, u.given_name ASC NULLS LAST
`;
} else {
const offset = (page - 1) * pageSize;
dataQuery = `
SELECT
u.id,
u.name,
u.given_name,
u.family_name,
u.email,
u.profile_picture_url,
u.is_active,
mp.id AS profile_id,
mp.fdisk_standesbuch_nr,
mp.dienstgrad,
mp.funktion,
mp.status,
mp.eintrittsdatum,
mp.telefon_mobil
FROM users u
LEFT JOIN mitglieder_profile mp ON mp.user_id = u.id
${whereClause}
ORDER BY u.family_name ASC NULLS LAST, u.given_name ASC NULLS LAST
LIMIT $${paramIdx} OFFSET $${paramIdx + 1}
`;
values.push(pageSize, offset);
}
const countQuery = `
SELECT COUNT(*)::INTEGER AS total
@@ -196,9 +222,11 @@ class MemberService {
${whereClause}
`;
const countValues = fetchAll ? values : values.slice(0, values.length - 2);
const [dataResult, countResult] = await Promise.all([
pool.query(dataQuery, values),
pool.query(countQuery, values.slice(0, values.length - 2)), // exclude LIMIT/OFFSET
pool.query(countQuery, countValues),
]);
const items: MemberListItem[] = dataResult.rows.map((row) => ({