Merge pull request #219 from CampusDual/BFS42024-295

Bfs42024 295
CampusDual · Jan 9, 2025 · 415649f · 415649f
2 parents 2820e9f + 082a246
commit 415649f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/...tend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html b/...tend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.html
@@ -275,6 +275,9 @@ <h3>{{ 'BootcampDoc' | oTranslate }}</h3>
             </div>
           </div>
         </mat-tab>
+        <mat-tab label="{{'Asistencia'|oTranslate}}">
+          <app-calendar-attendance [bootcampId]="bootcampId"></app-calendar-attendance>
+        </mat-tab>
 
       </o-form-layout-dialog-options>
     </o-form-layout-manager>

diff --git a/...ontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts b/...ontend/src/main/ngx/src/app/main/bootcamps/bootcamp-details/bootcamp-details.component.ts
@@ -15,6 +15,7 @@ import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 
 })
 export class BootcampDetailsComponent {
+
   @ViewChild('bootcampDetailForm') bootcampDetailForm:OFormComponent;
   @ViewChild("idNumber") idNumber: OTextInputComponent;
   @ViewChild("documentsTable") documentsTable: OTableComponent;
@@ -23,6 +24,7 @@ export class BootcampDetailsComponent {
   @ViewChild('sessionBootcampTable', { static: true }) table: OTableComponent;
   selectedStatuses: string[] = ['Started', 'Pending']; 
   months: Date[] = [];
+  bootcampId: number;
 
   validatorsArray: ValidatorFn[] = [];
   validatorsArray1: ValidatorFn[] = [];
@@ -219,10 +221,12 @@ export class BootcampDetailsComponent {
 
   getFileData() {
     if (this.idNumber) {
+      this.bootcampId = this.idNumber.getValue();
       return { bootcamp_id: this.idNumber.getValue() };
     } else {
       return null;
     }
+
   }
 
 
@@ -368,6 +372,9 @@ export class BootcampDetailsComponent {
     }
   }
 
+  loadBootcamp() {
+    this.bootcampId= this.bootcampDetailForm.getFieldValue("id");
+  }
 
 
 

diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/bootcamps/bootcamps.module.ts
@@ -11,6 +11,7 @@ import { BootcampTimetableNewComponent } from './bootcamp-details/bootcamp-timet
 import { TutorBootcampAddComponent } from './bootcamp-details/tutor-bootcamp-add/tutor-bootcamp-add.component';
 import { NewSessionBootcampComponent } from './bootcamp-details/new-session-bootcamp/new-session-bootcamp.component';
 import { UpdateSessionBootcampComponent } from './bootcamp-details/update-session-bootcamp/update-session-bootcamp.component';
+import { SharedModule } from "../../shared/shared.module";
 
 
 
@@ -30,7 +31,8 @@ import { UpdateSessionBootcampComponent } from './bootcamp-details/update-sessio
   imports: [
     CommonModule,
     OntimizeWebModule,
-    BootcampsRoutingModule
-  ]
+    BootcampsRoutingModule,
+    SharedModule
+]
 })
 export class BootcampsModule { }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/data.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/main/data/data.module.ts
@@ -8,7 +8,8 @@ import { BootcampStudentsTableComponent } from './personal-tutor-info/bootcamp-s
 import { PersonalInfoSessionsComponent } from './personal-info/personal-info-sessions/personal-info-sessions.component';
 import { UpdateSessionTutorComponent } from './personal-tutor-info/update-session-bootcamp/update-session-tutor.component';
 import { NewSessionBootcampComponent } from './personal-tutor-info/new-session-bootcamp/new-session-bootcamp.component';
-import { CalendarAttendanceComponent } from './personal-tutor-info/calendar-attendance/calendar-attendance.component';
+import { SharedModule } from 'src/app/shared/shared.module';
+
 
 @NgModule({
   declarations: [
@@ -18,13 +19,13 @@ import { CalendarAttendanceComponent } from './personal-tutor-info/calendar-atte
     UpdateSessionTutorComponent,
     PersonalInfoSessionsComponent,
     NewSessionBootcampComponent,
-    CalendarAttendanceComponent
 
   ],
   imports: [
     CommonModule,
     OntimizeWebModule,
-    DataRoutingModule
+    DataRoutingModule,
+    SharedModule
   ]
 })
 export class DataModule { }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/shared.module.ts b/cd2024bfs4g1-frontend/src/main/ngx/src/app/shared/shared.module.ts
@@ -3,19 +3,25 @@ import { NgModule } from '@angular/core';
 import { OntimizeWebModule } from 'ontimize-web-ngx';
 import { FilterComponent } from './components/filters/filters.component';
 import { HomeToolbarComponent } from './components/home-toolbar/home-toolbar.component';
+import { CalendarAttendanceComponent } from '../main/data/personal-tutor-info/calendar-attendance/calendar-attendance.component';
+
 
 @NgModule({
   imports: [
     OntimizeWebModule
   ],
   declarations: [
     FilterComponent,
-    HomeToolbarComponent
+    HomeToolbarComponent,
+    CalendarAttendanceComponent
   ],
   exports: [
     CommonModule,
     FilterComponent,
-    HomeToolbarComponent
+    HomeToolbarComponent,
+    CalendarAttendanceComponent
   ]
 })
 export class SharedModule { }
+
+