refs #1827 . UX changes. New calendar styles

refs #1922 . Show new fields in clients table. Fixed wrong details
2025-04-30 13:17:16 +02:00 · 2025-04-30 13:16:18 +02:00
14 changed files with 270 additions and 113 deletions
--- a/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.css
+++ b/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.css
@ -22,7 +22,12 @@

 .time-fields {
  display: flex;
-  gap: 15px; /* Espacio entre los campos */
+  gap: 15px;
+}
+
+.hour-fields {
+  display: flex;
+  gap: 15px;
 }

 .time-field {
@ -34,4 +39,74 @@
  justify-content: flex-end;
  gap: 1em;
  padding: 1.5em;
-}
+}
+
+.custom-text {
+  font-style: italic;
+  font-size: 0.875rem;
+  color: #666;
+  margin: 4px 0 12px;
+}
+
+.weekday-toggle-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin: 40px 0 40px 0;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.weekday-toggle {
+  flex: 1 1 calc(14.28% - 10px);
+  padding: 10px 0;
+  border-radius: 999px;
+  border: 1px solid #ccc;
+  background-color: #f5f5f5;
+  cursor: pointer;
+  font-size: 14px;
+  text-align: center;
+  transition: all 0.2s ease;
+  min-width: 40px;
+}
+
+.weekday-toggle.selected {
+  background-color: #1976d2;
+  color: white;
+  border-color: #1976d2;
+}
+
+
+.availability-summary {
+  background-color: #e3f2fd;
+  border-left: 4px solid #2196f3;
+  padding: 12px 16px;
+  margin-top: 16px;
+  border-radius: 6px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 14px;
+}
+
+.summary-text {
+  color: #0d47a1;
+  line-height: 1.4;
+}
+
+.unavailability-summary {
+  background-color: #ffebee;
+  border-left: 4px solid #d32f2f;
+  padding: 12px 16px;
+  margin-top: 16px;
+  border-radius: 6px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 14px;
+}
+
+.summary-text {
+  color: #b71c1c;
+  line-height: 1.4;
+}
--- a/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.html
+++ b/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.html
@ -1,24 +1,26 @@
 <h2 mat-dialog-title>{{ isEditMode ? ('editCalendar' | translate) : ('addCalendar' | translate) }}</h2>
 <mat-dialog-content class="form-container">
-  <mat-slide-toggle [(ngModel)]="isRemoteAvailable" class="example-margin">
+  <mat-checkbox [(ngModel)]="isRemoteAvailable">
    {{ 'remoteAvailability' | translate }}
-  </mat-slide-toggle>
+  </mat-checkbox>
+
+  <mat-divider style="margin: 10px 0;"></mat-divider>

  <div *ngIf="!isRemoteAvailable" class="form-group">
    <mat-label>{{ 'selectWeekDays' | translate }}</mat-label>
-    <div class="row">
-      <div class="col-md-6 checkbox-group">
-        <mat-checkbox *ngFor="let day of weekDays.slice(0, (weekDays.length / 2) + 1)" [(ngModel)]="busyWeekDays[day]">
-          {{ day }}
-        </mat-checkbox>
-      </div>
-      <div class="col-md-6 checkbox-group">
-        <mat-checkbox *ngFor="let day of weekDays.slice(weekDays.length / 2 + 1)" [(ngModel)]="busyWeekDays[day]">
-          {{ day }}
-        </mat-checkbox>
-      </div>
+    <p class="custom-text"> (Los dias y horas seleccionados se marcarán como aula no disponible para remote pc.) </p>
+    <div class="weekday-toggle-group full-width">
+      <button
+        *ngFor="let day of weekDays"
+        type="button"
+        class="weekday-toggle"
+        [class.selected]="busyWeekDays[day]"
+        (click)="busyWeekDays[day] = !busyWeekDays[day]">
+        {{ day.slice(0, 3) }}
+      </button>
    </div>

