#22 fix frontend components

thm-mni-ii · Oct 26, 2024 · 8f92dd8 · 8f92dd8
1 parent f50beea
commit 8f92dd8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 30 deletions.
diff --git a/frontend/src/Boards.vue b/frontend/src/Boards.vue
@@ -138,7 +138,7 @@ export default {
               headers: {
                 'Content-Type': 'application/json',
               },
-              body: JSON.stringify({ name: this.boardName }),
+              body: JSON.stringify(requestBody),
             });
 
             if (!response.ok) {
@@ -154,7 +154,16 @@ export default {
             }
         },
         goToApp(board) {
+          if (this.timeTracking) {
+            this.$router.push({
+              name: 'Board-Time-Tracking',
+              params: {
+                userId: this.$route.params.userId,
+                boardId: board.timekeeping_board_id
+              }});
+          } else {
             this.$router.push(`/groups/${this.$route.params.groupId}/boards/${board.board_id}`);
+          }
         },
     },
 }

diff --git a/frontend/src/TimeTrackingBoard.vue b/frontend/src/TimeTrackingBoard.vue
@@ -24,12 +24,11 @@
                   <Label
                       v-for="month in months"
                       :key="month"
-                      ref="monthLabel"
+                      ref="month + 'Label'"
                       :sectionTitle="month.charAt(0).toUpperCase() + month.slice(1)"
                       :status="month"
                       :items="monthItems[month]"
                       @update:items="monthItems[month] = $event"
-                      @cardMoved="handleCardMoved"
                   />
                 </v-row>
               </v-card>
@@ -56,6 +55,12 @@ export default {
     addTimeCard,
   },
   setup() {
+
+    const monthNames = [
+      'january', 'february', 'march', 'april', 'may', 'june',
+      'july', 'august', 'september', 'october', 'november', 'december'
+    ];
+
     const monthItems = {
       january: [],
       february: [],
@@ -71,18 +76,19 @@ export default {
       december:[],
     };
 
-    const boardName = ref("Kanban Board");
+    const boardName = ref("Time Tracking");
 
     const quarters = [
-      ['januar', 'february', 'march'],
+      ['january', 'february', 'march'],
       ['april', 'may', 'june'],
-      ['juli', 'august', 'september'],
+      ['july', 'august', 'september'],
       ['october', 'november', 'december'],
     ];
 
 
 
     return {
+      monthNames,
       monthItems,
       boardName,
       quarters
@@ -92,22 +98,13 @@ export default {
     showDialog() {
       this.$refs.addTimeCard.showDialog();
     },
-    reloadCardsByMonth(month) {
-      switch (month) {
-        case 'january':
-          this.$refs.janLabel.loadCards();
-          break;
-        case 'working_on':
-          this.$refs.febLabel.loadCards();
-          break;
-        case 'review':
-          this.$refs.marLabel.loadCards();
-          break;
-        case 'done':
-          this.$refs.junLabel.loadCards();
-          break;
-        default:
-          console.error('Invalid status');
+    reloadCardsByMonth(monthNumber) {
+      const monthName = this.monthNames[monthNumber - 1];
+
+      if (this.$refs[`${monthName}Label`]) {
+        this.$refs[`${monthName}Label`].loadCards();
+      } else {
+        console.error('Invalid month reference:', monthName);
       }
     },
   },

diff --git a/frontend/src/components/addTimeCard.vue b/frontend/src/components/addTimeCard.vue
@@ -79,7 +79,6 @@ export default {
       const card = {
         date: this.date,
         start: this.start,
-        end: this.end,
         time: this.calculatedTime,
         description: this.cardDescription,
       };
@@ -96,7 +95,7 @@ export default {
           throw new Error('Network response was not ok');
         }
         this.resetForm();
-        this.$emit('addedMonth',this.date.getMonth+1);
+        this.$emit('addedMonth',this.date.getMonth()+1);
         this.dialog = false;
       } catch (error) {
         console.error('There was an error!', error);
@@ -118,11 +117,7 @@ export default {
       const endTime = this.parseTime(this.end);
       const calculatedTime = (endTime - startTime) / (1000 * 60 * 60); // Berechnung in Stunden
 
-      if (calculatedTime > 0) {
-        this.calculatedTime = calculatedTime.toFixed(2); // Zeit auf zwei Dezimalstellen
-      } else {
-        this.calculatedTime = '0.00'; // Setze auf 0, wenn ungültig
-      }
+      this.calculatedTime = calculatedTime > 0 ? calculatedTime : 0;
     },
     resetForm() {
       this.start = new Date(new Date().getTime() - 90 * 60 * 1000).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });

diff --git a/frontend/src/router.js b/frontend/src/router.js
@@ -28,7 +28,7 @@ const routes = [
     //props: true
   },
   {
-    path: '/users/:userId/boards/board:id',
+    path: '/users/:userId/boards/boardId',
     name: 'Board-Time-Tracking',
     component:TimeTrackingBoard
   }