eduardo
/
datasurvey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22 from Quantum-P3/feature/US-07 

Cambios solicitados por QA paraUS-07
This commit is contained in:
Eduardo Quiros 2021-07-12 04:01:43 +00:00 committed by GitHub
parent 0857cb459c 5c892b296a
commit 29c5ae52ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 109 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
package-lock.json generated
View File

@ -23,6 +23,8 @@
"@ng-bootstrap/ng-bootstrap": "9.1.3",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@types/gapi.auth2": "0.0.54",
"angularx-social-login": "^4.0.1",
"bootstrap": "4.6.0",
"dayjs": "1.10.5",
"ngx-infinite-scroll": "10.0.1",
@ -4227,6 +4229,19 @@
"@types/node": "*"
}
},
"node_modules/@types/gapi": {
"version": "0.0.40",
"resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz",
"integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw=="
},
"node_modules/@types/gapi.auth2": {
"version": "0.0.54",
"resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz",
"integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==",
"dependencies": {
"@types/gapi": "*"
}
},
"node_modules/@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@ -5091,6 +5106,18 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true
},
"node_modules/angularx-social-login": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz",
"integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/common": "^12.0.0",
"@angular/core": "^12.0.0"
}
},
"node_modules/ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@ -30320,6 +30347,19 @@
"@types/node": "*"
}
},
"@types/gapi": {
"version": "0.0.40",
"resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz",
"integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw=="
},
"@types/gapi.auth2": {
"version": "0.0.54",
"resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz",
"integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==",
"requires": {
"@types/gapi": "*"
}
},
"@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@ -30984,6 +31024,14 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true
},
"angularx-social-login": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz",
"integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==",
"requires": {
"tslib": "^2.0.0"
}
},
"ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",

30
src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html
View File

@ -1,21 +1,11 @@
<div>
<h2 id="page-heading" data-cy="UsuarioExtraHeading">
<span jhiTranslate="dataSurveyApp.usuarioExtra.home.title">Usuario Extras</span>
<span jhiTranslate="dataSurveyApp.usuarioExtra.home.title">Usuarios</span>
<div class="d-flex justify-content-end">
<button class="btn btn-info mr-2" (click)="loadAll()" [disabled]="isLoading">
<fa-icon icon="sync" [spin]="isLoading"></fa-icon>
<span jhiTranslate="dataSurveyApp.usuarioExtra.home.refreshListLabel">Refresh List</span>
</button>
<button
id="jh-create-entity"
data-cy="entityCreateButton"
class="btn btn-primary jh-create-entity create-usuario-extra"
[routerLink]="['/usuario-extra/new']"
>
<button id="jh-create-entity" data-cy="entityCreateButton" class="ds-btn ds-btn--primary" [routerLink]="['/usuario-extra/new']">
<fa-icon icon="plus"></fa-icon>
<span jhiTranslate="dataSurveyApp.usuarioExtra.home.createLabel"> Create a new Usuario Extra </span>
<span jhiTranslate="dataSurveyApp.usuarioExtra.home.createLabel"> Create a new administrador </span>
</button>
</div>
</h2>
@ -32,10 +22,10 @@
<table class="table table-striped" aria-describedby="page-heading">
<thead>
<tr>
<th scope="col"><span>Rol</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.iconoPerfil">Icono Perfil</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.rol">Rol</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.iconoPerfil">Icono</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.nombre">Nombre Usuario</span></th>
<th scope="col"><span>Correo electrónico</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.correo">Correo electrónico</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.estado">Estado</span></th>
<!--<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.plantilla">Plantilla</span></th>-->
<th scope="col"></th>
@ -62,19 +52,19 @@
>{{ last ? '' : ', ' }}
</span>
</td>-->
<td class="text-right">
<td class="text-center">
<div class="btn-group">
<button
type="submit"
[routerLink]="['/usuario-extra', usuarioExtra.id, 'view']"
class="btn btn-info btn-sm"
class="ds-btn ds-btn--primary btn-sm"
data-cy="entityDetailsButton"
>
<fa-icon icon="eye"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
</button>
<button type="submit" (click)="delete(usuarioExtra)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton">
&nbsp;&nbsp;
<button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--danger btn-sm" data-cy="entityDeleteButton">
<fa-icon icon="times"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
</button>

4
src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.scss
View File

@ -10,3 +10,7 @@
list-style: none;
padding-left: 10px;
}
.btn-group button {
margin: 0 2px;
}

4
src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.ts
View File

@ -30,9 +30,9 @@ export class UsuarioExtraComponent implements OnInit {
rolList = user.authorities;
let a = rolList?.pop();
if (a == 'ROLE_ADMIN') {
user.authorities = ['ADMIN'];
user.authorities = ['Admin'];
} else if (a == 'ROLE_USER') {
user.authorities = ['USUARIO'];
user.authorities = ['Usuario'];
}
});
this.publicUsers = res;

14
src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html
View File

