Jose Pinto / foca-crear-hoja-ruta

Download as
Browse Code ยป

Commit 65a17285eac116acaf54ef9e2fc6b8ec8f7296fb

Authored by Eric Fernandez
2 parents 93737756ae 38f8916430
Exists in master

Merge branch 'master' into 'master' 

agrego foca-botonera-lateral

See merge request !5
Showing 4 changed files   Show diff stats
... ... @@ -40,7 +40,7 @@ gulp.task('uglify', ['templates'], function() {
40 40 ]),
41 41 concat('foca-crear-hoja-ruta.js'),
42 42 replace('src/views/', ''),
43   - replace("'ngRoute', 'focaModalRemito', 'ui.bootstrap'", ''),
  43 + replace("'ngRoute','focaModalRemito','ui.bootstrap','focaBotoneraLateral'", ''),
44 44 gulp.dest(paths.tmp),
45 45 rename('foca-crear-hoja-ruta.min.js'),
46 46 uglify(),
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
Diff comments   View file @ 65a1728
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,13 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
36 44 //La pantalla solo se usa para cargar pedidos
37 45 //var hojaRutaTemp = crearHojaRutaService.getHojaRuta();
38 46  
  47 + //SETEO BOTONERA LATERAL
  48 + $timeout(function() {
  49 + focaBotoneraLateralService.showSalir(true);
  50 + focaBotoneraLateralService.showPausar(true);
  51 + focaBotoneraLateralService.showGuardar(true, $scope.crearNotaPedido);
  52 + });
  53 +
39 54 crearHojaRutaService.getNumeroHojaRuta().then(
40 55 function(res) {
41 56 $scope.puntoVenta = $scope.rellenar(res.data.sucursal, 4);
src/views/hoja-ruta.html
Diff comments   View file @ 65a1728
1   -<div class="crear-hoja-ruta foca-crear one-row row">
  1 +<div class="crear-hoja-ruta foca-crear row">
2 2 <foca-cabecera-facturador
3 3 titulo="'HOJA DE RUTA'"
4 4 numero="puntoVenta + '-' + comprobante"
... ... @@ -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">