Merge branch 'develop' of ssh://ognproject.evlt.uma.es:21987/opengnsys/oggui into develop

2025-05-08 08:01:38 +02:00 · 2025-05-08 08:01:38 +02:00 · 59e8c3842e
parent fc51481977 f35ba106ba
commit 59e8c3842e
7 changed files with 110 additions and 76 deletions
--- a/ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.html
+++ b/ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.html
@ -19,6 +19,6 @@
  <button mat-menu-item [disabled]="command.disabled
  || (command.slug === 'create-image' && clientData.length > 1)" *ngFor="let command of arrayCommands"
    (click)="onCommandSelect(command.slug)">
-    {{ command.name }}
+    {{ command.translationKey | translate }}
  </button>
 </mat-menu>
--- a/ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.ts
+++ b/ogWebconsole/src/app/components/commands/main-commands/execute-command/execute-command.component.ts
@ -21,17 +21,17 @@ export class ExecuteCommandComponent implements OnInit {
  loading: boolean = true;

  arrayCommands: any[] = [
-    { name: 'Enceder', slug: 'power-on', disabled: false },
-    { name: 'Apagar', slug: 'power-off', disabled: false },
-    { name: 'Reiniciar', slug: 'reboot', disabled: false },
-    { name: 'Iniciar Sesión', slug: 'login', disabled: true },
-    { name: 'Crear imagen', slug: 'create-image', disabled: false },
-    { name: 'Clonar/desplegar imagen', slug: 'deploy-image', disabled: false },
-    { name: 'Eliminar Imagen Cache', slug: 'delete-image-cache', disabled: true },
-    { name: 'Particionar y Formatear', slug: 'partition', disabled: false },
-    { name: 'Inventario Software', slug: 'software-inventory', disabled: true },
-    { name: 'Inventario Hardware', slug: 'hardware-inventory', disabled: true },
-    { name: 'Ejecutar comando', slug: 'run-script', disabled: false },
+    { translationKey: 'executeCommands.powerOn', slug: 'power-on', disabled: false },
+    { translationKey: 'executeCommands.powerOff', slug: 'power-off', disabled: false },
+    { translationKey: 'executeCommands.reboot', slug: 'reboot', disabled: false },
+    { translationKey: 'executeCommands.login', slug: 'login', disabled: true },
+    { translationKey: 'executeCommands.createImage', slug: 'create-image', disabled: false },
+    { translationKey: 'executeCommands.deployImage', slug: 'deploy-image', disabled: false },
+    { translationKey: 'executeCommands.deleteImageCache', slug: 'delete-image-cache', disabled: true },
+    { translationKey: 'executeCommands.partition', slug: 'partition', disabled: false },
+    { translationKey: 'executeCommands.softwareInventory', slug: 'software-inventory', disabled: true },
+    { translationKey: 'executeCommands.hardwareInventory', slug: 'hardware-inventory', disabled: true },
+    { translationKey: 'executeCommands.runScript', slug: 'run-script', disabled: false },
  ];

  client: any = {};
@ -232,7 +232,7 @@ export class ExecuteCommandComponent implements OnInit {

    this.router.navigate(['/clients/run-script'], {
      queryParams: {
-        clientData: JSON.stringify(clientDataToSend) ,
+        clientData: JSON.stringify(clientDataToSend),
        runScriptContext: JSON.stringify(this.runScriptContext)
      }
    })
--- a/ogWebconsole/src/app/components/groups/groups.component.html
+++ b/ogWebconsole/src/app/components/groups/groups.component.html
@ -205,7 +205,7 @@
            <span>{{ 'partitions' | translate }}</span>
          </button>
          <app-execute-command [clientData]="selectedNode?.clients || []" [buttonType]="'menu-item'"
-            [buttonText]="'Ejecutar comandos'" [icon]="'terminal'"
+            [buttonText]="'ejecutarComandos' | translate" [icon]="'terminal'"
            [disabled]="!((selectedNode?.clients ?? []).length > 0)" [runScriptContext]="selectedNode?.name || ''"
            [runScriptContext]="getRunScriptContext(selectedNode?.clients || [])">
          </app-execute-command>
--- a/ogWebconsole/src/app/components/groups/shared/legend/legend.component.html
+++ b/ogWebconsole/src/app/components/groups/shared/legend/legend.component.html
@ -22,11 +22,11 @@

  <mat-list-item>
    <mat-icon matListItemIcon style="color: green;">school</mat-icon>
-    <div matListItemTitle>Disponible acceso remoto</div>
+    <div matListItemTitle>{{ 'remoteAccess' | translate }}</div>
  </mat-list-item>
  <mat-list-item>
    <mat-icon matListItemIcon style="color: rgb(209, 5, 5);">school</mat-icon>
-    <div matListItemTitle>No disponible acceso remoto</div>
+    <div matListItemTitle>{{ 'noRemoteAccess' | translate }}</div>
  </mat-list-item>

-</mat-list>
+</mat-list>
--- 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
@ -1,12 +1,13 @@
 <div class="create-ou-container">
-    <h1 mat-dialog-title>{{ isEditMode ? 'Editar' : 'Crear' }} Unidad Organizativa</h1>
-  <div class="mat-dialog-content" [ngClass]="{'loading': loading}">
+    <h1 mat-dialog-title>{{ isEditMode ? ('edit' | translate) : ('createButton' | translate) }} {{
+        'labelOrganizationalUnit' | translate }}</h1>
+    <div class="mat-dialog-content" [ngClass]="{'loading': loading}">
        <!-- Paso 1: General -->
-      <mat-spinner class="loading-spinner" *ngIf="loading"></mat-spinner>
-      <span *ngIf="!loading" class="step-title">General</span>
+        <mat-spinner class="loading-spinner" *ngIf="loading"></mat-spinner>
+        <span *ngIf="!loading" class="step-title">{{ 'generalTabLabel' | translate }}</span>
        <form *ngIf="generalFormGroup && !loading" [formGroup]="generalFormGroup" class="grid-form">
            <mat-form-field class="form-field" appearance="fill">
-                <mat-label>Tipo</mat-label>
+                <mat-label>{{ 'typeLabel' | translate }}</mat-label>
                <mat-select formControlName="type" required>
                    <mat-option *ngFor="let type of filteredTypes" [value]="type">
                        {{ typeTranslations[type] }}
@ -14,11 +15,11 @@
                </mat-select>
            </mat-form-field>
            <mat-form-field class="form-field" appearance="fill">
-                <mat-label>Nombre</mat-label>
+                <mat-label>{{ 'nameColumnHeader' | translate }}</mat-label>
                <input matInput formControlName="name" required>
            </mat-form-field>
            <mat-form-field class="form-field" appearance="fill">
-                <mat-label>Unidad organizativa superior</mat-label>
+                <mat-label>{{ 'createOrgUnitparentLabel' | translate }}</mat-label>
                <mat-select formControlName="parent" (selectionChange)="onParentChange($event)">
                    <mat-select-trigger>
                        {{ getSelectedParentName() }}
@ -31,7 +32,7 @@
            </mat-form-field>

            <mat-form-field class="form-field description-form-field" appearance="fill">
-                <mat-label>Descripción</mat-label>
+                <mat-label>{{ 'descriptionLabel' |translate }}</mat-label>
                <textarea matInput formControlName="description"></textarea>
            </mat-form-field>

@ -41,22 +42,23 @@
        </form>

        <!-- Paso 2: Información del Aula -->
-        <span *ngIf="generalFormGroup.value.type === 'classroom' && !loading" class="step-title">Información del aula</span>
+        <span *ngIf="generalFormGroup.value.type === 'classroom' && !loading"
+            class="step-title">{{'classroomInfoStepLabel' | translate}}</span>
        <form *ngIf="generalFormGroup.value.type === 'classroom' && !loading" class="grid-form"
            [formGroup]="classroomInfoFormGroup">
            <mat-form-field class="form-field">
-                <mat-label>Localización</mat-label>
+                <mat-label>{{ 'locationLabel' | translate }}</mat-label>
                <input matInput formControlName="location">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Aforo</mat-label>
+                <mat-label>{{ 'capacityLabel' | translate }}</mat-label>
                <input matInput formControlName="capacity" type="number" min="0">
                <mat-error *ngIf="classroomInfoFormGroup.get('capacity')?.hasError('min')">
-                    El aforo no puede ser negativo
+                    {{ 'capacityWarning' | translate }}
                </mat-error>
            </mat-form-field>
            <mat-form-field class="form-field" appearance="fill" style="grid-column: span 1;">
-                <mat-label>Calendario Asociado</mat-label>
+                <mat-label>{{ 'associatedCalendarLabel' | translate }}</mat-label>
                <mat-select formControlName="remoteCalendar" (selectionChange)="onCalendarChange($event)">
                    <mat-option *ngFor="let calendar of calendars" [value]="calendar['@id']">
                        {{ calendar.name }}
@ -64,32 +66,32 @@
                </mat-select>
            </mat-form-field>
            <div class="projector-board-field">
-                <mat-slide-toggle formControlName="projector">Proyector</mat-slide-toggle>
-                <mat-slide-toggle formControlName="board">Pizarra</mat-slide-toggle>
+                <mat-slide-toggle formControlName="projector">{{ 'projectorAlt' | translate }}</mat-slide-toggle>
+                <mat-slide-toggle formControlName="board">{{ 'boardToggle' | translate }}</mat-slide-toggle>
            </div>
        </form>

        <!-- Paso 3: Configuración de Red -->
-        <span *ngIf="!loading" class="step-title">Configuración de Red</span>
+        <span *ngIf="!loading" class="step-title">{{ 'networkSettingsStepLabel' | translate }}</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>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-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>{{ 'templateLabel' | translate }}</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>{{ 'repositoryLabel' | translate }}</mat-label>
                <mat-select formControlName="repository" (selectionChange)="onRepositoryChange($event)">
                    <mat-option *ngFor="let repository of repositories" [value]="repository['@id']">
                        {{ repository.name }}
@ -105,17 +107,17 @@
                <input matInput formControlName="dns">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Máscara de Red</mat-label>
+                <mat-label>{{ 'netmaskLabel' | translate }}</mat-label>
                <input matInput formControlName="netmask">
            </mat-form-field>
-          <mat-form-field class="form-field">
-            <mat-label i18n="@@netiface-label">Interfaz de red</mat-label>
-            <mat-select formControlName="netiface">
-              <mat-option *ngFor="let type of netifaceTypes" [value]="type.value">
-                {{ type.name }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
+            <mat-form-field class="form-field">
+                <mat-label i18n="@@netiface-label">{{ 'netifaceLabel' | translate }}</mat-label>
+                <mat-select formControlName="netiface">
+                    <mat-option *ngFor="let type of netifaceTypes" [value]="type.value">
+                        {{ type.name }}
+                    </mat-option>
+                </mat-select>
+            </mat-form-field>
            <mat-form-field class="form-field">
                <mat-label>Router</mat-label>
                <input matInput formControlName="router">
@ -125,7 +127,7 @@
                <input matInput formControlName="ntp">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Modo P2P</mat-label>
+                <mat-label>{{ 'p2pModeLabel' | translate }}</mat-label>
                <mat-select formControlName="p2pMode">
                    <mat-option *ngFor="let option of p2pModeOptions" [value]="option.value">
                        {{ option.name }}
@ -133,23 +135,23 @@
                </mat-select>
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Tiempo P2P</mat-label>
+                <mat-label>{{ 'p2pTimeLabel' | translate }}</mat-label>
                <input matInput formControlName="p2pTime" type="number">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Mcast IP</mat-label>
+                <mat-label>{{ 'mcastIpLabel' | translate }}</mat-label>
                <input matInput formControlName="mcastIp">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Mcast Speed</mat-label>
+                <mat-label>{{ 'mcastSpeedLabel' | translate }}</mat-label>
                <input matInput formControlName="mcastSpeed" type="number">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Mcast Port</mat-label>
+                <mat-label>{{ 'mcastPortLabel' | translate }}</mat-label>
                <input matInput formControlName="mcastPort" type="number">
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Mcast Mode</mat-label>
+                <mat-label>{{ 'mcastModeLabel' | translate }}</mat-label>
                <mat-select formControlName="mcastMode">
                    <mat-option *ngFor="let option of multicastModeOptions" [value]="option.value">
                        {{ option.name }}
@ -157,7 +159,7 @@
                </mat-select>
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Menu</mat-label>
+                <mat-label>{{ 'menuLabel' | translate }}</mat-label>
                <mat-select formControlName="menu">
                    <mat-option *ngFor="let menu of menus" [value]="menu['@id']">
                        {{ menu.name }}
@ -165,28 +167,28 @@
                </mat-select>
            </mat-form-field>
            <mat-form-field class="form-field">
-                <mat-label>Perfil de Hardware</mat-label>
+                <mat-label>{{ 'hardwareProfileLabel' | translate }}</mat-label>
                <mat-select formControlName="hardwareProfile">
                    <mat-option *ngFor="let unit of hardwareProfiles" [value]="unit['@id']">{{ unit.description
                        }}</mat-option>
                </mat-select>
-                <mat-error>Formato de URL incorrecto</mat-error>
+                <mat-error>{{ 'urlFormatError' | translate }}</mat-error>
            </mat-form-field>
        </form>

        <!-- Paso 4: Información Adicional -->
-        <span *ngIf="!loading" class="step-title">Información Adicional</span>
+        <span *ngIf="!loading" class="step-title">{{ 'additionalInfoStepLabel' | translate }}</span>
        <form *ngIf="additionalInfoFormGroup && !loading" [formGroup]="additionalInfoFormGroup">
            <mat-form-field class="form-field">
-                <mat-label>Comentarios</mat-label>
+                <mat-label>{{ 'commentsLabel' | translate }}</mat-label>
                <textarea matInput formControlName="comments"></textarea>
            </mat-form-field>
        </form>
    </div>
    <div class="mat-dialog-actions">
-        <button class="ordinary-button" (click)="onNoClick()">Cancelar</button>
+        <button class="ordinary-button" (click)="onNoClick()">{{ 'cancelButton' | translate }}</button>
        <button class="submit-button" (click)="onSubmit()"
            [disabled]="!generalFormGroup.valid || !additionalInfoFormGroup.valid || !networkSettingsFormGroup.valid">{{
-            isEditMode ? 'Editar' : 'Crear' }}</button>
+            isEditMode ? ('edit' | translate) : ('createButton' | translate) }}</button>
    </div>
-</div>
+</div>
--- a/ogWebconsole/src/locale/en.json
+++ b/ogWebconsole/src/locale/en.json
@ -489,10 +489,26 @@
  "usedPercentageLabel": "Used",
  "errorLoadingData": "Error fetching data. Service not available",
  "repositoryTitleStep": "On this screen you can manage image repositories.",
-  "partitions": "Particiones",
+  "partitions": "Partitions",
  "clientsViewStepText": "Display of the selected organizational unit's clients",
  "vistalista": "List View",
  "vistatarjeta": "Card View",
  "ejecutarComandos": "Execute Commands",
-  "searchState": "Search state"
+  "searchState": "Search state",
+  "executeCommands": {
+    "powerOn": "Power On",
+    "powerOff": "Shut Down",
+    "reboot": "Reboot",
+    "login": "Login",
+    "createImage": "Create Image",
+    "deployImage": "Deploy Image",
+    "deleteImageCache": "Delete Image Cache",
+    "partition": "Partition and Format",
+    "softwareInventory": "Software Inventory",
+    "hardwareInventory": "Hardware Inventory",
+    "runScript": "Run Script"
+  },
+  "remoteAccess": "Remote access available",
+  "noRemoteAccess": "Remote access not available",
+  "capacityWarning": "The capacity cannot be negative"
 }
--- a/ogWebconsole/src/locale/es.json
+++ b/ogWebconsole/src/locale/es.json
@ -496,5 +496,21 @@
  "vistalista": "Vista Lista",
  "vistatarjeta": "Vista Tarjeta",
  "ejecutarComandos": "Ejecutar Comandos",
-  "searchState": "Buscar por estado"
+  "searchState": "Buscar por estado",
+  "executeCommands": {
+    "powerOn": "Encender",
+    "powerOff": "Apagar",
+    "reboot": "Reiniciar",
+    "login": "Iniciar Sesión",
+    "createImage": "Crear imagen",
+    "deployImage": "Clonar/desplegar imagen",
+    "deleteImageCache": "Eliminar Imagen Cache",
+    "partition": "Particionar y Formatear",
+    "softwareInventory": "Inventario Software",
+    "hardwareInventory": "Inventario Hardware",
+    "runScript": "Ejecutar script"
+  },
+  "remoteAccess": "Disponible acceso remoto",
+  "noRemoteAccess": "No disponible acceso remoto",
+  "capacityWarning": "El aforo no puede ser"
 }