Merge pull request #218 from CampusDual/BFS42024-300

grupo e: 300 botonera
CampusDual · Jan 7, 2025 · 63de64d · 63de64d
2 parents 2fe32e4 + 751ac08
commit 63de64d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/...c/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css b/...c/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css
@@ -1,3 +1,10 @@
+.button-container{
+  padding: 20px;
+  display: flex;
+  justify-content: flex-end;
+  gap:20px;
+}
+
 .calendar-timestamps-container {
   display: flex;
   flex-direction: row;
@@ -221,10 +228,6 @@ select option {
   overflow-x: hidden;
 }
 
-.button-container {
-  text-align: center;
-  margin-top: 20px;
-}
 
 .custom-select {
   width: 80px;
@@ -263,4 +266,5 @@ select option {
   align-items: center;
   justify-content: center;
   font-size: 16px;
-}
+}
+
diff --git a/.../app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html b/.../app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html
@@ -1,5 +1,9 @@
 <div class="calendar-timestamps-container">
     <div class="calendar-container">
+        <div class="button-container">
+            <o-button (click)="goToToday()" label="today"></o-button>
+            <o-button (click)="onButtonClick()" label="AttendanceSave"></o-button>
+        </div>
         <div class="date-item-container">
             <o-button color="white" (click)="decSelectedWeek()" icon="arrow_back"></o-button>
             <div class="years" *ngFor="let year of years">
@@ -52,8 +56,5 @@
         </div>
 
 
-        <div class="button-container">
-            <o-button (click)="onButtonClick()" label="AttendanceSave"></o-button>
-        </div>
     </div>
 </div>
diff --git a/...rc/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts b/...rc/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts
@@ -339,7 +339,7 @@ export class CalendarAttendanceComponent {
     this.service.insert({ data: attendanceArray }, 'attendance').subscribe(
       response => {
         this.attendanceModified = [];
-        this.snackBarService.open('Asistencias guardadas correctamente.');
+        this.snackBarService.open('asistenciasSave');
         this.loadAttendance();
       },
       error => {
@@ -389,4 +389,16 @@ export class CalendarAttendanceComponent {
   isBootcampInRange(date: Date): boolean {
     return date >= this.startBootcampDate && date <= this.endBootcampsDate;
   }
+
+  goToToday(): void {
+    const startOfWeek = moment().startOf('isoWeek');
+    this.startDate = startOfWeek.toDate();
+    this.endDate = moment(startOfWeek).add(this.weeksToShow * 7, 'days').toDate();
+    this.loadDays(); 
+    this.loadStudents(); 
+    this.updateCurrentMonthAndYear(); 
+  }
+
 }
+
+
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -319,8 +319,10 @@
   "REQ_LDESCRIPTION" : "Description*",
   "LATTENDANCESTATUS" : "Attendance status",
   "AttendanceSave" : "Save Attendance",
+  "today":"Go today",
   "Estudiante" : "Student",
   "Asistencia" : "Attendance",
   "abbreviation" : "Abbreviation",
-  "Alumno" : "Student"
+  "Alumno" : "Student",
+  "asistenciasSave":"Attendance saved correctly."
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -317,8 +317,10 @@
   "REQ_LDESCRIPTION" : "Descripción*",
   "LATTENDANCESTATUS" : "Estado de asistencia",
   "AttendanceSave" : "Guardar Asistencia",
+  "today":"Ir a Dia actual",
   "Estudiante" : "Estudiante",
   "Asistencia" : "Asistencia",
   "abbreviation" : "Abreviatura",
-  "Alumno" : "Alumno"
+  "Alumno" : "Alumno",
+  "asistenciasSave":"Asistencias guardadas correctamente."
 }