Commit 15849478c3a4598a3b07cf4a26e1620a529f013e
Exists in
master
Merge branch 'master' into 'master'
Agrego foca-botonera-lateral See merge request !4
Showing
4 changed files
Show diff stats
src/js/app.js
src/js/controller.js
| 1 | 1 | angular.module('focaAbmChofer') |
| 2 | 2 | .controller('focaAbmChoferesController', [ |
| 3 | - '$scope', 'focaAbmChoferService', '$location', 'focaModalService', | |
| 4 | - function($scope, focaAbmChoferService, $location, focaModalService) { | |
| 3 | + '$scope', 'focaAbmChoferService', '$location', | |
| 4 | + 'focaModalService', 'focaBotoneraLateralService', '$timeout', | |
| 5 | + function($scope, focaAbmChoferService, $location, focaModalService, | |
| 6 | + focaBotoneraLateralService, $timeout) { | |
| 5 | 7 | |
| 6 | 8 | $scope.filters = ''; |
| 7 | 9 | $scope.choferes = []; |
| ... | ... | @@ -12,7 +14,13 @@ angular.module('focaAbmChofer') |
| 12 | 14 | $scope.choferesFiltrados = $scope.choferes; |
| 13 | 15 | }); |
| 14 | 16 | |
| 15 | - | |
| 17 | + //SETEO BOTONERA LATERAL | |
| 18 | + $timeout(function() { | |
| 19 | + focaBotoneraLateralService.showSalir(true); | |
| 20 | + focaBotoneraLateralService.showPausar(false); | |
| 21 | + focaBotoneraLateralService.showCancelar(false); | |
| 22 | + focaBotoneraLateralService.showGuardar(false); | |
| 23 | + }); | |
| 16 | 24 | |
| 17 | 25 | $scope.editar = function(id) { |
| 18 | 26 | $location.path('/chofer/' + id); |
| ... | ... | @@ -32,12 +40,22 @@ angular.module('focaAbmChofer') |
| 32 | 40 | } |
| 33 | 41 | ]) |
| 34 | 42 | .controller('focaAbmChoferController', [ |
| 35 | - '$scope', 'focaAbmChoferService', '$routeParams', '$location', | |
| 36 | - function($scope, focaAbmChoferService, $routeParams, $location) { | |
| 43 | + '$scope', 'focaAbmChoferService', '$routeParams', | |
| 44 | + '$location', 'focaBotoneraLateralService', '$timeout', | |
| 45 | + function($scope, focaAbmChoferService, $routeParams, | |
| 46 | + $location, focaBotoneraLateralService, $timeout) { | |
| 37 | 47 | |
| 38 | 48 | $scope.chofer = {}; |
| 39 | 49 | $scope.transportistas = []; |
| 40 | 50 | |
| 51 | + //SETEO BOTONERA LATERAL | |
| 52 | + $timeout(function() { | |
| 53 | + focaBotoneraLateralService.showSalir(false); | |
| 54 | + focaBotoneraLateralService.showPausar(true); | |
| 55 | + focaBotoneraLateralService.showCancelar(true); | |
| 56 | + focaBotoneraLateralService.showGuardar(true, $scope.guardar); | |
| 57 | + }); | |
| 58 | + | |
| 41 | 59 | focaAbmChoferService.getChofer($routeParams.id).then(function(res) { |
| 42 | 60 | if(res.data) $scope.chofer = res.data; |
| 43 | 61 | }); |
src/views/foca-abm-choferes-item.html
| ... | ... | @@ -46,14 +46,4 @@ |
| 46 | 46 | /> |
| 47 | 47 | </div> |
| 48 | 48 | </div> |
| 49 | - <div class="form-group row"> | |
| 50 | - <div class="col-sm-7 text-right"> | |
| 51 | - <button | |
| 52 | - class="btn btn-primary" | |
| 53 | - ng-click="guardar()" | |
| 54 | - ng-disabled="!formChofer.$valid" | |
| 55 | - >Guardar</button> | |
| 56 | - <button class="btn btn-default" ng-click="cancelar()">Cancelar</button> | |
| 57 | - </div> | |
| 58 | - </div> | |
| 59 | 49 | </form> |
src/views/foca-abm-choferes-listado.html