skrd/unified-restaurant-original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mejoras en el agregar usuario

Browse Source
This commit is contained in:
Daniel Cortés
2021-07-27 13:30:07 -04:00
parent 68fc4086c3
commit e146c935ea
5 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/app/components/agregar-usuario/agregar-usuario.component.html
View File

@@ -5,7 +5,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let r of usuarios.data" data-bs-toggle="modal" data-bs-target="#ModificarUsuarios" (click)="modificarModelUsuario(r.id,r.nombre)"> <tr *ngFor="let r of usuarios" data-bs-toggle="modal" data-bs-target="#ModificarUsuarios" (click)="modificarModelUsuario(r.id)">
<td>{{r.id}}</td> <td>{{r.id}}</td>
<td>{{r.nombre}}</td> <td>{{r.nombre}}</td>
<td> <span *ngFor="let f of r.roles" class="badge badge-success spam_magin">{{f}}</span> </td> <td> <span *ngFor="let f of r.roles" class="badge badge-success spam_magin">{{f}}</span> </td>
@@ -17,4 +17,4 @@
Agregar Agregar
</button> </button>
<app-modal-usuario [idModalUsu]="idSelect" [NombreModalusu]="nombreSelect"></app-modal-usuario> <app-modal-usuario [user]="selected"></app-modal-usuario>

28
frontend/src/app/components/agregar-usuario/agregar-usuario.component.ts
View File

