From 8d5a298bc63ee32cf5990ab0c8ffe7abd80c7e1f Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Wed, 19 Dec 2018 13:00:45 -0300 Subject: [PATCH] agrego foca-botonera-lateral --- src/js/app.js | 7 ++++++- src/js/controller.js | 28 +++++++++++++++++++++++----- src/views/foca-abm-choferes-item.html | 10 ---------- src/views/foca-abm-choferes-listado.html | 7 +------ 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 998056c..8048e60 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1,6 @@ -angular.module('focaAbmChofer', ['ngRoute', 'focaModal', 'ui.bootstrap']); +angular.module('focaAbmChofer', [ + 'ngRoute', + 'focaModal', + 'ui.bootstrap', + 'focaBotoneraLateral' +]); diff --git a/src/js/controller.js b/src/js/controller.js index f5d99ec..c8236de 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,7 +1,9 @@ angular.module('focaAbmChofer') .controller('focaAbmChoferesController', [ - '$scope', 'focaAbmChoferService', '$location', 'focaModalService', - function($scope, focaAbmChoferService, $location, focaModalService) { + '$scope', 'focaAbmChoferService', '$location', + 'focaModalService', 'focaBotoneraLateralService', '$timeout', + function($scope, focaAbmChoferService, $location, focaModalService, + focaBotoneraLateralService, $timeout) { $scope.filters = ''; $scope.choferes = []; @@ -12,7 +14,13 @@ angular.module('focaAbmChofer') $scope.choferesFiltrados = $scope.choferes; }); - + //SETEO BOTONERA LATERAL + $timeout(function() { + focaBotoneraLateralService.showSalir(true); + focaBotoneraLateralService.showPausar(false); + focaBotoneraLateralService.showCancelar(false); + focaBotoneraLateralService.showGuardar(false); + }); $scope.editar = function(id) { $location.path('/chofer/' + id); @@ -32,12 +40,22 @@ angular.module('focaAbmChofer') } ]) .controller('focaAbmChoferController', [ - '$scope', 'focaAbmChoferService', '$routeParams', '$location', - function($scope, focaAbmChoferService, $routeParams, $location) { + '$scope', 'focaAbmChoferService', '$routeParams', + '$location', 'focaBotoneraLateralService', '$timeout', + function($scope, focaAbmChoferService, $routeParams, + $location, focaBotoneraLateralService, $timeout) { $scope.chofer = {}; $scope.transportistas = []; + //SETEO BOTONERA LATERAL + $timeout(function() { + focaBotoneraLateralService.showSalir(false); + focaBotoneraLateralService.showPausar(true); + focaBotoneraLateralService.showCancelar(true); + focaBotoneraLateralService.showGuardar(true, $scope.guardar); + }); + focaAbmChoferService.getChofer($routeParams.id).then(function(res) { if(res.data) $scope.chofer = res.data; }); diff --git a/src/views/foca-abm-choferes-item.html b/src/views/foca-abm-choferes-item.html index 286335c..779489b 100644 --- a/src/views/foca-abm-choferes-item.html +++ b/src/views/foca-abm-choferes-item.html @@ -46,14 +46,4 @@ /> -
-
- - -
-
diff --git a/src/views/foca-abm-choferes-listado.html b/src/views/foca-abm-choferes-listado.html index 39fcde9..6179c83 100644 --- a/src/views/foca-abm-choferes-listado.html +++ b/src/views/foca-abm-choferes-listado.html @@ -63,10 +63,5 @@ -
- - Salir - -
+ -- 1.9.1