diff --git a/ogWebconsole/src/app/app-routing.module.ts b/ogWebconsole/src/app/app-routing.module.ts index ba8e87d..084a8e1 100644 --- a/ogWebconsole/src/app/app-routing.module.ts +++ b/ogWebconsole/src/app/app-routing.module.ts @@ -8,6 +8,7 @@ import { PageNotFoundComponent } from './components/page-not-found/page-not-foun import { AdminComponent } from './components/pages/admin/admin.component'; import { UsersComponent } from './components/pages/admin/users/users/users.component'; import { RolesComponent } from './components/pages/admin/roles/roles/roles.component'; +import { GroupsComponent } from './components/groups/groups.component'; const routes: Routes = [ { path: '', redirectTo: 'auth/login', pathMatch: 'full' }, { @@ -18,6 +19,7 @@ const routes: Routes = [ { path: 'admin', component: AdminComponent }, { path: 'users', component: UsersComponent }, { path: 'user-groups', component: RolesComponent }, + { path: 'groups', component: GroupsComponent }, ], }, { diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index f687bf7..b8c1f8c 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -33,6 +33,7 @@ import { EditUserModalComponent } from './components/pages/admin/users/users/edi import { AddRoleModalComponent } from './components/pages/admin/roles/roles/add-role-modal/add-role-modal.component'; import { DeleteRoleModalComponent } from './components/pages/admin/roles/roles/delete-role-modal/delete-role-modal.component'; import { ChangePasswordModalComponent } from './components/pages/admin/users/users/change-password-modal/change-password-modal.component'; +import { GroupsComponent } from './components/groups/groups.component'; @NgModule({ declarations: [ @@ -51,7 +52,8 @@ import { ChangePasswordModalComponent } from './components/pages/admin/users/use EditUserModalComponent, AddRoleModalComponent, DeleteRoleModalComponent, - ChangePasswordModalComponent + ChangePasswordModalComponent, + GroupsComponent ], bootstrap: [AppComponent], imports: [BrowserModule, diff --git a/ogWebconsole/src/app/components/groups/data.service.ts b/ogWebconsole/src/app/components/groups/data.service.ts new file mode 100644 index 0000000..5ee1405 --- /dev/null +++ b/ogWebconsole/src/app/components/groups/data.service.ts @@ -0,0 +1,35 @@ +// data.service.ts +import { Injectable } from '@angular/core'; +import { UnidadOrganizativa } from './model'; + +@Injectable({ + providedIn: 'root', +}) +export class DataService { + private unidadesOrganizativas: UnidadOrganizativa[] = [ + { + id: 1, + nombre: 'Unidad Organizativa 1', + aulas: [ + { + id: 1, + nombre: 'Aula 1', + clientes: [ + { id: 1, nombre: 'Cliente 1' }, + { id: 2, nombre: 'Cliente 2' }, + ], + }, + { + id: 2, + nombre: 'Aula 2', + clientes: [{ id: 3, nombre: 'Cliente 3' }], + }, + ], + }, + // Otros datos de ejemplo + ]; + + getUnidadesOrganizativas(): UnidadOrganizativa[] { + return this.unidadesOrganizativas; + } +} diff --git a/ogWebconsole/src/app/components/groups/groups.component.css b/ogWebconsole/src/app/components/groups/groups.component.css new file mode 100644 index 0000000..aaecff2 --- /dev/null +++ b/ogWebconsole/src/app/components/groups/groups.component.css @@ -0,0 +1,7 @@ +.groupLists-container{ + display: flex; +} + +mat-card { + margin: 10px; +} \ No newline at end of file diff --git a/ogWebconsole/src/app/components/groups/groups.component.html b/ogWebconsole/src/app/components/groups/groups.component.html new file mode 100644 index 0000000..2706b33 --- /dev/null +++ b/ogWebconsole/src/app/components/groups/groups.component.html @@ -0,0 +1,39 @@ + +

groups works!

+
+ + Unidad organizativa + + + + {{ unidad.nombre }} + + + + + + Aulas + + + + {{ aula.nombre }} + + + + + + Clientes + + + + {{ cliente.nombre }} + + + + +
diff --git a/ogWebconsole/src/app/components/groups/groups.component.spec.ts b/ogWebconsole/src/app/components/groups/groups.component.spec.ts new file mode 100644 index 0000000..ee75d8e --- /dev/null +++ b/ogWebconsole/src/app/components/groups/groups.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GroupsComponent } from './groups.component'; + +describe('GroupsComponent', () => { + let component: GroupsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [GroupsComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GroupsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ogWebconsole/src/app/components/groups/groups.component.ts b/ogWebconsole/src/app/components/groups/groups.component.ts new file mode 100644 index 0000000..e84cacf --- /dev/null +++ b/ogWebconsole/src/app/components/groups/groups.component.ts @@ -0,0 +1,33 @@ +// groups.component.ts +import { Component, OnInit } from '@angular/core'; +import { DataService } from './data.service'; +import { UnidadOrganizativa, Aula, Cliente } from './model'; + +@Component({ + selector: 'app-groups', + templateUrl: './groups.component.html', + styleUrls: ['./groups.component.css'] +}) +export class GroupsComponent implements OnInit { + unidadesOrganizativas: UnidadOrganizativa[] = []; + selectedUnidad: UnidadOrganizativa | null = null; + selectedAula: Aula | null = null; + selectedClientes: Cliente[] = []; + + constructor(private dataService: DataService) {} + + ngOnInit(): void { + this.unidadesOrganizativas = this.dataService.getUnidadesOrganizativas(); + } + + onSelectUnidad(unidad: UnidadOrganizativa): void { + this.selectedUnidad = unidad; + this.selectedAula = null; + this.selectedClientes = []; + } + + onSelectAula(aula: Aula): void { + this.selectedAula = aula; + this.selectedClientes = aula.clientes; + } +} diff --git a/ogWebconsole/src/app/components/groups/model.ts b/ogWebconsole/src/app/components/groups/model.ts new file mode 100644 index 0000000..7a672a4 --- /dev/null +++ b/ogWebconsole/src/app/components/groups/model.ts @@ -0,0 +1,19 @@ +// models.ts +export interface Cliente { + id: number; + nombre: string; + } + + export interface Aula { + id: number; + nombre: string; + clientes: Cliente[]; + bloques?: Aula[]; + } + + export interface UnidadOrganizativa { + id: number; + nombre: string; + aulas: Aula[]; + } + \ No newline at end of file diff --git a/ogWebconsole/src/app/components/layout/header/header.component.html b/ogWebconsole/src/app/components/layout/header/header.component.html index b00e6be..737223f 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.html +++ b/ogWebconsole/src/app/components/layout/header/header.component.html @@ -4,7 +4,7 @@ Opengnsys webconsole
- + diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.css b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.css new file mode 100644 index 0000000..6916e95 --- /dev/null +++ b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.css @@ -0,0 +1,10 @@ +.user-form .form-field { + display: block; + margin-bottom: 10px; /* Puedes ajustar el valor para cambiar la separación */ + } + + .checkbox-group label { + display: block; + margin-bottom: 8px; /* Ajusta este valor según necesites */ + } + \ No newline at end of file diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.html b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.html new file mode 100644 index 0000000..8819559 --- /dev/null +++ b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.html @@ -0,0 +1,21 @@ +

Editar Usuario

+
+
+ + Nombre de usuario + + + + Contraseña + + + + Repite la contraseña + + +
+
+
+ + +
diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.spec.ts b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.spec.ts new file mode 100644 index 0000000..0135615 --- /dev/null +++ b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ChangePasswordModalComponent } from './change-password-modal.component'; + +describe('ChangePasswordModalComponent', () => { + let component: ChangePasswordModalComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ChangePasswordModalComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ChangePasswordModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.ts b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.ts new file mode 100644 index 0000000..5910929 --- /dev/null +++ b/ogWebconsole/src/app/components/pages/admin/users/users/change-password-modal/change-password-modal.component.ts @@ -0,0 +1,65 @@ +import { Component, EventEmitter, Inject, OnInit, Output } from '@angular/core'; +import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { UserService } from '../users.service'; + +@Component({ + selector: 'app-change-password-modal', + templateUrl: './change-password-modal.component.html', + styleUrl: './change-password-modal.component.css' +}) + +export class ChangePasswordModalComponent implements OnInit { + @Output() userEdited = new EventEmitter(); + userForm: FormGroup; + + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any, + private fb: FormBuilder, + private userService: UserService + ) { + this.userForm = this.fb.group({ + username: [this.data.user, Validators.required], + password: [''], + confirmPassword: [''] + }, { validators: this.passwordMatchValidator }); + } + + ngOnInit(): void {} + + onNoClick(): void { + this.dialogRef.close(); + } + + onSubmit(): void { + if (this.userForm.valid) { + const userPayload = { + username: this.userForm.value.username, + allowedOrganizationalUnits: this.data.user.allowedOrganizationalUnits, + password: this.userForm.value.password, + enabled: true, + userGroups: this.data.user.userGroups + }; + + this.userService.updateUser(this.data.user.uuid, userPayload).subscribe( + response => { + console.log('User updated successfully:', response); + this.userEdited.emit(); + this.dialogRef.close(this.userForm.value); + }, + error => { + console.error('Error updating user:', error); + // Agregar alguna lógica para manejar el error en la interfaz de usuario + } + ); + } else { + console.error('Form is invalid'); + // Agregar alguna lógica para manejar el error en la interfaz de usuario + } + } + + private passwordMatchValidator(form: FormGroup): { [key: string]: boolean } | null { + return form.get('password')?.value === form.get('confirmPassword')?.value ? null : { mismatch: true }; + } +} \ No newline at end of file