From 8ae9575443051e5cbf8b829c27897a141b8f4c02 Mon Sep 17 00:00:00 2001 From: efernandez Date: Tue, 20 Nov 2018 15:57:12 -0300 Subject: [PATCH] refactor servicios --- package.json | 17 +++++++++-------- src/js/controller.js | 6 +++--- src/views/lista-hoja-ruta.html | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index d322c89..fa47817 100644 --- a/package.json +++ b/package.json @@ -28,22 +28,23 @@ "foca-modal-remito": "git+https://debo.suite.repo/modulos-npm/foca-modal-remito.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", - "gulp-angular-templatecache": "2.2.5", + "gulp-angular-templatecache": "^2.2.5", "gulp-clean": "^0.4.0", "gulp-concat": "^2.6.1", "gulp-connect": "^5.6.1", - "gulp-htmlmin": "5.0.1", - "gulp-jshint": "2.1.0", - "gulp-rename": "1.4.0", - "gulp-replace": "1.0.0", + "gulp-htmlmin": "^5.0.1", + "gulp-jshint": "^2.1.0", + "gulp-rename": "^1.4.0", + "gulp-replace": "^1.0.0", "gulp-sequence": "^1.0.0", - "gulp-uglify": "3.0.1", + "gulp-uglify": "^3.0.1", + "gulp-uglify-es": "^1.0.4", "jasmine-core": "^3.3.0", "jquery": "^3.3.1", - "jshint": "2.9.6", + "jshint": "^2.9.6", "ladda": "1.0.6", "pre-commit": "^1.2.2", - "pump": "3.0.0", + "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5" } } diff --git a/src/js/controller.js b/src/js/controller.js index 4a019b1..8b4e0e0 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -7,9 +7,9 @@ angular.module('focaHojaRuta') $scope.hojasRuta = hojaRuta; $scope.puntoVenta = hojaRuta.sucursal; $scope.comprobante = hojaRuta.numeroHojaRuta; - addCabecera('Transportista:', hojaRuta.transportista[0].nombre); - addCabecera('Chofer:', hojaRuta.chofer[0].nombre); - addCabecera('Vehículo:', hojaRuta.vehiculo[0].tractor); + addCabecera('Transportista:', hojaRuta.transportista.NOM); + addCabecera('Chofer:', hojaRuta.chofer.nombre); + addCabecera('Vehículo:', hojaRuta.vehiculo.tractor); }); $scope.cabecera = []; $scope.showCabecera = true; diff --git a/src/views/lista-hoja-ruta.html b/src/views/lista-hoja-ruta.html index 412fd52..ef05c7e 100644 --- a/src/views/lista-hoja-ruta.html +++ b/src/views/lista-hoja-ruta.html @@ -74,7 +74,7 @@