diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css index d174de6..c86bb98 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.css @@ -5,16 +5,6 @@ padding: 10px; } -.client-header { - display: flex; - align-items: center; - margin-bottom: 10px; - background-color: #fff; - padding: 20px; - border-radius: 12px; - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); -} - .client-icon { flex-shrink: 0; margin-right: 20px; @@ -63,7 +53,6 @@ justify-content: center; } - .icon-pc { font-size: 25px; color: #3b82f6; @@ -85,9 +74,7 @@ } .info-section { - margin-bottom: 30px; background-color: #fff; - padding: 20px; border-radius: 12px; } diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html index 44a7f85..a78d6f8 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.html @@ -12,71 +12,64 @@ - - -
- -
+
+ +
-
-
-
-
-
{{ clientData?.property }}
-
{{ clientData?.value }}
-
-
-
-
-
{{ clientData?.property }}
-
{{ clientData?.value }}
-
-
+
+
+
+
+
{{ clientData?.property }}
+
{{ clientData?.value }}
- - -
-

Discos/Particiones

+
+
+
{{ clientData?.property }}
+
{{ clientData?.value }}
+
+
+
+
+

Discos/Particiones

+
-
- - - - +
+
{{ column.header }} - - {{ column.cell(image) }} - - - - {{ (image.size / 1024).toFixed(2) }} GB - - -
+ + + - -
{{ column.header }} + + {{ column.cell(image) }} -
+ + + {{ (image.size / 1024).toFixed(2) }} GB + + + + + + + +
+ +
+ +
+
+ + + +

Disco {{ disk.diskNumber }}

+

Usado: {{ (disk.used).toFixed(2) }} GB ({{ disk.percentage }}%)

+

Total: {{ disk.total }} GB

+
- -
- -
-
- - - -

Disco {{ disk.diskNumber }}

-

Usado: {{ (disk.used).toFixed(2) }} GB ({{ disk.percentage }}%)

-

Total: {{ disk.total }} GB

-
-
-
-
- - - +
+
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts index 83a7d83..78b9a40 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/client-main-view.component.ts @@ -110,26 +110,22 @@ export class ClientMainViewComponent implements OnInit { updateGeneralData() { this.generalData = [ { property: 'Nombre', value: this.clientData?.name || '' }, - { property: 'Uuid', value: this.clientData?.uuid || '' }, { property: 'IP', value: this.clientData?.ip || '' }, { property: 'MAC', value: this.clientData?.mac || '' }, { property: 'Nº de serie', value: this.clientData?.serialNumber || '' }, - { property: 'Netiface', value: this.clientData?.netiface || '' }, + { property: 'Netiface', value: this.clientData?.netiface || this.clientData?.organizationalUnit?.networkSettings?.netiface || '' }, { property: 'Perfil hardware', value: this.clientData?.hardwareProfile?.description || '' }, - { property: 'Menú', value: this.clientData?.menu?.description || '' }, ]; } updateNetworkData() { this.networkData = [ + { property: 'Pxe', value: this.clientData?.template?.name || '' }, { property: 'Remote Pc', value: this.clientData.remotePc || '' }, { property: 'Subred', value: this.clientData?.subnet || '' }, { property: 'OGlive', value: this.clientData?.ogLive?.name || '' }, { property: 'Autoexec', value: '' }, { property: 'Repositorio', value: this.clientData?.repository?.name || '' }, - { property: 'Validación', value: this.clientData?.organizationalUnit?.networkSettings?.validation || '' }, - { property: 'Pxe', value: this.clientData?.template?.name || '' }, - { property: 'Creado por', value: this.clientData?.createdBy || '' } ]; } diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html index 5762385..e514d0b 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.html @@ -1,5 +1,5 @@
-

Deploy imagen en {{ clientName }}

+

Desplegar imagen en {{ clientName }}

@@ -25,7 +25,7 @@ Seleccione método de deploy - {{ method }} + {{ method }}
diff --git a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts index 58623ea..2c48a74 100644 --- a/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts +++ b/ogWebconsole/src/app/components/groups/components/client-main-view/deploy-image/deploy-image.component.ts @@ -3,7 +3,7 @@ import {MatTableDataSource} from "@angular/material/table"; import {SelectionModel} from "@angular/cdk/collections"; import {HttpClient} from "@angular/common/http"; import {ToastrService} from "ngx-toastr"; -import {ActivatedRoute} from "@angular/router"; +import {ActivatedRoute, Router} from "@angular/router"; @Component({ selector: 'app-deploy-image', @@ -92,7 +92,8 @@ export class DeployImageComponent { constructor( private http: HttpClient, private toastService: ToastrService, - private route: ActivatedRoute + private route: ActivatedRoute, + private router: Router, ) {} ngOnInit() { @@ -134,7 +135,7 @@ export class DeployImageComponent { } loadImages() { - const url = `${this.baseUrl}/images?page=1&itemsPerPage=1000`; + const url = `${this.baseUrl}/images?status=success&page=1&itemsPerPage=1000`; this.http.get(url).subscribe( (response: any) => { this.images = response['hydra:member']; @@ -162,6 +163,7 @@ export class DeployImageComponent { .subscribe({ next: (response) => { this.toastService.success('Imagen creada exitosamente'); + this.router.navigate(['/images']); }, error: (error) => { console.error('Error:', error);