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", "@ng-bootstrap/ng-bootstrap": "9.1.3",
"@ngx-translate/core": "13.0.0", "@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.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", "bootstrap": "4.6.0",
"dayjs": "1.10.5", "dayjs": "1.10.5",
"ngx-infinite-scroll": "10.0.1", "ngx-infinite-scroll": "10.0.1",
@ -4227,6 +4229,19 @@
"@types/node": "*" "@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": { "node_modules/@types/glob": {
"version": "7.1.3", "version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@ -5091,6 +5106,18 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true "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": { "node_modules/ansi-colors": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@ -30320,6 +30347,19 @@
"@types/node": "*" "@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": { "@types/glob": {
"version": "7.1.3", "version": "7.1.3",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@ -30984,6 +31024,14 @@
"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
"dev": true "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": { "ansi-colors": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "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> <div>
<h2 id="page-heading" data-cy="UsuarioExtraHeading"> <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"> <div class="d-flex justify-content-end">
<button class="btn btn-info mr-2" (click)="loadAll()" [disabled]="isLoading"> <button id="jh-create-entity" data-cy="entityCreateButton" class="ds-btn ds-btn--primary" [routerLink]="['/usuario-extra/new']">
<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']"
>
<fa-icon icon="plus"></fa-icon> <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> </button>
</div> </div>
</h2> </h2>
@ -32,10 +22,10 @@
<table class="table table-striped" aria-describedby="page-heading"> <table class="table table-striped" aria-describedby="page-heading">
<thead> <thead>
<tr> <tr>
<th scope="col"><span>Rol</span></th> <th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.rol">Rol</span></th>
<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.iconoPerfil">Icono Perfil</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 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.estado">Estado</span></th>
<!--<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.plantilla">Plantilla</span></th>--> <!--<th scope="col"><span jhiTranslate="dataSurveyApp.usuarioExtra.plantilla">Plantilla</span></th>-->
<th scope="col"></th> <th scope="col"></th>
@ -62,19 +52,19 @@
>{{ last ? '' : ', ' }} >{{ last ? '' : ', ' }}
</span> </span>
</td>--> </td>-->
<td class="text-right"> <td class="text-center">
<div class="btn-group"> <div class="btn-group">
<button <button
type="submit" type="submit"
[routerLink]="['/usuario-extra', usuarioExtra.id, 'view']" [routerLink]="['/usuario-extra', usuarioExtra.id, 'view']"
class="btn btn-info btn-sm" class="ds-btn ds-btn--primary btn-sm"
data-cy="entityDetailsButton" data-cy="entityDetailsButton"
> >
<fa-icon icon="eye"></fa-icon> <fa-icon icon="eye"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span> <span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
</button> </button>
&nbsp;&nbsp;
<button type="submit" (click)="delete(usuarioExtra)" class="btn btn-danger btn-sm" data-cy="entityDeleteButton"> <button type="submit" (click)="delete(usuarioExtra)" class="ds-btn ds-btn--danger btn-sm" data-cy="entityDeleteButton">
<fa-icon icon="times"></fa-icon> <fa-icon icon="times"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span> <span class="d-none d-md-inline" jhiTranslate="entity.action.delete">Delete</span>
</button> </button>

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

@ -10,3 +10,7 @@
list-style: none; list-style: none;
padding-left: 10px; 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; rolList = user.authorities;
let a = rolList?.pop(); let a = rolList?.pop();
if (a == 'ROLE_ADMIN') { if (a == 'ROLE_ADMIN') {
user.authorities = ['ADMIN']; user.authorities = ['Admin'];
} else if (a == 'ROLE_USER') { } else if (a == 'ROLE_USER') {
user.authorities = ['USUARIO']; user.authorities = ['Usuario'];
} }
}); });
this.publicUsers = res; 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! The password and its confirmation do not match!
</div> </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="mb-3">
<div class="form-group"> <div class="form-group">
<label for="name" class="form-label">Nombre completo</label> <label for="name" class="form-label">Nombre completo</label>
@ -86,7 +94,7 @@
<div class="mb-3"> <div class="mb-3">
<div class="form-group"> <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 <input
type="email" type="email"
class="form-control" class="form-control"
@ -239,7 +247,7 @@
<button <button
type="submit" type="submit"
[disabled]="registerForm.invalid" [disabled]="registerForm.invalid"
class="btn btn-primary w-100" class="ds-btn ds-btn--primary w-100"
jhiTranslate="register.form.button" jhiTranslate="register.form.button"
data-cy="submit" data-cy="submit"
> >

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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