Marcelo Puebla / foca-orden-carga

Download as
Browse Code »

Commit 482e242ad02884fad751449f9e3eb8decf17d826

Authored by Marcelo Puebla
2 parents 8a4b631e3b ba81ca837c
Exists in master

Merge branch 'master' into 'develop' 

Master(benjamin)

See merge request !4
Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 482e242
... ... @@ -83,9 +83,14 @@ angular.module('focaOrdenCarga')
83 83 {
84 84 propiedad: 'capacidadTotalCisternas',
85 85 nombre: 'Capacidad'
86   - }
  86 + },
  87 + // {
  88 + // propiedad: 'cantidad',
  89 + // nombre: 'carga'
  90 + // }
87 91 ],
88 92 query: '/vehiculo/transportista/' + transportista.COD,
  93 + // query: '/cisterna_carga/cisterna/vehiculo/transportista/' + transportista.COD,
89 94 titulo: 'Búsqueda de vehiculos',
90 95 subTitulo: transportista.COD + '-' + transportista.NOM
91 96 };
... ... @@ -351,4 +356,4 @@ angular.module('focaOrdenCarga')
351 356 $location.path('/');
352 357 }
353 358 }
354   - }]);
  359 + }]);
src/views/orden-carga.html
Diff comments   View file @ 482e242
... ... @@ -10,16 +10,14 @@
10 10 </div>
11 11 </div>
12 12  
13   - <table class="table table-default table-hover table-sm table-abm table-striped mb-0">
  13 + <table class="cursero-default table table-default table-hover table-sm table-abm table-striped mb-0">
14 14 <thead>
15 15 <tr>
16 16 <th>Cisterna</th>
17 17 <th>Producto</th>
18 18 <th>Capacidad Total</th>
19 19 <th>Carga</th>
20   - <th>Disponible</th>
21   - <th class="text-center">
22   - </th>
  20 + <th class="text-center">Disponible</th>
23 21 </tr>
24 22 </thead>
25 23 <tbody>
... ... @@ -28,7 +26,7 @@
28 26 <td>producto</td>
29 27 <td ng-bind="cisterna.capacidad"></td>
30 28 <td ng-bind="cisterna.cantidadDescargada"></td>
31   - <td>{{cisterna.capacidad - cisterna.cantidadDescargada}}</td>
  29 + <td class="text-center">{{cisterna.capacidad - cisterna.cantidadDescargada}}</td>
32 30 </tr>
33 31 </tbody>
34 32 </table>