Marcelo Puebla / foca-abm-vehiculo

Download as
Browse Code »

Commit c46beb118786ea7bc12d7628f9798a6bb612f56c

Authored by Eric Fernandez
2 parents a08de32e4b 2a229bdfd5
Exists in master

Merge branch 'master' into 'develop' 

Master

See merge request !45
Showing 4 changed files   Show diff stats
... ... @@ -35,14 +35,14 @@
35 35 "pump": "^3.0.x"
36 36 },
37 37 "devDependencies": {
38   - "angular": "^1.7.5",
  38 + "angular": "^1.7.8",
39 39 "angular-mocks": "^1.7.8",
40   - "angular-route": "^1.7.7",
  40 + "angular-route": "^1.7.8",
41 41 "bootstrap": "^4.1.3",
42 42 "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git",
43 43 "font-awesome": "^4.7.0",
44 44 "gulp": "^3.9.1",
45   - "gulp-angular-templatecache": "^2.2.5",
  45 + "gulp-angular-templatecache": "^2.2.7",
46 46 "gulp-clean": "^0.4.0",
47 47 "gulp-connect": "^5.6.1",
48 48 "gulp-footer": "^2.0.2",
... ... @@ -53,10 +53,10 @@
53 53 "gulp-replace": "^1.0.0",
54 54 "gulp-uglify": "^3.0.1",
55 55 "gulp-uglify-es": "^1.0.4",
56   - "jasmine": "^3.3.1",
57   - "jasmine-core": "^3.3.0",
58   - "jquery": "^3.3.1",
59   - "jshint": "^2.9.6",
  56 + "jasmine": "^3.4.0",
  57 + "jasmine-core": "^3.4.0",
  58 + "jquery": "^3.4.1",
  59 + "jshint": "^2.10.2",
60 60 "pre-commit": "^1.2.2",
61 61 "pump": "^3.0.0",
62 62 "ui-bootstrap4": "^3.0.5"
src/js/controller.js
Diff comments   View file @ c46beb1
... ... @@ -26,6 +26,7 @@ angular.module('focaAbmVehiculo')
26 26 $scope.editar = function (id) {
27 27 $location.path('/vehiculo/' + id + '/' + $scope.idTransportista);
28 28 };
  29 +
29 30 $scope.solicitarConfirmacion = function (vehiculo) {
30 31 focaModalService.confirm('¿Está seguro que desea borrar el vehiculo ' +
31 32 vehiculo.id + ' ' + vehiculo.tractor + ' ?').then(
... ... @@ -117,12 +118,12 @@ angular.module('focaAbmVehiculo')
117 118 focaAbmVehiculoService
118 119 .getTransportistaPorId($routeParams.idTransportista)
119 120 .then(function (res) {
120   - var codigo = ('00000' + res.data.COD).slice(-5);
121   - $scope.vehiculo.idTransportista = res.data.COD;
  121 + var codigo = ('00000' + res.data[0].COD).slice(-5);
  122 + $scope.vehiculo.idTransportista = res.data[0].COD;
122 123 $scope.vehiculo.transportista = res.data;
123 124 $scope.$broadcast('addCabecera', {
124 125 label: 'Transportista:',
125   - valor: codigo + ' - ' + res.data.NOM
  126 + valor: codigo + ' - ' + res.data[0].ALI
126 127 });
127 128 });
128 129 }
src/views/foca-abm-vehiculos-item.html
Diff comments   View file @ c46beb1
... ... @@ -83,7 +83,7 @@
83 83 <th class="text-center">
84 84 <button
85 85 class="btn btn-outline-debo boton-accion"
86   - title="Agregar"
  86 + title="Agregar Cisterna"
87 87 ng-click="crearCisterna()"
88 88 ng-disabled="crear">
89 89 <i class="fa fa-plus"></i>
src/views/foca-abm-vehiculos-listado.html
Diff comments   View file @ c46beb1
... ... @@ -32,7 +32,7 @@
32 32 <button
33 33 ng-disabled="!idTransportista"
34 34 class="btn btn-outline-debo boton-accion"
35   - title="Agregar"
  35 + title="Agregar Vehículo"
36 36 ng-click="editar(0)"
37 37 ><i class="fa fa-plus"></i>
38 38 </button>