@ -34,7 +34,15 @@
The password and its confirmation do not match!
</div>
<form name="form" role="form" class="form" (ngSubmit)="register()" [formGroup]="registerForm" *ngIf="!success" autocomplete="off">
<form
name="form"
role="form"
class="ds-form"
(ngSubmit)="register()"
[formGroup]="registerForm"
*ngIf="!success"
autocomplete="off"
>
<div class="mb-3">
<div class="form-group">
<label for="name" class="form-label">Nombre completo</label>
@ -86,7 +94,7 @@
<div class="mb-3">
<div class="form-group">
<label for="emailaddress" class="form-label">Correo electrónico</label>
<label for="email" class="form-label">Correo electrónico</label>
<input
type="email"
class="form-control"
@ -239,7 +247,7 @@
<button
type="submit"
[disabled]="registerForm.invalid"
class="btn btn-primary w-100"
class="ds-btn ds-btn--primary w-100"
jhiTranslate="register.form.button"
data-cy="submit"
>

4
src/main/webapp/i18n/es/accesoEncuesta.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"AccesoEncuesta": {
"null": "",
"PUBLIC": "PUBLIC",
"PRIVATE": "PRIVATE"
"PUBLIC": "Pública",
"PRIVATE": "Privada"
}
}
}

4
src/main/webapp/i18n/es/estadoCategoria.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"EstadoCategoria": {
"null": "",
"ACTIVE": "ACTIVA",
"INACTIVE": "INACTIVA"
"ACTIVE": "Activa",
"INACTIVE": "Inactiva"
}
}
}

4
src/main/webapp/i18n/es/estadoColaborador.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"EstadoColaborador": {
"null": "",
"PENDING": "PENDING",
"ACTIVE": "ACTIVE"
"PENDING": "Pendiente",
"ACTIVE": "Activo"
}
}
}

8
src/main/webapp/i18n/es/estadoEncuesta.json
View File

@ -2,10 +2,10 @@
"dataSurveyApp": {
"EstadoEncuesta": {
"null": "",
"DRAFT": "DRAFT",
"ACTIVE": "ACTIVE",
"FINISHED": "FINISHED",
"DELETED": "DELETED"
"DRAFT": "Borrador",
"ACTIVE": "Activa",
"FINISHED": "Finalizada",
"DELETED": "Eliminada"
}
}
}

8
src/main/webapp/i18n/es/estadoPlantilla.json
View File

@ -2,10 +2,10 @@
"dataSurveyApp": {
"EstadoPlantilla": {
"null": "",
"DRAFT": "DRAFT",
"ACTIVE": "ACTIVE",
"DELETED": "DELETED",
"DISABLED": "DISABLED"
"DRAFT": "Borrador",
"ACTIVE": "Activa",
"DELETED": "Eliminada",
"DISABLED": "Desactivada"
}
}
}

4
src/main/webapp/i18n/es/estadoUsuario.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"EstadoUsuario": {
"null": "",
"ACTIVE": "ACTIVE",
"SUSPENDED": "SUSPENDED"
"ACTIVE": "Activo",
"SUSPENDED": "Bloqueado"
}
}
}

4
src/main/webapp/i18n/es/preguntaCerradaTipo.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"PreguntaCerradaTipo": {
"null": "",
"SINGLE": "SINGLE",
"MULTIPLE": "MULTIPLE"
"SINGLE": "Única",
"MULTIPLE": "Múltiple"
}
}
}

4
src/main/webapp/i18n/es/rolColaborador.json
View File

@ -2,8 +2,8 @@
"dataSurveyApp": {
"RolColaborador": {
"null": "",
"READ": "READ",
"WRITE": "WRITE"
"READ": "Lector",
"WRITE": "Escritor"
}
}
}

26
src/main/webapp/i18n/es/usuarioExtra.json
View File

@ -2,27 +2,29 @@
"dataSurveyApp": {
"usuarioExtra": {
"home": {
"title": "Usuario Extras",
"title": "Usuarios",
"refreshListLabel": "Refrescar lista",
"createLabel": "Crear nuevo Usuario Extra",
"createOrEditLabel": "Crear o editar Usuario Extra",
"notFound": "Ningún Usuario Extras encontrado"
"createLabel": "Crear nuevo administrador",
"createOrEditLabel": "Crear o editar usuario",
"notFound": "Ningún usuario encontrado"
},
"created": "Un nuevo Usuario Extra ha sido creado con el identificador {{ param }}",
"updated": "Un Usuario Extra ha sido actualizado con el identificador {{ param }}",
"deleted": "Un Usuario Extra ha sido eliminado con el identificador {{ param }}",
"created": "Un nuevo usuario ha sido creado",
"updated": "El usuario con el identificador {{ param }} ha sido actualizado",
"deleted": "El usuario con el identificador {{ param }} ha sido eliminado",
"delete": {
"question": "¿Seguro que quiere eliminar Usuario Extra {{ id }}?"
"question": "¿Seguro que quiere eliminar el usuario {{ id }}?"
},
"detail": {
"title": "Usuario Extra"
"title": "Usuario"
},
"id": "ID",
"rol": "Rol",
"nombre": "Nombre",
"iconoPerfil": "Icono Perfil",
"fechaNacimiento": "Fecha Nacimiento",
"iconoPerfil": "Icono",
"fechaNacimiento": "Fecha de Nacimiento",
"estado": "Estado",
"user": "User",
"user": "Usuario",
"correo": "Correo electrónico",
"encuesta": "Encuesta",
"usuarioEncuesta": "Usuario Encuesta",
"plantilla": "Plantilla"