diff --git a/package.json b/package.json index 62daf1c..110096f 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-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 gulp-replace jquery jshint pump git+https://192.168.0.11/modulos-npm/foca-modal.git" + "install-dev": "npm install -D jasmine-core pre-commit angular 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 gulp-replace jquery jshint pump git+http://git.focasoftware.com/npm/foca-modal.git" }, "pre-commit": [ "gulp-pre-commit" @@ -37,7 +37,7 @@ "angular": "^1.7.4", "angular-route": "^1.7.5", "bootstrap": "^4.1.3", - "foca-modal": "git+https://192.168.0.11/modulos-npm/foca-modal.git", + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", "gulp-angular-templatecache": "^2.2.1", diff --git a/src/js/app.js b/src/js/app.js index 97b42b0..b5425e0 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1,6 @@ -angular.module('focaAbmPreciosCondiciones', ['ngRoute', 'ui.bootstrap', 'focaModal']); +angular.module('focaAbmPreciosCondiciones', [ + 'ngRoute', + 'ui.bootstrap', + 'focaModal', + 'focaBotoneraLateral' +]); diff --git a/src/js/controller.js b/src/js/controller.js index 8d91aad..0c45aff 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,10 +1,20 @@ angular.module('focaAbmPreciosCondiciones') .controller('focaAbmPreciosCondicionesController', [ - '$scope', 'focaAbmPreciosCondicionesService', '$location', 'focaModalService', - function($scope, focaAbmPreciosCondicionesService, $location, focaModalService) { + '$scope', 'focaAbmPreciosCondicionesService', '$location', + 'focaModalService', 'focaBotoneraLateralService', '$timeout', + function($scope, focaAbmPreciosCondicionesService, $location, + focaModalService, focaBotoneraLateralService, $timeout) { focaAbmPreciosCondicionesService.obtenerPreciosCondiciones().then(function(datos) { $scope.preciosCondiciones = datos.data; }); + + $timeout(function() { + focaBotoneraLateralService.showSalir(true); + focaBotoneraLateralService.showPausar(false); + focaBotoneraLateralService.showCancelar(false); + focaBotoneraLateralService.showGuardar(false); + }); + $scope.editar = function(id) { $location.path('/precio-condicion/' + id); }; @@ -25,11 +35,11 @@ angular.module('focaAbmPreciosCondiciones') } ]) .controller('focaAbmPrecioCondicionController', [ - '$scope', 'focaAbmPreciosCondicionesService', - '$routeParams', '$location', 'focaModalService', + '$scope', 'focaAbmPreciosCondicionesService', 'focaBotoneraLateralService', + '$routeParams', '$location', 'focaModalService', '$timeout', function( - $scope, focaAbmPreciosCondicionesService, - $routeParams, $location, focaModalService + $scope, focaAbmPreciosCondicionesService, focaBotoneraLateralService, + $routeParams, $location, focaModalService, $timeout ) { $scope.mostrarPlazos = $routeParams.id > 0; focaAbmPreciosCondicionesService.obtenerPrecioCondicion($routeParams.id) @@ -50,6 +60,14 @@ angular.module('focaAbmPreciosCondiciones') }); } }); + + $timeout(function() { + focaBotoneraLateralService.showSalir(false); + focaBotoneraLateralService.showPausar(true); + focaBotoneraLateralService.showCancelar(true); + focaBotoneraLateralService.showGuardar(true, $scope.guardar); + }); + $scope.cancelar = function() { $location.path('/precio-condicion'); }; diff --git a/src/views/foca-abm-precios-condiciones-item.html b/src/views/foca-abm-precios-condiciones-item.html index 597b544..f8b772a 100644 --- a/src/views/foca-abm-precios-condiciones-item.html +++ b/src/views/foca-abm-precios-condiciones-item.html @@ -87,15 +87,4 @@ -
-
- - -
-
- - Salir - \ No newline at end of file diff --git a/src/views/foca-abm-precios-condiciones-listado.html b/src/views/foca-abm-precios-condiciones-listado.html index ca4be39..f61e4b2 100644 --- a/src/views/foca-abm-precios-condiciones-listado.html +++ b/src/views/foca-abm-precios-condiciones-listado.html @@ -28,8 +28,3 @@ - - Salir -