diff --git a/backend/controllers/memberController.js b/backend/controllers/memberController.js index 40a0833..732384f 100644 --- a/backend/controllers/memberController.js +++ b/backend/controllers/memberController.js @@ -29,11 +29,11 @@ const getWaitingApprovals = async(req, res) => { } } -const setClubMembers = async(req, res) => { - const { id: memberId, firstname: firstName, lastname: lastName, street, city, birthdate, phone, email} = req.body; +const setClubMembers = async (req, res) => { + const { id: memberId, firstname: firstName, lastname: lastName, street, city, birthdate, phone, email, active } = req.body; const { id: clubId } = req.params; const { authcode: userToken } = req.headers; - const addResult = await MemberService.setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, birthdate, phone, email); + const addResult = await MemberService.setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, birthdate, phone, email, active); res.status(addResult.status || 500).json(addResult.response); } diff --git a/backend/services/memberService.js b/backend/services/memberService.js index 2f82f2c..1325915 100644 --- a/backend/services/memberService.js +++ b/backend/services/memberService.js @@ -30,7 +30,7 @@ class MemberService { return members; } - async setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, birthdate, phone, email) { + async setClubMember(userToken, clubId, memberId, firstName, lastName, street, city, birthdate, phone, email, active = true) { try { console.log('[setClubMembers] - Check access'); await checkAccess(userToken, clubId); @@ -38,7 +38,7 @@ class MemberService { let member = null; console.log('[setClubMembers] - load member if possible'); if (memberId) { - member = await Member.findOne({ where: { id: memberId }}); + member = await Member.findOne({ where: { id: memberId } }); } console.log('[setClubMembers] - set member'); if (member) { @@ -49,6 +49,7 @@ class MemberService { member.birthDate = birthdate; member.phone = phone; member.email = email; + member.active = active; // Active status setzen await member.save(); } else { await Member.create({ @@ -60,6 +61,7 @@ class MemberService { phone: phone, email: email, clubId: clubId, + active: active // Active status setzen }); } console.log('[setClubMembers] - load club members'); diff --git a/frontend/src/views/MembersView.vue b/frontend/src/views/MembersView.vue index f15e688..3ecd886 100644 --- a/frontend/src/views/MembersView.vue +++ b/frontend/src/views/MembersView.vue @@ -3,8 +3,9 @@