diff --git a/ogWebconsole/src/app/components/groups/groups.component.html b/ogWebconsole/src/app/components/groups/groups.component.html index 5415b20..32755af 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.html +++ b/ogWebconsole/src/app/components/groups/groups.component.html @@ -387,7 +387,7 @@ {{ 'pxeTemplate' | translate }} - {{ client.template?.name }} + {{ client.pxeTemplate?.name }} diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts index ba768cc..16a8dc7 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.ts +++ b/ogWebconsole/src/app/components/groups/groups.component.ts @@ -583,11 +583,11 @@ export class GroupsComponent implements OnInit, OnDestroy { onRoomMap(room: TreeNode | null): void { if (!room || !room['@id']) return; this.subscriptions.add( - this.http.get<{ clients: Client[] }>(`${this.baseUrl}${room['@id']}`).subscribe( + this.http.get(`${this.baseUrl}/clients?organizationalUnit.id=${room.id}`, { }).subscribe( (response) => { this.dialog.open(ClassroomViewDialogComponent, { width: '90vw', - data: { clients: response.clients }, + data: { clients: response['hydra:member'] }, }); }, (error) => { @@ -612,7 +612,7 @@ export class GroupsComponent implements OnInit, OnDestroy { onShowClientDetail(event: MouseEvent, client: Client): void { event.stopPropagation(); this.dialog.open(ClientDetailsComponent, { - width: '1200px', + width: '1300px', data: { clientData: client }, }) } @@ -850,12 +850,12 @@ export class GroupsComponent implements OnInit, OnDestroy { openPartitionTypeModal(event: MouseEvent, node: TreeNode | null = null): void { event.stopPropagation(); - + const simplifiedClientsData = node?.clients?.map((client: any) => ({ name: client.name, partitions: client.partitions })); - + this.dialog.open(PartitionTypeOrganizatorComponent, { width: '1200px', data: simplifiedClientsData