From 4aa8f26e936f825eb9777cc4044094862eb3a51f Mon Sep 17 00:00:00 2001
From: Luigi <fluigipanettieri@gmail.com>
Date: Thu, 4 Jul 2019 12:56:15 -0300
Subject: [PATCH] vista de vehiculos y puntero en el mapa

---
 src/js/osm-directive.js                   |   8 +--
 src/views/foca-logistica-pedido-ruta.html | 101 +++++++++++++-----------------
 2 files changed, 48 insertions(+), 61 deletions(-)

diff --git a/src/js/osm-directive.js b/src/js/osm-directive.js
index 2f5c05c..de3c715 100644
--- a/src/js/osm-directive.js
+++ b/src/js/osm-directive.js
@@ -86,11 +86,11 @@ angular.module('focaLogisticaPedidoRuta').directive('focaLogistica', function()
                         });
                     } else {
                         observacion += '<br/>';
-                        observacion += '<i class="fa fa-map-marker fa-3x" aria-hidden="true"'+
+                        observacion += '<i class="fa fa-map-marker marcador fa-4x" aria-hidden="true"'+
                         'class="form-control" ondragend="dropEnd()" ondragstart=\'drag(event, '+
-                        JSON.stringify(marcador)+')\' draggable="true"></i>(Arrastrar icono)';
+                        JSON.stringify(marcador)+')\' draggable="true"></i><br><b>(Arrastrar icono)</b>';
                         observacion += '<button title="Ver productos" class="btn btn-secondary' +
-                                    ' float-right mt-2"'+
+                                    ' float-right informacion"'+
                                     'ng-click="verProductos('+marcador.notaPedido.remito.id+')">' +
                                     '<i class="fa fa-info" aria-hidden="true"></i>' +
                                     '</button>';
@@ -107,7 +107,7 @@ angular.module('focaLogisticaPedidoRuta').directive('focaLogistica', function()
                     }
 
                     //COMPILO HTML PARA QUE FUNCIONE BOTON EN POPUP
-                    observacion = '<div>' + observacion + '</div>';
+                    observacion = '<div class="disable-selection">' + observacion + '</div>';
                     var compiledHtml = $compile(angular.element(observacion))($scope);
 
                     $scope.markers.push(
diff --git a/src/views/foca-logistica-pedido-ruta.html b/src/views/foca-logistica-pedido-ruta.html
index 9e54073..d936af8 100644
--- a/src/views/foca-logistica-pedido-ruta.html
+++ b/src/views/foca-logistica-pedido-ruta.html
@@ -11,7 +11,7 @@
             <foca-botonera-facturador botones="botonera" max="6" class="row"></foca-botonera-facturador>
         </div>
         <div class="col-2 pl-0 position-absolute right-0">
-            <strong>Filtros: </strong>
+            <strong>Ver Remitos</strong>
             <br>
             <span>Fecha Desde</span>
             <input
@@ -39,7 +39,7 @@
                 ng-focus="fechaHastaOpen = true"
                 ng-change="search()"
             />
-            <div class="custom-control custom-radio">
+            <div class="custom-control custom-radio pt-4">
                 <input
                     type="radio"
                     class="custom-control-input"
@@ -90,65 +90,52 @@
                 parametros= "datosBuscados"
             />
         </div>
-        <div class="row">
-            <div
-                class="container col-auto"
-                ng-repeat="vehiculo in vehiculos"
-                ng-click="mostrarDetalleVehiculo(vehiculo)"
-            >
-                <div>
-                    <div class="col-md-3 col-sm-6">
-                        <div class="progress-circle" ng-class="{'arrastrando': arrastrando}">
-                            <span class="progress-left">
-                                <span class="progress-bar"></span>
-                            </span>
-                            <span class="progress-right">
-                                <span class="progress-bar"></span>
-                            </span>
-                            <div class="progress-value py-4 px-3 d-flex align-content-between flex-wrap">
-                                <small class="w-100">
-                                    <small>
-                                        <small>
-                                            {{vehiculo.transportista.NOM.trim()}}
-                                        </small>
-                                    </small>
-                                </small>
-                                <small class="w-100">
-                                    {{vehiculo.codigo}}
-                                </small>
-                            </div>
+        <div class="col-12 p-0">
+            <div class="py-2 row">
+                <div class="col-sm-3" ng-repeat="vehiculo in vehiculos">
+                    <div 
+                        style="width: 15rem;" 
+                        class="card bg-secondary text-white m-2">
+                        <div class="card-body text-center">
+                            <p class="card-text">{{vehiculo.transportista.NOM.trim()}}</p>
+                            <p class="card-text"></p>
+                            <p class="card-text">{{vehiculo.codigo}}</p>
                         </div>
-                    </div>
-                    <div class="row ml-2">
-                        <div class="col-3 position-absolute">
-                            <img
-                                src="img/hojaRutaVolante.png"
-                                width="100%">
-                        </div>
-                        <div class="col-3"
-                            uib-tooltip="Confirmar distribuición"
-                            ng-click="hacerHojaRuta(vehiculo)"></div>
-                        <div class="col-3">
-                            <i
-                                class="fa fa-eye fa-2x"
-                                uib-tooltip="Ver cisternas"
-                                ng-click="cargar(vehiculo.id, -1)">
-                            </i>
+                        <div class="card-footer" ng-hide="arrastrando">
+                            <div class="row justify-content-around">
+                                <div class="col-3 ml-2">
+                                    <i
+                                        class="fa fa-trash fa-2x"
+                                        uib-tooltip="Eliminar vehiculo"
+                                        ng-click="quitarVehiculo(vehiculo)">
+                                    </i>
+                                </div>
+                                <div class="col-3">
+                                    <i
+                                        class="fa fa-eye fa-2x"
+                                        uib-tooltip="Ver cisternas"
+                                        ng-click="cargar(vehiculo.id, -1)">
+                                    </i>
+                                </div>
+                                <div class="col-3">
+                                    <i
+                                        class="fa fa-save fa-2x"
+                                        uib-tooltip="Confirmar distribuición"
+                                        ng-click="hacerHojaRuta(vehiculo)">
+                                    </i>
+                                </div>
+                            </div>
                         </div>
-                        <div class="col-3 ml-2">
-                            <i
-                                class="fa fa-trash fa-2x"
-                                uib-tooltip="Eliminar vehiculo"
-                                ng-click="quitarVehiculo(vehiculo)"></i>
+                        <div class="card-footer text-center" ng-show="arrastrando">
+                            <button 
+                                class="btn flashit btn-block btn-dashed text-dark" 
+                                id="{{vehiculo.id}}"
+                                ondrop="drop(event)"
+                                ondragover="allowDrop(event)">
+                                Arrastrar aquí
+                            </button>
                         </div>
                     </div>
-                    <div
-                        class="ml-1 border border-dark text-center w-100"
-                        ng-show="arrastrando"
-                        id="{{vehiculo.id}}"
-                        ondrop="drop(event)"
-                        ondragover="allowDrop(event)"
-                    >Soltar acá</div>
                 </div>
             </div>
         </div>
-- 
1.9.1