From 80f6085b819924190705e11fa1c493c4f44fb3d1 Mon Sep 17 00:00:00 2001
From: Torsten Schulz <tsschulz@gmx.net>
Date: Tue, 24 Sep 2024 14:19:28 +0200
Subject: [PATCH] Added phone numver show, added training info show

---
 backend/services/diaryDateActivityService.js |  2 +-
 frontend/src/views/DiaryView.vue             | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backend/services/diaryDateActivityService.js b/backend/services/diaryDateActivityService.js
index 9e29f8b..fe70c29 100644
--- a/backend/services/diaryDateActivityService.js
+++ b/backend/services/diaryDateActivityService.js
@@ -118,7 +118,7 @@ class DiaryDateActivityService {
             include: [
                 {
                     model: PredefinedActivity,
-                    as: 'predefinedActivity', // Assuming 'predefinedActivity' is the alias used in the model association
+                    as: 'predefinedActivity', 
                 }
             ]
         });
diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue
index 97e46ca..62bb925 100644
--- a/frontend/src/views/DiaryView.vue
+++ b/frontend/src/views/DiaryView.vue
@@ -54,6 +54,7 @@
                                 <th>Uhrzeit</th>
                                 <th>Aktivität</th>
                                 <th>Länge / Gesamtzeit (Min)</th>
+                                <th></th>
                             </tr>
                         </thead>
                         <tbody ref="sortableList">
@@ -61,10 +62,8 @@
                                 <td class="drag-handle">☰</td>
                                 <td>{{ calculatePlanItemTime(index) }}</td>
                                 <td>{{ planItem.predefinedActivity.name }}</td>
-                                <td>
-                                    <span @click="removePlanItem(planItem.id)" class="add-plan-item">-</span>
-                                    {{ planItem.duration }}
-                                </td>
+                                <td>{{ planItem.durationText }} / {{ planItem.duration }}</td>
+                                <td><span @click="removePlanItem(planItem.id)" class="add-plan-item">-</span></td>
                             </tr>
                             <tr>
                                 <td></td>
@@ -89,7 +88,8 @@
                             </tr>
                         </tbody>
                     </table>
-                    <button v-if="trainingPlan && trainingPlan.length && trainingPlan.length > 0" @click="generatePDF">Als PDF herunterladen</button>
+                    <button v-if="trainingPlan && trainingPlan.length && trainingPlan.length > 0"
+                        @click="generatePDF">Als PDF herunterladen</button>
                 </div>
 
                 <div class="column">
@@ -124,6 +124,7 @@
             <div class="modal-content">
                 <span class="close" @click="closeNotesModal">&times;</span>
                 <h3>Notizen für {{ selectedMember.firstName }} {{ selectedMember.lastName }}</h3>
+                <div>Telefon-Nr.: {{ selectedMember.phone }}</div>
                 <div class="modal-body">
                     <div class="modal-left">
                         <img v-if="selectedMember.imageUrl" :src="selectedMember.imageUrl" alt="Mitgliedsbild"
@@ -661,6 +662,9 @@ button[type="button"] {
     margin-left: 10px;
 }
 
+h3 {
+    display: block;
+}
 .columns {
     display: flex;
     justify-content: space-between;