Jose Pinto / foca-modal-provincia

Commit fecec77bcec4e831f4ebd6596cb31f565080b096

Authored by Eric Fernandez 2018-12-12 17:14:47 -0300

Exists in master

Merge branch 'master' into 'master'

Mastercambio icons, input focus si no hay resultados

See merge request !2

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ fecec77

 angular.module('focaModalProvincia')
     .controller('focaModalProvinciaController', [
+        '$timeout',
         '$filter',
         '$scope',
         '$uibModalInstance',
         'focaModalProvinciaService',
         'filters',
-        function($filter, $scope, $uibModalInstance, focaModalProvinciaService, filters) {
+        function($timeout, $filter, $scope, $uibModalInstance, focaModalProvinciaService, filters) {
             $scope.filters = filters;
             $scope.provincias = [];
             $scope.primerBusqueda = false;
             $scope.searchLoading = false;
             // pagination
             $scope.numPerPage = 10;
             $scope.currentPage = 1;
             $scope.filteredProvincias = [];
             $scope.currentPageProvincias = [];
             $scope.selectedProvincia = -1;
             $scope.busquedaPress = function(key) {
                 if (key === 13) {
                     $scope.searchLoading = true;
                     focaModalProvinciaService.getProvincias().then(
                         function(res) {
                             $scope.searchLoading = false;
                             $scope.primerBusqueda = true;
                             $scope.provincias = res.data;
-                            $scope.search();
+                            $scope.search(true);
                             primera();
                         }
                     );
                 }
             };
-            $scope.search = function() {
+            $scope.search = function(pressed) {
                 if($scope.provincias.length > 0) {
                     $scope.filteredProvincias = $filter('filter')(
-                    $scope.provincias, { $: $scope.filters }
+                        $scope.provincias, { $: $scope.filters }
                     );
+                    if(pressed && $scope.filteredProvincias.length === 0){
+                        $timeout(function() {
+                            angular.element('#search')[0].focus();
+                            $scope.filters = '';
+                        });
+                    }
                     $scope.lastPage = Math.ceil(
                         $scope.filteredProvincias.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.currentPageProvincias = $scope.filteredProvincias.slice(start, end);
                 $scope.currentPage = page;
             };
             $scope.select = function(vendedor) {
                 $uibModalInstance.close(vendedor);
             };
             $scope.cancel = function() {
                 $uibModalInstance.dismiss('cancel');
             };
             $scope.busquedaDown = function(key) {
                 if (key === 40) {
                     primera(key);
                 }
             };
             $scope.itemProvincia = 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.selectedProvincia = 0;
             }
             function anterior() {
                 if ($scope.selectedProvincia === 0 && $scope.currentPage > 1) {
                     retrocederPagina();
                 } else {
                     $scope.selectedProvincia--;
                 }
             }
             function siguiente() {
                 if ($scope.selectedProvincia < $scope.currentPageProvincias.length - 1) {
                     $scope.selectedProvincia++;
                 } else {
                     avanzarPagina();
                 }
             }
             function retrocederPagina() {
                 if ($scope.currentPage > 1) {
                     $scope.selectPage($scope.currentPage - 1);
                     $scope.selectedProvincia = $scope.numPerPage - 1;
                 }
             }
             function avanzarPagina() {
                 if ($scope.currentPage < $scope.lastPage) {
                     $scope.selectPage($scope.currentPage + 1);
                     $scope.selectedProvincia = 0;
                 }
             }
             $scope.busquedaPress(13);
         }]
     );

src/views/modal-provincias.html

Diff comments View file @ fecec77

 <div class="modal-header">
     <h5 class="modal-title my-1">Búsqueda de provincias</h5>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group">
         <input
             ladda="searchLoading"
             type="text"
             class="form-control form-control-sm"
-            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="selectedProvincia == -1"
             ng-focus="selectedProvincia = -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>
     <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="currentPageProvincias.length == 0 && primerBusqueda">
                 <td colspan="3">
                     No se encontraron resultados.
                 </td>
             </tr>
             <tr class="selected"
                 ng-repeat="(key, provincia) in currentPageProvincias"
                 ng-click="select(provincia)"
                 >
                 <td ng-bind="provincia.ID"></td>
                 <td ng-bind="provincia.NOMBRE"></td>
                 <td class="d-md-none text-primary">
-                    <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                    <i class="fa fa-circle-thin" aria-hidden="true"></i>
                 </td>
                 <td class="d-none d-md-table-cell">
                     <button
                         type="button"
                         class="btn btn-xs p-1 float-right"
                         ng-class="{
                             'btn-secondary': selectedProvincia != key,
                             'btn-primary': selectedProvincia == key
                         }"
                         foca-focus="selectedProvincia == {{key}}"
                         ng-keydown="itemProvincia($event.keyCode)">
-                        <i class="fa fa-arrow-right" aria-hidden="true"></i>
+                        <i class="fa fa-circle-thin" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
     <nav ng-show="currentPageProvincias.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="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>
 </div>
 <div class="modal-footer">
     <button class="btn btn-sm btn-secondary my-1" type="button" ng-click="cancel()">Cancelar</button>
 </div>