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

Cambios solicitador por QA 

Se realizaron los cambios que QA solicitó realizar, además de algunas de arreglar algunas traducciones del inglés al español
This commit is contained in:
Mariela Bonilla 2021-07-11 20:09:56 -06:00
parent ec4f092b72
commit 73a6397133
13 changed files with 95 additions and 46 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",

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

@ -1,13 +1,8 @@
<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"
@ -15,7 +10,7 @@
[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 +27,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,7 +57,7 @@
>{{ last ? '' : ', ' }}
</span>
</td>-->
<td class="text-right">
<td class="text-center">
<div class="btn-group">
<button
type="submit"
@ -73,7 +68,7 @@
<fa-icon icon="eye"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.view">View</span>
</button>
&nbsp;&nbsp;
<button type="submit" (click)="delete(usuarioExtra)" class="btn 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>

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;

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"