Commit a0b526f8eb4d66895e0ade6427e1a6ec35471a9c
Exists in
master
Merge branch 'master' into 'master'
Master See merge request !6
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -4,11 +4,12 @@ angular.module('focaModalPrecioCondicion') |
| 4 | 4 | '$timeout', |
| 5 | 5 | '$filter', |
| 6 | 6 | '$scope', |
| 7 | + '$uibModal', | |
| 7 | 8 | '$uibModalInstance', |
| 8 | 9 | 'focaModalService', |
| 9 | 10 | 'focaModalPrecioCondicionService', |
| 10 | 11 | function( |
| 11 | - $timeout, $filter, $scope, $uibModalInstance, | |
| 12 | + $timeout, $filter, $scope, $uibModal, $uibModalInstance, | |
| 12 | 13 | focaModalService, focaModalPrecioCondicionService |
| 13 | 14 | ) { |
| 14 | 15 | |
| ... | ... | @@ -162,6 +163,25 @@ angular.module('focaModalPrecioCondicion') |
| 162 | 163 | avanzarPagina(); |
| 163 | 164 | } |
| 164 | 165 | }; |
| 166 | + | |
| 167 | + $scope.verListaPrecio = function(id) { | |
| 168 | + $uibModal.open( | |
| 169 | + { | |
| 170 | + ariaLabelledBy: 'Busqueda de Productos', | |
| 171 | + templateUrl: 'modal-busqueda-productos.html', | |
| 172 | + controller: 'modalBusquedaProductosCtrl', | |
| 173 | + resolve: { | |
| 174 | + parametroProducto: { | |
| 175 | + idLista: id, | |
| 176 | + cotizacion: 1, | |
| 177 | + simbolo: '$', | |
| 178 | + soloMostrar: true | |
| 179 | + } | |
| 180 | + }, | |
| 181 | + size: 'md' | |
| 182 | + } | |
| 183 | + ); | |
| 184 | + }; | |
| 165 | 185 | |
| 166 | 186 | function calcularPages(paginaActual) { |
| 167 | 187 | var paginas = []; |
src/views/modal-precio-condicion.html
| ... | ... | @@ -76,12 +76,15 @@ |
| 76 | 76 | </td> |
| 77 | 77 | </tr> |
| 78 | 78 | <tr class="selectable" |
| 79 | - ng-repeat="(key, precioCondicion) in currentPagePrecioCondicion" | |
| 80 | - ng-click="select(precioCondicion)"> | |
| 81 | - <td ng-bind="precioCondicion.id | rellenarDigitos: 4: 0"></td> | |
| 82 | - <td ng-bind="precioCondicion.nombre"></td> | |
| 83 | - <td ng-bind="precioCondicion.idListaPrecio"></td> | |
| 84 | - <td ng-bind="precioCondicion.plazos"></td> | |
| 79 | + ng-repeat="(key, precioCondicion) in currentPagePrecioCondicion"> | |
| 80 | + <td ng-bind="precioCondicion.id | rellenarDigitos: 4: 0" | |
| 81 | + ng-click="select(precioCondicion)"></td> | |
| 82 | + <td ng-bind="precioCondicion.nombre" | |
| 83 | + ng-click="select(precioCondicion)"></td> | |
| 84 | + <td ng-bind="precioCondicion.idListaPrecio" | |
| 85 | + ng-click="select(precioCondicion)"></td> | |
| 86 | + <td ng-bind="precioCondicion.plazos" | |
| 87 | + ng-click="select(precioCondicion)"></td> | |
| 85 | 88 | <td> |
| 86 | 89 | <button |
| 87 | 90 | type="button" |
| ... | ... | @@ -93,9 +96,18 @@ |
| 93 | 96 | }" |
| 94 | 97 | foca-focus="selectedPrecioCondicion == {{key + 1}}" |
| 95 | 98 | ng-keydown="itemProducto($event.keyCode)" |
| 99 | + ng-click="select(precioCondicion)" | |
| 96 | 100 | > |
| 97 | 101 | <i class="fa fa-circle-thin" aria-hidden="true"></i> |
| 98 | 102 | </button> |
| 103 | + <button | |
| 104 | + type="button" | |
| 105 | + class="btn btn-sm p-1 float-right btn-secondary mr-2" | |
| 106 | + title="Ver lista precio" | |
| 107 | + ng-click="verListaPrecio(precioCondicion.id)" | |
| 108 | + > | |
| 109 | + <i class="fa fa-eye" aria-hidden="true"></i> | |
| 110 | + </button> | |
| 99 | 111 | </td> |
| 100 | 112 | </tr> |
| 101 | 113 | </tbody> |