@@ -10,9 +10,7 @@ import {RestaurantesService} from "../../restaurantes.service";
export class AgregarUsuarioComponent implements OnInit { export class AgregarUsuarioComponent implements OnInit {
usuarios: any; usuarios: any;
idSelect:any; selected: any;
nombreSelect:any;
agreU={ agreU={
nombre:null, nombre:null,
@@ -22,6 +20,7 @@ export class AgregarUsuarioComponent implements OnInit {
roles:['admin'], roles:['admin'],
restaurant:null restaurant:null
} }
modi={ modi={
nombre: null, nombre: null,
roles:['productor'] roles:['productor']
@@ -32,29 +31,18 @@ export class AgregarUsuarioComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.recuperarUsuarios(); this.recuperarUsuarios();
} }
recuperarUsuarios(){ recuperarUsuarios(){
this.restaurantServ.mostrarUsuarios().subscribe(result => this.usuarios = result) this.restaurantServ.mostrarUsuarios().subscribe((result :any) => this.usuarios = result.data)
}
AgregarUsu(){
this.restaurantServ.agregarUsu(this.agreU).subscribe(this.recuperarUsuarios)
} }
eliminarUsu(id:any){ eliminarUsu(id:any){
if(confirm("Esta seguro de eliminar este registro?")){ if(confirm("Esta seguro de eliminar este registro?")){
this.restaurantServ.eliminarUsu(id).subscribe(); this.restaurantServ.eliminarUsu(id).subscribe();
} }
}
modificarUsu(id:any){
this.restaurantServ.moficiarUsu(id,this.modi).subscribe();
}
modificarModelUsuario(id:any,nombre:any){
this.idSelect=id;
this.nombreSelect=nombre;
} }
modificarModelUsuario(id:any){
this.selected = this.usuarios.find((user :any) => user.id === id);
}
} }

48
frontend/src/app/components/modal-usuario/modal-usuario.component.html
View File

@@ -8,38 +8,40 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="Nombre">nombre</label> <label for="Nombre">nombre</label>
<input type="text" class="form-control" id="Nombre" [(ngModel)]="agreU.nombre" placeholder="nombre"> <input type="text" class="form-control" id="Nombre" [(ngModel)]="user_add.nombre" placeholder="Nombre">
</div>
<div class="form-group">
<label for="NombredeUsuarios">Nombre de Usuario</label>
<input type="text" class="form-control" id="NombredeUsuarios" [(ngModel)]="user_add.username" placeholder="Nombre de Usuario" >
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="email">email</label> <label for="email">email</label>
<input type="email" class="form-control" id="email" aria-describedby="emailHelp" [(ngModel)]="agreU.email" placeholder="email"> <input type="email" class="form-control" id="email" [(ngModel)]="user_add.email" placeholder="Email">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="NombredeUsuarios">Nombre de Usuarios</label> <label for="contraseña">Contraseña</label>
<input type="text" class="form-control" id="NombredeUsuarios" [(ngModel)]="agreU.username" placeholder="Nombre de Usuarios" > <input type="password" class="form-control" id="contraseña" [(ngModel)]="user_add.password" placeholder="Contraseña">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="contraseña">contraseña</label> <label for="rolesM">Roles</label>
<input type="password" class="form-control" id="contraseña" [(ngModel)]="agreU.password" placeholder="contraseña"> <select class="form-control" multiple [(ngModel)]="user_add.roles">
<option *ngFor="let role of possible_roles" value="{{role.id}}">{{role.name}}</option>
</select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="roles">roles</label> <label for="restaurantes">Restaurante</label>
<input type="text" class="form-control" id="roles" [(ngModel)]="agreU.roles" placeholder="roles"> <input type="text" class="form-control" id="restaurantes" [(ngModel)]="user_add.restaurant" placeholder="Restaurante">
</div>
<div class="form-group">
<label for="restaurantes">restaurantes</label>
<input type="text" class="form-control" id="restaurantes" [(ngModel)]="agreU.restaurant" placeholder="restaurantes">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cerrar</button>
<button type="submit" class="btn btn-primary" data-bs-dismiss="modal" (click)="AgregarUsu()">guardar</button> <button type="submit" class="btn btn-primary" data-bs-dismiss="modal" (click)="AgregarUsu()">Guardar</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="ModificarUsuarios" tabindex="-1" aria-labelledby="ModificarModalLabel" aria-hidden="true"> <div class="modal fade" *ngIf="user" id="ModificarUsuarios" tabindex="-1" aria-labelledby="ModificarModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@@ -48,18 +50,20 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
<label for="NombreM">nombre</label> <label for="NombreM">Nombre</label>
<input type="text" class="form-control" id="NombreM" [(ngModel)]="modi.nombre" placeholder="{{NombreModalusu}}"> <input type="text" class="form-control" id="NombreM" [(ngModel)]="user.nombre">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="rolesM">roles</label> <label for="rolesM">Roles</label>
<input type="text" class="form-control" id="rolesM" [(ngModel)]="modi.roles" placeholder="roles"> <select class="form-control" multiple [(ngModel)]="user.roles">
<option *ngFor="let role of possible_roles" value="{{role.id}}">{{role.name}}</option>
</select>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cerrar</button>
<button type="submit" class="btn btn-primary" data-bs-dismiss="modal" (click)="modificarUsu(idModalUsu)">guardar</button> <button type="submit" class="btn btn-primary" data-bs-dismiss="modal" (click)="modificarUsu(user.id)">Guardar</button>
<button type="submit" class="btn btn-danger" data-bs-dismiss="modal" (click)="eliminarUsu(idModalUsu)">eliminar</button> <button type="submit" class="btn btn-danger" data-bs-dismiss="modal" (click)="eliminarUsu(user.id)">Eliminar</button>
</div> </div>
</div> </div>
</div> </div>

43
frontend/src/app/components/modal-usuario/modal-usuario.component.ts
View File

@@ -8,26 +8,28 @@ import {RestaurantesService} from "../../restaurantes.service";
}) })
export class ModalUsuarioComponent implements OnInit { export class ModalUsuarioComponent implements OnInit {
@Input() user: any;
user_add: any = null;
usuarios: any; usuarios: any;
@Input()idModalUsu:any; possible_roles = [
@Input()NombreModalusu:any; {id: 'global_admin', name: 'Administrador Global'},
{id: 'admin', name: 'Administrador'},
{id: 'recaudador', name: 'Recaudador'},
{id: 'productor', name: 'Productor'},
{id: 'mesero', name: 'Mesero'},
];
constructor(private restaurantServ: RestaurantesService) {
agreU={ this.user_add = {
nombre:null, nombre: null,
email:null, username: null,
username:null, email: null,
password:null, password: null,
roles:['admin'], roles: [],
restaurant:null restaurant: null,
}
} }
modi={
nombre: null,
roles:['productor']
}
constructor(private restaurantServ : RestaurantesService) { }
ngOnInit(): void { ngOnInit(): void {
this.recuperarUsuarios(); this.recuperarUsuarios();
@@ -36,18 +38,19 @@ export class ModalUsuarioComponent implements OnInit {
recuperarUsuarios(){ recuperarUsuarios(){
this.restaurantServ.mostrarUsuarios().subscribe(result => this.usuarios = result) this.restaurantServ.mostrarUsuarios().subscribe(result => this.usuarios = result)
} }
AgregarUsu(){ AgregarUsu(){
this.restaurantServ.agregarUsu(this.agreU).subscribe(this.recuperarUsuarios) this.restaurantServ.agregarUsu(this.user_add).subscribe(this.recuperarUsuarios)
} }
eliminarUsu(id:any){ eliminarUsu(id:any){
if(confirm("Esta seguro de eliminar este registro?")){ if(confirm("Esta seguro de eliminar este registro?")){
this.restaurantServ.eliminarUsu(id).subscribe(); this.restaurantServ.eliminarUsu(id).subscribe();
} }
} }
modificarUsu(id:any){ modificarUsu(id:any){
this.restaurantServ.moficiarUsu(id,this.modi).subscribe(); this.restaurantServ.moficiarUsu(this.user).subscribe();
} }

6
frontend/src/app/restaurantes.service.ts
View File

@@ -49,11 +49,13 @@ export class RestaurantesService {
eliminarUsu(codigo:any){ eliminarUsu(codigo:any){
return this.http.delete(`${this.url}/users/${codigo}`); return this.http.delete(`${this.url}/users/${codigo}`);
} }
moficiarUsu(codigo:any,Usuariomodificado:any){
moficiarUsu(user :any){
const headers: HttpHeaders = new HttpHeaders({ const headers: HttpHeaders = new HttpHeaders({
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}); });
return this.http.put(`${this.url}/users/${codigo}`, JSON.stringify(Usuariomodificado), { headers: headers });
return this.http.put(`${this.url}/users/${user.id}`, JSON.stringify(user), { headers: headers });
} }
//CRUD DE SECTORES //CRUD DE SECTORES