Merge pull request #280 from CampusDual/develop

Spring 6

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;

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>

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,15 +156,29 @@ export class BootcampDetailsComponent {
 
 
   ngOnInit() {
-
-   }
+    //this.configureBootcamps();
+  }
 
   protected configureBootcamps() {
     const conf = this.service.getDefaultServiceConfiguration('bootcamps');
     this.service.configureService(conf);
 
   }
 
+
+
+  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,17 +324,17 @@ 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();
           }
         });
       }
     });
 
-   }
+  }
 
   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();
   }
 

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>