From f70dcd109acf8f9e42d9eb0ad8b5dba992f37453 Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Mon, 19 May 2025 08:12:53 +0200 Subject: [PATCH] Assistants improvements --- .../create-task-schedule.component.ts | 1 + .../create-command/create-command.component.ts | 1 + .../partition-assistant.component.html | 10 +++++----- .../run-script-assistant.component.html | 2 +- .../run-script-assistant.component.ts | 3 --- .../create-pxe-template.component.ts | 3 +-- .../app/components/task-logs/task-logs.component.html | 4 ++-- .../src/app/layout/sidebar/sidebar.component.html | 2 ++ ogWebconsole/src/locale/es.json | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ogWebconsole/src/app/components/commands/commands-task/create-task-schedule/create-task-schedule.component.ts b/ogWebconsole/src/app/components/commands/commands-task/create-task-schedule/create-task-schedule.component.ts index 9cf584f..b87c9c1 100644 --- a/ogWebconsole/src/app/components/commands/commands-task/create-task-schedule/create-task-schedule.component.ts +++ b/ogWebconsole/src/app/components/commands/commands-task/create-task-schedule/create-task-schedule.component.ts @@ -115,6 +115,7 @@ export class CreateTaskScheduleComponent implements OnInit{ } convertDateToLocalISO(date: Date): string { + date = new Date(date); const adjustedDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())); return adjustedDate.toISOString(); } diff --git a/ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.ts b/ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.ts index c7de763..a5f890b 100644 --- a/ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.ts +++ b/ogWebconsole/src/app/components/commands/main-commands/create-command/create-command.component.ts @@ -75,6 +75,7 @@ export class CreateCommandComponent implements OnInit{ readOnly: this.createCommandForm.value.readOnly, enabled: this.createCommandForm.value.enabled, comments: this.createCommandForm.value.comments, + parameters: this.createCommandForm.value.parameters, }; if (this.commandId) { diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html index 34290de..ec2d67c 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/partition-assistant/partition-assistant.component.html @@ -10,11 +10,11 @@
- +
-
@@ -101,15 +101,15 @@
- Espacio usado: {{ selectedDisk.used }} MB + Espacio usado: {{ selectedDisk.used | number:'1.2-2' }} MB
- Espacio libre: {{ selectedDisk.totalDiskSize - selectedDisk.used}} MB + Espacio libre: {{ (selectedDisk.totalDiskSize - selectedDisk.used) | number:'1.2-2' }} MB
- Espacio total: {{ selectedDisk.totalDiskSize }} MB + Espacio total: {{ selectedDisk.totalDiskSize | number:'1.2-2' }} MB
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.html index 74465cf..c4daeef 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.html @@ -101,7 +101,7 @@
-
+

Ingrese los parámetros:

diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.ts index 56dd99e..b463fc0 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/run-script-assistant/run-script-assistant.component.ts @@ -77,15 +77,12 @@ export class RunScriptAssistantComponent implements OnInit{ if (!ctx) { return ''; } - // Si es un array de clientes if (Array.isArray(ctx)) { return ctx.map(c => c.name).join(', '); } - // Si es un objeto con propiedad name if (typeof ctx === 'object' && 'name' in ctx) { return ctx.name; } - // Si es un string plano return String(ctx); } diff --git a/ogWebconsole/src/app/components/ogboot/pxe/manage-pxeTemplate/create-pxe-template.component.ts b/ogWebconsole/src/app/components/ogboot/pxe/manage-pxeTemplate/create-pxe-template.component.ts index ae7c9d1..f53307d 100644 --- a/ogWebconsole/src/app/components/ogboot/pxe/manage-pxeTemplate/create-pxe-template.component.ts +++ b/ogWebconsole/src/app/components/ogboot/pxe/manage-pxeTemplate/create-pxe-template.component.ts @@ -129,8 +129,7 @@ export class CreatePxeTemplateComponent implements OnInit { this.dialogRef.close(true); }, error: error => { - this.toastService.error('Error al actualizar la plantilla PXE'); - this.dialogRef.close(false); + this.toastService.error(error.error['hydra:description']); } }); } diff --git a/ogWebconsole/src/app/components/task-logs/task-logs.component.html b/ogWebconsole/src/app/components/task-logs/task-logs.component.html index 06d54ee..29f979c 100644 --- a/ogWebconsole/src/app/components/task-logs/task-logs.component.html +++ b/ogWebconsole/src/app/components/task-logs/task-logs.component.html @@ -153,7 +153,7 @@ {{ 'columnActions' | translate }} -
\ No newline at end of file +
diff --git a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html index f858acb..1aab78b 100644 --- a/ogWebconsole/src/app/layout/sidebar/sidebar.component.html +++ b/ogWebconsole/src/app/layout/sidebar/sidebar.component.html @@ -34,6 +34,7 @@ {{ 'commands' | translate }} + diff --git a/ogWebconsole/src/locale/es.json b/ogWebconsole/src/locale/es.json index ec3f35b..09045c6 100644 --- a/ogWebconsole/src/locale/es.json +++ b/ogWebconsole/src/locale/es.json @@ -25,7 +25,7 @@ "back": "Atrás", "addClientDialogTitle": "Añadir Cliente", "dialogTitleEditUser": "Editar usuario", - "dialogTitleChangePassword": "Change password", + "dialogTitleChangePassword": "Cambiar contraseña", "labelCurrentPassword": "Contraseña actual", "labelNewPassword": "Nueva contraseña", "labelRepeatPassword": "Repite la contraseña", @@ -521,7 +521,7 @@ "remoteAccess": "Disponible acceso remoto", "noRemoteAccess": "No disponible acceso remoto", "capacityWarning": "El aforo no puede ser", - "procedimientosCliente": "Procedimientos", + "procedimientosCliente": "Histórico acciones", "tableDateRepositoryText": "Esta tabla muestra los datos asociados a los repositorios existentes.", "repositoryTitleStepText": "En esta pantalla se pueden gestionar los repositorios de imágenes.", "monolithicImageStep": "Imagen monolítica",