From ced28de390f6471199d1bb81d34245e4d5f9250a Mon Sep 17 00:00:00 2001
From: D'jalmar Gutierrez <dgutierrez@adsib.gob.bo>
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 @@
-<div class="container">
-  <div class="row">
-    <h2 class="sub-header">Cargos</h2>
+<div class="row">
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-4 col-xs-6">
+        <h2>Cargos</h2>
+      </div>
+      <div class="col-sm-3 col-sm-offset-5">
+        <div class="pull-right">
+          <button class="btn btn-success header-button" ng-click="vm.crearCargos()">
+            <i class="fa fa-plus"></i> Crear Cargo
+          </button>
+        </div>
+      </div>
+    </div>
     <uib-alert ng-repeat="alerta in vm.alertas" type="{{alerta.tipo}}" close="vm.alertas.splice($index,1)"
                dismiss-on-timeout="3000">{{alerta.mensaje}}
     </uib-alert>
-    <div class="pull-right">
-      <button class="btn btn-success" ng-click="vm.crearCargos()">
-        <i class="fa fa-plus"></i> Crear Cargo
-      </button>
-    </div>
+
     <div class="table-responsive">
       <table class="table table-striped">
         <thead>
@@ -21,7 +28,8 @@
         <tr ng-repeat="cargo in vm.cargos">
           <td>{{cargo.nombre}}</td>
           <td width="150">
-            <a class = "btn btn-info btn-xs" href = "#" role = "button" ng-click="vm.editar(cargo._id)"><i class="fa fa-edit"></i></a>
+            <a class="btn btn-info btn-xs" href="#" role="button" ng-click="vm.editar(cargo._id)"><i
+              class="fa fa-edit fa-lg"></i></a>
           </td>
           <!--Mostrar un dialogo de eliminar-->
           <!--<td><a ng-click="vm.eliminar(cargo._id)">Eliminar</a></td>-->
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 @@
 <div class="row">
   <div class="container">
-    <h2 class="sub-header">Postulantes
-    </h2>
+    <div class="row">
+      <div class="col-sm-4 col-xs-6">
+        <h2>Postulantes</h2>
+      </div>
+      <div class="col-sm-3 col-sm-offset-5">
+        <div class="pull-right">
+          <button class="btn btn-success header-button" ng-click="vm.crear()">
+            <i class="fa fa-plus"></i> Crear Postulante
+          </button>
+        </div>
+      </div>
+    </div>
     <uib-alert ng-repeat="alerta in vm.alertas" type="{{alerta.tipo}}" close="vm.alertas.splice($index,1)"
                dismiss-on-timeout="3000">{{alerta.mensaje}}
     </uib-alert>
-    <div class="container">
-      <div class="pull-right">
-        <button class="btn btn-success" ng-click="vm.crear()"><i
-          class="fa fa-plus"></i> Crear Postulante
-        </button>
-      </div>
-    </div>
-    <hr>
+
     <div class="form-group">
       <div class="">
         <div class="input-group">
@@ -31,16 +34,22 @@
         <tr>
           <th><a href="" ng-click="vm.ordenar('nombres')">Nombres</a></th>
           <th><a href="" ng-click="vm.ordenar('apellidos')">Apellidos</a></th>
-          <th colspan="2">Opciones</th>
+          <th colspan="2" class="text-center">Opciones</th>
         </tr>
         </thead>
         <tbody>
         <tr ng-repeat="postulante in vm.postulantes">
           <td>{{postulante.nombres}}</td>
           <td>{{postulante.apellidos}}</td>
-          <td>
-            <a class = "btn btn-info btn-xs" href = "#" role = "button" ng-click="vm.editar(postulante._id)"><i class="fa fa-edit"></i></a>
-            <a class = "btn btn-danger btn-xs" href = "#" role = "button" ng-click="vm.eliminar(postulante)"><i class="fa fa-trash"></i></a>
+          <td class="text-center">
+            <div class="btn-group" role="group">
+              <a class="btn btn-info btn-xs" href="#" role="button" ng-click="vm.editar(postulante._id)">
+                <i class="fa fa-edit fa-lg"></i>
+              </a>
+              <a class="btn btn-danger btn-xs" href="#" role="button" ng-click="vm.eliminar(postulante)">
+                <i class="fa fa-trash fa-lg"></i>
+              </a>
+            </div>
           </td>
         </tr>
         </tbody>
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 @@
-<div class="navbar navbar-default navbar-static-top" ng-controller="NavbarController">
+<div class="navbar navbar-inverse navbar-static-top" ng-controller="NavbarController">
   <div class="container">
     <div class="navbar-header">
       <button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main" ng-click="nav.isCollapsed = !nav.isCollapsed">
diff --git a/server/components/errors/errorManager.js b/server/components/errors/errorManager.js
index f819d7d..e32b519 100644
--- a/server/components/errors/errorManager.js
+++ b/server/components/errors/errorManager.js
@@ -12,7 +12,9 @@ export function respondWithResult(res, statusCode) {
       else {
         entity.rows = res.inclusiones.length > 0 ? filtro.filtrar(entity.rows, res.inclusiones) : entity.rows;
         entity.count = entity.rows.length;
-        entity.rows = res.offset && res.limit ? entity.rows.slice(res.offset, res.offset + res.limit) : entity.rows;
+        console.log(res.offset)
+        console.log(res.limit)
+        entity.rows = res.tienePaginacion? entity.rows.slice(res.offset, res.offset + res.limit) : entity.rows;
         res.status(statusCode).json(entity);
       }
     }
diff --git a/server/components/middleware/parametrosRuta.validator.js b/server/components/middleware/parametrosRuta.validator.js
index a575ae5..20ee6b9 100644
--- a/server/components/middleware/parametrosRuta.validator.js
+++ b/server/components/middleware/parametrosRuta.validator.js
@@ -32,9 +32,12 @@ export function formatearRuta(req, res, next) {
     res.busquedaInterna = true;
     if (req.query.elementos) {
       res.limit = numeroElementos(req.query.elementos);
+      res.tienePaginacion = true;
       if (req.query.pagina)
         res.offset = numeroPagina(req.query.pagina, res.limit);
     }
+    else
+      res.tienePaginacion = false;
   }
   //parametros.subQuery=false;
 
-- 
2.24.1