Marcelo Puebla / foca-abm-vehiculo

Download as
Browse Code »

Commit 336ca8d5e98e9b7a8dd352003bd12a1431d83236

Authored by Nicolás Guarnieri
2 parents 81fb188cbb a6f2298711
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !7
Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 336ca8d
... ... @@ -84,8 +84,11 @@ angular.module('focaAbmVehiculo')
84 84 }
85 85 delete $scope.vehiculo.transportista;
86 86 focaAbmVehiculoService.guerdarVehiculo($scope.vehiculo).then(function(res) {
87   - console.log(res.data);
88   - $location.path('/vehiculo/' + res.data.id + '/' + res.data.idTransportista);
  87 + if($scope.nuevo) {
  88 + $location.path('/vehiculo/' + res.data.id + '/' + res.data.idTransportista);
  89 + } else {
  90 + $location.path('/vehiculo');
  91 + }
89 92 });
90 93 };
91 94 $scope.solicitarConfirmacionCisterna = function(cisterna) {
src/views/foca-abm-vehiculos-listado.html
Diff comments   View file @ 336ca8d
... ... @@ -26,10 +26,9 @@
26 26 <thead>
27 27 <tr>
28 28 <th>Unidad</th>
29   - <th>Tractor</th>
30   - <th>Semi</th>
  29 + <th>Dominio Tractor</th>
  30 + <th>Dominio Semi</th>
31 31 <th>Capacidad</th>
32   - <th>Cisternado</th>
33 32 <th class="text-center">
34 33 <button
35 34 ng-disabled="!idTransportista"
... ... @@ -45,8 +44,7 @@
45 44 <td ng-bind="vehiculo.codigo"></td>
46 45 <td ng-bind="vehiculo.tractor"></td>
47 46 <td ng-bind="vehiculo.semi"></td>
48   - <td ng-bind="vehiculo.capacidad"></td>
49   - <td ng-bind="vehiculo.cisternado"></td>
  47 + <td ng-bind="vehiculo.capacidadTotalCisternas"></td>
50 48 <td class="text-center">
51 49 <button
52 50 class="btn btn-default boton-accion"