Merge pull request 'feature/#33-print-member' (#75) from feature/#33-print-member into develop

Reviewed-on: #75
This commit is contained in:
Julian Krauser 2025-03-18 09:27:23 +00:00
commit e2a916f37d
9 changed files with 341 additions and 3 deletions

View file

@ -118,6 +118,45 @@ export async function getMemberStatisticsById(req: Request, res: Response): Prom
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: {
today: new Date(),
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
* @param req {Request} Express req object

View file

@ -47,6 +47,7 @@ import { salutation } from "./entity/configuration/salutation";
import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase";
import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema";
import { MemberPrintoutTemplates1742207245862 } from "./migrations/1742207245862-memberPrintoutTemplates";
const dataSource = new DataSource({
type: DB_TYPE as any,
@ -100,7 +101,7 @@ const dataSource = new DataSource({
webapi,
webapiPermission,
],
migrations: [BackupAndResetDatabase1738166124200, CreateSchema1738166167472],
migrations: [BackupAndResetDatabase1738166124200, CreateSchema1738166167472, MemberPrintoutTemplates1742207245862],
migrationsRun: true,
migrationsTransactionMode: "each",
subscribers: [],

138
src/demodata/member.data.ts Normal file
View file

@ -0,0 +1,138 @@
import { communication } from "../entity/club/member/communication";
import { member } from "../entity/club/member/member";
import { memberAwards } from "../entity/club/member/memberAwards";
import { memberExecutivePositions } from "../entity/club/member/memberExecutivePositions";
import { memberQualifications } from "../entity/club/member/memberQualifications";
import { membership } from "../entity/club/member/membership";
export const memberDemoData: {
member: Partial<member>;
today: string;
memberships: Array<Partial<membership>>;
awards: Array<Partial<memberAwards>>;
qualifications: Array<Partial<memberQualifications>>;
positions: Array<Partial<memberExecutivePositions>>;
communications: Array<Partial<communication>>;
} = {
today: "Montag, 17.03.2025",
member: {
id: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
firstname: "Julian",
lastname: "Krauser",
nameaffix: "",
//@ts-ignore
birthdate: "2003-09-20",
internalId: "1312",
salutationId: 47,
salutation: { id: 47, salutation: "Herr", members: [] },
firstMembershipEntry: {
id: 8681,
//@ts-ignore
start: "2017-11-13",
end: null,
terminationReason: null,
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
statusId: 34,
status: { id: 34, status: "aktiv", memberships: [] },
//@ts-ignore
member: {},
},
lastMembershipEntry: {
id: 8681,
//@ts-ignore
start: "2017-11-13",
end: null,
terminationReason: null,
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
statusId: 34,
status: { id: 34, status: "aktiv", memberships: [] },
//@ts-ignore
member: {},
},
preferredCommunication: [
{
id: 7031,
preferred: true,
isSMSAlarming: false,
isSendNewsletter: true,
mobile: "",
email: "julian.krauser@jk-effects.com",
postalCode: "",
city: "",
street: "",
streetNumber: 0,
streetNumberAddition: "",
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
typeId: 46,
type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
// @ts-ignore
member: {},
},
],
smsAlarming: [],
sendNewsletter: {
id: 7031,
preferred: true,
isSMSAlarming: false,
isSendNewsletter: true,
mobile: "",
email: "julian.krauser@jk-effects.com ",
postalCode: "",
city: "",
street: "",
streetNumber: 0,
streetNumberAddition: "",
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
typeId: 46,
type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
// @ts-ignore
member: {},
},
},
memberships: [
{
id: 8681,
//@ts-ignore
start: "2017-11-13",
end: null,
terminationReason: null,
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
statusId: 34,
status: { id: 34, status: "aktiv", memberships: [] },
},
],
awards: [],
qualifications: [],
positions: [
{
id: 696,
note: "",
//@ts-ignore
start: "2025-01-06",
end: null,
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
executivePositionId: 192,
executivePosition: { id: 192, position: "Schriftführer", members: [] },
},
],
communications: [
{
id: 7031,
preferred: true,
isSMSAlarming: false,
isSendNewsletter: true,
mobile: "",
email: "julian.krauser@jk-effects.com",
postalCode: "",
city: "",
street: "",
streetNumber: 0,
streetNumberAddition: "",
memberId: "2fe205f8-8ae8-4218-839f-af3456d3f39d",
typeId: 46,
//@ts-ignore
member: {},
type: { id: 46, type: "Email", useColumns: ["email"], communications: [] },
},
],
};

View file

@ -1,10 +1,11 @@
import { newsletterDemoData } from "../demodata/newsletter.data";
import { protocolDemoData } from "../demodata/protocol.data";
import { PermissionModule } from "../type/permissionTypes";
import {memberlistDemoData} from "../demodata/member.list.data";
import { memberlistDemoData } from "../demodata/member.list.data";
import { memberDemoData } from "../demodata/member.data";
export abstract class DemoDataHelper {
static getData(scope: `${PermissionModule}`|`${PermissionModule}.${string}`) {
static getData(scope: `${PermissionModule}` | `${PermissionModule}.${string}`) {
switch (scope) {
case "protocol":
return protocolDemoData;
@ -12,6 +13,8 @@ export abstract class DemoDataHelper {
return newsletterDemoData;
case "member.list":
return memberlistDemoData;
case "member":
return memberDemoData;
default:
return {};
}

View file

@ -4,6 +4,33 @@ import TemplateUsageService from "../service/configuration/templateUsageService"
import Handlebars, { template } from "handlebars";
import { FileSystemHelper } from "./fileSystemHelper";
Handlebars.registerHelper("date", function (aString) {
return new Date(aString).toLocaleDateString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
});
});
Handlebars.registerHelper("longdate", function (aString) {
return new Date(aString).toLocaleDateString("de-DE", {
weekday: "long",
day: "2-digit",
month: "2-digit",
year: "numeric",
});
});
Handlebars.registerHelper("datetime", function (aString) {
return new Date(aString).toLocaleDateString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour: "2-digit",
minute: "2-digit",
});
});
export abstract class TemplateHelper {
static getTemplateFromFile(template: string) {
return FileSystemHelper.readTemplateFile(`/src/templates/${template}.template.html`);

View file

@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { templateUsage } from "../entity/configuration/templateUsage";
export class MemberPrintoutTemplates1742207245862 implements MigrationInterface {
name = "MemberPrintoutTemplates1742207245862";
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.manager
.createQueryBuilder()
.insert()
.into(templateUsage)
.values([{ scope: "member" }])
.orUpdate(["headerId", "bodyId", "footerId", "headerHeight", "footerHeight"], ["scope"])
.execute();
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.manager.createQueryBuilder().delete().from(templateUsage).where({ scope: "member" }).execute();
}
}

View file

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

View file

@ -0,0 +1,102 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Mitglied</title>
</head>
<body>
<h1>
{{member.salutation.salutation}} {{member.lastname}}, {{member.firstname}}{{#if member.nameaffix}} -
{{member.nameaffix}}{{/if}}
</h1>
<p>Mitglieds-Ausdruck Stand {{longdate today}}</p>
<br />
<p>geboren: {{date member.birthdate}}</p>
<p>eingetreten: {{date member.firstMembershipEntry.start}}</p>
{{#if member.lastMembershipEntry?.end}}
<p>ausgetreten: {{date member.lastMembershipEntry.end}}</p>
{{/if}} {{#if memberships.length}}
<br />
<h2>Mitgliedschaften</h2>
{{#each memberships}}
<div>
<h3>{{this.status.status}}: {{date this.start}} bis {{#if this.end}}{{date this.end}}{{else}}heute{{/if}}</h3>
{{#if this.terminationReason}}
<p>beendet, weil:{{this.terminationReason}}</p>
{{/if}}
</div>
<br />
{{/each}} {{/if}} {{#if positions.length}}
<br />
<h2>Vereinsämter</h2>
{{#each positions}}
<div>
<h3>
{{this.executivePosition.position}}: {{date this.start}} bis {{#if this.end}}{{date
this.end}}{{else}}heute{{/if}}
</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}}: {{date 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}}: {{date this.date}}</h3>
{{#if this.terminationReason}}
<p>beendet, weil:{{this.terminationReason}}</p>
{{/if}} {{#if this.note}}
<p>Notiz: {{this.note}}</p>
{{/if}}
</div>
<br />
{{/each}} {{/if}}
</body>
<style>
h2,
h3,
p,
span,
ul,
li {
padding: 0;
margin: 0;
}
h1,
h2 {
color: #990b00;
}
h2 {
margin-bottom: 5px;
}
table,
th,
td {
border: 1px solid black;
border-collapse: collapse;
text-align: start;
}
</style>
</html>

View file

@ -0,0 +1,3 @@
<div style="font-size: 10px; text-align: center; width: 100%; color: #888">
Seite <span class="pageNumber"></span> von <span class="totalPages"></span>
</div>