Jose Pinto / foca-modal-vehiculo

Commit 83e62217006066f77284a2ecd092b73ac84c9dfa

Authored by Eric Fernandez 2018-12-12 17:17:39 -0300

Exists in master

Merge branch 'master' into 'master'

teclado virtual funciona, focus input si no hay resultados

See merge request !2

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ 83e6221

 angular.module('focaModalVehiculo')
     .controller('focaModalVehiculoController',
         [
+            '$timeout',
             '$filter',
             '$scope',
             '$uibModalInstance',
             'focaModalVehiculoService',
-            function($filter, $scope, $uibModalInstance,
+            function($timeout, $filter, $scope, $uibModalInstance,
                 focaModalVehiculoService
             ) {
                 $scope.filters = '';
                 $scope.vehiculos = [];
                 $scope.primerBusqueda = false;
                 $scope.searchLoading = false;
                 // pagination
                 $scope.numPerPage = 10;
                 $scope.currentPage = 1;
                 $scope.filteredVehiculos = [];
                 $scope.currentPageVehiculos = [];
                 $scope.selectedVehiculo = -1;
                 //METODOS
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
                         $scope.searchLoading = true;
                         focaModalVehiculoService.getVehiculos().then(llenarDatos);
                     }
                 };
                 function llenarDatos(res) {
                     $scope.searchLoading = false;
                     $scope.primerBusqueda = true;
                     $scope.vehiculos = res.data;
-                    $scope.search();
+                    $scope.search(true);
                     primera();
                 }
-                $scope.search = function() {
+                $scope.search = function(pressed) {
                     if($scope.vehiculos.length > 0) {
                         $scope.filteredVehiculos = $filter('filter')(
                             $scope.vehiculos,
                             {$: $scope.filters}
                         );
+                        if(pressed && $scope.filteredVehiculos.length === 0) {
+                            $timeout(function() {
+                                angular.element('#search')[0].focus();
+                                $scope.filters = '';
+                            });
+                        }
                         $scope.lastPage = Math.ceil(
                             $scope.filteredVehiculos.length / $scope.numPerPage
                         );
                         $scope.resetPage();
                     }
                 };
                 $scope.resetPage = function() {
                     $scope.currentPage = 1;
                     $scope.selectPage(1);
                 };
                 $scope.selectPage = function(page) {
                     var start = (page - 1) * $scope.numPerPage;
                     var end = start + $scope.numPerPage;
                     $scope.paginas = [];
                     $scope.paginas = calcularPages(page);
                     $scope.currentPageVehiculos =
                         $scope.filteredVehiculos.slice(start, end);
                     $scope.currentPage = page;
                 };
                 $scope.select = function(vehiculo) {
                     $uibModalInstance.close(vehiculo);
                 };
                 $scope.cancel = function() {
                     $uibModalInstance.dismiss('cancel');
                 };
                 $scope.busquedaDown = function(key) {
                     if (key === 40) {
                         primera(key);
                     }
                 };
                 $scope.itemVehiculo = 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.selectedVehiculo = 0;
                 }
                 function anterior() {
                     if ($scope.selectedVehiculo === 0 && $scope.currentPage > 1) {
                         retrocederPagina();
                     } else {
                         $scope.selectedVehiculo--;
                     }
                 }
                 function siguiente() {
                     if (
                         $scope.selectedVehiculo < $scope.currentPageVehiculos.length - 1
                     ) {
                         $scope.selectedVehiculo++;
                     } else {
                             avanzarPagina();
                     }
                 }
                 function retrocederPagina() {
                     if ($scope.currentPage > 1) {
                         $scope.selectPage($scope.currentPage - 1);
                         $scope.selectedVehiculo = $scope.numPerPage - 1;
                     }
                 }
                 function avanzarPagina() {
                     if ($scope.currentPage < $scope.lastPage) {
                         $scope.selectPage($scope.currentPage + 1);
                         $scope.selectedVehiculo = 0;
                     }
                 }
             }
         ]
     );

src/views/modal-vehiculo.html

Diff comments View file @ 83e6221

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-lg-6">
-            <h5 class="modal-title my-1">Busqueda de Vehiculo</h5>
+            <h5 class="modal-title my-1">Búsqueda de Vehiculo</h5>
         </div>
         <div class="input-group col-lg-6 pr-0 my-2">
             <input
                 ladda="searchLoading"
                 type="text"
                 class="form-control"
-                placeholder="Busqueda"
+                id="search"
+                placeholder="Búsqueda"
                 ng-model="filters"
                 ng-change="search()"
                 ng-keydown="busquedaDown($event.keyCode)"
                 ng-keypress="busquedaPress($event.keyCode)"
                 foca-focus="selectedVehiculo == -1"
                 ng-focus="selectedVehiculo = -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>Tractor</th>
                 <th>Semi</th>
                 <th>Capacidad</th>
                 <th>Cisternado</th>
             </tr>
         </thead>
         <tbody>
             <tr ng-show="currentPageVehiculos.length == 0 && primerBusqueda">
                 <td colspan="5">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr class="selectable"
                 ng-repeat="(key,vehiculo) in currentPageVehiculos"
                 ng-click="select(vehiculo)">
                 <td ng-bind="vehiculo.id"></td>
                 <td ng-bind="vehiculo.tractor"></td>
                 <td ng-bind="vehiculo.semi"></td>
                 <td ng-bind="vehiculo.capacidad"></td>
                 <td ng-bind="vehiculo.cisternado"></td>
                 <td>
                     <button
                         type="button"
                         class="btn btn-xs p-1 float-right"
                         ng-class="{
                             'btn-secondary': selectedVehiculo != key,
                             'btn-primary': selectedVehiculo == key
                         }"
                         foca-focus="selectedVehiculo == {{key}}"
                         ng-keydown="itemVehiculo($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="currentPageVehiculos.length > 0 && primerBusqueda" class="mr-auto">
         <ul class="pagination pagination-sm justify-content 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>