diff --git a/src/controller/admin/protocolController.ts b/src/controller/admin/protocolController.ts index 5af549b..32e1016 100644 --- a/src/controller/admin/protocolController.ts +++ b/src/controller/admin/protocolController.ts @@ -247,14 +247,8 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P month: "2-digit", year: "numeric", }), - start: new Date(protocol.starttime).toLocaleTimeString("de-DE", { - minute: "2-digit", - hour: "2-digit", - }), - end: new Date(protocol.endtime).toLocaleTimeString("de-DE", { - minute: "2-digit", - hour: "2-digit", - }), + start: protocol.starttime, + end: protocol.endtime, agenda, decisions, presence: presence.map((p) => p.member), diff --git a/src/entity/protocol.ts b/src/entity/protocol.ts index c82dd88..b218164 100644 --- a/src/entity/protocol.ts +++ b/src/entity/protocol.ts @@ -11,10 +11,10 @@ export class protocol { @Column({ type: "date" }) date: Date; - @Column({ type: "timestamp", nullable: true }) + @Column({ type: "time", nullable: true }) starttime: Date; - @Column({ type: "timestamp", nullable: true }) + @Column({ type: "time", nullable: true }) endtime: Date; @Column({ type: "text", nullable: true }) diff --git a/src/migrations/1729347911107-protocol.ts b/src/migrations/1729347911107-protocol.ts index 8a65a15..57c51cf 100644 --- a/src/migrations/1729347911107-protocol.ts +++ b/src/migrations/1729347911107-protocol.ts @@ -14,8 +14,8 @@ export class Protocol1729347911107 implements MigrationInterface { { name: "id", type: variableType_int, isPrimary: true, isGenerated: true, generationStrategy: "increment" }, { name: "title", type: "varchar", length: "255", isNullable: false }, { name: "date", type: "date", isNullable: false }, - { name: "starttime", type: "timestamp", isNullable: true }, - { name: "endtime", type: "timestamp", isNullable: true }, + { name: "starttime", type: "time", isNullable: true }, + { name: "endtime", type: "time", isNullable: true }, { name: "summary", type: "text", isNullable: true }, ], }), diff --git a/src/templates/protocol.template.html b/src/templates/protocol.template.html index 4a49c61..98a2a21 100644 --- a/src/templates/protocol.template.html +++ b/src/templates/protocol.template.html @@ -9,33 +9,60 @@

Am {{date}} von {{start}} Uhr bis {{end}} Uhr

Ausdruck Nr {{iteration}}


+

Zusammenfassung:

{{{summary}}}

-

Anwesenheit

+
+
+

Anwesenheit ({{presence.length}})

+

Agenda

- + {{#each agenda}} +
+

{{this.topic}}

+ {{{this.context}}} +
+ {{/each}} +

Entscheidungen

- -

Abstimmungen - (für|enthalten|gegen)

- + {{#each decisions}} +
+

{{this.topic}}

+ {{{this.context}}} +
+ {{/each}} +
+

Abstimmungen

+ {{#each votings}} +
+

{{this.topic}}

+

Ergebnis: dafür: {{this.favour}} | enthalten: {{this.abstain}} | dagegen: {{this.against}}

+ {{{this.context}}} +
+ {{/each}} +