patches v1.3.3 #78

Merged
jkeffects merged 13 commits from develop into main 2025-03-21 09:48:00 +00:00
3 changed files with 99 additions and 6 deletions
Showing only changes of commit 2f72cc3925 - Show all commits

View file

@ -118,6 +118,44 @@ export async function getMemberStatisticsById(req: Request, res: Response): Prom
res.json(MemberFactory.mapToMemberStatistic(member)); res.json(MemberFactory.mapToMemberStatistic(member));
} }
/**
* @description get member printout by id
* @param req {Request} Express req object
* @param res {Response} Express res object
* @returns {Promise<*>}
*/
export async function getMemberPrintoutById(req: Request, res: Response): Promise<any> {
const memberId = req.params.id;
let member = await MemberService.getById(memberId);
let memberships = await MembershipService.getAll(memberId);
let awards = await MemberAwardService.getAll(memberId);
let qualifications = await MemberQualificationService.getAll(memberId);
let positions = await MemberExecutivePositionService.getAll(memberId);
let communications = await CommunicationService.getAll(memberId);
let pdf = await PdfExport.renderFile({
title: "Mitglieder-Ausdruck",
template: "member",
saveToDisk: false,
data: {
member,
memberships,
awards,
qualifications,
positions,
communications,
},
});
let pdfbuffer = Buffer.from(pdf);
res.setHeader("Content-Type", "application/pdf");
res.setHeader("Content-Length", pdfbuffer.byteLength);
res.setHeader("Content-Disposition", "inline; filename=preview.pdf");
res.send(pdfbuffer);
}
/** /**
* @description get memberships by member * @description get memberships by member
* @param req {Request} Express req object * @param req {Request} Express req object

View file

@ -21,6 +21,7 @@ import {
getExecutivePositionByMemberAndRecord, getExecutivePositionByMemberAndRecord,
getExecutivePositionsByMember, getExecutivePositionsByMember,
getMemberById, getMemberById,
getMemberPrintoutById,
getMembersByIds, getMembersByIds,
getMembershipByMemberAndRecord, getMembershipByMemberAndRecord,
getMembershipsByMember, getMembershipsByMember,
@ -55,6 +56,10 @@ router.get("/:id/statistics", async (req: Request, res: Response) => {
await getMemberStatisticsById(req, res); await getMemberStatisticsById(req, res);
}); });
router.get("/:id/print", async (req: Request, res: Response) => {
await getMemberPrintoutById(req, res);
});
router.get("/print/namelist", async (req: Request, res: Response) => { router.get("/print/namelist", async (req: Request, res: Response) => {
await createMemberPrintoutList(req, res); await createMemberPrintoutList(req, res);
}); });

View file

@ -5,18 +5,68 @@
<title>Mitglied</title> <title>Mitglied</title>
</head> </head>
<body> <body>
<h1>{{member.lastname}} {{member.firstname}}{{#if member.nameaffix}} - {{member.nameaffix}}{{/if}}</h1> <h1>
{{member.salutation}} {{member.lastname}} {{member.firstname}}{{#if member.nameaffix}} -
{{member.nameaffix}}{{/if}}
</h1>
<p>Mitglieds-Ausdruck Stand {{today}}</p> <p>Mitglieds-Ausdruck Stand {{today}}</p>
<br /> <br />
<h2>Agenda</h2> <p>geboren: {{member.birthdate}}</p>
{{#each ---}} <p>eingetreten: {{member.firstMembershipEntry.start}}</p>
{{#if member.lastMembershipEntry}}
<p>ausgetreten: {{member.lastMembershipEntry.end}}</p>
{{/if}} {{#if memberships.length}}
<br />
<h2>Mitgliedschaften</h2>
{{#each memberships}}
<div> <div>
<h3></h3> <h3>{{this.status.status}}: {{this.start}} - {{this.end ?? 'heute'}}</h3>
<span></span> {{#if this.terminationReason}}
<p>beendet, weil:{{this.terminationReason}}</p>
{{/if}}
</div> </div>
<br /> <br />
{{/each}} {{/each}} {{/if}} {{#if memberships.length}}
<br />
<h2>Vereinsämter</h2>
{{#each positions}}
<div>
<h3>{{this.executivePosition.position}}: {{this.start}} - {{this.end ?? 'heute'}}</h3>
{{#if this.note}}
<p>Notiz: {{this.note}}</p>
{{/if}}
</div>
<br />
{{/each}} {{/if}} {{#if awards.length}}
<br />
<h2>Auszeichnungen</h2>
{{#each awards}}
<div>
<h3>{{this.award.award}}: {{this.date}}</h3>
{{#if this.given}}
<p>wurde vergeben</p>
{{else}}
<p>wurde verwehrt / zurückgewiesen</p>
{{/if}} {{#if this.note}}
<p>Notiz: {{this.note}}</p>
{{/if}}
</div>
<br />
{{/each}} {{/if}} {{#if qualifications.length}}
<br />
<h2>Qualifikationen</h2>
{{#each qualifications}}
<div>
<h3>{{this.qualification.qualification}}: {{this.date}}</h3>
{{#if this.terminationReason}}
<p>beendet, weil:{{this.terminationReason}}</p>
{{/if}} {{/if}} {{#if this.note}}
<p>Notiz: {{this.note}}</p>
{{/if}}
</div>
<br />
{{/each}} {{/if}}
</body> </body>
<style> <style>
h2, h2,