Commit 81fb188cbbe4c87b1dce5203163d597a04332489

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !6
src/js/controller.js
... ... @@ -61,7 +61,7 @@ angular.module('focaAbmVehiculo')
61 61 .then(function(res) {
62 62 $scope.vehiculo.idTransportista = res.data.COD;
63 63 $scope.vehiculo.transportista = res.data;
64   - })
  64 + });
65 65 }
66 66 $scope.vehiculo = {};
67 67 focaAbmVehiculoService.getVehiculo($routeParams.idVehiculo).then(function(res) {
src/views/foca-abm-cisterna-item.html
1 1 <h4>Cisterna</h4>
2 2 <form name="formCisterna">
3 3 <div class="form-group row">
4   - <label class="offset-sm-1 col-sm-2 col-form-label">Código</label>
  4 + <label class="offset-sm-1 col-sm-2 col-form-label">Unidad</label>
5 5 <div class="col-sm-4">
6 6 <input
7 7 class="form-control"
src/views/foca-abm-vehiculos-item.html
... ... @@ -21,7 +21,7 @@
21 21 </div>
22 22 </div>
23 23 <div class="form-group row">
24   - <label class="offset-sm-1 col-sm-2 col-form-label">Código</label>
  24 + <label class="offset-sm-1 col-sm-2 col-form-label">Unidad</label>
25 25 <div class="col-sm-4">
26 26 <input
27 27 class="form-control"
... ... @@ -56,18 +56,6 @@
56 56 </div>
57 57 </div>
58 58 <div class="form-group row">
59   - <label class="offset-sm-1 col-sm-2 col-form-label">Capacidad</label>
60   - <div class="col-sm-4">
61   - <input
62   - class="form-control"
63   - type="text"
64   - teclado-virtual
65   - ng-model="vehiculo.capacidad"
66   - ng-required="true"
67   - />
68   - </div>
69   - </div>
70   - <div class="form-group row">
71 59 <div class="col-sm-7 text-right">
72 60 <button
73 61 class="btn btn-primary"
... ... @@ -83,7 +71,7 @@
83 71 <table class="table table-sm table-striped table-dark">
84 72 <thead>
85 73 <tr>
86   - <th>Código</th>
  74 + <th>Unidad</th>
87 75 <th>Unidad de Medida</th>
88 76 <th>Capacidad</th>
89 77 <th>Carga</th>
src/views/foca-abm-vehiculos-listado.html
... ... @@ -25,7 +25,7 @@
25 25 <table class="table table-sm table-striped table-dark">
26 26 <thead>
27 27 <tr>
28   - <th>Código</th>
  28 + <th>Unidad</th>
29 29 <th>Tractor</th>
30 30 <th>Semi</th>
31 31 <th>Capacidad</th>
... ... @@ -42,7 +42,7 @@
42 42 </thead>
43 43 <tbody>
44 44 <tr ng-repeat="vehiculo in vehiculos | filter:filtros">
45   - <td ng-bind="vehiculo.id"></td>
  45 + <td ng-bind="vehiculo.codigo"></td>
46 46 <td ng-bind="vehiculo.tractor"></td>
47 47 <td ng-bind="vehiculo.semi"></td>
48 48 <td ng-bind="vehiculo.capacidad"></td>
... ... @@ -64,7 +64,7 @@
64 64 </tr>
65 65 </body>
66 66 </table>
67   - <a href="#!/" title="Salir"
  67 + <a href="#!/" title="Salir"
68 68 class="btn btn-secondary btn-block float-right col-md-2"
69 69 >
70 70 Salir