Add time added to frontend

codeurjc-students · Dec 28, 2024 · 1a2c5e9 · 1a2c5e9
1 parent c0efa09
commit 1a2c5e9
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 6 deletions.
diff --git a/.github/workflows/testBackend.yml b/.github/workflows/testBackend.yml
@@ -62,4 +62,4 @@ jobs:
             file: ./Docker/App/Dockerfile
             push: true
             platforms: linux/amd64,linux/arm64
-            tags: jesussmariscal/reurjc:latest
+            tags: jesussmariscal/reurjc:latest
diff --git a/Backend/src/main/java/com/example/model/Attendance.java b/Backend/src/main/java/com/example/model/Attendance.java
@@ -24,7 +24,6 @@
 public class Attendance {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    @JsonIgnore
     private Long id;
 
     private LocalDateTime dateTime;
@@ -101,4 +100,8 @@ public User getCreator() {
         return creator;
     }
 
+    public long getId() {
+        return id;
+    }
+
 }
diff --git a/Backend/target/classes/com/example/model/Attendance.class b/Backend/target/classes/com/example/model/Attendance.class
diff --git a/Frontend/src/app/homePage/bluetooth-page/asistencia.component.html b/Frontend/src/app/homePage/bluetooth-page/asistencia.component.html
@@ -51,9 +51,14 @@ <h2 class="section-title">Historial de Asistencias</h2>
       </ion-card-header>
       <ion-card-content>
         <p><strong>Código:</strong> {{ attendance.code }}</p>
-        <ion-button expand="block" (click)="toggleUsers(attendance)">
-          {{ showUsers[attendance.code] ? 'Mostrar menos' : 'Mostrar más' }}
-        </ion-button>
+        <div class="button-container">
+          <ion-button expand="block" (click)="toggleUsers(attendance)">
+            {{ showUsers[attendance.code] ? 'Mostrar menos' : 'Mostrar más' }}
+          </ion-button>
+          <ion-button expand="block" (click)="addTimeToAttendance(attendance.id)" color="success">
+            Aumentar tiempo
+          </ion-button>
+        </div>
         <ion-list *ngIf="showUsers[attendance.code]">
           <ion-item *ngFor="let userAttendance of attendance.usersPresent">
             {{ userAttendance.user.name }} {{ userAttendance.user.surname1 }}: {{ userAttendance.user.dni }}

diff --git a/Frontend/src/app/homePage/bluetooth-page/asistencia.component.scss b/Frontend/src/app/homePage/bluetooth-page/asistencia.component.scss
@@ -0,0 +1,4 @@
+.button-container {
+    display: flex;
+    gap: 10px; /* Espacio entre los botones */
+  }
diff --git a/Frontend/src/app/homePage/bluetooth-page/asistencia.component.ts b/Frontend/src/app/homePage/bluetooth-page/asistencia.component.ts
@@ -92,4 +92,18 @@ export class AsistenciaComponent implements OnInit {
 
     this.subjectService.getSubjects().subscribe((subjects: SubjectInfo[]) => { this.subjects = subjects })
   }
-}
+
+  addTimeToAttendance(attendanceId: number) {
+    this.teacherService.addTimeToAttendance(attendanceId).subscribe({
+      next: () => {
+        this.presentToast('Tiempo añadido correctamente', 'success');
+        this.getAsisttances(); // Actualizar la lista de asistencias
+      },
+      error: (error) => {
+        console.error('Error al añadir tiempo:', error);
+        this.presentToast('Error al añadir tiempo', 'danger');
+      }
+    });
+  }
+
+}
diff --git a/Frontend/src/app/services/TeacherService/teacher.service.ts b/Frontend/src/app/services/TeacherService/teacher.service.ts
@@ -19,4 +19,8 @@ export class TeacherService {
   getAllAttendances(): Observable<Attendance[]> {
     return this.http.get<Attendance[]>(`${this.API_BASE_URL}/attendances`, { withCredentials: true });
   }
+
+  addTimeToAttendance(attendanceId: number): Observable<void> {
+    return this.http.put<void>(`${this.API_BASE_URL}/attendances/${attendanceId}/add-time`, null, { withCredentials: true });
+  }
 }
diff --git a/Frontend/src/app/services/UserService/Attendance.ts b/Frontend/src/app/services/UserService/Attendance.ts
@@ -3,6 +3,7 @@ import { User } from "./user.model";
 import { UserAttendance } from "./UserAttendance";
 
 export interface Attendance {
+    id: number
     dateTime: Date;
     creator: User;
     subject: SubjectInfo;