Marcelo Puebla / foca-modal-domicilio

Commit a159da92f7fa199ac4a6b10733689c8066c1aa8d

Authored by Marcelo Puebla 2020-03-27 15:56:20 -0300

Exists in develop

Fix

Inputs de localidad y provincia

Showing 2 changed files with 12 additions and 6 deletions Show diff stats

src/js/controller.js

Diff comments View file @ a159da9

 angular.module('focaModalDomicilio')
   .controller('focaModalDomicilioController',
     ['$timeout', '$filter', '$scope', '$uibModalInstance', 'focaModalDomicilioService',
       '$uibModal', 'idCliente', 'esNuevo', 'focaModalService', 'IDomicilio',
       function ($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService,
         $uibModal, idCliente, esNuevo, focaModalService, IDomicilio) {
         $scope.buscar = function () {
           focaModalDomicilioService
             .getDomiciliosEntregaByIdCliente($scope.idCliente)
             .then(function (res) {
               $scope.domicilios = res.data;
               $scope.search();
               $scope.primerBusqueda = true;
             });
         };
         $scope.filters = '';
         $scope.idCliente = idCliente;
         $scope.buscar();
         $scope.ingreso = esNuevo;
         $scope.primerBusqueda = false;
         $scope.contactos = [{}];
         // pagination
         $scope.numPerPage = 5;
         $scope.currentPage = 1;
         $scope.filteredDomicilios = [];
         $scope.currentPageDomicilios = [];
         $scope.selectedDomicilio = -1;
         $scope.focused = 1;
         $scope.domicilio = IDomicilio;
         //METODOS
         $scope.search = function (pressed) {
           $scope.filteredDomicilios = $filter('filter')(
             $scope.domicilios,
             { $: $scope.filters }
           );
           if (pressed) {
             if ($scope.filteredDomicilios.length === 0) {
               $timeout(function () {
                 angular.element('#search')[0].focus();
                 $scope.filters = '';
               });
             } else {
               primera();
             }
           }
           $scope.lastPage = Math.ceil(
             $scope.filteredDomicilios.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.currentPageDomicilios = $scope.filteredDomicilios.slice(start, end);
           $scope.currentPage = page;
         };
         $scope.select = function (domicilio) {
           $uibModalInstance.close(domicilio);
         };
         $scope.cancel = function () {
           $uibModalInstance.dismiss('cancel');
         };
         $scope.busquedaDown = function (key) {
-          if (!key === 40) return;
+          if (key !== 40) return;
           primera(key);
         };
         $scope.busquedaPress = function (key) {
-          if (!key === 13) return;
+          if (key !== 13) return;
           $scope.search(true);
         };
         $scope.seleccionarLocalidad = function (key) {
-          if (!key === 13) return;
+          if (key !== 13) return;
           if (!$scope.domicilio.provincia.ID) {
             focaModalService.alert('Seleccione una provincia');
             return;
           }
           var parametrosModal = {
             searchText: $scope.domicilio.localidad.NOMBRE,
             query: '/localidad/' + parseInt($scope.domicilio.provincia.ID),
             columnas: focaModalDomicilioService.getLocalidadTableFormat(),
             titulo: 'Búsqueda de localidades',
             size: 'md'
           };
           focaModalService.modal(parametrosModal)
             .then(function (localidad) {
               $scope.domicilio.localidad = localidad;
               $timeout(function () {
                 $scope.focused = 5;
               });
+            }, function () {
+              $scope.domicilio.localidad.NOMBRE = '';
             });
         };
         $scope.seleccionarProvincia = function (key) {
-          if (!key === 13) return;
+          if (key !== 13) return;
           var parametrosModal = {
             searchText: $scope.domicilio.provincia.NOMBRE,
             query: '/provincia',
             columnas: focaModalDomicilioService.getProvinciaTableFormat(),
             titulo: 'Búsqueda de provincias',
             size: 'md'
           };
           focaModalService.modal(parametrosModal)
             .then(function (provincia) {
               $scope.domicilio.provincia = provincia;
               $timeout(function () {
                 $scope.focused = 4;
               });
+            }, function () {
+              $scope.domicilio.provincia.NOMBRE = '';
             });
         };
         $scope.itemDomicilio = function (key) {
           switch (key) {
             case 38:
               anterior(key);
               break;
             case 40:
               siguiente(key);
               break;
             case 37:
               retrocederPagina();
               break;
             case 39:
               avanzarPagina();
               break;
           }
         };
         $scope.agregarDomicilio = function () {
           $scope.domicilio.valores = [];
           $scope.domicilio.idCliente = $scope.idCliente;
           if ($scope.domicilio.calle) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 1,
               dato: $scope.domicilio.calle
             });
           }
           if ($scope.domicilio.numeroCalle) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 2,
               dato: $scope.domicilio.numeroCalle
             });
           }
           if ($scope.domicilio.localidad.ID) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 3,
               dato: $scope.domicilio.localidad.NOMBRE
             });
           }
           if ($scope.domicilio.provincia.ID) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 4,
               dato: $scope.domicilio.provincia.NOMBRE
             });
           }
           if ($scope.domicilio.latitud) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 23,
               dato: $scope.domicilio.latitud.toString()
             });
           }
           if ($scope.domicilio.longitud) {
             $scope.domicilio.valores.push({
               ID_ADAC_1: 24,
               dato: $scope.domicilio.longitud.toString()
             });
           }
           if (!$scope.domicilio.titulo) {
             focaModalService.alert('Ingrese titulo');
             return;
           } else if (!$scope.domicilio.calle) {
             focaModalService.alert('Ingrese calle');
             return;
           } else if (!$scope.domicilio.numeroCalle) {
             focaModalService.alert('Ingrese numero de calle');
             return;
           } else if (!$scope.domicilio.localidad.ID) {
             focaModalService.alert('Ingrese localidad');
             return;
           } else if (!$scope.domicilio.provincia.ID) {
             focaModalService.alert('Ingrese provincia');
             return;
           }
           //domicilios de entrega corresponden al 1
           focaModalDomicilioService
             .obtenerUltimoPorNivelPadre(1)
             .then(function (res) {
               $scope.domicilio.nivel1 = 1; //domicilio de entrega corresponde 1
               $scope.domicilio.nivel2 = res.data[0].ultimo + 1;
               focaModalDomicilioService
                 .guardarDomicilio($scope.domicilio)
                 .then(function () {
                   $scope.buscar();
                   $scope.ingreso = false;
                   $scope.domicilio = {};
                 })
                 .catch(function () {
                   focaModalService.alert('Hubo un error al crear el domicilio');
                   $scope.ingreso = false;
                 });
             });
         };
         $scope.verPuntosDescarga = function (key) {
           $scope.currentPageDomicilios[key].verPuntos = true;
           $scope.select($scope.currentPageDomicilios[key]);
         };
         $scope.localizarDomicilio = function (localizar) {
           var direccion = null;
           if (localizar) {
             direccion = {
               calle: $scope.domicilio.calle,
               numero: $scope.domicilio.numeroCalle,
               localidad: $scope.domicilio.localidad.NOMBRE,
               provincia: $scope.domicilio.provincia.NOMBRE
             };
           }
           var modalInstance = $uibModal.open(
             {
               ariaLabelledBy: 'Buscar domicilio',
               templateUrl: 'modal-localizar.html',
               controller: 'focaModalLocalizarController',
               size: 'lg',
               resolve: {
                 parametros: {
                   direccion: direccion,
                   latitud: $scope.domicilio.latitud,
                   longitud: $scope.domicilio.longitud
                 }
               }
             }
           );
           modalInstance.result.then(function (res) {
             $scope.domicilio.latitud = res.latitud;
             $scope.domicilio.longitud = res.longitud;
           }, function () {
             //TODO: función llamada cuando cancela el modal
           });
         };
         $scope.next = function (key) {
           if (key === 13) $scope.focused++;
         };
         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.selectedDomicilio = 0;
         }
         function anterior() {
           if ($scope.selectedDomicilio === 0 && $scope.currentPage > 1) {
             retrocederPagina();
           } else {
             $scope.selectedDomicilio--;
           }
         }
         function siguiente() {
           if ($scope.selectedDomicilio < $scope.currentPageDomicilios.length) {
             $scope.selectedDomicilio++;
           } else {
             avanzarPagina();
           }
         }
         function retrocederPagina() {
           if ($scope.currentPage > 1) {
             $scope.selectPage($scope.currentPage - 1);
             $scope.selectedDomicilio = $scope.numPerPage - 1;
           }
         }
         function avanzarPagina() {
           if ($scope.currentPage < $scope.lastPage) {
             $scope.selectPage($scope.currentPage + 1);
             $scope.selectedDomicilio = 0;
           }
         }
       }
     ]
   );

