diff --git a/backend/services/activities.js b/backend/services/activities.js index 2ea9715..c6562f3 100644 --- a/backend/services/activities.js +++ b/backend/services/activities.js @@ -146,11 +146,11 @@ serviceRouter.get('/activities/all/:plant_id', function(request, response) { serviceRouter.delete('/activities/:id', function(request, response) { console.log('Service activities: Client requested deletion of activity, id=' + request.params.id); - const plantsDaoInstance = new plantsDao(request.app.locals.dbConnection); + const activitiesDaoInstance = new activitiesDao(request.app.locals.dbConnection); try { - if (plantsDaoInstance.exists(request.params.id)) { - plantsDaoInstance.delete(request.params.id); + if (activitiesDaoInstance.exists(request.params.id)) { + activitiesDaoInstance.delete(request.params.id); console.log('Service activities: Deletion of activity successfull, id=' + request.params.id); response.status(200).json({ 'fehler': false, 'nachricht': 'Activity deleted' }); } else { diff --git a/frontend/public/css/style.css b/frontend/public/css/style.css index 7f35275..8ba31f8 100644 --- a/frontend/public/css/style.css +++ b/frontend/public/css/style.css @@ -55,8 +55,7 @@ main { backdrop-filter: blur(10px); } -.btn-delete-plant:hover { - background-color: rgba(255, 255, 255, 0.5); +.text-red-hover:hover { color: red; } diff --git a/frontend/public/detailseite_pflanze.html b/frontend/public/detailseite_pflanze.html index 87aef9d..de3a125 100644 --- a/frontend/public/detailseite_pflanze.html +++ b/frontend/public/detailseite_pflanze.html @@ -63,16 +63,16 @@
- -
+

Loading...
Lade Pflanze -

+

-

diff --git a/frontend/public/js/detailseite_pflanze.mjs b/frontend/public/js/detailseite_pflanze.mjs index 4636a84..9b5a729 100644 --- a/frontend/public/js/detailseite_pflanze.mjs +++ b/frontend/public/js/detailseite_pflanze.mjs @@ -59,27 +59,27 @@ async function reloadActivities(plantId) { // Display fetched activities to the user for (const activity of activities) { - let createdActivityCard = await createActivityCard(activity.type, activity.date, activity.days_since); + let createdActivityCard = await createActivityCard(activity); activitiesContainer.append(createdActivityCard); } } -function createActivityCard(type, date, days_since) { - let col = $('
'); +function createActivityCard(activity) { + let col = $('
'); let card = $('
'); col.append(card); - let cardBody = $('
'); + let cardBody = $('
'); card.append(cardBody); - if (type == 0) { - let iconContainer = $(''); - let icon = $(''); + if (activity.type == 0) { + let iconContainer = $(''); + let icon = $(''); iconContainer.append(icon); cardBody.append(iconContainer); - } else if (type == 1) { - let iconContainer = $(''); - let icon = $(''); + } else if (activity.type == 1) { + let iconContainer = $(''); + let icon = $(''); iconContainer.append(icon); cardBody.append(iconContainer); } @@ -87,18 +87,27 @@ function createActivityCard(type, date, days_since) { let textContainer = $('
'); cardBody.append(textContainer); - if(type == 0) { - let title = $('

Gegossen

'); + if(activity.type == 0) { + let title = $('

Gegossen

'); textContainer.append(title); - } else if(type == 1) { - let title = $('

Umgetopft

'); + } else if(activity.type == 1) { + let title = $('

Umgetopft

'); textContainer.append(title); } - let dateText = `${utils.convertSqlDateToGermanFormat(date)} - vor ${days_since} Tagen`; - let subtitle = $('

' + dateText + '

'); + let dateText = `${utils.convertSqlDateToGermanFormat(activity.date)} - vor ${activity.days_since} Tagen`; + let subtitle = $('

' + dateText + '

'); textContainer.append(subtitle); + let activityDeleteButton = $(" -
Pflanziska
+

Pflanziska

Glücksfeder - Zamioculcas
@@ -100,39 +100,47 @@

Pflanziska
-
- - +
+ +
-

+

Gegossen -

+

-

+

24.03.2025 - vor 3 Tagen

+ +
-
- +
+
-

+

Gegossen -

+

-

+

20.03.2025 - vor 7 Tagen

+ +
@@ -140,19 +148,23 @@
Pflanziska
-
- +
+
-

+

Umgetopft -

+

-

+

12.08.2024 - vor 10 Tagen

+ +