Commit 6607e5c60ce3d6df3cc67fc62feac2065f542f18
1 parent
0c4b4d8187
Exists in
master
agrego foca-botonera-lateral
Showing
3 changed files
with
26 additions
and
29 deletions
Show diff stats
src/js/app.js
| 1 | -angular.module('focaCrearHojaRuta', ['ngRoute', 'focaModalRemito', 'ui.bootstrap'/*, | |
| 2 | - 'focaBusquedaProductos', | |
| 1 | +angular.module('focaCrearHojaRuta', [ | |
| 2 | + 'ngRoute', | |
| 3 | + 'focaModalRemito', | |
| 4 | + 'ui.bootstrap', | |
| 5 | + 'focaBotoneraLateral', | |
| 6 | + /*'focaBusquedaProductos', | |
| 3 | 7 | 'focaModalProveedor', |
| 4 | 8 | 'focaBusquedaCliente', |
| 5 | 9 | 'focaModalPrecioCondicion', |
src/js/controller.js
| 1 | 1 | angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl', |
| 2 | 2 | [ |
| 3 | - '$scope', '$uibModal', '$location', '$filter', 'crearHojaRutaService', 'focaModalService', | |
| 4 | - function($scope, $uibModal, $location, $filter, crearHojaRutaService, focaModalService) { | |
| 3 | + '$scope', | |
| 4 | + '$uibModal', | |
| 5 | + '$location', | |
| 6 | + '$filter', | |
| 7 | + '$timeout', | |
| 8 | + 'crearHojaRutaService', | |
| 9 | + 'focaModalService', | |
| 10 | + 'focaBotoneraLateralService', | |
| 11 | + function($scope, $uibModal, $location, $filter, $timeout, | |
| 12 | + crearHojaRutaService, focaModalService, focaBotoneraLateralService) { | |
| 5 | 13 | |
| 6 | 14 | $scope.botonera = crearHojaRutaService.getBotonera(); |
| 7 | 15 | $scope.datepickerAbierto = false; |
| ... | ... | @@ -36,6 +44,15 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl', |
| 36 | 44 | //La pantalla solo se usa para cargar pedidos |
| 37 | 45 | //var hojaRutaTemp = crearHojaRutaService.getHojaRuta(); |
| 38 | 46 | |
| 47 | + | |
| 48 | + //SETEO BOTONERA LATERAL | |
| 49 | + $timeout(function() { | |
| 50 | + focaBotoneraLateralService.showSalir(true); | |
| 51 | + focaBotoneraLateralService.showPausar(true); | |
| 52 | + focaBotoneraLateralService.showGuardar(true, $scope.crearNotaPedido); | |
| 53 | + }); | |
| 54 | + | |
| 55 | + | |
| 39 | 56 | crearHojaRutaService.getNumeroHojaRuta().then( |
| 40 | 57 | function(res) { |
| 41 | 58 | $scope.puntoVenta = $scope.rellenar(res.data.sucursal, 4); |
src/views/hoja-ruta.html
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 | <div class="col-12 col-md-10 border border-light rounded"> |
| 11 | 11 | <div class="row px-5 py-2 botonera-secundaria"> |
| 12 | 12 | <div class="col-12"> |
| 13 | - <foca-botonera-facturador botones="botonera" extra="1" class="row"></foca-botonera-facturador> | |
| 13 | + <foca-botonera-facturador botones="botonera" extra="7" class="row"></foca-botonera-facturador> | |
| 14 | 14 | </div> |
| 15 | 15 | </div> |
| 16 | 16 | <!-- PC --> |
| ... | ... | @@ -252,30 +252,6 @@ |
| 252 | 252 | </table> |
| 253 | 253 | </div> |
| 254 | 254 | </div> |
| 255 | - <div class="col-auto my-2 col-lg-2 botonera-lateral d-none"> | |
| 256 | - <div class="col-12 mt-auto"> | |
| 257 | - <button | |
| 258 | - ng-click="crearHojaRuta()" | |
| 259 | - type="submit" | |
| 260 | - title="Crear nota pedido" | |
| 261 | - class="btn btn-default btn-block mb-2 border border-dark"> | |
| 262 | - <strong>GUARDAR</strong> | |
| 263 | - </button> | |
| 264 | - <button | |
| 265 | - type="submit" | |
| 266 | - title="Crear nota pedido" | |
| 267 | - class="btn btn-default btn-block mb-2 border border-dark"> | |
| 268 | - <strong>PAUSAR</strong> | |
| 269 | - </button> | |
| 270 | - <button | |
| 271 | - ng-click="salir()" | |
| 272 | - type="button" | |
| 273 | - title="Salir" | |
| 274 | - class="btn btn-default btn-block border border-dark"> | |
| 275 | - <strong>SALIR</strong> | |
| 276 | - </button> | |
| 277 | - </div> | |
| 278 | - </div> | |
| 279 | 255 | </div> |
| 280 | 256 | </div> |
| 281 | 257 | <div class="row d-md-none fixed-bottom"> |