Luigi / foca-logistica-pedido-ruta

Download as
Browse Code »

Commit 332683dd9f41b63bca52366f81f61b2fca6724d4

Authored by Jose Pinto
2 parents 8e94559592 3db891c88e
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !12
Showing 6 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 332683d
... ... @@ -26,6 +26,9 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo
26 26 focaBotoneraLateralService.showPausar(false);
27 27 focaBotoneraLateralService.showGuardar(false);
28 28  
  29 + focaLogisticaPedidoRutaService.getVehiculosByIdUsuario().then(function(res) {
  30 + $scope.vehiculos = res.data;
  31 + });
29 32  
30 33 $scope.general = function() {
31 34 $scope.idVendedor = 0;
... ... @@ -145,19 +148,13 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo
145 148 };
146 149  
147 150 $scope.seleccionarVehiculo = function(idTransportista) {
148   - var modalInstance = $uibModal.open(
149   - {
150   - ariaLabelledBy: 'Busqueda de Vehiculo',
151   - templateUrl: 'modal-vehiculo.html',
152   - controller: 'focaModalVehiculoController',
153   - size: 'lg',
154   - resolve: {
155   - idTransportista: function() {return idTransportista;}
156   - }
157   - }
158   - );
159   -
160   - modalInstance.result.then(
  151 + var query = '/vehiculo/transportista/' + idTransportista;
  152 + var columnas = {
  153 + nombre: ['Código', 'tractor', 'Semi', 'Capacidad'],
  154 + propiedad: ['codigo', 'tractor', 'semi', 'capacidadTotalCisternas']
  155 + };
  156 + var titulo = 'Búsqueda de vehiculos';
  157 + focaModalService.modal(columnas, query, titulo).then(
161 158 function(vehiculo) {
162 159 var existe = $filter('filter')($scope.vehiculos, {id: vehiculo.id});
163 160 if(existe.length) {
... ... @@ -171,8 +168,7 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo
171 168 $scope.vehiculos.push(vehiculo);
172 169 }, function() {
173 170 // funcion ejecutada cuando se cancela el modal
174   - }
175   - );
  171 + });
176 172 };
177 173  
178 174 function getSeguimiento() {
src/js/controllerDetalleVehiculo.js
Diff comments   View file @ 332683d
... ... @@ -31,6 +31,7 @@ angular.module('focaLogisticaPedidoRuta')
31 31 $uibModalInstance.close();
32 32 }
33 33 $scope.articulos = res.data.articulosRemito;
  34 + $scope.cambioArticulo($scope.articulos[0]);
34 35 }
35 36 );
36 37 }
... ... @@ -65,6 +65,9 @@ angular.module('focaLogisticaPedidoRuta')
65 65 }
66 66 }
67 67 return remitosRes;
  68 + },
  69 + getVehiculosByIdUsuario: function() {
  70 + return $http.get(API_ENDPOINT.URL + '/vehiculo/usuario/' + this.idUsuario);
68 71 }
69 72 };
70 73 }]);
src/views/foca-detalle-vehiculo.html
Diff comments   View file @ 332683d
1 1 <div class="modal-header">
2 2 <h4>Detalle de carga</h4>
3   - Vehículo <strong ng-bind="vehiculo.tractor"></strong>
4 3 Transportista <strong ng-bind="vehiculo.transportista.NOM"></strong>
  4 + Unidad <strong ng-bind="vehiculo.codigo"></strong>
  5 + Tractor <strong ng-bind="vehiculo.tractor"></strong>
5 6 <br>
6 7 <div ng-show="idRemito !== -1">
7 8 <span>Remito Nº</span>
8 9 <strong ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></strong>
  10 + <span>, Fecha</span>
  11 + <strong ng-bind="remito.fechaRemito | date: 'dd/MM/yyyy HH:mm'"></strong>
9 12 <span>, Cliente</span>
10 13 <strong ng-bind="remito.nombreCliente"></strong>
11   - <span>, Domicilio</span>
  14 + <span>, Domicilio entrega</span>
12 15 <strong ng-bind="remito.domicilioStamp"></strong>
13 16 </div>
14 17 </div>
... ... @@ -44,9 +47,9 @@
44 47 <table class="table table-sm">
45 48 <thead>
46 49 <tr>
47   - <th>Cisterna</th>
48   - <th>Cantidad asignada</th>
49   - <th>Estado</th>
  50 + <th width="10%">Cisterna</th>
  51 + <th width="20%">Cantidad asignada</th>
  52 + <th width="35%">Estado</th>
