From 9166ecf84f10416ec05ed0ab7529ad8b6ab14867 Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Mon, 29 Oct 2018 15:58:09 -0300
Subject: [PATCH] =?UTF-8?q?cambio=20l=C3=B3gica=20mostrar=20resultados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/controller.js            |  15 +----
 src/views/modal-vendedores.html | 127 +++++++++++++++++++++-------------------
 2 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 33c4693..7a898e9 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -13,7 +13,6 @@ angular.module('focaModalVendedores')
             $scope.currentPageVendedores = [];
             $scope.selectedVendedor = -1;
             $scope.primerBusqueda = false;
-            $scope.sinResultados = false;
 
             $scope.busquedaPress = function(key) {
                 if (key === 13) {
@@ -21,13 +20,8 @@ angular.module('focaModalVendedores')
                     focaVendedoresService.getVendedores($scope.filters).then(
                         function(res) {
                             $scope.vendedores = res.data;
-                            if(res.data.length === 0) {
-                                $scope.sinResultados = true;
-                            } else {
-                                $scope.sinResultados = false;
-                                $scope.search();
-                                primera();
-                            }
+                            $scope.search();
+                            primera();
                         }
                     );
                 }
@@ -38,11 +32,6 @@ angular.module('focaModalVendedores')
                     $scope.filteredVendedores = $filter('filter')(
                     $scope.vendedores, { $: $scope.filters }
                     );
-                    if($scope.filteredVendedores.length === 0) {
-                        $scope.sinResultados = true;
-                    } else {
-                        $scope.sinResultados = false;
-                    }
                     $scope.lastPage = Math.ceil(
                         $scope.filteredVendedores.length / $scope.numPerPage
                     );
diff --git a/src/views/modal-vendedores.html b/src/views/modal-vendedores.html
index 1016d43..a18fd2b 100644
--- a/src/views/modal-vendedores.html
+++ b/src/views/modal-vendedores.html
@@ -19,68 +19,73 @@
                 <i class="fa fa-search" aria-hidden="true"></i>
             </button>
         </div>
-        <table ng-show="!sinResultados && primerBusqueda" class="table table-striped table-sm">
-            <thead>
-                <tr>
-                    <th>Código</th>
-                    <th>Nombre</th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr class="selected"
-                    ng-repeat="(key, vendedor) in currentPageVendedores"
-                    ng-click="select(vendedor)">
-                    <td ng-bind="vendedor.CodVen"></td>
-                    <td ng-bind="vendedor.NomVen"></td>
-                    <td>
-                        <button
-                            type="button"
-                            class="btn btn-xs p-1 float-right"
-                            ng-class="{
-                                'btn-secondary': selectedVendedor != key,
-                                'btn-primary': selectedVendedor == key
-                            }"
-                            foca-focus="selectedVendedor == {{key}}"
-                            ng-keydown="itemVendedor($event.keyCode)">
-                            <i class="fa fa-arrow-right" aria-hidden="true"></i>
-                        </button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        <nav ng-show="!sinResultados && primerBusqueda">
-            <ul class="pagination pagination-sm justify-content-end mb-0">
-                <li class="page-item" ng-class="{'disabled': currentPage == 1}">
-                    <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)">
-                        <span aria-hidden="true">&laquo;</span>
-                        <span class="sr-only">Anterior</span>
-                    </a>
-                </li>
-                <li
-                    class="page-item"
-                    ng-repeat="pagina in paginas"
-                    ng-class="{'active': pagina == currentPage}"
-                >
-                    <a
-                        class="page-link"
-                        href="#"
-                        ng-click="selectPage(pagina)"
-                        ng-bind="pagina"
-                    ></a>
-                </li>
-                <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
-                    <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)">
-                        <span aria-hidden="true">&raquo;</span>
-                        <span class="sr-only">Siguiente</span>
-                    </a>
-                </li>
-            </ul>
-        </nav>
-    </div>
-    <div ng-show="primerBusqueda && sinResultados">
-        <i class="fa fa-minus"></i> No se encontraron resultados.
     </div>
+    <table ng-show="primerBusqueda" class="table table-striped table-sm col-12">
+        <thead>
+            <tr>
+                <th>Código</th>
+                <th>Nombre</th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr ng-show="currentPageVendedores.length == 0">
+                <td colspan="3">
+                    No se encontraron resultados.
+                </td>
+            </tr>
+            <tr class="selected"
+                ng-repeat="(key, vendedor) in currentPageVendedores"
+                ng-click="select(vendedor)"
+                >
+                <td ng-bind="vendedor.CodVen"></td>
+                <td ng-bind="vendedor.NomVen"></td>
+                <td>
+                    <button
+                        type="button"
+                        class="btn btn-xs p-1 float-right"
+                        ng-class="{
+                            'btn-secondary': selectedVendedor != key,
+                            'btn-primary': selectedVendedor == key
+                        }"
+                        foca-focus="selectedVendedor == {{key}}"
+                        ng-keydown="itemVendedor($event.keyCode)">
+                        <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                    </button>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    <nav ng-show="currentPageVendedores.length > 0 && primerBusqueda">
+        <ul class="pagination pagination-sm justify-content mb-0">
+            <li class="page-item" ng-class="{'disabled': currentPage == 1}">
+                <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)">
+                    <span aria-hidden="true">&laquo;</span>
+                    <span class="sr-only">Anterior</span>
+                </a>
+            </li>
+            <li
+                class="page-item"
+                ng-repeat="pagina in paginas"
+                ng-class="{'active': pagina == currentPage}"
+            >
+                <a
+                    class="page-link"
+                    href="#"
+                    ng-click="selectPage(pagina)"
+                    ng-bind="pagina"
+                ></a>
+            </li>
+            <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
+                <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)">
+                    <span aria-hidden="true">&raquo;</span>
+                    <span class="sr-only">Siguiente</span>
+                </a>
+            </li>
+        </ul>
+    </nav>
+
+
 </div>
 <div class="modal-footer py-1">
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
-- 
1.9.1