Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 10 Pull requests Projects Releases 6 Packages Wiki Activity Actions

feature/#40-protocol-presence-status #44

Merged
jkeffects merged 3 commits from feature/#40-protocol-presence-status into develop 2025-01-19 12:46:47 +00:00
Conversation 0 Commits 3 Files changed 9 +5 -1
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b5509ba162 - Show all commits

1
src/command/club/protocol/protocolPresenceCommand.ts
View file

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

1
src/command/club/protocol/protocolPresenceCommandHandler.ts
View file

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

4
src/controller/admin/club/protocolController.ts
View file

@ -260,7 +260,8 @@ 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_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,
},
});
@ -389,6 +390,7 @@ export async function synchronizeProtocolPrecenseById(req: Request, res: Respons
members: presence.map((p) => ({
memberId: p.memberId,
absent: p.absent,
excused: p.excused,
})),
protocolId,
};