From ced28de390f6471199d1bb81d34245e4d5f9250a Mon Sep 17 00:00:00 2001 From: D'jalmar Gutierrez Date: Thu, 21 Apr 2016 18:00:44 -0400 Subject: [PATCH] cambios en la apariencia y reparacion de bugs menores --- client/app/app.scss | 4 ++ client/app/cargos/cargos.lista.html | 26 ++++++++----- client/app/cargos/cargos.scss | 17 --------- .../editar/postulantes.editar.controller.js | 2 +- .../app/postulantes/postulantes.controller.js | 6 +-- client/app/postulantes/postulantes.lista.html | 37 ++++++++++++------- client/components/navbar/navbar.html | 2 +- server/components/errors/errorManager.js | 4 +- .../middleware/parametrosRuta.validator.js | 3 ++ 9 files changed, 55 insertions(+), 46 deletions(-) diff --git a/client/app/app.scss b/client/app/app.scss index ac6340e..e948654 100644 --- a/client/app/app.scss +++ b/client/app/app.scss @@ -22,6 +22,10 @@ $masculino-color: #57b6ff; .input-group { margin-bottom: 10px; } +.header-button{ + margin-top: 20px; + margin-bottom: 10px; +} // Component styles are injected through grunt // injector diff --git a/client/app/cargos/cargos.lista.html b/client/app/cargos/cargos.lista.html index 494e966..b8c2ea5 100644 --- a/client/app/cargos/cargos.lista.html +++ b/client/app/cargos/cargos.lista.html @@ -1,14 +1,21 @@ -
-
-

Cargos

+
+
+
+
+

Cargos

+
+
+
+ +
+
+
{{alerta.mensaje}} -
- -
+
@@ -21,7 +28,8 @@ diff --git a/client/app/cargos/cargos.scss b/client/app/cargos/cargos.scss index bc8686d..6e5c114 100644 --- a/client/app/cargos/cargos.scss +++ b/client/app/cargos/cargos.scss @@ -1,20 +1,3 @@ -tags-input .tags .tag-item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - display: inline-block; - white-space: nowrap; - margin: -1px 5px 5px 0; - height: 22px; - vertical-align: top; - cursor: default; - color: #767676; - background-color: #fff; - border-color: #ccc; -} .modal-header-success { color:#fff; padding:9px 15px; diff --git a/client/app/postulantes/editar/postulantes.editar.controller.js b/client/app/postulantes/editar/postulantes.editar.controller.js index cf85076..3576cf4 100644 --- a/client/app/postulantes/editar/postulantes.editar.controller.js +++ b/client/app/postulantes/editar/postulantes.editar.controller.js @@ -122,7 +122,7 @@ this.tagService.getTags() .then(tags=> { this.tags = tags; - return this.tags.rows.filter(x=>x.includes(query)); + return this.tags.rows.filter(x=>x.nombre.includes(query)); }) } else return this.tags.rows.filter(x=>x.nombre.includes(query)); diff --git a/client/app/postulantes/postulantes.controller.js b/client/app/postulantes/postulantes.controller.js index 0bfebfc..f77606c 100644 --- a/client/app/postulantes/postulantes.controller.js +++ b/client/app/postulantes/postulantes.controller.js @@ -53,7 +53,7 @@ else { this.service.getPostulantes({ pagina: this.paginaActual, - elementos: 15, + elementos: 10, ordenarPor: this.ordenarPor, orden: this.ordenDescendente }) @@ -78,7 +78,7 @@ this.tagService.getTags() .then(tags=> { this.tags = tags; - return this.tags.rows.filter(x=>x.includes(query)); + return this.tags.rows.filter(x=>x.nombre.includes(query)); }) } else return this.tags.rows.filter(x=>x.nombre.includes(query)); @@ -91,7 +91,7 @@ }); this.service.getPostulantes({ pagina: this.paginaActual, - elementos: 15, + elementos: 10, ordenarPor: this.ordenarPor, orden: this.ordenDescendente, incluye: [{entidad: 'Tags', buscar: palabras}] diff --git a/client/app/postulantes/postulantes.lista.html b/client/app/postulantes/postulantes.lista.html index f206e3a..90feaac 100644 --- a/client/app/postulantes/postulantes.lista.html +++ b/client/app/postulantes/postulantes.lista.html @@ -1,18 +1,21 @@
-

Postulantes -

+
+
+

Postulantes

+
+
+
+ +
+
+
{{alerta.mensaje}} -
-
- -
-
-
+
@@ -31,16 +34,22 @@
- + - diff --git a/client/components/navbar/navbar.html b/client/components/navbar/navbar.html index e077738..08d2b8d 100644 --- a/client/components/navbar/navbar.html +++ b/client/components/navbar/navbar.html @@ -1,4 +1,4 @@ -
{{cargo.nombre}} - +
Nombres ApellidosOpcionesOpciones
{{postulante.nombres}} {{postulante.apellidos}} - - + +