diff --git a/frontend/src/components/PDFGenerator.js b/frontend/src/components/PDFGenerator.js index ec04b71..a7d9d98 100644 --- a/frontend/src/components/PDFGenerator.js +++ b/frontend/src/components/PDFGenerator.js @@ -81,15 +81,18 @@ class PDFGenerator { } addTrainingPlan(clubName, trainingDate, trainingStart, trainingEnd, trainingPlan) { + const formattedDate = new Date(trainingDate).toLocaleDateString('de-DE'); + const formattedStartTime = trainingStart.slice(0, 5); + const formattedEndTime = trainingEnd.slice(0, 5); this.pdf.setFontSize(14); this.pdf.setFont('helvetica', 'bold'); this.pdf.text(`${clubName} - Trainingsplan`, this.margin, this.yPos); this.yPos += 10; this.pdf.setFontSize(12); this.pdf.setFont('helvetica', 'normal'); - this.pdf.text(`Datum: ${trainingDate}`, this.margin, this.yPos); + this.pdf.text(`Datum: ${formattedDate}`, this.margin, this.yPos); this.yPos += 7; - this.pdf.text(`Uhrzeit: ${trainingStart} - ${trainingEnd}`, this.margin, this.yPos); + this.pdf.text(`Uhrzeit: ${formattedStartTime} - ${formattedEndTime}`, this.margin, this.yPos); this.yPos += 10; this.pdf.setFont('helvetica', 'bold'); this.pdf.text('Uhrzeit', this.margin, this.yPos); @@ -99,8 +102,8 @@ class PDFGenerator { this.pdf.setFont('helvetica', 'normal'); trainingPlan.forEach((item, index) => { const time = this.calculatePlanItemTime(index, trainingStart, trainingPlan); - this.pdf.text(time, this.margin, this.yPos); - this.pdf.text(item.activity, this.margin + 60, this.yPos); + this.pdf.text(time.slice(0, 5), this.margin, this.yPos); + this.pdf.text(item.predefinedActivity.name, this.margin + 60, this.yPos); this.pdf.text(item.duration.toString(), this.margin + 150, this.yPos); this.yPos += 7; diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue index b18eb5d..97e46ca 100644 --- a/frontend/src/views/DiaryView.vue +++ b/frontend/src/views/DiaryView.vue @@ -3,14 +3,13 @@

Trainingstagebuch

- -
+

Neues Datum anlegen

@@ -29,8 +28,7 @@
- -
+

Trainingszeiten bearbeiten

@@ -45,7 +43,7 @@
-
+

Trainingsplan

@@ -62,7 +60,7 @@ ☰ {{ calculatePlanItemTime(index) }} - {{ planItem.activity }} + {{ planItem.predefinedActivity.name }} - {{ planItem.duration }} @@ -78,7 +76,7 @@
{{ activity.name }} ({{ activity.durationText || '' }} / {{ - activity.duration }} Minuten) + activity.duration }} Minuten)
@@ -91,7 +89,62 @@ - + +
+ +
+

Teilnehmer

+
    +
  • + +
  • +
+

Aktivitäten

+ + +
    +
  • + {{ activity.description }} +
  • +
+ +
+
+
+ + @@ -101,19 +154,34 @@