Mauricio Cattafi / foca-modal-domicilio

Download as
Browse Code »

Commit de3b36785a21ef75b9ee7d60a16479088560b70f

Authored by Jose Pinto
2 parents 3d8cb710bf 2cd1adeb9e
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master' 

agrego modal punto descarga

See merge request !3
Showing 3 changed files   Show diff stats
1   -angular.module('focaModalDomicilio', ['ui.bootstrap', 'focaDirectivas']);
  1 +angular.module('focaModalDomicilio', [
  2 + 'ui.bootstrap',
  3 + 'focaDirectivas',
  4 + 'focaModal'
  5 +]);
src/js/controller.js
Diff comments   View file @ de3b367
... ... @@ -6,9 +6,11 @@ angular.module('focaModalDomicilio')
6 6 '$scope',
7 7 '$uibModalInstance',
8 8 'idCliente',
  9 + 'esNuevo',
9 10 'focaModalDomicilioService',
10   - function($timeout, $filter, $scope, $uibModalInstance, idCliente,
11   - focaModalDomicilioService) {
  11 + '$uibModal',
  12 + function($filter, $scope, $uibModalInstance, idCliente, esNuevo,
  13 + focaModalDomicilioService, $uibModal) {
12 14  
13 15 $scope.buscar = function() {
14 16 focaModalDomicilioService
... ... @@ -23,7 +25,7 @@ angular.module('focaModalDomicilio')
23 25 $scope.filters = '';
24 26 $scope.idCliente = idCliente;
25 27 $scope.buscar();
26   - $scope.ingreso = false;
  28 + $scope.ingreso = esNuevo;
27 29 $scope.primerBusqueda = false;
28 30 $scope.contactos = [{}];
29 31 // pagination
... ... @@ -153,6 +155,28 @@ angular.module('focaModalDomicilio')
153 155 });
154 156 };
155 157  
  158 + $scope.verPuntosDescarga = function(key) {
  159 + var modalInstance = $uibModal.open(
  160 + {
  161 + ariaLabelledBy: 'Busqueda de Puntos de descarga',
  162 + templateUrl: 'modal-punto-descarga.html',
  163 + controller: 'focaModalPuntoDescargaController',
  164 + size: 'md',
  165 + resolve: {
  166 + filters: {
  167 + idDomicilio: $scope.domicilios[key].id,
  168 + idCliente: idCliente
  169 + }
  170 + }
  171 + }
  172 + );
  173 + modalInstance.result.then(function(puntoDescarga) {
  174 + console.log(puntoDescarga);
  175 + }, function() {
  176 + //TODO: función llamada cuando cancela el modal
  177 + });
  178 + };
  179 +
156 180 function calcularPages(paginaActual) {
157 181 var paginas = [];
158 182 paginas.push(paginaActual);
src/views/modal-domicilio.html
Diff comments   View file @ de3b367
1 1 <div class="modal-header py-1">
2 2 <div class="row w-100">
3 3 <div class="col-lg-6">
4   - <h5 class="modal-title my-1">Búsqueda de Domicilios</h5>
  4 + <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5>
  5 + <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilio</h5>
5 6 </div>
6 7 <div class="input-group col-lg-6 pr-0 my-2">
7 8 <input
... ... @@ -45,6 +46,7 @@
45 46 <th>Localidad</th>
46 47 <th>Provincia</th>
47 48 <th></th>
  49 + <th></th>
48 50 </tr>
49 51 </thead>
50 52 <tbody>
... ... @@ -80,8 +82,7 @@
80 82 </td>
81 83 </tr>
82 84 <tr class="selectable"
83   - ng-repeat="(key,domicilio) in currentPageDomicilios"
84   - ng-click="select(domicilio)">
  85 + ng-repeat="(key,domicilio) in currentPageDomicilios">
85 86 <td ng-bind="domicilio.titulo"></td>
86 87 <td ng-bind="domicilio.Calle + ' ' + domicilio.Numero"></td>
87 88 <td ng-bind="domicilio.Localidad"></td>
... ... @@ -89,6 +90,15 @@
89 90 <td>
90 91 <button
91 92 type="button"
  93 + class="btn btn-sm p-1 float-right btn-secondary"
  94 + ng-click="verPuntosDescarga(key)"
  95 + >
  96 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  97 + </button>
  98 + </td>
  99 + <td>
  100 + <button
  101 + type="button"
92 102 class="btn btn-sm p-1 float-right"
93 103 ng-class="{
94 104 'btn-secondary': selectedDomicilio != key + 1,
... ... @@ -96,6 +106,7 @@
96 106 }"
97 107 foca-focus="selectedDomicilio == {{key + 1}}"
98 108 ng-keydown="itemDomicilio($event.keyCode)"
  109 + ng-click="select(domicilio)"
99 110 >
100 111 <i class="fa fa-circle-thin" aria-hidden="true"></i>
101 112 </button>