diff --git a/package.json b/package.json index d9bf656..ee3c6e0 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "compile": "gulp uglify", "gulp-pre-commit": "gulp pre-commit", "postinstall": "npm run compile && gulp clean-post-install", - "install-dev": "npm install -D jasmine-core pre-commit angular angular-ladda ladda@1.0.6 angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+https://debo.suite.repo/modulos-npm/foca-directivas.git git+https://debo.suite.repo/modulos-npm/foca-modal-remito.git" + "install-dev": "npm install -D jasmine-core pre-commit angular angular-ladda ladda@1.0.6 angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-uglify jquery jshint pump git+http://git.focasoftware.com/npm/foca-botonera-facturador.git git+http://git.focasoftware.com/npm/foca-directivas.git git+http://git.focasoftware.com/npm/foca-modal-remito.git" }, "pre-commit": [ "gulp-pre-commit" @@ -24,8 +24,9 @@ "angular-ladda": "^0.4.3", "angular-route": "^1.7.5", "bootstrap": "^4.1.3", - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", - "foca-modal-remito": "git+https://debo.suite.repo/modulos-npm/foca-modal-remito.git", + "foca-botonera-facturador": "git+http://git.focasoftware.com/npm/foca-botonera-facturador.git", + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", + "foca-modal-remito": "git+http://git.focasoftware.com/npm/foca-modal-remito.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", "gulp-angular-templatecache": "^2.2.5", diff --git a/src/js/controller.js b/src/js/controller.js index 3047bf0..eb1aed3 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -2,19 +2,8 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl', [ '$scope', '$uibModal', '$location', '$filter', 'crearHojaRutaService', 'focaModalService', function($scope, $uibModal, $location, $filter, crearHojaRutaService, focaModalService) { - $scope.botonera = [ - {texto: 'Transportista', imagen: '../img/abmPrecios.png', - accion: function() {$scope.seleccionarProveedor();}}, - {texto: 'Chofer', imagen: '../img/abmPrecios.png', - accion: function() {$scope.seleccionarChofer();}}, - {texto: 'VehĂ­culo', imagen: '../img/abmPrecios.png', - accion: function() {$scope.seleccionarVehiculo();}}, - {texto: 'Tarifario', imagen: '../img/abmPrecios.png', - accion: function() {$scope.seleccionarTarifario();}}, - {texto: 'Remitos', imagen: '../img/abmPrecios.png', - accion: function() {$scope.seleccionarRemito();}}, - {texto: '', accion: function() {}} - ]; + + $scope.botonera = crearHojaRutaService.getBotonera(); $scope.datepickerAbierto = false; $scope.show = false; @@ -181,7 +170,7 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl', ); }; - $scope.seleccionarProveedor = function() { + $scope.seleccionarTransportista = function() { var modalInstance = $uibModal.open( { ariaLabelledBy: 'Busqueda de Transportista', @@ -273,7 +262,7 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl', ); }; - $scope.seleccionarRemito = function() { + $scope.seleccionarRemitos = function() { var modalInstance = $uibModal.open( { ariaLabelledBy: 'Busqueda de Remito', diff --git a/src/js/service.js b/src/js/service.js index d239037..de20837 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -54,6 +54,9 @@ angular.module('focaCrearHojaRuta') }, getNumeroHojaRuta: function() { return $http.get(route + '/hoja-ruta/numero-siguiente'); + }, + getBotonera: function() { + return ['Transportista', 'Chofer', 'Vehiculo', 'Tarifario', 'Remitos']; } }; }]); diff --git a/src/views/hoja-ruta.html b/src/views/hoja-ruta.html index ad35c01..73776e1 100644 --- a/src/views/hoja-ruta.html +++ b/src/views/hoja-ruta.html @@ -74,22 +74,7 @@
-
-
- -
-
+