diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.css
index 958a1cac2..32f20345d 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.css
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.css
@@ -203,6 +203,23 @@ h3 {
   overflow-x: auto; 
   background-color: #f5f0f2;
   padding: 20px 0;
+  border-radius: 0;
+  margin: 0px;
+}
+
+.rounded_top{
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
+}
+
+.rounded_bottom{
+  border-bottom-left-radius: 15px;
+  border-bottom-right-radius: 15px;
+}
+
+.aligned-container {
+  border-top-left-radius: 15px;
+  border-top-right-radius: 15px;
 }
 
 .input-button-container {
@@ -318,15 +335,7 @@ div.notification label {
   height: 100%;
 }
 
-.table_containerfichero {
-  width: 98%;
-  overflow-x: hidden;
-  margin: 0 auto;
-  margin-top: 25px;
-  padding: 0 10px;
-}
-
-.table_containerhorarios {
+.mat_table_container {
   width: 98%;
   overflow-x: hidden;
   margin: 0 auto;
@@ -559,11 +568,6 @@ div.notification label {
   border-radius: 15px;
   padding: 20px;
 }
-.table_sesions{
-  background-color: #f5f0f2;
-  font-family: 'Roboto', sans-serif;
-  height: auto;
-}
 
 o-list img {
   width: 50px;
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html
index a56847032..74e3c2c35 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html
@@ -1,6 +1,6 @@
 <o-form #bootcampDetailForm attr="bootcampsDetail" service="bootcamps" entity="bootcamp" keys="id"
   header-actions="R;U;D" (onUpdate)="volver($event)" (onDelete)="volver($event)" show-header-navigation="no"
-  confirm-exit="false" (onDataLoaded)="onBootcampChange($event);inicialDR()">
+  confirm-exit="false" (onDataLoaded)="onBootcampChange($event);inicialDR()" (onBeforeUpdate)="asistencia.saveAttendaces()">
   <o-text-input #idNumber attr="id" sql-type="INTEGER" enabled="no" hidden="true"></o-text-input>
 
   <div class="grid-container">
@@ -33,7 +33,8 @@
     </div>
     <div class="especial fecha-inicio" hidden="true">
       <o-date-input #startdate class="fechas" attr="start_date" hidden="true" required="yes"
-        format="DD/MM/YYYY"></o-date-input>
+        format="DD/MM/YYYY">
+      </o-date-input>
     </div>
     <div class="especial fecha-fin" hidden="true">
       <o-date-input #enddate attr="end_date" required="yes" hidden="true" [validators]="validatorsArray"
@@ -42,7 +43,7 @@
       </o-date-input>
     </div>
   </div>
-  <mat-tab-group class="tab" animationDuration="0ms" dynamicHeight>
+  <mat-tab-group class="tab" animationDuration="0ms" dynamicHeight (selectedTabChange)="onTabChange($event)">
     <mat-tab label="{{ 'StudentsAndMentors' | oTranslate }}">
       <div class="general_container">
         <div class="table_container">
@@ -129,11 +130,11 @@ <h3> {{'Mentors' | oTranslate}}</h3>
       </div>
     </mat-tab>
     <mat-tab label="{{ 'Schedule' | oTranslate }}">
-      <div class="table_containerhorarios">
+      <div class="mat_table_container">
         <div class="table_horario">
           <o-form-layout-manager attr="" mode="dialog" title="Timetable" virtual-scroll="false">
             <o-form-layout-dialog-options class="popup">
-              <o-table class="timetable_table" virtual-scroll="false" attr="bootcampTimetable"
+              <o-table #bootcampTimetable class="timetable_table" virtual-scroll="false" attr="bootcampTimetable"
                 service="bootcampTimetable" insert-form-route="newTimetable" pagination-controls="false"
                 detail-mode="none" update-button="false" entity="bootcampTimetable" keys="id"
                 parent-keys="id_bootcamp:id;start_date;end_date"
@@ -157,7 +158,7 @@ <h3> {{'Mentors' | oTranslate}}</h3>
       </div>
     </mat-tab>
     <mat-tab label="{{ 'Documents' | oTranslate }}">
-      <div class="table_containerfichero">
+      <div class="mat_table_container">
         <div class="table_ficheros">
           <div class="upload-container">
             <label for="fileinput">{{ 'fileinput' | oTranslate }}</label>
@@ -196,12 +197,12 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
         </div>
       </div>
     </mat-tab>
-    <o-form-layout-manager attr="popupNewSession" title="Session" mode="dialog">
+    <o-form-layout-manager attr="popupNewSession" title="Session" mode="dialog"  >
       <o-form-layout-dialog-options class="popup">
         <mat-tab label="{{ 'Sesiones' | oTranslate }}">
-          <div class="table_sesions general_table">
+          <div class="mat_table_container">
             <div class="calendar-container">
-              <o-column>
+              <o-column class="rounded_top">
 
                 <o-combo
                   attr="status"
@@ -246,7 +247,7 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
               sort="session_date:ASC">
             </o-filter-builder>
 
-              <o-table #sessionsTable class="general_table" virtual-scroll="false" attr="sessionBootcamp_table" detail-form-route="session"
+              <o-table #sessionsTable class="general_table rounded_bottom" virtual-scroll="false" attr="sessionBootcamp_table" detail-form-route="session"
                        service="sessionBootcamp"
                        entity="sessionBootcamp" keys="id"
                        parent-keys="id_bootcamp:id"
@@ -255,6 +256,7 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
                        select-all-checkbox-visible="true" selection-mode="multiple"
                        [row-class]="getRowClass"
                        sort-columns="session_date"
+                       detail-mode="dblclick"
                        >
 
                 <o-table-column class="center" attr="session_date" title="session_date" type="date" format="DD/MM/YYYY"></o-table-column>
@@ -276,7 +278,9 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
           </div>
         </mat-tab>
         <mat-tab label="{{'Asistencia'|oTranslate}}">
-          <app-calendar-attendance #asistencia [bootcampId]="bootcampId"></app-calendar-attendance>
+          <div class="mat_table_container">
+            <app-calendar-attendance #asistencia [bootcampId]="bootcampId"></app-calendar-attendance>
+          </div>
         </mat-tab>
 
       </o-form-layout-dialog-options>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts
index 8bf03c8a1..58c10f0fa 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts
@@ -7,6 +7,7 @@ import { DialogService, Expression, FilterExpressionUtils, OFileInputComponent,
 import moment from 'moment';
 import { ODateInputComponent, ODateRangeInputComponent, OFormComponent, OntimizeService, OTranslateService } from 'ontimize-web-ngx';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
+import { MatTabChangeEvent } from '@angular/material/tabs';
 import { CalendarAttendanceComponent } from '../../data/personal-tutor-info/calendar-attendance/calendar-attendance.component';
 
 @Component({
@@ -17,16 +18,22 @@ import { CalendarAttendanceComponent } from '../../data/personal-tutor-info/cale
 })
 export class BootcampDetailsComponent {
 
-  @ViewChild('bootcampDetailForm') bootcampDetailForm:OFormComponent;
+  @ViewChild('bootcampDetailForm') bootcampDetailForm: OFormComponent;
   @ViewChild("idNumber") idNumber: OTextInputComponent;
   @ViewChild("documentsTable") documentsTable: OTableComponent;
   @ViewChild("fileinput") fileinput: OFileInputComponent;
   @ViewChild('studentsTable', { static: true }) studentsTable!: OTableComponent;
   @ViewChild('sessionBootcampTable', { static: true }) table: OTableComponent;
-  selectedStatuses: string[] = ['Started', 'Pending']; 
+  @ViewChild('bootcampTimetable', { static: true }) bootcampTimetable: OTableComponent;
+  @ViewChild('asistencia') asistencia: CalendarAttendanceComponent;
+  
+  selectedStatuses: string[] = ['Started', 'Pending'];
   months: Date[] = [];
   bootcampId: number;
 
+  previousTabIndex: number | null = null;
+
+
   validatorsArray: ValidatorFn[] = [];
   validatorsArray1: ValidatorFn[] = [];
   validatorsWithoutSpace: ValidatorFn[] = [];
@@ -39,7 +46,7 @@ export class BootcampDetailsComponent {
     @Inject(MAT_DATE_LOCALE) private _locale: string,
     private translateService: OTranslateService,
     protected dialogService: DialogService
-   ) {
+  ) {
     this.validatorsArray.push(this.dateValidator);
     this.validatorsWithoutSpace.push(OValidators.patternValidator(/^(?!\s*$).+/, 'hasSpecialCharacters'));
     this.service = this.injector.get(OntimizeService);
@@ -55,13 +62,31 @@ export class BootcampDetailsComponent {
   goToStudentDetail(event: any) {
     const studentId = event.student_id;
     this.router.navigate([`/main/students/${studentId}`]);
-  this.clearTableSelection();
+    this.clearTableSelection();
+  }
+
+  onTabChange(event: MatTabChangeEvent) {
+    const previousIndex = this.previousTabIndex;
+    const currentIndex = event.index;
+
+    switch (currentIndex) {
+      case 0:
+        this.configureStudentBootcamps();
+        this.studentsTable.refresh();
+        break;
+      case 2:
+        this.configureBootcampTimetable()
+        this.bootcampTimetable.refresh();
+        break;
+
+    }
+    this.previousTabIndex = currentIndex;
   }
 
   goToTutorDetail(tutor: any) {
     const tutorId = tutor.tutor_id;
     this.router.navigate([`/main/tutors/${tutorId}`]);
-  this.clearTableSelection();
+    this.clearTableSelection();
   }
 
   clearTableSelection(): void {
@@ -90,6 +115,7 @@ export class BootcampDetailsComponent {
   }
 
   inicialDR() {
+    
     const startDateValue = this.startDateInput.getValue();
     const endDateValue = this.endDateInput.getValue();
 
@@ -115,7 +141,7 @@ export class BootcampDetailsComponent {
     this.bootcampDetailForm.setFieldValue("start_date", startDate);
     this.bootcampDetailForm.setFieldValue("end_date", endDate);
 
-}
+  }
 
   @ViewChild("startdate") startDateInput: ODateInputComponent;
   @ViewChild("enddate") endDateInput: ODateInputComponent;
@@ -130,8 +156,8 @@ export class BootcampDetailsComponent {
 
 
   ngOnInit() {
-
-   }
+    //this.configureBootcamps();
+  }
 
   protected configureBootcamps() {
     const conf = this.service.getDefaultServiceConfiguration('bootcamps');
@@ -139,6 +165,20 @@ export class BootcampDetailsComponent {
 
   }
 
+  
+
+  protected configureBootcampTimetable() {
+    const conf = this.service.getDefaultServiceConfiguration('bootcampTimetable');
+    this.service.configureService(conf);
+
+  }
+
+  protected configureStudentBootcamps() {
+    const conf = this.service.getDefaultServiceConfiguration('studentBootcamps');
+    this.service.configureService(conf);
+
+  }
+
   protected configureDocuments() {
     const documentConf = this.service.getDefaultServiceConfiguration('documents');
     this.service.configureService(documentConf);
@@ -151,6 +191,7 @@ export class BootcampDetailsComponent {
 
 
   onBootcampChange(event: any) {
+
     this.studentsTable.refresh();
     this.configureBootcamps();
     const bootcampId = event.id;
@@ -227,7 +268,7 @@ export class BootcampDetailsComponent {
     } else {
       return null;
     }
-    
+
   }
 
 
@@ -283,9 +324,9 @@ export class BootcampDetailsComponent {
 
     this.configureTutorsBootcamp();
     this.dialogService.confirm('Confirm_dialog_title', 'Do_you_really_want_to_delete');
-    this.dialogService.dialogRef.afterClosed().subscribe( result => {
-      if(result) {
-        this.service.delete({id: tutors.id}, 'tutorBootcamp').subscribe(res => {
+    this.dialogService.dialogRef.afterClosed().subscribe(result => {
+      if (result) {
+        this.service.delete({ id: tutors.id }, 'tutorBootcamp').subscribe(res => {
           if (res.code === 0) {
             this.list.reloadData();
           }
@@ -293,7 +334,7 @@ export class BootcampDetailsComponent {
       }
     });
 
-   }
+  }
 
   showAlert() {
     if (this.dialogService) {
@@ -302,13 +343,13 @@ export class BootcampDetailsComponent {
   }
   getRowClass(rowData: any): string {
     const today = new Date();
-    const sessionDate = new Date(rowData.session_date); 
+    const sessionDate = new Date(rowData.session_date);
     if (isNaN(sessionDate.getTime())) {
       console.error('Invalid date format:', rowData.session_date);
-      return ''; 
+      return '';
     }
     if (sessionDate.toDateString() === today.toDateString()) {
-      return 'highlight-today'; 
+      return 'highlight-today';
     }
     return '';
   }
@@ -321,7 +362,7 @@ export class BootcampDetailsComponent {
       this.sessionFilters = null;
     } else {
       const filter = [{ attr: 'status', value: selectedStatuses }];
-      this.table.queryData(filter); 
+      this.table.queryData(filter);
     }
   }
   createFilter(values: Array<{ attr: string, value: any }>): Expression {
@@ -346,7 +387,7 @@ export class BootcampDetailsComponent {
 
     return filters.length > 0
       ? filters.reduce((exp1, exp2) =>
-          FilterExpressionUtils.buildComplexExpression(exp1, exp2, FilterExpressionUtils.OP_AND))
+        FilterExpressionUtils.buildComplexExpression(exp1, exp2, FilterExpressionUtils.OP_AND))
       : null;
   }
 
@@ -362,9 +403,9 @@ export class BootcampDetailsComponent {
       this.selectedStatuses = ['Started', 'Pending'];
     }
   }
-  @ViewChild('asistencia', { static: true }) asistencia!: CalendarAttendanceComponent;
+
   loadBootcamp() {
-    this.bootcampId= this.bootcampDetailForm.getFieldValue("id");
+    this.bootcampId = this.bootcampDetailForm.getFieldValue("id");
     this.asistencia.refresh();
   }
 
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html
index b6cf29812..70a9d5fd4 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/bootcamp-students-table/bootcamp-students-table.component.html
@@ -2,6 +2,9 @@
   show-header-navigation="no" confirm-exit="false" show-header="no" (onDataLoaded)="loadData()">
   <o-text-input #bootcampIdComp attr="id" sql-type="INTEGER" enabled="no" hidden></o-text-input>
   <mat-tab-group mat-stretch-tabs="true" mat-align-tabs="center" animationDuration="0ms">
+    <mat-tab label="{{'Asistencia'|oTranslate}}">
+      <app-calendar-attendance [bootcampId]="bootcampId"></app-calendar-attendance>
+    </mat-tab>
     <mat-tab label="{{'Estudiante'|oTranslate}}">
   <div class="student-sesion-grid">
     <fieldset class="estudiantes">
@@ -97,9 +100,6 @@
   </div>
     </mat-tab>
 
-    <mat-tab label="{{'Asistencia'|oTranslate}}">
-      <app-calendar-attendance [bootcampId]="bootcampId"></app-calendar-attendance>
-    </mat-tab>
   </mat-tab-group>
 </o-form>
 
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css
index 1f90aa85d..0995e5905 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.css
@@ -6,8 +6,8 @@
 }
 
 .no-computable {
-  background-color: rgb(255, 108, 108); 
-  color: white;           
+  background-color: rgb(255, 108, 108);
+  color: white;
 }
 
 
@@ -228,7 +228,7 @@ select option {
   grid-row: 1;
   gap: 5px;
   min-width: 1550px;
- 
+
 }
 
 .student_row.days {
@@ -243,7 +243,7 @@ select option {
 
 .custom-select {
   width: 80px;
-  height: 40px;
+  height: 15px;
   background-color: white;
   border: 1px solid #ccc;
   border-radius: 5px;
@@ -287,40 +287,35 @@ select option {
 .warning {
   display: flex;
   align-items: center;
-  color: red; 
+  color: red;
   font-size: 12px;
   margin-top: 5px;
-  gap: 5px; 
-}
-.fixed-size {
-  width: 300px; 
-  margin: 0 auto; 
+  gap: 5px;
 }
+
 .center-content {
   display: flex;
   justify-content: center;
-  margin-bottom: 16px; 
+  margin-bottom: 16px;
 }
 
 .form-group {
   display: flex;
-  flex-direction: column; 
-  align-items: center; 
-  width: 100%; 
-  position: relative; 
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  position: relative;
 }
 
 .form-label {
-  align-self: center; 
-  margin-bottom: 4px; 
-  width: 100%; 
-  max-width: 300px; 
-
+  align-self: center;
+  margin-bottom: 4px;
+  width: 100%;
   text-align: left;
 }
 
 .fixed-size {
-  width: 100%; 
-  max-width: 300px; 
+  width: 100%;
+  margin: 0 auto;
 }
 
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html
index da6cbcf23..0d24150f9 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.html
@@ -3,7 +3,7 @@
         <div class="button-container">
             <o-button (click)="openAttendanceDialog()" label="Multiple Selection"></o-button>
             <o-button (click)="goToToday()" label="today"></o-button>
-            <o-button (click)="onButtonClick()" label="AttendanceSave"></o-button>
+            <o-button (click)="saveAttendaces()" label="AttendanceSave"></o-button>
         </div>
 
         <ng-template #attendanceDialog>
@@ -19,7 +19,7 @@ <h1 mat-dialog-title class="center-select h1-spacing">{{'Registrar Asistencia' |
                     <input matEndDate [(ngModel)]="selectedEndDate">
                   </mat-date-range-input>
                   <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-                  <mat-date-range-picker #picker></mat-date-range-picker>
+                  <mat-date-range-picker #picker (closed)="onDatePickerClosed()"></mat-date-range-picker>
                 </mat-form-field>
               </div>
             </div>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts
index 2c0f235a3..a842751fb 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component.ts
@@ -50,6 +50,9 @@ export class CalendarAttendanceComponent {
   selectedEndDate: Date;
 
   protected service: OntimizeService;
+  protected serviceName: string;
+  protected serviceBkName: string;
+
 
   @Input('bootcampId')
   bootcampId: number;
@@ -70,6 +73,7 @@ export class CalendarAttendanceComponent {
   attendanceMap: { [key: string]: number } = {};
   studentMap = new Map<number, Map<string, number>>();
 
+
   backendResponse: any;
   startBootcampDate: Date;
   endBootcampsDate: Date;
@@ -94,19 +98,23 @@ export class CalendarAttendanceComponent {
     this.loadYears();
 
     this.service = this.injector.get(OntimizeService);
+
+
   }
   refresh() {
-    this.loadStudents();
-    this.loadAttendance();
+    this.getStudents();
+    //this.loadAttendance();
+    this.getAttendance();
     this.getBootcampDates();
   }
   ngOnInit() {
-    this.loadAttendanceStatus();
+    this.getAttendanceStatus();
     this.configureBootcamps();
   }
   ngOnChanges() {
-    this.loadStudents();
-    this.loadAttendance();
+    this.getStudents();
+   // this.loadAttendance();
+   this.getAttendance();
     this.getBootcampDates();
 
   }
@@ -132,21 +140,13 @@ export class CalendarAttendanceComponent {
     this.service.configureService(conf);
   }
 
-  protected configureHolidays() {
-    // Configure the service using the configuration defined in the `app.services.config.ts` file
-    const conf = this.service.getDefaultServiceConfiguration('holidays');
-    this.service.configureService(conf);
-  }
 
-  loadStudents(): void {
-    this.configureStudents();
-    this.getStudents();
-  }
   getStudents() {
+
     if (this.service && this.bootcampId) {
       const columns = ['student_id', 'name', 'surname1', 'surname2', 'computable'];
       const filter = { 'bootcamp_id': this.bootcampId };
-
+      this.configureStudents();
       this.service.query(filter, columns, 'studentsWithComputable').subscribe(resp => {
         if (resp.code === 0) {
           if (resp.data.length > 0) {
@@ -165,22 +165,19 @@ export class CalendarAttendanceComponent {
           this.snackBarService.open('Error al cargar los datos de los estudiantes.');
         }
       });
+      this.configureBootcamps();
     }
   }
 
 
 
-  loadAttendanceStatus(): void {
-    this.configureAttendanceStatus();
-    this.getAttendanceStatus();
-    this.statusData.map(status => {
-    });
-  }
+
   getAttendanceStatus() {
     if (this.service !== null) {
       const columns = ['id', 'abbreviation', 'description', 'color'];
 
 
+      this.configureAttendanceStatus();
       this.service.query({}, columns, 'attendanceControl').subscribe(resp => {
         if (resp.code === 0) {
           if (resp.data.length > 0) {
@@ -192,14 +189,13 @@ export class CalendarAttendanceComponent {
           this.snackBarService.open('Error al cargar los datos de los estatus de asistencia.');
         }
       });
+      this.configureBootcamps();
     }
   }
 
-  loadAttendance(): void {
-    this.configureAttendance();
-    this.getAttendance();
-  }
+
   getAttendance() {
+
     if (this.service && this.bootcampId) {
       const columns = ['id', 'student_id', 'bootcamp_id', 'date', 'attendance_status_id'];
 
@@ -207,6 +203,7 @@ export class CalendarAttendanceComponent {
         'bootcamp_id': this.bootcampId
       }
 
+      this.configureAttendance();
       this.service.query(filter, columns, 'attendance').subscribe(resp => {
         if (resp.code === 0) {
           if (resp.data.length > 0) {
@@ -229,6 +226,7 @@ export class CalendarAttendanceComponent {
           this.snackBarService.open('Error al cargar los datos de asistencia.');
         }
       });
+      this.configureBootcamps();
     }
   }
 
@@ -265,22 +263,26 @@ export class CalendarAttendanceComponent {
   }
 
   //ir a semana anterior
+
+  //llama
   decSelectedWeek(): void {
     this.attendanceModified = [];
     this.startDate = moment(this.startDate).subtract(1, 'weeks').toDate();
     this.endDate = moment(this.startDate).add(this.weeksToShow * 7, 'days').toDate();
     this.loadDays();
-    this.loadStudents();
+    this.getStudents();
     this.updateCurrentMonthAndYear();
   }
 
   //ir a semana posterior
+
+  //llama
   incSelectedWeek(): void {
     this.attendanceModified = [];
     this.startDate = moment(this.startDate).add(1, 'weeks').toDate();
     this.endDate = moment(this.startDate).add(this.weeksToShow * 7, 'days').toDate();
     this.loadDays();
-    this.loadStudents();
+    this.getStudents();
     this.updateCurrentMonthAndYear();
   }
 
@@ -368,20 +370,25 @@ export class CalendarAttendanceComponent {
     return selectedStatus ? selectedStatus.description : null; // Retorna null si no hay selección.
   }
 
-  onButtonClick() {
-    this.configureAttendance();
+  saveAttendaces() { 
+
     const attendanceArray = Object.values(this.attendanceModified);
-    this.service.insert({ data: attendanceArray }, 'attendance').subscribe(
-      response => {
-        this.attendanceModified = [];
-        this.snackBarService.open('asistenciasSave');
-        this.loadAttendance();
-      },
-      error => {
-        console.error('Error al procesar asistencias:', error);
-        this.snackBarService.open('Error al guardar asistencias.');
-      }
-    );
+    if(attendanceArray.length > 0){
+      this.configureAttendance();
+      this.service.insert({ data: attendanceArray }, 'attendance').subscribe(
+        response => {
+          this.attendanceModified = [];
+          this.snackBarService.open('asistenciasSave');
+          //this.loadAttendance();
+          this.getAttendance();
+        },
+        error => {
+          console.error('Error al procesar asistencias:', error);
+          this.snackBarService.open('Error al guardar asistencias.');
+        }
+      );
+      this.configureBootcamps();
+    }    
   }
 
   getBackgroundColor(abbreviation: string): string {
@@ -405,13 +412,15 @@ export class CalendarAttendanceComponent {
   }
 
   getBootcampDates(): void {
-    this.configureBootcamps();
+
     if (this.service && this.bootcampId) {
       const columns = ['start_date', 'end_date'];
 
       const filter = {
         'id': this.bootcampId
       }
+
+      this.configureBootcamps();
       this.service.query(filter, columns, 'bootcamp').subscribe(resp => {
         if (resp.code === 0) {
           if (resp.data.length > 0) {
@@ -441,12 +450,13 @@ export class CalendarAttendanceComponent {
     this.startDate = startOfWeek.toDate();
     this.endDate = moment(startOfWeek).add(this.weeksToShow * 7, 'days').toDate();
     this.loadDays();
-    this.loadStudents();
+    this.getStudents();
     this.updateCurrentMonthAndYear();
   }
 
   openAttendanceDialog() {
     this.dialog.open(this.attendanceDialog);
+    this.configureBootcamps();
   }
 
   iterateDateRange() {
@@ -464,6 +474,13 @@ export class CalendarAttendanceComponent {
 
     return dates;
   }
+
+
+  onDatePickerClosed(): void {
+    this.configureBootcamps();
+  }
+
+
   submitAttendance() {
     const dateRange = this.iterateDateRange();
     console.log('Date Range:', dateRange);
@@ -482,10 +499,13 @@ export class CalendarAttendanceComponent {
       }
     }
 
-    this.onButtonClick();
+    this.saveAttendaces();
     this.loadDays();
     this.updateCurrentMonthAndYear();
     this.dialog.closeAll();
   }
 
+
+
+
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
index 328f05d17..5399a9752 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.css
@@ -133,9 +133,6 @@ padding: 20px 40px;
   justify-content: flex-end;
 }
 
-
-
-
 .user-grid {
 display: grid;
 grid-template-columns: 1fr 1fr;
@@ -314,21 +311,18 @@ grid-column: 1 / 3;
   margin: 0%;
   height: 100%;
 }
-.aviso label{
- color:rgb(244, 67, 54);
- display: flex;
- font-size: 11px;
- height: 20PX;
- letter-spacing: normal;
- font-weight: 400;
- line-height: 15px;
- text-align: left;
- text-size-adjust: 100%;
- width: 542.453px
-}
-.aviso label mat-icon{
- padding-bottom: 10px;
+
+.aviso p{
+  color: red;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  text-align: left;
+  font-size: 0.9rem;
+  margin-top: 5px;
+  gap: 5px;
 }
+
 .p_info_foto{
   margin-top: 30px;
   font-size: 12px;
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html
index 1bcc9fc45..acabbaa87 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.html
@@ -1,5 +1,5 @@
 <o-form #form attr="studentsDetail" service="students" entity="student" keys="id" header-actions="U;D" after-insert-mode="detail"
-  show-header-navigation="no">
+  show-header-navigation="no" (onUpdate)="refreshwarning()">
   <div o-form-toolbar-buttons>
     <o-button attr="backButton" class="o-form-toolbar-button" type="RAISED" icon="keyboard_backspace" label="Go back"
       (click)="location.back()" *ngIf="mostrarBoton" color="primary"></o-button>
@@ -38,13 +38,12 @@
           <div class="datosPrincipales2">
 
             <div class="dni">
-              <label for="LDNI">{{'LDNI' | oTranslate}}</label>
-              <o-nif-input attr="dni" label="{{'NIF' | oTranslate}}" read-only="no" required="no"
-                (onBlur)="mostrar($event)"></o-nif-input>
               <div class="aviso" *ngIf="showNotice">
-                <link rel="stylesheet" />
-                <label for="dni">{{'DNI_WARNING'|oTranslate}}<mat-icon svgIcon="ontimize:warning"></mat-icon></label>
+                <p>{{'DNI_WARNING'|oTranslate}}<mat-icon svgIcon="ontimize:warning"></mat-icon></p>
               </div>
+              <label for="LDNI">{{'LDNI' | oTranslate}}</label>
+              <o-nif-input attr="dni" label="{{'NIF' | oTranslate}}" read-only="no" required="no"
+                (onBlur)="mostrar($event)" (input)="toUpperCase($event)"></o-nif-input>
             </div>
             <div>
               <label for="REQ_LBIRTHDATE">{{'LBIRTHDATE' | oTranslate}}</label>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts
index 4bba357b9..6ac0ef2d9 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-detail/students-detail.component.ts
@@ -354,9 +354,9 @@ deleteNotes(notas: any) {
 
  }
 
- focusnote(){
-
- }
+refreshwarning(){
+  this.showNotice = false;
+}
 
 
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.css b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.css
index 95ae17e8b..238bab347 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.css
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.css
@@ -248,17 +248,6 @@ fieldset {
   justify-content: flex-end;
 }
 
-.fct-container {
-  display: grid;
-  grid-template-columns: 2fr 1fr;
-  grid-template-rows: auto auto;
-  width: 96%;
-  margin: 5px auto;
-  background-color: #f5f0f2;
-  border-radius: 15px;
-  padding: 20px;
-  gap: 20px;
-}
 
 .fct-grid {
   border-radius: 15px;
@@ -294,17 +283,7 @@ fieldset {
   justify-content: flex-end;
 }
 
-.fct-container {
-  display: grid;
-  grid-template-columns: 2fr 1fr;
-  grid-template-rows: auto auto;
-  width: 96%;
-  margin: 5px auto;
-  background-color: #f5f0f2;
-  border-radius: 15px;
-  padding: 20px;
-  gap: 20px;
-}
+
 
 .fct-grid {
   border-radius: 15px;
@@ -339,9 +318,8 @@ fieldset {
 
 .fct-container {
   display: grid;
-  grid-template-columns: 2fr 1fr;
-  grid-template-rows: auto auto;
-  width: 96%;
+  grid-template-columns: 1fr; 
+  width: 100%; 
   margin: 5px auto;
   background-color: #f5f0f2;
   border-radius: 15px;
@@ -349,12 +327,13 @@ fieldset {
   gap: 20px;
 }
 
-.fct-grid {
-  border-radius: 15px;
-  grid-column: 1 / 2;
-  grid-row: 1 / 3;
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 60px;
-  padding: 20px;
+.aviso p{
+  color: red;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  text-align: left;
+  font-size: 0.9rem;
+  margin-top: 5px;
+  gap: 5px;
 }
\ No newline at end of file
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.html b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.html
index 6d6c5d925..cc60b2b04 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.html
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/students/students-new/students-new.component.html
@@ -29,25 +29,13 @@
             </div>
           </div>
           <div class="datosPrincipales2">
-            <div class="sepGitUdemy">
-              <div class="githubUser">
-                <label for="LGITHUB_USER">{{'LGITHUB_USER' | oTranslate}}</label>
-                <o-text-input attr="github_user" required="no" max-length="150"></o-text-input>
-              </div>
-              <div class="udemy">
-                <div class="checkbox-container">
-                  <o-checkbox attr="udemy"></o-checkbox>
-                </div>
-              </div>
-            </div>
             <div class="dni">
-              <label for="dni">{{'LDNI' | oTranslate}}</label>
-              <o-nif-input attr="dni" label="{{'NIF' | oTranslate}}" read-only="no" required="no"
-                (input)="toUpperCase($event)" (onBlur)="mostrar($event)"></o-nif-input>
               <div class="aviso" *ngIf="showNotice">
-                <link rel="stylesheet" />
-                <label for="dni">{{'DNI_WARNING'|oTranslate}}<mat-icon svgIcon="ontimize:warning"></mat-icon> </label>
+                <p>{{'DNI_WARNING'|oTranslate}}<mat-icon svgIcon="ontimize:warning"></mat-icon></p>
               </div>
+              <label for="LDNI">{{'LDNI' | oTranslate}}</label>
+              <o-nif-input attr="dni" label="{{'NIF' | oTranslate}}" read-only="no" required="no"
+                (onBlur)="mostrar($event)" (input)="toUpperCase($event)"></o-nif-input>
             </div>
 
             <div class="fechaCumple">
@@ -73,6 +61,17 @@
                 </o-combo>
               </div>
             </div>
+            <div class="sepGitUdemy">
+              <div class="githubUser">
+                <label for="LGITHUB_USER">{{'LGITHUB_USER' | oTranslate}}</label>
+                <o-text-input attr="github_user" required="no" max-length="150"></o-text-input>
+              </div>
+              <div class="udemy">
+                <div class="checkbox-container">
+                  <o-checkbox attr="udemy"></o-checkbox>
+                </div>
+              </div>
+            </div>
           </div>
         </fieldset>
         <div class="login">
@@ -145,12 +144,6 @@
             </o-date-input>
           </div>
         </fieldset>
-        <fieldset title="{{'LNOTES'|oTranslate}}">
-          <legend for="LNOTES">{{'LNOTES' | oTranslate}}</legend>
-          <div class="notes">
-            <o-textarea-input attr="notes" required="no" max-length="1000"></o-textarea-input>
-          </div>
-        </fieldset>
       </div>
     </mat-tab>
   </mat-tab-group>
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
index 1110e48de..e851f79ed 100644
--- a/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
+++ b/cd2024bfs4g1-frontend/src/main/ngx/src/styles.scss
@@ -63,7 +63,6 @@
 button.calendarcellStart span {
   background: #2E8B57;
   text-align:center;
-  width: 100%;
   height: 89%;
 
   margin-top: 1.5px;
@@ -76,7 +75,6 @@ button.calendarcellStart span {
 button.calendarcellEnd span {
   background: #DC143C;
   text-align:center;
-  width: 100%;
   height: 89%;
   margin-top: 1.5px;
 }
@@ -88,7 +86,6 @@ button.calendarcell{
 button.calendarcell span{
   background: lightgrey;
   text-align:center;
-  width: 100%;
   height: 89%;
 }
 span.mat-calendar-body-cell-content{
@@ -128,7 +125,7 @@ button.mat-mdc-outlined-button:not([disabled]).mat-mdc-button-base.mat-primary,
 .o-button button.mat-mdc-outlined-button,
 button.mat-mdc-outlined-button:not([disabled]).mat-mdc-button-base.mat-accent,
 button.mat-mdc-outlined-button:not([disabled]).mat-mdc-button-base.mat-accent,
-.list_container .o-list-container .add-button, .boton-angular, .mat-primary.mat-stroked-button
+.list_container .o-list-container .add-button, .boton-angular
 {
   border: none;
   background-color: #8AB237;
@@ -155,9 +152,9 @@ button.mat-mdc-raised-button.mat-primary:hover,
 button.mat-mdc-outlined-button:not([disabled]).mat-mdc-button-base.mat-primary:hover,
 .o-button button.mat-mdc-outlined-button:hover,
 button.mat-mdc-outlined-button:not([disabled]).mat-mdc-button-base.mat-accent:hover,
-.list_container .o-list-container .add-button:hover, .mat-primary.mat-stroked-button:hover,
+.list_container .o-list-container .add-button:hover,
 .boton-angular:hover {
-  border: none;
+  border: 2px solid #8AB237;
   background-color: #1a3459;
   border-radius: 10px;
   color: #8AB237;
@@ -455,9 +452,6 @@ o-column.o-column .o-container > .o-container-title span{
 .mat-calendar-body-in-range::before{
   background-color: #8AB237;
 }
-.mat-calendar-body-cell-content.mat-focus-indicator{
-  border-radius: 50%;
-}
 
 .active.available.end-date.in-range.weekend.ng-star-inserted, .active.available.end-date.in-range.ng-star-inserted, .available.ng-star-inserted.active.start-date.in-range{
   background-color: #1a3459;
diff --git a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/AttendanceService.java b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/AttendanceService.java
index fcbcc8fc8..4fd592493 100644
--- a/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/AttendanceService.java
+++ b/cd2024bfs4g1-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/AttendanceService.java
@@ -3,6 +3,7 @@
 
 import com.campusdual.cd2024bfs4g1.api.core.service.IAttendanceService;
 import com.campusdual.cd2024bfs4g1.model.core.dao.AttendanceDao;
+import com.campusdual.cd2024bfs4g1.model.core.dao.BootcampDao;
 import com.ontimize.jee.common.db.AdvancedEntityResult;
 import com.ontimize.jee.common.dto.EntityResult;
 import com.ontimize.jee.common.dto.EntityResultMapImpl;
@@ -21,11 +22,13 @@
 @Service("AttendanceService")
 @Lazy
 public class AttendanceService implements IAttendanceService {
-  @Autowired
-  private DefaultOntimizeDaoHelper daoHelper;
-  @Autowired
-  private AttendanceDao attendanceDao;
+    @Autowired
+    private DefaultOntimizeDaoHelper daoHelper;
+    @Autowired
+    private AttendanceDao attendanceDao;
 
+    @Autowired
+    private BootcampDao bootcampDao;
 
     @Override
     public EntityResult attendanceQuery(Map<String, Object> keyMap, List<String> attributes) throws OntimizeJEERuntimeException {
@@ -95,6 +98,8 @@ public EntityResult attendanceUpdate(Map<String, Object> attrMap, Map<String, Ob
         return this.daoHelper.update(this.attendanceDao, attrMap, keyMap);
     }
 
+
+
     @Override
     public EntityResult attendanceDelete(Map<String, Object> keyMap) throws OntimizeJEERuntimeException {
         return this.daoHelper.delete(this.attendanceDao, keyMap);
diff --git a/charts/cd2024bfs4g1/values-dev.yaml b/charts/cd2024bfs4g1/values-dev.yaml
index c2ed998d1..a2a0a5d2e 100644
--- a/charts/cd2024bfs4g1/values-dev.yaml
+++ b/charts/cd2024bfs4g1/values-dev.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: IfNotPresent
   ## provided as basic setup. replace as needed
   repository: ghcr.io/campusdual/cd2024bfs4g1
-  version: dev8c4a183
+  version: dev7ad8678
 imagePullSecrets: 
   - name: "github-ecr-cred" 
 nameOverride: ""