From 5fa8100a871a40c7c24e361ed22a81004ad44cbc Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Thu, 3 Jan 2019 14:37:22 -0300
Subject: [PATCH] ver detalle de carga

---
 src/js/controller.js                      |  7 ++++++-
 src/js/controllerDetalleVehiculo.js       | 21 ++++++++++++---------
 src/js/osm-directive.js                   |  6 ------
 src/views/foca-detalle-vehiculo.html      | 16 +++++++++-------
 src/views/foca-logistica-pedido-ruta.html | 23 ++++++++++++++++++-----
 5 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 3ef5b87..935a99f 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -38,7 +38,12 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo
         };
 
         $scope.cargar = function(idVehiculo, punto) {
-            var idRemito = JSON.parse(punto).notaPedido.remito.id;
+            var idRemito;
+            if (punto === -1) {
+                idRemito = -1;
+            }else {
+                idRemito = JSON.parse(punto).notaPedido.remito.id;
+            }
             var modalInstance = $uibModal.open(
                 {
                     ariaLabelledBy: 'Busqueda de Vehiculo',
diff --git a/src/js/controllerDetalleVehiculo.js b/src/js/controllerDetalleVehiculo.js
index 9494d6e..67f567d 100644
--- a/src/js/controllerDetalleVehiculo.js
+++ b/src/js/controllerDetalleVehiculo.js
@@ -11,6 +11,7 @@ angular.module('focaLogisticaPedidoRuta')
             focaLogisticaPedidoRutaService
         ) {
             //seteo variables
+            $scope.idRemito = idRemito;
             $scope.articulos = [];
             $scope.vehiculo = {};
             $scope.remito = {};
@@ -21,16 +22,18 @@ angular.module('focaLogisticaPedidoRuta')
                     $scope.vehiculo = res.data;
                 }
             );
-            focaLogisticaPedidoRutaService.obtenerRemitoById(idRemito).then(
-                function(res) {
-                    $scope.remito = res.data;
-                    if($scope.remito.idUsuarioProceso) {
-                        focaModalService.alert('El remito esta siendo cargado por otro usario');
-                        $uibModalInstance.close();
+            if (idRemito !== -1) {
+                focaLogisticaPedidoRutaService.obtenerRemitoById(idRemito).then(
+                    function(res) {
+                        $scope.remito = res.data;
+                        if($scope.remito.idUsuarioProceso) {
+                            focaModalService.alert('El remito esta siendo cargado por otro usario');
+                            $uibModalInstance.close();
+                        }
+                        $scope.articulos = res.data.articulosRemito;
                     }
-                    $scope.articulos = res.data.articulosRemito;
-                }
-            );
+                );    
+            }
             $scope.aceptar = function() {
                 $scope.cargando = true;
                 var cisternaCargas = [];
diff --git a/src/js/osm-directive.js b/src/js/osm-directive.js
index 43d4b8e..3d1c3b8 100644
--- a/src/js/osm-directive.js
+++ b/src/js/osm-directive.js
@@ -42,12 +42,6 @@ angular.module('focaLogisticaPedidoRuta').directive('focaLogistica', function()
                         observacion += '<br/>Distancia a casa central: ' +
                             marcador.distancia + 'km';
                     }
-                    // }else {
-                    //     observacion += 'Cantidad de remitos: ' +
-                    //         marcador.cantidad + '<br/>';
-                    //     observacion += 'Total Vendido: ' +
-                    //         $filter('currency')(marcador.total, '$');
-                    // }
                     observacion += '<br/>';
                     observacion += '<i class="fa fa-map-marker fa-3x" aria-hidden="true"'+
                         'class="form-control" ondragend="dropEnd()" ondragstart=\'drag(event, '+
diff --git a/src/views/foca-detalle-vehiculo.html b/src/views/foca-detalle-vehiculo.html
index f7e763c..b8f3d9d 100644
--- a/src/views/foca-detalle-vehiculo.html
+++ b/src/views/foca-detalle-vehiculo.html
@@ -3,16 +3,18 @@
     Vehículo <strong ng-bind="vehiculo.tractor"></strong>
     Transportista <strong ng-bind="vehiculo.transportista.NOM"></strong>
     <br>
-    Remito Nº
-    <strong ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></strong>
-    , Cliente
-    <strong ng-bind="remito.nombreCliente"></strong>
-    , Domicilio
-    <strong ng-bind="remito.domicilioStamp"></strong>
+    <div ng-show="idRemito !== -1">
+        <span>Remito Nº</span>
+        <strong ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></strong>
+        <span>, Cliente</span>
+        <strong ng-bind="remito.nombreCliente"></strong>
+        <span>, Domicilio</span>
+        <strong ng-bind="remito.domicilioStamp"></strong>
+    </div>
 </div>
 <div class="modal-body">
     <div>
-        <table class="table table-sm">
+        <table class="table table-sm" ng-show="idRemito !== -1">
             <thead>
                 <tr>
                     <th></th>
diff --git a/src/views/foca-logistica-pedido-ruta.html b/src/views/foca-logistica-pedido-ruta.html
index 0814cbc..d5fe8a1 100644
--- a/src/views/foca-logistica-pedido-ruta.html
+++ b/src/views/foca-logistica-pedido-ruta.html
@@ -52,6 +52,12 @@
                     foca-focus="idVendedor == -1"
                 >
             </div>
+            <div>
+                <img src="img/marker-icon-2x-blue.png">
+                <strong>Asignado</strong>
+                <img src="img/marker-icon-2x-red.png">
+                <strong>Sin asignar</strong>
+            </div>
         </div>
        <div class="row">
             <div
@@ -71,15 +77,22 @@
                             <div class="progress-value">{{vehiculo.codigo}}</div>
                         </div>
                     </div>
-                    <div class="row px-4">
-                        <div class="text-left col-6 ml-1 position-absolute">
+                    <div class="row col-5">
+                        <div class="col-4">
                             <img
                                 src="img/hojaRutaVolante.png"
-                                width="34%"
+                                width="80%%"
                                 uib-tooltip="Confeccionar hoja de ruta"
                                 ng-click="hacerHojaRuta(vehiculo)">
                         </div>
-                        <div class="text-right ml-5 col-6 position-absolute">
+                        <div class="col-4">
+                            <i
+                                class="fa fa-eye fa-2x"
+                                uib-tooltip="Ver cisternas"
+                                ng-click="cargar(vehiculo.id, -1)">
+                            </i>
+                        </div>
+                        <div class="col-4">
                             <i
                                 class="fa fa-trash fa-2x"
                                 uib-tooltip="Eliminar vehiculo"
@@ -87,7 +100,7 @@
                         </div>
                     </div>
                     <div
-                        class="col-12 mt-5 border border-dark text-center"
+                        class="col-4 ml-1 border border-dark text-center"
                         ng-show="arrastrando"
                         id="{{vehiculo.id}}"
                         ondrop="drop(event)"
-- 
1.9.1