From 01bbb85485e22709250c4309cabf51fb94fceec5 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Thu, 16 Oct 2025 22:20:51 +0200 Subject: [PATCH] Enhance diary member activity management by adding validation and logging in addMembersToActivity function. Implement checks for participantIds to ensure they are an array, and log relevant information for better debugging. Update DiaryDateActivityService to improve error handling and logging for group activity associations. Modify frontend DiaryView to support group activity member assignment, including new methods for toggling and assigning members to group activities, enhancing user experience and functionality. --- .../diaryMemberActivityController.js | 26 +++- backend/services/diaryDateActivityService.js | 14 +- backend/services/schedulerService.js | 2 +- frontend/public/site.webmanifest | 20 ++- frontend/src/views/DiaryView.vue | 134 +++++++++++++++++- 5 files changed, 190 insertions(+), 6 deletions(-) diff --git a/backend/controllers/diaryMemberActivityController.js b/backend/controllers/diaryMemberActivityController.js index b47a3bd..41269fd 100644 --- a/backend/controllers/diaryMemberActivityController.js +++ b/backend/controllers/diaryMemberActivityController.js @@ -19,20 +19,44 @@ export const addMembersToActivity = async (req, res) => { const { authcode: userToken } = req.headers; const { clubId, diaryDateActivityId } = req.params; const { participantIds } = req.body; // array of participant ids + + console.log('[addMembersToActivity] Request:', { + clubId, + diaryDateActivityId, + participantIds, + bodyKeys: Object.keys(req.body) + }); + await checkAccess(userToken, clubId); + + if (!participantIds || !Array.isArray(participantIds)) { + console.error('[addMembersToActivity] Invalid participantIds:', participantIds); + return res.status(400).json({ error: 'participantIds must be an array' }); + } + const validParticipants = await Participant.findAll({ where: { id: participantIds } }); + console.log('[addMembersToActivity] Valid participants found:', validParticipants.length); + const validIds = new Set(validParticipants.map(p => p.id)); const created = []; for (const pid of participantIds) { - if (!validIds.has(pid)) continue; + if (!validIds.has(pid)) { + console.log('[addMembersToActivity] Participant not found:', pid); + continue; + } const existing = await DiaryMemberActivity.findOne({ where: { diaryDateActivityId, participantId: pid } }); if (!existing) { const rec = await DiaryMemberActivity.create({ diaryDateActivityId, participantId: pid }); + console.log('[addMembersToActivity] Created:', rec.id); created.push(rec); + } else { + console.log('[addMembersToActivity] Already exists:', pid); } } + console.log('[addMembersToActivity] Success, created:', created.length); res.status(201).json(created); } catch (e) { + console.error('[addMembersToActivity] Error:', e); res.status(500).json({ error: 'Error adding members to activity' }); } }; diff --git a/backend/services/diaryDateActivityService.js b/backend/services/diaryDateActivityService.js index e0b0f64..d63aa9a 100644 --- a/backend/services/diaryDateActivityService.js +++ b/backend/services/diaryDateActivityService.js @@ -246,8 +246,20 @@ class DiaryDateActivityService { throw new Error('Activity not found'); } const group = await Group.findByPk(groupId); - if (!group || group.diaryDateId !== diaryDateActivity.diaryDateId) { + if (!group) { + console.error('[DiaryDateActivityService::addGroupActivity] Group not found:', groupId); + throw new Error('Group not found'); + } + + console.log('[DiaryDateActivityService::addGroupActivity] Group found:', { + groupId: group.id, + groupDiaryDateId: group.diaryDateId, + activityDiaryDateId: diaryDateActivity.diaryDateId + }); + + if (group.diaryDateId !== diaryDateActivity.diaryDateId) { console.error('[DiaryDateActivityService::addGroupActivity] Group and date don\'t fit'); + console.error('Group diaryDateId:', group.diaryDateId, 'Activity diaryDateId:', diaryDateActivity.diaryDateId); throw new Error('Group isn\'t related to date'); } const [predefinedActivity, created] = await PredefinedActivity.findOrCreate({ diff --git a/backend/services/schedulerService.js b/backend/services/schedulerService.js index 59d4c13..ddc7bd9 100644 --- a/backend/services/schedulerService.js +++ b/backend/services/schedulerService.js @@ -17,7 +17,7 @@ class SchedulerService { devLog('Scheduler is already running'); return; } - + devLog('Starting scheduler service...'); // Schedule automatic rating updates at 6:00 AM daily diff --git a/frontend/public/site.webmanifest b/frontend/public/site.webmanifest index 45dc8a2..b0a97a9 100644 --- a/frontend/public/site.webmanifest +++ b/frontend/public/site.webmanifest @@ -1 +1,19 @@ -{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file +{ + "name": "Trainingstagebuch", + "short_name": "TT-Tagebuch", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#2c3e50", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue index f37a517..7159064 100644 --- a/frontend/src/views/DiaryView.vue +++ b/frontend/src/views/DiaryView.vue @@ -144,7 +144,7 @@ item.durationText }}) -
{{ groupItem.groupsGroupActivity.name }} - + + +
+
+ Teilnehmer zuordnen + + +
+ +
+ +
+
+ @@ -518,6 +549,8 @@ export default { activityMembersMap: {}, // key: activityId, value: Set(participantIds) activityGroupsMap: {}, // key: activityId, value: groupId memberGroupsMap: {}, // key: memberId, value: groupId + groupActivityMembersOpenId: null, + groupActivityMembersMap: {}, // key: groupActivityId, value: Set(participantIds) // Schnell hinzufügen Dialog showQuickAddDialog: false, newMember: { @@ -1796,6 +1829,103 @@ export default { } }, + // Group Activity Members Methods + async toggleGroupActivityMembers(groupItem) { + if (this.groupActivityMembersOpenId === groupItem.id) { + this.groupActivityMembersOpenId = null; + return; + } + this.groupActivityMembersOpenId = groupItem.id; + await this.ensureGroupActivityMembersLoaded(groupItem.id); + }, + + async ensureGroupActivityMembersLoaded(groupActivityId) { + if (this.groupActivityMembersMap[groupActivityId]) return; + try { + const r = await apiClient.get(`/diary-member-activities/${this.currentClub}/${groupActivityId}`); + const setIds = new Set(r.data.map(x => x.participantId)); + this.$set ? this.$set(this.groupActivityMembersMap, groupActivityId, setIds) : (this.groupActivityMembersMap[groupActivityId] = setIds); + } catch (e) { + this.groupActivityMembersMap[groupActivityId] = new Set(); + } + }, + + isAssignedToGroupActivity(groupActivityId, memberId) { + const participantId = this.participantIdForMember(memberId); + const setIds = this.groupActivityMembersMap[groupActivityId]; + return setIds ? setIds.has(participantId) : false; + }, + + async toggleMemberForGroupActivity(groupActivityId, memberId, checked) { + let participantId = this.participantIdForMember(memberId); + try { + if (checked) { + // Falls Mitglied noch kein Participant ist: zuerst hinzufügen + if (!participantId) { + const created = await apiClient.post('/participants/add', { + diaryDateId: this.date.id, + memberId: memberId, + }); + participantId = created.data.id; + if (!this.participantMapByMemberId) this.participantMapByMemberId = {}; + this.participantMapByMemberId[memberId] = participantId; + if (!this.participants.includes(memberId)) this.participants.push(memberId); + } + // Zuordnung erstellen + await apiClient.post(`/diary-member-activities/${this.currentClub}/${groupActivityId}`, { + participantIds: [participantId], + }); + const setIds = this.groupActivityMembersMap[groupActivityId] || new Set(); + setIds.add(participantId); + this.$set ? this.$set(this.groupActivityMembersMap, groupActivityId, setIds) : (this.groupActivityMembersMap[groupActivityId] = setIds); + } else { + // Zuordnung entfernen + await apiClient.delete(`/diary-member-activities/${this.currentClub}/${groupActivityId}/${participantId}`); + const setIds = this.groupActivityMembersMap[groupActivityId]; + if (setIds) { + setIds.delete(participantId); + } + } + } catch (error) { + console.error('Fehler beim Zuordnen des Teilnehmers zu Gruppen-Aktivität:', error); + this.showInfo('Fehler', 'Teilnehmer konnte nicht zugeordnet werden.', '', 'error'); + } + }, + + async assignAllMembersToGroupActivity(groupActivityId) { + try { + // Alle anwesenden Mitglieder zur Gruppen-Aktivität hinzufügen + for (const member of this.presentMembers) { + if (!this.isAssignedToGroupActivity(groupActivityId, member.id)) { + await this.toggleMemberForGroupActivity(groupActivityId, member.id, true); + } + } + } catch (error) { + console.error('Fehler beim Zuordnen aller Teilnehmer:', error); + this.showInfo('Fehler', 'Fehler beim Zuordnen aller Teilnehmer', '', 'error'); + } + }, + + async assignGroupToGroupActivity(groupActivityId, groupId) { + if (!groupId) return; // Leere Auswahl ignorieren + + try { + // Alle Mitglieder der gewählten Gruppe zur Gruppen-Aktivität hinzufügen + const groupMembers = this.presentMembers.filter(member => + this.getMemberGroup(member.id) === groupId + ); + + for (const member of groupMembers) { + if (!this.isAssignedToGroupActivity(groupActivityId, member.id)) { + await this.toggleMemberForGroupActivity(groupActivityId, member.id, true); + } + } + } catch (error) { + console.error('Fehler beim Zuordnen der Gruppe:', error); + this.showInfo('Fehler', 'Fehler beim Zuordnen der Gruppe', '', 'error'); + } + }, + // Gruppenzuordnung für Teilnehmer getMemberGroup(memberId) { return this.memberGroupsMap[memberId] || '';