src/views/modal-domicilio.html

Diff comments View file @ a159da9

 <div class="modal-header py-1">
     <div class="row w-100 justify-content-between">
         <div class="col-auto">
             <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5>
             <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5>
         </div>
         <div class="col-auto pr-0 my-2">
             <button
                 class="btn btn-outline-debo mr-2"
                 ng-click="ingreso = true"
                 ng-show="!ingreso"
                 title="Nuevo">
                 <i class="fa fa-plus"></i>
             </button>
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div ng-show="!primerBusqueda">Debe realizar una primer búsqueda.</div>
     <div ng-show="!ingreso">
         <table ng-show="!ingreso" class="table table-striped table-sm">
             <thead>
                 <tr>
                     <th>Titulo</th>
                     <th>Calle</th>
                     <th>Localidad</th>
                     <th>Provincia</th>
                     <th></th>
                     <th></th>
                 </tr>
             </thead>
             <tbody>
                 <tr ng-show="currentPageDomicilios.length == 0 && primerBusqueda">
                     <td colspan="5">No se encontraron resultados.</td>
                 </tr>
                 <tr class="selectable"
                     ng-repeat="(key,domicilio) in currentPageDomicilios">
                     <td
                         ng-bind="domicilio.titulo"
                         ng-click="select(domicilio)">
                     </td>
                     <td
                         ng-bind="domicilio.Calle + ' ' + domicilio.Numero"
                         ng-click="select(domicilio)">
                     </td>
                     <td
                         ng-bind="domicilio.Localidad"
                         ng-click="select(domicilio)">
                     </td>
                     <td
                         ng-bind="domicilio.Provincia"
                         ng-click="select(domicilio)">
                     </td>
                     <td>
                         <button
                             class="btn btn-sm p-1 float-right btn-secondary"
                             ng-click="verPuntosDescarga(key)"
                             title="Puntos de descarga">
                             <small>PD</small>
                         </button>
                     </td>
                     <td>
                         <button
                             class="btn btn-sm p-1 float-right"
                             ng-class="{
                                 'btn-secondary': selectedDomicilio != key + 1,
                                 'btn-primary': selectedDomicilio == key + 1
                             }"
                             foca-focus="selectedDomicilio == {{key + 1}}"
                             ng-keydown="itemDomicilio($event.keyCode)"
                             ng-click="select(domicilio)"
                             title="Seleccionar">
                             <i class="fa fa-circle-thin"></i>
                         </button>
                     </td>
                 </tr>
             </tbody>
         </table>
     </div>
     <form name="formDomicilio" ng-show="ingreso">
         <input
             type="hidden"
             ng-model="domicilio.latitud"
             ng-required="true">
         <input
             type="hidden"
             ng-model="domicilio.longitud"
             ng-required="true">
         <div class="row">
             <div class="col-4">
                 <label>Tipo</label>
                 <select
                     class="form-control"
                     ng-disabled="true">
                     <option ng-value="2">Entrega</option>
                 </select>
             </div>
             <div class="col-8">
                 <label>Titulo</label>
                 <input
                     type="text"
                     foca-focus="ingreso"
                     class="form-control"
                     ng-model="domicilio.titulo"
                     placeholder="Ingrese título"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 1"
                     foca-focus="focused == 1"
                     teclado-virtual/>
             </div>
             <div class="col-9">
                 <label>Calle</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.calle"
                     placeholder="Ingrese calle"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 2"
                     foca-focus="focused == 2"
                     teclado-virtual/>
             </div>
             <div class="col-3">
                 <label>Nº</label>
                 <input
                     type="text"
                     class="form-control"
                     ng-model="domicilio.numeroCalle"
                     placeholder="Ingrese Numero"
                     ng-required="true"
                     ng-keypress="next($event.keyCode)"
                     ng-focus="focused = 3"
                     foca-focus="focused == 3"
                     only-numbers
                     teclado-virtual
                 />
             </div>
             <div class="col-6">
                 <label>Localidad</label>
                 <div class="input-group">
                     <input
                         type="text"
                         class="form-control form-control-sm"
                         ng-model="domicilio.localidad.NOMBRE"
                         ng-keypress="seleccionarLocalidad($event.keyCode)"
                         placeholder="Seleccione localidad"
                         ng-required="true"
                         foca-focus="focused == 5"
                         ng-focus="focus(5)"
