src/command/club/protocol/protocolPresenceCommand.ts

@@ -6,5 +6,4 @@ export interface SynchronizeProtocolPresenceCommand {
 export interface ProtocolPresenceCommand {
   memberId: number;
   absent: boolean;
-  excused: boolean;
 }

src/command/club/protocol/protocolPresenceCommandHandler.ts

@@ -74,7 +74,6 @@ export default abstract class ProtocolPresenceCommandHandler {
       .update(protocolPresence)
       .set({
         absent: member.absent,
-        excused: member.excused,
       })
       .where("memberId = :memberId", { memberId: member.memberId })
       .andWhere("protocolId = :protocolId", { protocolId })

src/controller/admin/club/protocolController.ts

@@ -260,9 +260,7 @@ export async function createProtocolPrintoutById(req: Request, res: Response): P
       agenda,
       decisions,
       presence: presence.filter((p) => !p.absent).map((p) => p.member),
-      absent: presence.filter((p) => p.absent).map((p) => ({ ...p.member, excused: p.excused })),
+      absent: presence.filter((p) => p.absent).map((p) => p.member),
-      excused_absent: presence.filter((p) => p.absent && p.excused).map((p) => p.member),
-      unexcused_absent: presence.filter((p) => p.absent && !p.excused).map((p) => p.member),
       votings,
     },
   });
@@ -391,7 +389,6 @@ export async function synchronizeProtocolPrecenseById(req: Request, res: Respons
     members: presence.map((p) => ({
       memberId: p.memberId,
       absent: p.absent,
-      excused: p.excused,
     })),
     protocolId,
   };

src/templates/protocol.body.template.html

@@ -14,19 +14,9 @@
     <br />
     <br />
     <h2>Anwesenheit ({{presence.length}})</h2>
-    <p>
+    <p>{{#each presence}} {{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}} {{/each}}</p>
-      {{#each presence}}{{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}}{{/each}}{{#unless
-      presence.length}}---{{/unless}}
-    </p>
     <h2>Abwesenheit ({{absent.length}})</h2>
-    <p>
+    <p>{{#each absent}} {{this.firstname}} {{this.lastname}}{{#unless @last}}, {{/unless}} {{/each}}</p>
-      entschuldigt: {{#each excused_absent}}{{this.firstname}} {{this.lastname}}{{#unless @last}},
-      {{/unless}}{{/each}}{{#unless excused_absent.length}}---{{/unless}}
-    </p>
-    <p>
-      unentschuldigt: {{#each unexcused_absent}}{{this.firstname}} {{this.lastname}}{{#unless @last}},
-      {{/unless}}{{/each}}{{#unless unexcused_absent.length}}---{{/unless}}
-    </p>
     <br />
     <h2>Agenda</h2>
     {{#each agenda}}