Nicolás Guarnieri / foca-modal-vendedores

Download as
Browse Code »

Commit 9166ecf84f10416ec05ed0ab7529ad8b6ab14867

Authored by Eric Fernandez
1 parent 1f6cbe252c
Exists in master

cambio lógica mostrar resultados

Showing 2 changed files with 68 additions and 74 deletions   Show diff stats
src/js/controller.js
Diff comments   View file @ 9166ecf
... ... @@ -13,7 +13,6 @@ angular.module('focaModalVendedores')
13 13 $scope.currentPageVendedores = [];
14 14 $scope.selectedVendedor = -1;
15 15 $scope.primerBusqueda = false;
16   - $scope.sinResultados = false;
17 16  
18 17 $scope.busquedaPress = function(key) {
19 18 if (key === 13) {
... ... @@ -21,13 +20,8 @@ angular.module('focaModalVendedores')
21 20 focaVendedoresService.getVendedores($scope.filters).then(
22 21 function(res) {
23 22 $scope.vendedores = res.data;
24   - if(res.data.length === 0) {
25   - $scope.sinResultados = true;
26   - } else {
27   - $scope.sinResultados = false;
28   - $scope.search();
29   - primera();
30   - }
  23 + $scope.search();
  24 + primera();
31 25 }
32 26 );
33 27 }
... ... @@ -38,11 +32,6 @@ angular.module('focaModalVendedores')
38 32 $scope.filteredVendedores = $filter('filter')(
39 33 $scope.vendedores, { $: $scope.filters }
40 34 );
41   - if($scope.filteredVendedores.length === 0) {
42   - $scope.sinResultados = true;
43   - } else {
44   - $scope.sinResultados = false;
45   - }
46 35 $scope.lastPage = Math.ceil(
47 36 $scope.filteredVendedores.length / $scope.numPerPage
48 37 );
src/views/modal-vendedores.html
Diff comments   View file @ 9166ecf
... ... @@ -19,68 +19,73 @@
19 19 <i class="fa fa-search" aria-hidden="true"></i>
20 20 </button>
21 21 </div>
22   - <table ng-show="!sinResultados && primerBusqueda" class="table table-striped table-sm">
23   - <thead>
24   - <tr>
25   - <th>Código</th>
26   - <th>Nombre</th>
27   - <th></th>
28   - </tr>
29   - </thead>
30   - <tbody>
31   - <tr class="selected"
32   - ng-repeat="(key, vendedor) in currentPageVendedores"
33   - ng-click="select(vendedor)">
34   - <td ng-bind="vendedor.CodVen"></td>
35   - <td ng-bind="vendedor.NomVen"></td>
36   - <td>
37   - <button
38   - type="button"
39   - class="btn btn-xs p-1 float-right"
40   - ng-class="{
41   - 'btn-secondary': selectedVendedor != key,
42   - 'btn-primary': selectedVendedor == key
43   - }"
44   - foca-focus="selectedVendedor == {{key}}"
45   - ng-keydown="itemVendedor($event.keyCode)">
46   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
47   - </button>
48   - </td>
49   - </tr>
50   - </tbody>
51   - </table>
52   - <nav ng-show="!sinResultados && primerBusqueda">
53   - <ul class="pagination pagination-sm justify-content-end mb-0">
54   - <li class="page-item" ng-class="{'disabled': currentPage == 1}">
55   - <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)">
56   - <span aria-hidden="true">&laquo;</span>
57   - <span class="sr-only">Anterior</span>
58   - </a>
59   - </li>
60   - <li
61   - class="page-item"
62   - ng-repeat="pagina in paginas"
63   - ng-class="{'active': pagina == currentPage}"
64   - >
65   - <a
66   - class="page-link"
67   - href="#"
68   - ng-click="selectPage(pagina)"
69   - ng-bind="pagina"
70   - ></a>
71   - </li>
72   - <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
73   - <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)">
74   - <span aria-hidden="true">&raquo;</span>
75   - <span class="sr-only">Siguiente</span>
76   - </a>
77   - </li>
78   - </ul>
79   - </nav>
80   - </div>
81   - <div ng-show="primerBusqueda && sinResultados">
82   - <i class="fa fa-minus"></i> No se encontraron resultados.
83 22 </div>
  23 + <table ng-show="primerBusqueda" class="table table-striped table-sm col-12">
  24 + <thead>
  25 + <tr>
  26 + <th>Código</th>
  27 + <th>Nombre</th>
  28 + <th></th>
  29 + </tr>
  30 + </thead>
  31 + <tbody>
  32 + <tr ng-show="currentPageVendedores.length == 0">
  33 + <td colspan="3">
  34 + No se encontraron resultados.
  35 + </td>
  36 + </tr>
  37 + <tr class="selected"
  38 + ng-repeat="(key, vendedor) in currentPageVendedores"
  39 + ng-click="select(vendedor)"
  40 + >
  41 + <td ng-bind="vendedor.CodVen"></td>
  42 + <td ng-bind="vendedor.NomVen"></td>
  43 + <td>
  44 + <button
  45 + type="button"
  46 + class="btn btn-xs p-1 float-right"
  47 + ng-class="{
  48 + 'btn-secondary': selectedVendedor != key,
  49 + 'btn-primary': selectedVendedor == key
  50 + }"
  51 + foca-focus="selectedVendedor == {{key}}"
  52 + ng-keydown="itemVendedor($event.keyCode)">
  53 + <i class="fa fa-arrow-right" aria-hidden="true"></i>
  54 + </button>
  55 + </td>
  56 + </tr>
  57 + </tbody>
  58 + </table>
  59 + <nav ng-show="currentPageVendedores.length > 0 && primerBusqueda">
  60 + <ul class="pagination pagination-sm justify-content mb-0">
  61 + <li class="page-item" ng-class="{'disabled': currentPage == 1}">
  62 + <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)">
  63 + <span aria-hidden="true">&laquo;</span>
  64 + <span class="sr-only">Anterior</span>
  65 + </a>
  66 + </li>
  67 + <li
  68 + class="page-item"
  69 + ng-repeat="pagina in paginas"
  70 + ng-class="{'active': pagina == currentPage}"
  71 + >
  72 + <a
  73 + class="page-link"
  74 + href="#"
  75 + ng-click="selectPage(pagina)"
  76 + ng-bind="pagina"
  77 + ></a>
  78 + </li>
  79 + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
  80 + <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)">
  81 + <span aria-hidden="true">&raquo;</span>
  82 + <span class="sr-only">Siguiente</span>
  83 + </a>
  84 + </li>
  85 + </ul>
  86 + </nav>
  87 +
  88 +
84 89 </div>
85 90 <div class="modal-footer py-1">
86 91 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>