+
    <div class="time-fields">
      <mat-form-field appearance="fill" class="time-field">
        <mat-label>{{ 'startTime' | translate }}</mat-label>
@ -30,12 +32,24 @@
        <input matInput [(ngModel)]="busyToHour" type="time" placeholder="{{ 'endTimePlaceholder' | translate }}" [required]="!isRemoteAvailable">
      </mat-form-field>
    </div>
+
+    <mat-divider></mat-divider>
+
+    <div class="unavailability-summary" *ngIf="busyFromHour && busyToHour && busyWeekDays && getSelectedDays().length">
+      <mat-icon style="width: 50px;" color="warn">block</mat-icon>
+      <span class="summary-text">
+      El aula estará <strong>no disponible</strong> para Remote PC los días:
+      <strong>{{ getSelectedDays().join(', ') }}</strong> de
+      <strong>{{ busyFromHour }}</strong> a <strong>{{ busyToHour }}</strong>.
+    </span>
+    </div>
  </div>

  <div *ngIf="isRemoteAvailable" class="form-group">
    <mat-form-field appearance="fill" class="full-width">
      <mat-label>{{ 'reasonLabel' | translate }}</mat-label>
      <input matInput [(ngModel)]="availableReason" placeholder="{{ 'reasonPlaceholder' | translate }}" [required]="isRemoteAvailable">
+      <mat-hint>Razón por la cual el aula SI está disponible para su uso en Remote PC</mat-hint>
    </mat-form-field>
    <div class="time-fields">
      <mat-form-field appearance="fill" class="full-width">
@ -53,6 +67,32 @@
        <mat-datepicker #picker2></mat-datepicker>
      </mat-form-field>
    </div>
+    <div class="hour-fields">
+      <mat-form-field appearance="fill" class="time-field">
+        <mat-label>{{ 'startTime' | translate }}</mat-label>
+        <input matInput [(ngModel)]="busyFromHour" type="time" placeholder="{{ 'startTimePlaceholder' | translate }}" [required]="!isRemoteAvailable">
+      </mat-form-field>
+
+      <mat-form-field appearance="fill" class="time-field">
+        <mat-label>{{ 'endTime' | translate }}</mat-label>
+        <input matInput [(ngModel)]="busyToHour" type="time" placeholder="{{ 'endTimePlaceholder' | translate }}" [required]="!isRemoteAvailable">
+      </mat-form-field>
+    </div>
+
+    <mat-divider></mat-divider>
+
+    <div class="availability-summary" *ngIf="availableFromDate && availableToDate">
+      <mat-icon color="primary" style="width: 50px;">info</mat-icon>
+      <span class="summary-text">
+        El aula estará <strong>disponible</strong> para reserva desde el
+        <strong>{{ availableFromDate | date:'fullDate' }}</strong> hasta el
+        <strong>{{ availableToDate | date:'fullDate' }}</strong>
+        <span *ngIf="busyFromHour && busyToHour">
+          en el horario de <strong>{{ busyFromHour }}</strong> a <strong>{{ busyToHour }}</strong>.
+      </span>
+    </span>
+    </div>
+
  </div>
 </mat-dialog-content>

--- a/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.ts
+++ b/ogWebconsole/src/app/components/calendar/create-calendar-rule/create-calendar-rule.component.ts
@ -64,8 +64,8 @@ export class CreateCalendarRuleComponent {
    this.dialogRef.close();
  }

