Commit 0fed68f2e7fe3441db539e22d1ddc8ac02736367

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'develop'

Master

See merge request !58
src/views/modal-detalle-carga.html
1 <div class="modal-header py-1"> 1 <div class="modal-header py-1">
2 <div class="row w-100"> 2 <div class="row w-100">
3 <div class="col-lg-6"> 3 <div class="col-lg-6">
4 <h5 class="modal-title my-1">Detalle de Carga</h5> 4 <h5 class="modal-title my-1">Detalle de Carga</h5>
5 </div> 5 </div>
6 </div> 6 </div>
7 </div> 7 </div>
8 <div class="row"> 8 <div class="row">
9 <div class="col ml-3 mt-2"> 9 <div class="col ml-3 mt-2">
10 <span class=" text-left"> 10 <span class=" text-left">
11 Transportista <b>{{hojasRutas.idTransportista}} {{hojasRutas.transportista.NOM}}</b> 11 Transportista <b>{{hojasRutas.idTransportista}} {{hojasRutas.transportista.NOM}}</b>
12 Unidad <b>{{hojasRutas.vehiculo.codigo}}</b> Tractor <b>{{hojasRutas.vehiculo.tractor}}</b> 12 Unidad <b>{{hojasRutas.vehiculo.codigo}}</b> Tractor <b>{{hojasRutas.vehiculo.tractor}}</b>
13 </span> 13 </span>
14 14
15 </div> 15 </div>
16 </div> 16 </div>
17 <div class="row"> 17 <div class="row">
18 <div class="col ml-3"> 18 <div class="col ml-3">
19 <span class=" text-left">Fecha <b>{{hojasRutas.fecha | date:'yyyy-MM-dd':'-0300'}}</b></span> 19 <span class=" text-left">Fecha <b>{{hojasRutas.fecha | date:'yyyy-MM-dd':'-0300'}}</b></span>
20 </div> 20 </div>
21 </div> 21 </div>
22 <div class="modal-body" id="modal-body"> 22 <div class="modal-body" id="modal-body">
23 <table class="table table-hover table-sm table-striped"> 23 <table class="table table-hover table-sm table-striped">
24 <thead> 24 <thead>
25 <tr> 25 <tr>
26 <th>Cisterna</th> 26 <th>Cisterna</th>
27 <th>Capacidad</th> 27 <th>Capacidad</th>
28 <th>Disponibles</th> 28 <th>Disponibles</th>
29 <th>Articulo Cargado</th> 29 <th>Articulo Cargado</th>
30 </tr> 30 </tr>
31 </thead> 31 </thead>
32 <tbody> 32 <tbody>
33 <tr 33 <tr
34 ng-repeat="(key, cisterna) in hojasRutas.vehiculo.cisternas" 34 ng-repeat="(key, cisterna) in hojasRutas.vehiculo.cisternas"
35 > 35 >
36 <td ng-bind="cisterna.id"></td> 36 <td ng-bind="cisterna.id"></td>
37 <td ng-bind="cisterna.capacidad"></td> 37 <td ng-bind="cisterna.capacidad"></td>
38 <td class="w-50"> 38 <td class="w-50">
39 <input 39 <input
40 ng-focus="$event.target.select();"
40 ng-model="cisterna.disponible" 41 ng-model="cisterna.disponible"
41 ng-keyup="validarCisternaDisponible(cisterna)" 42 ng-keyup="validarCisternaDisponible(cisterna)"
42 class="form-control" 43 class="form-control"
43 solo-positivos 44 solo-positivos
44 foca-tipo-input 45 foca-tipo-input
45 /> 46 />
46 </td> 47 </td>
47 <td class="w-25"> 48 <td class="w-25">
48 <div class="input-group "> 49 <div class="input-group ">
49 <input 50 <input
50 ng-model="cisterna.nombreArticulo" 51 ng-model="cisterna.nombreArticulo"
51 class="form-control" 52 class="form-control"
52 ng-click="seleccionarProductos(key, cisterna)" 53 ng-click="seleccionarProductos(key, cisterna)"
53 readonly 54 readonly
54 /> 55 />
55 <div class="input-group-append"> 56 <div class="input-group-append">
56 <button 57 <button
57 ladda="searchLoading" 58 ladda="searchLoading"
58 class="btn btn-outline-secondary form-control" 59 class="btn btn-outline-secondary form-control"
59 type="button" 60 type="button"
60 ng-click="seleccionarProductos(key, cisterna)" 61 ng-click="seleccionarProductos(key, cisterna)"
61 > 62 >
62 <i class="fa fa-search" aria-hidden="true"></i> 63 <i class="fa fa-search" aria-hidden="true"></i>
63 </button> 64 </button>
64 </div> 65 </div>
65 </div> 66 </div>
66 </td> 67 </td>
67 </tr> 68 </tr>
68 </tbody> 69 </tbody>
69 </table> 70 </table>
70 </div> 71 </div>
71 <div class="modal-footer py-1"> 72 <div class="modal-footer py-1">
72 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button> 73 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
73 <button class="btn btn-sm btn-primary" type="button" ng-click="guardar()">Guardar</button> 74 <button class="btn btn-sm btn-primary" type="button" ng-click="guardar()">Guardar</button>
74 </div> 75 </div>
75 </div> 76 </div>