50 53 <th>Articulo cargado</th>
51 54 </tr>
52 55 </thead>
... ... @@ -65,9 +68,9 @@
65 68 ng-change="actualizarArticulo()"
66 69 >
67 70 </td>
68   - <td colspan="2"><div class="progress foca-alto-progress pl-0 pr-0 mt-1">
  71 + <td><div class="progress foca-alto-progress pl-0 pr-0 mt-1">
69 72 <strong
70   - class="mt-2 col-3 text-center position-absolute"
  73 + class="mt-2 col-4 text-center position-absolute"
71 74 ng-bind="(cisterna.cisternaCarga.cantidad || 0) + '/' + (cisterna.capacidad)">
72 75 </strong>
73 76 <div
... ... @@ -111,5 +114,5 @@
111 114 ladda="cargando"
112 115 type="button"
113 116 ng-click="aceptar()"
114   - ng-disabled="tieneArticulosPendientes()">Cargar</button>
  117 + ng-disabled="tieneArticulosPendientes() || idRemito === -1">Cargar</button>
115 118 </div>
src/views/foca-logistica-pedido-ruta.html
Diff comments   View file @ 332683d
... ... @@ -23,12 +23,16 @@
23 23 </div>
24 24 <div class="col-2 pl-0">
25 25 <input
26   - type="date"
  26 + type="text"
  27 + readonly
27 28 ng-model="now"
28   - class="btn col-12 my-1"
29   - foca-focus="true"
30   - ng-blur="fecha()"
31   - hasta-hoy
  29 + class="form-control"
  30 + uib-datepicker-popup="dd/MM/yyyy"
  31 + show-button-bar="false"
  32 + is-open="datepickerOpen"
  33 + on-open-focus="false"
  34 + ng-focus="datepickerOpen = true"
  35 + datepicker-options="dateOptions"
32 36 />
33 37 <button
34 38 type="button"
... ... @@ -102,7 +106,7 @@
102 106 </div>
103 107 </div>
104 108 <div
105   - class="col-4 ml-1 border border-dark text-center"
  109 + class="ml-1 border border-dark text-center"
106 110 ng-show="arrastrando"
107 111 id="{{vehiculo.id}}"
108 112 ondrop="drop(event)"
src/views/foca-modal-crear-hoja-ruta.html
Diff comments   View file @ 332683d
1 1 <div class="modal-header">
2   - <h4>-en desarrollo</h4>
3 2 <h4>Confeccionar hoja de ruta</h4>
4   - Hoja de ruta Nº <strong ng-bind="[sucursal, numero] | comprobante"></strong>
5   - Fecha:
6   - <input
7   - type="date"
8   - ng-model="now"
9   - class="form-control form-control-sm col-3 float-right"
10   - />
11   - <br>
  3 + <div class="row">
  4 + <div class="col-6">
  5 + <span>Hoja de ruta Nº </span>
  6 + <strong ng-bind="[sucursal, numero] | comprobante"></strong>
  7 + </div>
  8 + <div class="col-6 row">
  9 + <label class="col-3 mt-2">Fecha:</label>
  10 + <input
  11 + type="text"
  12 + readonly
  13 + ng-model="now"
  14 + uib-datepicker-popup="dd/MM/yyyy"
  15 + show-button-bar="false"
  16 + is-open="datepickerOpen"
  17 + on-open-focus="false"
  18 + ng-focus="datepickerOpen = true"
  19 + datepicker-options="dateOptions"
  20 + class="form-control col-8"/>
  21 + </div>
  22 + </div>
12 23 </div>
13 24 <div class="modal-body">
14 25 <form class="row" name="formHojaRuta">
15   -
16 26  
17   - <div class="col-2 form-group">
18   - <label>Vehículo</label>
  27 + <div class="col-2">
  28 + <label>Transportista</label>
19 29 </div>
20   - <div class="col-4">
  30 + <div class="col-4">
21 31 <input
22   - class="form-control"
23   - readonly
24   - ng-model="vehiculo.tractor"
  32 + class="form-control"
  33 + readonly
  34 + ng-model="vehiculo.transportista.NOM"
25 35 >
26 36 </div>
27   - <div class="col-2">
28   - <label>Transportista</label>
  37 + <div class="col-2 form-group">
  38 + <label>Unidad</label>
29 39 </div>
30 40 <div class="col-4">
31 41 <input
32 42 class="form-control"
33 43 readonly
34   - ng-model="vehiculo.transportista.NOM"
  44 + ng-model="vehiculo.tractor"
35 45 >
36 46 </div>
37 47 <div class="col-2 form-group">
... ... @@ -71,7 +81,7 @@
71 81 <tr>
72 82 <th>Remito Nº</th>
73 83 <th>Cliente</th>
74   - <th>Domicilio</th>
  84 + <th>Domicilio de entrega</th>
75 85 </tr>
76 86 </thead>
77 87 <tbody>