Marcelo Puebla / foca-modal-domicilio

Download as
Browse Code »

Commit c65a4394808cc44425f823f93377525a9fd6c01c

Authored by Jose Pinto
1 parent ae73337ada
Exists in master and in 1 other branch develop

agrego modal punto descarga

Showing 3 changed files with 46 additions and 6 deletions   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 @ c65a439
... ... @@ -5,8 +5,11 @@ angular.module('focaModalDomicilio')
5 5 '$scope',
6 6 '$uibModalInstance',
7 7 'idCliente',
  8 + 'esNuevo',
8 9 'focaModalDomicilioService',
9   - function($filter, $scope, $uibModalInstance, idCliente, focaModalDomicilioService) {
  10 + '$uibModal',
  11 + function($filter, $scope, $uibModalInstance, idCliente, esNuevo,
  12 + focaModalDomicilioService, $uibModal) {
10 13  
11 14 $scope.buscar = function() {
12 15 focaModalDomicilioService
... ... @@ -20,7 +23,7 @@ angular.module('focaModalDomicilio')
20 23 };
21 24 $scope.idCliente = idCliente;
22 25 $scope.buscar();
23   - $scope.ingreso = false;
  26 + $scope.ingreso = esNuevo;
24 27 $scope.primerBusqueda = false;
25 28 $scope.contactos = [{}];
26 29 // pagination
... ... @@ -139,6 +142,28 @@ angular.module('focaModalDomicilio')
139 142 });
140 143 };
141 144  
  145 + $scope.verPuntosDescarga = function(key) {
  146 + var modalInstance = $uibModal.open(
  147 + {
  148 + ariaLabelledBy: 'Busqueda de Puntos de descarga',
  149 + templateUrl: 'modal-punto-descarga.html',
  150 + controller: 'focaModalPuntoDescargaController',
  151 + size: 'md',
  152 + resolve: {
  153 + filters: {
  154 + idDomicilio: $scope.domicilios[key].id,
  155 + idCliente: idCliente
  156 + }
  157 + }
  158 + }
  159 + );
  160 + modalInstance.result.then(function(puntoDescarga) {
  161 + console.log(puntoDescarga);
  162 + }, function() {
  163 + //TODO: función llamada cuando cancela el modal
  164 + });
  165 + };
  166 +
142 167 function calcularPages(paginaActual) {
143 168 var paginas = [];
144 169 paginas.push(paginaActual);
src/views/modal-domicilio.html
Diff comments   View file @ c65a439
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
... ... @@ -43,6 +44,7 @@
43 44 <th>Localidad</th>
44 45 <th>Provincia</th>
45 46 <th></th>
  47 + <th></th>
46 48 </tr>
47 49 </thead>
48 50 <tbody>
... ... @@ -78,8 +80,7 @@
78 80 </td>
79 81 </tr>
80 82 <tr class="selectable"
81   - ng-repeat="(key,domicilio) in currentPageDomicilios"
82   - ng-click="select(domicilio)">
  83 + ng-repeat="(key,domicilio) in currentPageDomicilios">
83 84 <td ng-bind="domicilio.titulo"></td>
84 85 <td ng-bind="domicilio.Calle + ' ' + domicilio.Numero"></td>
85 86 <td ng-bind="domicilio.Localidad"></td>
... ... @@ -87,6 +88,15 @@
87 88 <td>
88 89 <button
89 90 type="button"
  91 + class="btn btn-sm p-1 float-right btn-secondary"
  92 + ng-click="verPuntosDescarga(key)"
  93 + >
  94 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  95 + </button>
  96 + </td>
  97 + <td>
  98 + <button
  99 + type="button"
90 100 class="btn btn-sm p-1 float-right"
91 101 ng-class="{
92 102 'btn-secondary': selectedDomicilio != key + 1,
... ... @@ -94,6 +104,7 @@
94 104 }"
95 105 foca-focus="selectedDomicilio == {{key + 1}}"
96 106 ng-keydown="itemDomicilio($event.keyCode)"
  107 + ng-click="select(domicilio)"
97 108 >
98 109 <i class="fa fa-circle-thin" aria-hidden="true"></i>
99 110 </button>