diff --git a/backend/services/diaryDateActivityService.js b/backend/services/diaryDateActivityService.js index 2ce04bf..d9f9b73 100644 --- a/backend/services/diaryDateActivityService.js +++ b/backend/services/diaryDateActivityService.js @@ -166,6 +166,12 @@ class DiaryDateActivityService { { model: PredefinedActivity, as: 'groupPredefinedActivity', + include: [ + { + model: PredefinedActivityImage, + as: 'images' + } + ] }, ], } diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue index 96068ce..0ade7c2 100644 --- a/frontend/src/views/DiaryView.vue +++ b/frontend/src/views/DiaryView.vue @@ -1004,16 +1004,23 @@ export default { if (typeof pa.drawingData === 'string' && pa.drawingData.trim() !== '') return true; if (typeof pa.drawingData === 'object' && Object.keys(pa.drawingData).length > 0) return true; } - // Bildliste mit drawingData - if (Array.isArray(pa.images) && pa.images.some(img => { - if (!img || !img.drawingData) return false; - if (typeof img.drawingData === 'string' && img.drawingData.trim() !== '') return true; - if (typeof img.drawingData === 'object' && Object.keys(img.drawingData).length > 0) return true; - return false; - })) return true; + // Bildliste - prüfe sowohl auf drawingData als auch auf normale Bilder + if (Array.isArray(pa.images) && pa.images.length > 0) { + // Prüfe auf Bilder mit drawingData + if (pa.images.some(img => { + if (!img || !img.drawingData) return false; + if (typeof img.drawingData === 'string' && img.drawingData.trim() !== '') return true; + if (typeof img.drawingData === 'object' && Object.keys(img.drawingData).length > 0) return true; + return false; + })) return true; + // Prüfe auf normale Bilder (auch ohne drawingData) + if (pa.images.some(img => img && (img.imagePath || img.id))) return true; + } // gerenderter Code / renderSpec if (pa.renderCode && pa.renderCode.trim() !== '') return true; if (pa.renderSpec && Object.keys(pa.renderSpec).length) return true; + // imageLink für normale Bilder + if (pa.imageLink && pa.imageLink.trim() !== '') return true; } catch (e) { } return false; },