diff --git a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.css b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.css index 47667ca..ffb644b 100644 --- a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.css +++ b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.css @@ -57,3 +57,22 @@ mat-card-title { margin: 0; } +.loading-spinner { + display: block; + margin: 0 auto; +} + +.mat-dialog-content.loading { + display: flex; + align-items: center; + justify-content: center; + height: 100%; +} + +.client-form { + width: 100%; +} + +.form-field { + width: 100%; +} diff --git a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.ts b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.ts index 70f244a..1a6e498 100644 --- a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.ts +++ b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.ts @@ -20,7 +20,7 @@ interface GroupedClients { }) export class ClassroomViewComponent implements OnInit { @Input() clients: any[] = []; - @Input() pcInTable: number = 3; + @Input() pcInTable: number = 5; groupedClients: GroupedClients[] = []; constructor(public dialog: MatDialog) {} @@ -43,6 +43,7 @@ export class ClassroomViewComponent implements OnInit { return acc; }, {}); + console.log(grouped) this.groupedClients = Object.keys(grouped).map(ouName => ({ organizationalUnitName: ouName, clientRows: this.chunkArray(grouped[ouName], this.pcInTable) diff --git a/ogWebconsole/src/app/components/groups/client-view/client-view.component.ts b/ogWebconsole/src/app/components/groups/client-view/client-view.component.ts index dda2b48..63ccb03 100644 --- a/ogWebconsole/src/app/components/groups/client-view/client-view.component.ts +++ b/ogWebconsole/src/app/components/groups/client-view/client-view.component.ts @@ -17,12 +17,14 @@ export class ClientViewComponent { {property: 'MAC', value: this.data.client.mac}, {property: 'Nº de serie', value: this.data.client.serialNumber}, {property: 'Netiface', value: this.data.client.netiface}, + {property: 'Perfil hardware', value: this.data.client.hardwareProfile ? this.data.client.hardwareProfile.description : ''}, + {property: 'Menú', value: this.data.client.menu ? this.data.client.menu.description : ''}, {property: 'Fecha de creación', value: this.data.client.createdAt}, {property: 'Creado por', value: this.data.client.createdBy} ]; networkData = [ - {property: 'Menu', value: this.data.client.menu}, + {property: 'Menú', value: this.data.client.menu ? this.data.client.menu.description : ''}, {property: 'Perfil hardware', value: this.data.client.hardwareProfile ? this.data.client.hardwareProfile.description : ''}, {property: 'OGlive', value: ''}, {property: 'Autoexec', value: ''}, @@ -35,19 +37,19 @@ export class ClientViewComponent { ]; classroomData = [ - {property: 'Url servidor proxy', value: this.data.client.networkSettings ? this.data.client.networkSettings.proxy : ''}, - {property: 'IP DNS', value: this.data.client.networkSettings ? this.data.client.networkSettings.dns : ''}, - {property: 'Máscara de red', value: this.data.client.networkSettings ? this.data.client.networkSettings.mask : ''}, - {property: 'Router', value: this.data.client.networkSettings ? this.data.client.networkSettings.router : ''}, - {property: 'NTP', value: this.data.client.networkSettings ? this.data.client.networkSettings.ntp : ''}, - {property: 'Modo p2p', value: this.data.client.networkSettings ? this.data.client.networkSettings.p2pMode : ''}, - {property: 'Tiempo p2p', value: this.data.client.networkSettings ? this.data.client.networkSettings.p2pTime : ''}, - {property: 'IP multicast', value: this.data.client.networkSettings ? this.data.client.networkSettings.mcastIp : ''}, - {property: 'Modo multicast', value: this.data.client.networkSettings ? this.data.client.networkSettings.mcastMode : ''}, - {property: 'Puerto multicast', value: this.data.client.networkSettings ? this.data.client.networkSettings.mcastPort : ''}, - {property: 'Velocidad multicast', value: this.data.client.networkSettings ? this.data.client.networkSettings.mcastSpeed : ''}, - {property: 'Perfil hardware', value: this.data.client.networkSettings && this.data.client.networkSettings.hardwareProfile ? this.data.client.networkSettings.hardwareProfile.description : ''}, - {property: 'Menú', value: this.data.client.networkSettings && this.data.client.networkSettings.menu ? this.data.client.networkSettings.menu.description : ''} + {property: 'Url servidor proxy', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.proxy : ''}, + {property: 'IP DNS', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.dns : ''}, + {property: 'Máscara de red', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.netmask : ''}, + {property: 'Router', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.router : ''}, + {property: 'NTP', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.ntp : ''}, + {property: 'Modo p2p', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.p2pMode : ''}, + {property: 'Tiempo p2p', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.p2pTime : ''}, + {property: 'IP multicast', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.mcastIp : ''}, + {property: 'Modo multicast', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.mcastMode : ''}, + {property: 'Puerto multicast', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.mcastPort : ''}, + {property: 'Velocidad multicast', value: this.data.client.organizationalUnit.networkSettings ? this.data.client.organizationalUnit.networkSettings.mcastSpeed : ''}, + {property: 'Perfil hardware', value: this.data.client.organizationalUnit.networkSettings && this.data.client.organizationalUnit.networkSettings.hardwareProfile ? this.data.client.organizationalUnit.networkSettings.hardwareProfile.description : ''}, + {property: 'Menú', value: this.data.client.organizationalUnit.networkSettings && this.data.client.organizationalUnit.networkSettings.menu ? this.data.client.organizationalUnit.networkSettings.menu.description : ''} ]; constructor( diff --git a/ogWebconsole/src/app/components/groups/clients/create-client/create-client.component.html b/ogWebconsole/src/app/components/groups/clients/create-client/create-client.component.html index 27c6787..5281297 100644 --- a/ogWebconsole/src/app/components/groups/clients/create-client/create-client.component.html +++ b/ogWebconsole/src/app/components/groups/clients/create-client/create-client.component.html @@ -1,6 +1,7 @@