diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index a58f336..7d2e8fd 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -67,6 +67,7 @@ import { MatTreeNodeToggle } from "@angular/material/tree"; import { LegendComponent } from './components/groups/legend/legend.component'; +import { ClassroomViewDialogComponent } from './components/groups/classroom-view/classroom-view-modal'; @NgModule({ declarations: [ @@ -97,7 +98,8 @@ import { LegendComponent } from './components/groups/legend/legend.component'; DeleteGroupsModalComponent, ShowOrganizationalUnitComponent, TreeViewComponent, - LegendComponent + LegendComponent, + ClassroomViewDialogComponent ], bootstrap: [AppComponent], imports: [BrowserModule, 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 b2fddeb..d84a043 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 @@ -2,8 +2,7 @@ display: flex; flex-wrap: wrap; gap: 10px; - min-height: 43vh; - height: 1000px; + height: 90%; border: 3px solid black; } @@ -132,3 +131,7 @@ mat-chip { justify-content: center; margin-bottom: 25px; } + +button{ + margin-bottom: 10px; +} \ No newline at end of file diff --git a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.html b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.html index 833d99f..0cd7f3a 100644 --- a/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.html +++ b/ogWebconsole/src/app/components/groups/classroom-view/classroom-view.component.html @@ -1,7 +1,7 @@
- Clientes dentro de: {{ group.organizationalUnitName }} + {{ group.organizationalUnitName }}
Pizarra digital
Proyector 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 3af2bf7..9c97921 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,6 +20,7 @@ export class ClassroomViewComponent implements OnInit, OnChanges { groupedClients: GroupedClients[] = []; constructor(public dialog: MatDialog, private http: HttpClient) {} + ngOnInit(): void { this.groupClientsByOrganizationalUnit(); @@ -52,12 +53,13 @@ export class ClassroomViewComponent implements OnInit, OnChanges { this.groupedClients.forEach(group => { group.clientRows.forEach(row => { row.forEach(client => { - const position = client.position; // Ya es un objeto, no necesita JSON.parse + const position = client.position || { x: 0, y: 0 }; client.dragPosition = { x: position.x, y: position.y }; }); }); }); } + chunkArray(arr: any[], chunkSize: number): any[][] { const chunks = []; @@ -75,10 +77,6 @@ export class ClassroomViewComponent implements OnInit, OnChanges { const dragPosition = event.source.getFreeDragPosition() client.position.x = dragPosition.x; client.position.y = dragPosition.y; - console.log("el drag", event.source.getFreeDragPosition().x) - /* console.log('Elemento movido:', event.source.element.nativeElement); - console.log('Posición actual:', event.pointerPosition); - console.log('Posición relativa:', dragPosition); */ } saveDisposition(): void { diff --git a/ogWebconsole/src/app/components/groups/groups.component.html b/ogWebconsole/src/app/components/groups/groups.component.html index 541d2cc..5e5f2b7 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.html +++ b/ogWebconsole/src/app/components/groups/groups.component.html @@ -3,6 +3,7 @@
+
@@ -142,5 +143,5 @@
- +
diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts index e68d3d6..c68ba3d 100644 --- a/ogWebconsole/src/app/components/groups/groups.component.ts +++ b/ogWebconsole/src/app/components/groups/groups.component.ts @@ -13,6 +13,8 @@ import {ToastrService} from "ngx-toastr"; import {TreeViewComponent} from "./tree-view/tree-view.component"; import {MatBottomSheet} from "@angular/material/bottom-sheet"; import {LegendComponent} from "./legend/legend.component"; +import { ClassroomViewComponent } from './classroom-view/classroom-view.component'; +import { ClassroomViewDialogComponent } from './classroom-view/classroom-view-modal'; @Component({ selector: 'app-groups', @@ -251,4 +253,18 @@ constructor( openBottomSheet(): void { this._bottomSheet.open(LegendComponent); } + + roomMap(): void { + if (this.selectedDetail && this.selectedDetail.type === 'classroom') { + const dialogRef = this.dialog.open(ClassroomViewDialogComponent, { + width: '90vw', + height: '90vh', + data: { clients: this.clientsData } + }); + + dialogRef.afterClosed().subscribe(result => { + console.log('The dialog was closed'); + }); + } + } }