torsten/trainingstagebuch
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Added groups to diary

Browse Source
This commit is contained in:
Torsten Schulz
2024-10-21 18:21:43 +02:00
parent 47fa81e190
commit f230b73273
17 changed files with 589 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/controllers/diaryDateActivityController.js
View File

@@ -4,13 +4,14 @@ export const createDiaryDateActivity = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId } = req.params;
const { diaryDateId, activity, duration, durationText, orderId } = req.body;
const { diaryDateId, activity, duration, durationText, orderId, isTimeblock } = req.body;
const activityItem = await diaryDateActivityService.createActivity(userToken, clubId, {
diaryDateId,
activity,
duration,
durationText,
orderId,
isTimeblock,
});
res.status(201).json(activityItem);
} catch (error) {
@@ -23,13 +24,14 @@ export const updateDiaryDateActivity = async (req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId, id } = req.params;
const { predefinedActivityId, customActivityName, duration, durationText, orderId } = req.body;
const { predefinedActivityId, customActivityName, duration, durationText, orderId, groupId } = req.body; // Add groupId
const updatedActivity = await diaryDateActivityService.updateActivity(userToken, clubId, id, {
predefinedActivityId,
customActivityName,
duration,
durationText,
orderId,
groupId, // Pass groupId to the service
});
res.status(200).json(updatedActivity);
} catch (error) {
@@ -68,6 +70,19 @@ export const getDiaryDateActivities = async (req, res) => {
const activities = await diaryDateActivityService.getActivities(userToken, clubId, diaryDateId);
res.status(200).json(activities);
} catch (error) {
console.log(error);
res.status(500).json({ error: 'Error getting activities' });
}
}
export const addGroupActivity = async(req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubId, diaryDateId, groupId, activity } = req.body;
const activityItem = await diaryDateActivityService.addGroupActivity(userToken, clubId, diaryDateId, groupId, activity);
res.status(201).json(activityItem);
} catch (error) {
console.log(error);
res.status(500).json({ error: 'Error adding group activity' });
}
}

29
backend/controllers/groupController.js Normal file
View File

@@ -0,0 +1,29 @@
import HttpError from '../exceptions/HttpError.js';
import groupService from '../services/groupService.js';
const addGroup = async(req, res) => {
try {
const { authcode: userToken } = req.headers;
const { clubid: clubId, dateid: dateId, name, lead } = req.body;
const result = await groupService.addGroup(userToken, clubId, dateId, name, lead);
res.status(201).json(result);
} catch (error) {
console.error('[addGroup] - Error:', error);
console.log(req.params, req.headers, req.body)
res.status(error.statusCode || 500).json({ error: error.message });
}
}
const getGroups = async(req, res) => {
try {
const { clubId, dateId } = req.params;
const { authcode: userToken } = req.headers;
const result = await groupService.getGroups(userToken, clubId, dateId);
res.status(200).json(result);
} catch (error) {
console.error('[getGroups] - Error:', error);
res.status(error.statusCode || 500).json({ error: error.message });
}
}
export { addGroup, getGroups };