-  toggleAdditionalForm(): void {
-    this.showAdditionalForm = !this.showAdditionalForm;
+  getSelectedDays(): string[] {
+    return Object.keys(this.busyWeekDays || {}).filter(day => this.busyWeekDays[day]);
  }

  getSelectedDaysIndices() {
@ -93,7 +93,7 @@ export class CreateCalendarRuleComponent {
      this.http.put(`${this.baseUrl}${this.ruleId}`, formData)
        .subscribe({
          next: (response) => {
-            this.toastService.success('Calendar updated successfully');
+            this.toastService.success('Calendar rule updated successfully');
            this.dialogRef.close(true);
          },
          error: (error) => {
@ -105,7 +105,7 @@ export class CreateCalendarRuleComponent {
      this.http.post(`${this.baseUrl}/remote-calendar-rules`, formData)
        .subscribe({
          next: (response) => {
-            this.toastService.success('Calendar created successfully');
+            this.toastService.success('Calendar rule created successfully');
            this.dialogRef.close(true);
          },
          error: (error) => {
--- a/ogWebconsole/src/app/components/calendar/create-calendar/create-calendar.component.css
+++ b/ogWebconsole/src/app/components/calendar/create-calendar/create-calendar.component.css
@ -25,7 +25,7 @@

 .time-fields {
  display: flex;
-  gap: 15px; /* Espacio entre los campos */
+  gap: 15px;
 }

 .time-field {
@ -34,24 +34,25 @@

 .list-item-content {
  display: flex;
-  align-items: flex-start; /* Alinea el contenido al inicio */
-  justify-content: space-between; /* Espacio entre los textos y los íconos */
-  width: 100%; /* Asegúrate de que el contenido ocupe todo el ancho */
+  align-items: flex-start;
+  justify-content: space-between;
+  width: 100%;
 }

 .text-content {
-  flex-grow: 1; /* Permite que este contenedor ocupe el espacio disponible */
-  margin-right: 16px; /* Espaciado a la derecha para separar de los íconos */
+  flex-grow: 1;
+  margin-right: 16px;
  margin-left: 10px;
+  margin-bottom: 16px;
 }

 .icon-container {
  display: flex;
-  align-items: center; /* Alinea los íconos verticalmente */
+  align-items: center;
 }

 .right-icon {
-  margin-left: 8px; /* Espaciado entre los íconos */
+  margin-left: 8px;
  cursor: pointer;
 }

@ -60,4 +61,15 @@
  justify-content: flex-end;
  gap: 1em;
  padding: 1.5em;
-}
+}
+
+.rule-available {
+  background-color: #e8f5e9;
+  border-left: 4px solid #4caf50;
+}
+
+.rule-unavailable {
+  background-color: #ffebee;
+  border-left: 4px solid #f44336;
+}
+
--- a/ogWebconsole/src/app/components/calendar/create-calendar/create-calendar.component.html
+++ b/ogWebconsole/src/app/components/calendar/create-calendar/create-calendar.component.html
@ -6,7 +6,7 @@
    <input matInput [(ngModel)]="name" required>
    <mat-icon *ngIf="isEditMode" matSuffix (click)="submitForm()">mode_edit</mat-icon>
  </mat-form-field>
-  
+
  <div style="display: flex; justify-content: space-between; align-items: center;">
    <div *ngIf="isEditMode" mat-subheader>{{ 'rulesHeader' | translate }}</div>
    <button class="action-button" *ngIf="isEditMode" (click)="createRule()" style="padding: 10px;">
@ -18,14 +18,20 @@

  <mat-list *ngIf="isEditMode">
    <ng-container *ngFor="let rule of remoteCalendarRules;">
-      <mat-list-item>
+      <mat-list-item
+        [ngClass]="{
+          'rule-available': rule.isRemoteAvailable,
+          'rule-unavailable': !rule.isRemoteAvailable
+        }"
+      >
        <div class="list-item-content">
          <mat-icon matListItemIcon>event_available</mat-icon>
          <div class="text-content">
-            <div matListItemTitle>{{ rule.isRemoteAvailable ? ('statusAvailable' | translate) : ('statusUnavailable' | translate) }}</div>
-            <div matListItemLine *ngIf="!rule.isRemoteAvailable">{{ rule.busyFromHour }} - {{ rule.busyToHour }}</div>
-            <div matListItemLine *ngIf="!rule.isRemoteAvailable">{{ rule.busyWeekDaysMap }}</div>
-            <div matListItemLine *ngIf="rule.isRemoteAvailable">{{ rule.availableReason }} | {{ rule.availableFromDate | date }} - {{ rule.availableToDate | date }}</div>
+            <div matListItemTitle>{{ rule.isRemoteAvailable ? ('remotePcStatusAvailable' | translate) : ('remotePcStatusUnavailable' | translate) }}</div>
+            <div matListItemLine *ngIf="!rule.isRemoteAvailable">Días: <strong>{{ rule.busyWeekDaysMap }}</strong></div>
+            <div matListItemLine *ngIf="rule.isRemoteAvailable">Razón: {{ rule.availableReason }}</div>
+            <div matListItemLine *ngIf="rule.isRemoteAvailable">Días: <strong>{{ rule.availableFromDate | date }} - {{ rule.availableToDate | date }}</strong></div>
+            <div matListItemLine>Horario: {{ rule.busyFromHour }} - {{ rule.busyToHour }}</div>
          </div>
          <div class="icon-container">
            <button mat-icon-button color="primary" class="right-icon" (click)="createRule(rule)">
--- a/ogWebconsole/src/app/components/groups/shared/classroom-view/classroom-view.component.css
+++ b/ogWebconsole/src/app/components/groups/shared/classroom-view/classroom-view.component.css
@ -21,21 +21,24 @@ mat-card {
 }

 .client-image {
-  width: 100%;
+  display: flex;
+  justify-content: center;
+  width: 70%;
  height: auto;
+  margin: 0 auto;
 }

 .proyector-image {
  width: auto;
-  height: 100px;
+  height: 80px;
 }

 .client-info {
+  display: grid;
  text-align: center;
-  margin-top: 5px;
-  font-size: medium;
  color: gray;
  align-items: center;
+  font-size: small;
 }

 .client-name {
@ -131,4 +134,4 @@ mat-dialog-content {

 .submit-button {
  margin: 1rem;
-}
+}
--- a/ogWebconsole/src/app/components/groups/shared/classroom-view/classroom-view.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/classroom-view/classroom-view.component.html
@ -12,7 +12,9 @@
              <img mat-card-image src="assets/images/client.png" alt="{{ 'clientAlt' | translate }}" class="client-image"/>
            </div>
            <div class="client-info">
-              <span>{{ client.name }}</span>
+              <span><strong>{{ client.name }}</strong></span>
+              <span>{{ client.ip }}</span>
+              <span>{{ client.mac }}</span>
            </div>
          </mat-card>
        </div>
--- a/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.css
+++ b/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.css
@ -62,7 +62,8 @@
 }

 .table-container {
-  flex: 1 1 500px;
+  flex: 5;
+  display: flex;
  overflow-x: auto;
 }

@ -70,7 +71,7 @@
  display: flex;
  flex-wrap: wrap;
  gap: 24px;
-  flex: 1 1 300px;
+  flex: 2;
  justify-content: flex-start;
 }

@ -85,6 +86,13 @@ table {
  box-shadow: none;
 }

+.table-header-container {
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  gap: 20px;
+}
+
 .charts-container.single-disk {
  justify-content: center;
 }
@ -107,4 +115,18 @@ table {
  width: 100%;
  height: 160px;
  margin-bottom: 12px;
-}
+}
+
+.action-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 1em;
+  padding: 1.5em;
+}
+
+.client-container {
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+  margin-bottom: 40px;
+}
--- a/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.html
@ -23,10 +23,12 @@
      </div>
    </div>

-    <div class="section-header">
-      <h2 class="title" i18n="@@adminImagesTitle">Discos/Particiones</h2>
+    <div class="table-header-container">
+      <h2 i18n="@@adminImagesTitle">Discos/Particiones</h2>
+      <mat-chip> {{ clientData.firmwareType }}</mat-chip>
    </div>

+
    <div class="disk-container">
      <div class="disk-layout">
        <div class="table-container">
@ -63,4 +65,7 @@
      </div>
    </div>
  </div>
-</mat-dialog-content>
+</mat-dialog-content>
+<mat-dialog-actions class="action-container">
+  <button class="ordinary-button" (click)="onNoClick()">{{ 'closeButton' | translate }}</button>
+</mat-dialog-actions>
--- a/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.ts
+++ b/ogWebconsole/src/app/components/groups/shared/client-details/client-details.component.ts
@ -64,6 +64,11 @@ export class ClientDetailsComponent {
      header: 'Particion',
      cell: (partition: any) => `${partition.partitionNumber}`
    },
+    {
+      columnDef: 'partitionCode',
+      header: 'Tipo de partición',
+      cell: (partition: any) => `${partition.partitionCode}`
+    },
    {
      columnDef: 'description',
      header: 'Sistema de ficheros',
@ -115,7 +120,7 @@ export class ClientDetailsComponent {
      console.error('No se recibieron datos del cliente.');
    }
  }
-  
+
  loadClient = (uuid: string) => {
    this.http.get<any>(`${this.baseUrl}${uuid}`).subscribe({
      next: data => {
@ -225,42 +230,8 @@ export class ClientDetailsComponent {
    });
  }

-
-  loadCommands(): void {
-    this.http.get<any>(`${this.baseUrl}/commands?`).subscribe({
-      next: data => {
-        this.commands = data['hydra:member'];
-      },
-      error: error => {
-        console.error('Error al obtener las particiones:', error);
-      }
-    });
-  }
-
-  onCommandSelect(action: any): void {
-    if (action === 'partition') {
-      this.openPartitionAssistant();
-    }
-
-    if (action === 'create-image') {
-      this.openCreateImageAssistant();
-    }
-
-    if (action === 'deploy-image') {
-      this.openDeployImageAssistant();
-    }
-
-    if (action === 'reboot') {
-      this.rebootClient();
-    }
-
-    if (action === 'power-off') {
-      this.powerOffClient();
-    }
-
-    if (action === 'power-on') {
-      this.powerOnClient();
-    }
+  onNoClick(): void {
+    this.dialog.closeAll();
  }

  rebootClient(): void {
--- a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.html
@ -67,7 +67,7 @@

            <mat-form-field class="form-field">
                <mat-label>{{ 'templateLabel' | translate }}</mat-label>
-                <mat-select formControlName="template">
+                <mat-select formControlName="pxeTemplate">
                    <mat-option *ngFor="let template of templates" [value]="template['@id']">
                        {{ template.name }}
                    </mat-option>
--- a/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts
+++ b/ogWebconsole/src/app/components/groups/shared/clients/manage-client/manage-client.component.ts
@ -86,7 +86,7 @@ export class ManageClientComponent implements OnInit {
      netDriver: null,
      mac: ['', Validators.pattern(/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/)],
      ip: ['', Validators.required],
-      template: [null],
+      pxeTemplate: [null],
      hardwareProfile: [null],
      ogLive: [null],
      repository: [null],
@ -110,7 +110,8 @@ export class ManageClientComponent implements OnInit {
            repository: unit.networkSettings?.repository?.['@id'],
            hardwareProfile: unit.networkSettings?.hardwareProfile?.['@id'],
            ogLive: unit.networkSettings?.ogLive?.['@id'],
-            menu: unit.networkSettings?.menu?.['@id']
+            menu: unit.networkSettings?.menu?.['@id'],
+            pxeTemplate: unit.networkSettings?.pxeTemplate?.['@id'],
          }));

          const initialUnitId = this.clientForm.get('organizationalUnit')?.value;
@ -229,6 +230,7 @@ export class ManageClientComponent implements OnInit {
        ogLive: selectedUnit.ogLive || null,
        menu: selectedUnit.menu || null,
        netiface: selectedUnit.netiface || null,
+        pxeTemplate: selectedUnit.pxeTemplate || null
      });
    }
  }
@ -250,7 +252,7 @@ export class ManageClientComponent implements OnInit {
            organizationalUnit: data.organizationalUnit ? data.organizationalUnit['@id'] : null,
            repository: data.repository ? data.repository['@id'] : null,
            ogLive: data.ogLive ? data.ogLive['@id'] : null,
-            template: data.template ? data.template['@id'] : null,
+            pxeTemplate: data.pxeTemplate ? data.pxeTemplate['@id'] : null,
            menu: data.menu ? data.menu['@id'] : null,
            maintenance: data.maintenance
          });
--- a/ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.html
@ -18,7 +18,7 @@
                <input matInput formControlName="name" required>
            </mat-form-field>
            <mat-form-field class="form-field" appearance="fill">
-                <mat-label>Padre</mat-label>
+                <mat-label>Unidad organizativa superior</mat-label>
                <mat-select formControlName="parent" (selectionChange)="onParentChange($event)">
                    <mat-select-trigger>
                        {{ getSelectedParentName() }}
@ -72,14 +72,22 @@
        <!-- Paso 3: Configuración de Red -->
        <span *ngIf="!loading" class="step-title">Configuración de Red</span>
        <form *ngIf="networkSettingsFormGroup && !loading" [formGroup]="networkSettingsFormGroup" class="grid-form">
-            <mat-form-field class="form-field">
-                <mat-label>OgLive</mat-label>
-                <mat-select formControlName="ogLive" (selectionChange)="onOgLiveChange($event)">
-                    <mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']">
-                        {{ oglive.name }}
-                    </mat-option>
-                </mat-select>
-            </mat-form-field>
+          <mat-form-field class="form-field">
+              <mat-label>OgLive</mat-label>
+              <mat-select formControlName="ogLive" (selectionChange)="onOgLiveChange($event)">
+                  <mat-option *ngFor="let oglive of ogLives" [value]="oglive['@id']">
+                      {{ oglive.name }}
+                  </mat-option>
+              </mat-select>
+          </mat-form-field>
+          <mat-form-field class="form-field">
+            <mat-label>Plantilla PXE</mat-label>
+            <mat-select formControlName="pxeTemplate" (selectionChange)="onPxeTemplateChange($event)">
+              <mat-option *ngFor="let template of pxeTemplates" [value]="template['@id']">
+                {{ template.name }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
            <mat-form-field class="form-field">
                <mat-label>Repositorio</mat-label>
                <mat-select formControlName="repository" (selectionChange)="onRepositoryChange($event)">
--- a/ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.ts
+++ b/ogWebconsole/src/app/components/groups/shared/organizational-units/manage-organizational-unit/manage-organizational-unit.component.ts
@ -30,6 +30,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
  isEditMode: boolean;
  currentCalendar: any = [];
  ogLives: any[] = [];
+  pxeTemplates: any[] = [];
  menus: any[] = [];
  repositories: any[] = [];
  parentUnitsWithPaths: { id: string, name: string, path: string }[] = [];
@ -77,6 +78,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
    this.networkSettingsFormGroup = this._formBuilder.group({
      ogLive: [null],
      repository: [null],
+      pxeTemplate: [null],
      proxy: [null],
      dns: [null],
      netmask: [null],
@ -111,6 +113,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
      this.loadOgLives(),
      this.loadRepositories(),
      this.loadMenus(),
+      this.loadPxeTemplates()
    ];

    Promise.all(observables).then(() => {
@ -144,6 +147,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
            repository: unit.networkSettings?.repository?.['@id'],
            hardwareProfile: unit.networkSettings?.hardwareProfile?.['@id'],
            ogLive: unit.networkSettings?.ogLive?.['@id'],
+            pxeTemplate: unit.networkSettings?.pxeTemplate?.['@id'],
            menu: unit.networkSettings?.menu?.['@id'],
            mcastIp: unit.networkSettings?.mcastIp,
            mcastSpeed: unit.networkSettings?.mcastSpeed,
@ -183,6 +187,7 @@ export class ManageOrganizationalUnitComponent implements OnInit {
        repository: selectedUnit.repository || null,
        hardwareProfile: selectedUnit.hardwareProfile || null,
        ogLive: selectedUnit.ogLive || null,
+        pxeTemplate: selectedUnit.pxeTemplate || null,
        menu: selectedUnit.menu || null,
        mcastIp: selectedUnit.mcastIp || null,
        mcastSpeed: selectedUnit.mcastSpeed || null,
@ -219,6 +224,23 @@ export class ManageOrganizationalUnitComponent implements OnInit {
    });
  }

+  loadPxeTemplates(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = `${this.baseUrl}/pxe-templates?page=1&itemsPerPage=10000`;
+
+      this.http.get<any>(url).subscribe(
+          response => {
+          this.pxeTemplates = response['hydra:member'];
+          resolve();
+          },
+          error => {
+          console.error('Error fetching pxe templates:', error);
+          reject(error);
+          }
+      );
+    });
+  }
+
  loadOgLives(): Promise<void> {
    return new Promise((resolve, reject) => {
      const url = `${this.baseUrl}/og-lives?page=1&itemsPerPage=30`;
@ -287,22 +309,6 @@ export class ManageOrganizationalUnitComponent implements OnInit {
    });
  }

-  loadCurrentCalendar(uuid: string): void {
-    this.loading = true;
-    const apiUrl = `${this.baseUrl}/remote-calendars/${uuid}`;
-    this.http.get<any>(apiUrl).subscribe(
-      response => {
-        this.currentCalendar = response;
-        this.loading = false;
-      },
-      error => {
-        console.error('Error loading current calendar', error);
-        this.toastService.error('Error loading current calendar');
-        this.loading = false;
-      }
-    );
-  }
-
  onCalendarChange(event: any) {
    this.generalFormGroup.value.remoteCalendar = event.value;
  }
@ -315,6 +321,10 @@ export class ManageOrganizationalUnitComponent implements OnInit {
    this.networkSettingsFormGroup.value.repository = event.value;
  }

+  onPxeTemplateChange(event: any) {
+    this.networkSettingsFormGroup.value.pxeTemplate = event.value;
+  }
+
  loadData(uuid: string): Promise<void> {
    return new Promise((resolve, reject) => {
      const url = `${this.baseUrl}/organizational-units/${uuid}`;
@ -347,7 +357,8 @@ export class ManageOrganizationalUnitComponent implements OnInit {
            menu: data.networkSettings?.menu ? data.networkSettings.menu['@id'] : null,
            hardwareProfile: data.networkSettings?.hardwareProfile ? data.networkSettings.hardwareProfile['@id'] : null,
            ogLive: data.networkSettings?.ogLive ? data.networkSettings.ogLive['@id'] : null,
-            repository: data.networkSettings?.repository ? data.networkSettings.repository['@id'] : null
+            repository: data.networkSettings?.repository ? data.networkSettings.repository['@id'] : null,
+            pxeTemplate: data.networkSettings?.pxeTemplate ? data.networkSettings.pxeTemplate['@id'] : null
          });
          this.classroomInfoFormGroup.patchValue({
            location: data.location,
Author	SHA1	Message	Date
Manuel Aranda Rosales	1e05176758	refs #1827 . UX changes. New calendar styles testing/ogGui-multibranch/pipeline/head There was a failure building this commit Details	2025-04-30 13:17:16 +02:00
Manuel Aranda Rosales	83ab784c48	refs #1922 . Show new fields in clients table. Fixed wrong details	2025-04-30 13:16:18 +02:00