Jose Pinto / foca-modal-proveedor

Commit eeb3fe1fa8b7cbb9103dbe13d4b69b7a23ced3bf

Authored by Nicolás Guarnieri 2018-12-07 18:12:02 -0300

Exists in master

Merge branch 'master' into 'master'

buscador sin resultados hace focus

See merge request !2

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ eeb3fe1

 angular.module('focaModalProveedor')
     .controller('focaModalProveedorCtrl', [
+        '$timeout',
         '$filter',
         '$scope',
         '$uibModalInstance',
         'focaModalProveedorService',
         'transportista',
-        function ($filter, $scope, $uibModalInstance, focaModalProveedorService, transportista) {
+        function ($timeout, $filter, $scope, $uibModalInstance,
+            focaModalProveedorService, transportista) {
             $scope.filters = '';
             $scope.primerBusqueda = false;
             // pagination
             $scope.numPerPage = 10;
             $scope.currentPage = 1;
             $scope.filteredProveedores = [];
             $scope.currentPageProveedores = [];
             $scope.selectedProveedores = -1;
             $scope.transportista = transportista | false;
             $scope.busquedaPress = function(key) {
                 if (key === 13) {
                     $scope.searchLoading = true;
                     var json = {
                         razonCuitCod: $scope.filters
                     };
                     focaModalProveedorService.getProveedores(json).then(
                         function(res) {
                             for (var i = res.data.length - 1; i >= 0; i--) {
                                 if (res.data[i].COD === 0) {
                                     delete res.data[i];
                                 }
                             }
                             $scope.primerBusqueda = true;
                             $scope.proveedores = res.data;
-                            $scope.search();
+                            $scope.search(true);
                             primera();
                             $scope.searchLoading = false;
                         });
                 }
             };
-            $scope.search = function () {
+            $scope.search = function (pressed) {
                 if($scope.primerBusqueda) {
                     $scope.filteredProveedores = $filter('filter')(
                         $scope.proveedores, {$: $scope.filters}
                     );
+                    if(pressed && $scope.filteredProveedores.length === 0){
+                        $timeout(function() {
+                            angular.element('#search')[0].focus();
+                            $scope.filters = '';
+                        });
+                    }
                     $scope.lastPage = Math.ceil(
                         $scope.filteredProveedores.length / $scope.numPerPage
                     );
                     $scope.resetPage();
                 }
             };
             $scope.resetPage = function () {
                 $scope.currentPage = 1;
                 $scope.selectPage(1);
             };
             $scope.selectPage = function (page) {
                 console.info(page);
                 var start = (page - 1) * $scope.numPerPage;
                 var end = start + $scope.numPerPage;
                 $scope.paginas = [];
                 $scope.paginas = calcularPages(page);
                 $scope.currentPageProveedores = $scope.filteredProveedores.slice(start, end);
                 $scope.currentPage = page;
             };
             $scope.select = function(proveedor) {
                 $uibModalInstance.close(proveedor);
             };
             $scope.cancel = function() {
                 $uibModalInstance.dismiss('cancel');
             };
             $scope.busquedaDown = function(key) {
                 if (key === 40) {
                     primera(key);
                 }
             };
             $scope.itemProveedor = function(key) {
                 if (key === 38) {
                     anterior(key);
                 }
                 if (key === 40) {
                     siguiente(key);
                 }
                 if (key === 37) {
                     retrocederPagina();
                 }
                 if (key === 39) {
                     avanzarPagina();
                 }
             };
             function calcularPages(paginaActual) {
                 var paginas = [];
                 paginas.push(paginaActual);
                 if (paginaActual - 1 > 1) {
                     paginas.unshift(paginaActual - 1);
                     if (paginaActual - 2 > 1) {
                         paginas.unshift(paginaActual - 2);
                     }
                 }
                 if (paginaActual + 1 < $scope.lastPage) {
                     paginas.push(paginaActual + 1);
                     if (paginaActual + 2 < $scope.lastPage) {
                         paginas.push(paginaActual + 2);
                     }
                 }
                 if (paginaActual !== 1) {
                     paginas.unshift(1);
                 }
                 if (paginaActual !== $scope.lastPage) {
                     paginas.push($scope.lastPage);
                 }
                 return paginas;
             }
             function primera() {
                 $scope.selectedProveedores = 0;
             }
             function anterior() {
                 if ($scope.selectedProveedores === 0 && $scope.currentPage > 1) {
                     retrocederPagina();
                 } else {
                     $scope.selectedProveedores--;
                 }
             }
             function siguiente() {
                 if ($scope.selectedProveedores < $scope.currentPageProveedores.length - 1 ) {
                     $scope.selectedProveedores++;
                 } else {
                         avanzarPagina();
                 }
             }
             function retrocederPagina() {
                 if ($scope.currentPage > 1) {
                     $scope.selectPage($scope.currentPage - 1);
                     $scope.selectedProveedores = $scope.numPerPage - 1;
                 }
             }
             function avanzarPagina() {
                 if ($scope.currentPage < $scope.lastPage) {
                     $scope.selectPage($scope.currentPage + 1);
                     $scope.selectedProveedores = 0;
                 }
             }
         }]
     );

src/views/modal-proveedor.html

Diff comments View file @ eeb3fe1

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-lg-6">
             <h5 class="modal-title my-1" ng-hide="transportista">Búsqueda de Proveedor</h5>
             <h5 class="modal-title my-1" ng-show="transportista">Búsqueda de Transportista</h5>
         </div>
         <div class="input-group col-lg-6 pr-0 my-2">
             <input
                 ladda="searchLoading"
                 type="text"
                 class="form-control form-control-sm"
+                id="search"
                 placeholder="Busqueda"
                 ng-model="filters"
                 ng-change="search()"
                 ng-keydown="busquedaDown($event.keyCode)"
                 ng-keypress="busquedaPress($event.keyCode)"
                 foca-focus="selectedProveedores == -1"
                 ng-focus="selectedProveedores = -1"
                 teclado-virtual
             >
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"
                     class="btn btn-outline-secondary"
                     type="button"
                     ng-click="busquedaPress(13)">
                     <i class="fa fa-search" aria-hidden="true"></i>
                 </button>
             </div>
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div ng-show="!primerBusqueda">
         Debe realizar una primer búsqueda.
     </div>
     <table ng-show="primerBusqueda" class="table table-striped table-sm">
         <thead>
             <tr>
                 <th>Código</th>
                 <th>Nombre</th>
                 <th>CUIT</th>
                 <th></th>
             </tr>
         </thead>
         <tbody>
             <tr ng-show="currentPageProveedores.length == 0 && primerBusqueda">
                 <td colspan="4">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr
                 class="selectable"
                 ng-repeat="(key, proveedor) in currentPageProveedores"
                 ng-click="select(proveedor)">
                 <td ng-bind="proveedor.COD"></td>
                 <td ng-bind="proveedor.NOM"></td>
                 <td ng-bind="proveedor.CUIT"></td>
                 <td>
                     <button
                         type="button"
                         class="btn btn-xs p-1 float-right"
                         ng-class="{
                             'btn-secondary': selectedProveedores != key,
                             'btn-primary': selectedProveedores == key
                         }"
                         ng-click="select(proveedor)"
                         foca-focus="selectedProveedores == {{key}}"
                         ng-keydown="itemProveedor($event.keyCode)"
                     >
                         <i class="fa fa-circle-thin" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
 </div>
 <div class="modal-footer py-1">
     <nav ng-show="currentPageProveedores.length > 0 && primerBusqueda" class="mr-auto">
         <ul class="pagination pagination-sm mb-0">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" 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="javascript:void();"
                     ng-click="selectPage(pagina)"
                     ng-bind="pagina"
                 ></a>
             </li>
             <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Siguiente</span>
                 </a>
             </li>
         </ul>
     </nav>
     <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
 </div>