+                        ng-disabled="domicilio.localidad.ID"
                         teclado-virtual/>
                     <button
                         ng-show="domicilio.localidad.NOMBRE.length"
-                        class="clear-input"
+                        class="clear-input simple-hover"
                         ng-click="domicilio.localidad.ID = null; domicilio.localidad.NOMBRE = ''">
                         <i class="fa fa-times"></i>
                     </button>
                     <div class="input-group-append">
                         <button
                             ladda="searchLoading"
                             class="btn btn-outline-secondary"
                             ng-click="seleccionarLocalidad(13)">
                             <i class="fa fa-search"></i>
                         </button>
                     </div>
                 </div>
             </div>
             <div class="col-6">
                 <label>Provincia</label>
                 <div class="input-group">
                     <input
                         type="text"
                         class="form-control form-control-sm"
                         ng-model="domicilio.provincia.NOMBRE"
                         ng-keypress="seleccionarProvincia($event.keyCode)"
                         placeholder="Seleccione provincia"
                         ng-required="true"
                         ng-focus="focus(4)"
                         foca-focus="focused == 4"
+                        ng-disabled="domicilio.provincia.ID"
                         teclado-virtual/>
                     <button
                         ng-show="domicilio.provincia.NOMBRE.length"
-                        class="clear-input"
+                        class="clear-input simple-hover"
                         ng-click="domicilio.provincia.ID = null; domicilio.provincia.NOMBRE = ''">
                         <i class="fa fa-times"></i>
                     </button>
                     <div class="input-group-append">
                         <button
                             ladda="searchLoading"
                             class="btn btn-outline-secondary"
                             ng-click="seleccionarProvincia(13)">
                             <i class="fa fa-search"></i>
                         </button>
                     </div>
                 </div>
             </div>
         </div>
         <div class="row mt-3">
             <div class="col-12">
                 <button
                     class="btn btn-outline-debo float-right ml-3"
                     ng-click="localizarDomicilio()">Buscar</button>
                 <button
                     class="btn btn-outline-debo float-right"
                     ng-disabled="!domicilio.calle || !domicilio.numeroCalle || !domicilio.localidad || !domicilio.provincia"
                     ng-click="localizarDomicilio(true)">Localizar</button>
             </div>
         </div>
     </form>
 </div>
 <div class="modal-footer">
     <nav ng-show="currentPageDomicilios.length > 0 && !ingreso" class="mr-auto">
         <ul class="pagination pagination-sm mb-0 justify-content-end">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
                     <span>&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>&raquo;</span>
                     <span class="sr-only">Siguiente</span>
                 </a>
             </li>
         </ul>
     </nav>
     <button
         ng-show="!ingreso"
         class="btn btn-sm btn-secondary"
         ng-click="cancel()">
         Volver
     </button>
     <button
         ng-show="ingreso"
         class="btn btn-secondary btn-sm"
         ng-click="ingreso = !ingreso; domicilio = {}; contactos = [{}]">
         Cancelar
     </button>
     <button
         ng-show="ingreso"
         class="btn btn-sm btn-primary"
         ng-click="agregarDomicilio()">
         Agregar domicilio
     </button>
 </div>