From ba4d7cb83e47825d98bb223196535f59ebfcf039 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 5 Jul 2021 19:31:17 -0600 Subject: [PATCH 1/5] =?UTF-8?q?arreglar=20traducci=C3=B3n=20en=20secci?= =?UTF-8?q?=C3=B3n=20de=20categor=C3=ADas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/i18n/es/categoria.json | 18 +++++++++--------- src/main/webapp/i18n/es/estadoCategoria.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json index c60118e..b5d1305 100644 --- a/src/main/webapp/i18n/es/categoria.json +++ b/src/main/webapp/i18n/es/categoria.json @@ -2,20 +2,20 @@ "dataSurveyApp": { "categoria": { "home": { - "title": "Categorias", + "title": "Categorías", "refreshListLabel": "Refrescar lista", - "createLabel": "Crear nuevo Categoria", - "createOrEditLabel": "Crear o editar Categoria", - "notFound": "Ningún Categorias encontrado" + "createLabel": "Crear nueva Categoría", + "createOrEditLabel": "Crear o editar Categoría", + "notFound": "Ninguna Categoría encontrada" }, - "created": "Un nuevo Categoria ha sido creado con el identificador {{ param }}", - "updated": "Un Categoria ha sido actualizado con el identificador {{ param }}", - "deleted": "Un Categoria ha sido eliminado con el identificador {{ param }}", + "created": "Una nueva Categoría ha sido creada con el identificador {{ param }}", + "updated": "Una Categoría ha sido actualizado con el identificador {{ param }}", + "deleted": "Una Categoría ha sido eliminado con el identificador {{ param }}", "delete": { - "question": "¿Seguro que quiere eliminar Categoria {{ id }}?" + "question": "¿Seguro que quiere eliminar Categoría {{ id }}?" }, "detail": { - "title": "Categoria" + "title": "Categoría" }, "id": "ID", "nombre": "Nombre", diff --git a/src/main/webapp/i18n/es/estadoCategoria.json b/src/main/webapp/i18n/es/estadoCategoria.json index 31a71c2..89ac025 100644 --- a/src/main/webapp/i18n/es/estadoCategoria.json +++ b/src/main/webapp/i18n/es/estadoCategoria.json @@ -2,8 +2,8 @@ "dataSurveyApp": { "EstadoCategoria": { "null": "", - "ACTIVE": "ACTIVE", - "INACTIVE": "INACTIVE" + "ACTIVE": "ACTIVA", + "INACTIVE": "INACTIVA" } } } From ba6c6fd2bc08093442d6aa363ffb2f95327581b9 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Tue, 6 Jul 2021 09:19:22 -0600 Subject: [PATCH 2/5] hacer mvnw y npmw ejecutables --- mvnw | 0 npmw | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mvnw mode change 100644 => 100755 npmw diff --git a/mvnw b/mvnw old mode 100644 new mode 100755 diff --git a/npmw b/npmw old mode 100644 new mode 100755 From 09b3910e09a8bcb99e3f5293b56e891185e5998d Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Tue, 6 Jul 2021 09:20:32 -0600 Subject: [PATCH 3/5] agregar wrapper de maven al gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 50f7684..aa8f760 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,5 @@ Desktop.ini ###################### /coverage/ /.nyc_output/ + +.mvn/wrapper/maven-wrapper.jar \ No newline at end of file From 48cd746b5983bf08e4bb1f796a01404e5274ad67 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Tue, 6 Jul 2021 22:53:02 -0600 Subject: [PATCH 4/5] listar usuarios historia de usuario: listar usuarios registrados --- .../webapp/app/entities/user/user.model.ts | 13 +++++++- .../app/entities/user/user.service.spec.ts | 6 ++-- .../webapp/app/entities/user/user.service.ts | 3 ++ .../list/usuario-extra.component.html | 30 +++++++++-------- .../list/usuario-extra.component.scss | 12 +++++++ .../list/usuario-extra.component.ts | 33 +++++++++++++++++-- .../service/usuario-extra.service.ts | 8 +++++ 7 files changed, 87 insertions(+), 18 deletions(-) create mode 100644 src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss diff --git a/src/main/webapp/app/entities/user/user.model.ts b/src/main/webapp/app/entities/user/user.model.ts index 2792389..add3f05 100644 --- a/src/main/webapp/app/entities/user/user.model.ts +++ b/src/main/webapp/app/entities/user/user.model.ts @@ -1,10 +1,21 @@ export interface IUser { id?: number; login?: string; + firstName?: string | null; + lastName?: string | null; + email?: string; + authorities?: string[]; } export class User implements IUser { - constructor(public id: number, public login: string) {} + constructor( + public id: number, + public login: string, + public firstName?: string, + public lastName?: string, + public email?: string, + public authorities?: string[] + ) {} } export function getUserIdentifier(user: IUser): number | undefined { diff --git a/src/main/webapp/app/entities/user/user.service.spec.ts b/src/main/webapp/app/entities/user/user.service.spec.ts index 02c8695..3982373 100644 --- a/src/main/webapp/app/entities/user/user.service.spec.ts +++ b/src/main/webapp/app/entities/user/user.service.spec.ts @@ -32,8 +32,10 @@ describe('Service Tests', () => { }); const req = httpMock.expectOne({ method: 'GET' }); - req.flush([new User(123, 'user')]); - expect(expectedResult).toEqual([{ id: 123, login: 'user' }]); + req.flush([new User(123, 'user', 'fist name', 'last name', 'email@gmail.com', ['ROLE_USER'])]); + expect(expectedResult).toEqual([ + { id: 123, login: 'user', firstName: 'fist name', lastName: 'last name', email: 'email@gmail.com', authorities: ['ROLE_USER'] }, + ]); }); it('should propagate not found response', () => { diff --git a/src/main/webapp/app/entities/user/user.service.ts b/src/main/webapp/app/entities/user/user.service.ts index 7d23e9e..9d4571a 100644 --- a/src/main/webapp/app/entities/user/user.service.ts +++ b/src/main/webapp/app/entities/user/user.service.ts @@ -7,6 +7,9 @@ import { createRequestOption } from 'app/core/request/request-util'; import { isPresent } from 'app/core/util/operators'; import { Pagination } from 'app/core/request/request.model'; import { IUser, getUserIdentifier } from './user.model'; +import { map } from 'rxjs/operators'; + +export type EntityResponseType = HttpResponse; @Injectable({ providedIn: 'root' }) export class UserService { diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html index 768a830..e69f537 100644 --- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html +++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html @@ -32,34 +32,38 @@ - - + - + + + - - + + - - + + - -
IDNombreRol de usuario Icono PerfilFecha NacimientoNombre UsuarioNombre CompletoCorreo electrónico EstadoUserPlantilla
+
    +
  • +

    {{ userRole }}

    +
    • +
+ 		- {{ usuarioExtra.id }} +
{{ usuarioExtra.nombre }}{{ usuarioExtra.iconoPerfil }}{{ usuarioExtra.fechaNacimiento | formatMediumDatetime }}{{ usuarioExtra.user.firstName }} {{ usuarioExtra.user.lastName }}{{ usuarioExtra.user.email }} {{ usuarioExtra.estado }} - {{ usuarioExtra.user?.id }} - +
- -