From d451ba494c8659c5facc5743c1ea257e6c4db9e5 Mon Sep 17 00:00:00 2001 From: Torsten Schulz Date: Thu, 24 Oct 2024 13:01:00 +0200 Subject: [PATCH] Fixed birthdate output --- backend/controllers/memberController.js | 1 + backend/services/memberService.js | 6 +++--- frontend/src/views/MembersView.vue | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/controllers/memberController.js b/backend/controllers/memberController.js index 349e52c..9e364d0 100644 --- a/backend/controllers/memberController.js +++ b/backend/controllers/memberController.js @@ -7,6 +7,7 @@ const getClubMembers = async(req, res) => { if (showAll === null) { showAll = false; } + console.log('-------------- clubid:', clubId); res.status(200).json(await MemberService.getClubMembers(userToken, clubId, showAll)); } catch(error) { console.log('[getClubMembers] - Error: ', error); diff --git a/backend/services/memberService.js b/backend/services/memberService.js index c7b8132..ee3728f 100644 --- a/backend/services/memberService.js +++ b/backend/services/memberService.js @@ -22,9 +22,9 @@ class MemberService { }); } - getClubMembers(userToken, clubId, showAll) { + async getClubMembers(userToken, clubId, showAll) { console.log('[getClubMembers] - Check access'); - checkAccess(userToken, clubId); + await checkAccess(userToken, clubId); console.log('[getClubMembers] - Find members'); const where = { clubId: clubId @@ -32,7 +32,7 @@ class MemberService { if (!showAll || showAll === 'false') { where['active'] = true; } - return Member.findAll({ where }) + return await Member.findAll({ where }) .then(members => { return members.map(member => { const imagePath = path.join('images', 'members', `${member.id}.jpg`); diff --git a/frontend/src/views/MembersView.vue b/frontend/src/views/MembersView.vue index c390c1b..22644bf 100644 --- a/frontend/src/views/MembersView.vue +++ b/frontend/src/views/MembersView.vue @@ -56,7 +56,7 @@ {{ member.lastName }}, {{ member.firstName }} {{ member.street }}, {{ member.city }} - {{ member.birthDate }} + {{ getFormattedBirthdate(member.birthDate) }} {{ member.phone }} {{ member.email }} @@ -303,6 +303,10 @@ export default { pdfGenerator.addPhoneList(activeMembers); pdfGenerator.save('Telefonliste.pdf'); }, + getFormattedBirthdate(birthDate) { + const date = new Date(birthDate); + return `${String(date.getDate()).padStart(2, '0')}.${String(date.getMonth() + 1).padStart(2, '0')}.${date.getFullYear()}`; + } } }