Luis Suarez / foca-logistica-pedido-ruta

Download as
Browse Code »

Commit 73397751c1e3483a4b2d21eaf90868a4403f405e

Authored by Eric Fernandez
2 parents 915db0115e 4aa8f26e93
Exists in master and in 2 other branches develop, lab

Merge branch 'master' into 'develop' 

Master

See merge request !50
Showing 2 changed files   Show diff stats
src/js/osm-directive.js
Diff comments   View file @ 7339775
... ... @@ -86,11 +86,11 @@ angular.module('focaLogisticaPedidoRuta').directive('focaLogistica', function()
86 86 });
87 87 } else {
88 88 observacion += '<br/>';
89   - observacion += '<i class="fa fa-map-marker fa-3x" aria-hidden="true"'+
  89 + observacion += '<i class="fa fa-map-marker marcador fa-4x" aria-hidden="true"'+
90 90 'class="form-control" ondragend="dropEnd()" ondragstart=\'drag(event, '+
91   - JSON.stringify(marcador)+')\' draggable="true"></i>(Arrastrar icono)';
  91 + JSON.stringify(marcador)+')\' draggable="true"></i><br><b>(Arrastrar icono)</b>';
92 92 observacion += '<button title="Ver productos" class="btn btn-secondary' +
93   - ' float-right mt-2"'+
  93 + ' float-right informacion"'+
94 94 'ng-click="verProductos('+marcador.notaPedido.remito.id+')">' +
95 95 '<i class="fa fa-info" aria-hidden="true"></i>' +
96 96 '</button>';
... ... @@ -107,7 +107,7 @@ angular.module(&#39;focaLogisticaPedidoRuta&#39;).directive(&#39;focaLogistica&#39;, function()
107 107 }
108 108  
109 109 //COMPILO HTML PARA QUE FUNCIONE BOTON EN POPUP
110   - observacion = '<div>' + observacion + '</div>';
  110 + observacion = '<div class="disable-selection">' + observacion + '</div>';
111 111 var compiledHtml = $compile(angular.element(observacion))($scope);
112 112  
113 113 $scope.markers.push(
src/views/foca-logistica-pedido-ruta.html
Diff comments   View file @ 7339775
... ... @@ -11,7 +11,7 @@
11 11 <foca-botonera-facturador botones="botonera" max="6" class="row"></foca-botonera-facturador>
12 12 </div>
13 13 <div class="col-2 pl-0 position-absolute right-0">
14   - <strong>Filtros: </strong>
  14 + <strong>Ver Remitos</strong>
15 15 <br>
16 16 <span>Fecha Desde</span>
17 17 <input
... ... @@ -39,7 +39,7 @@
39 39 ng-focus="fechaHastaOpen = true"
40 40 ng-change="search()"
41 41 />
42   - <div class="custom-control custom-radio">
  42 + <div class="custom-control custom-radio pt-4">
43 43 <input
44 44 type="radio"
45 45 class="custom-control-input"
... ... @@ -90,65 +90,52 @@
90 90 parametros= "datosBuscados"
91 91 />
92 92 </div>
93   - <div class="row">
94   - <div
95   - class="container col-auto"
96   - ng-repeat="vehiculo in vehiculos"
97   - ng-click="mostrarDetalleVehiculo(vehiculo)"
98   - >
99   - <div>
100   - <div class="col-md-3 col-sm-6">
101   - <div class="progress-circle" ng-class="{'arrastrando': arrastrando}">
102   - <span class="progress-left">
103   - <span class="progress-bar"></span>
104   - </span>
105   - <span class="progress-right">
106   - <span class="progress-bar"></span>
107   - </span>
108   - <div class="progress-value py-4 px-3 d-flex align-content-between flex-wrap">
109   - <small class="w-100">
110   - <small>
111   - <small>
112   - {{vehiculo.transportista.NOM.trim()}}
113   - </small>
114   - </small>
115   - </small>
116   - <small class="w-100">
117   - {{vehiculo.codigo}}
118   - </small>
119   - </div>
  93 + <div class="col-12 p-0">
  94 + <div class="py-2 row">
  95 + <div class="col-sm-3" ng-repeat="vehiculo in vehiculos">
  96 + <div
  97 + style="width: 15rem;"
  98 + class="card bg-secondary text-white m-2">
  99 + <div class="card-body text-center">
  100 + <p class="card-text">{{vehiculo.transportista.NOM.trim()}}</p>
  101 + <p class="card-text"></p>
  102 + <p class="card-text">{{vehiculo.codigo}}</p>
120 103 </div>
121   - </div>
122   - <div class="row ml-2">
123   - <div class="col-3 position-absolute">
124   - <img
125   - src="img/hojaRutaVolante.png"
126   - width="100%">
127   - </div>
128   - <div class="col-3"
129   - uib-tooltip="Confirmar distribuición"
130   - ng-click="hacerHojaRuta(vehiculo)"></div>
131   - <div class="col-3">
132   - <i
133   - class="fa fa-eye fa-2x"
134   - uib-tooltip="Ver cisternas"
135   - ng-click="cargar(vehiculo.id, -1)">
136   - </i>
  104 + <div class="card-footer" ng-hide="arrastrando">
  105 + <div class="row justify-content-around">
  106 + <div class="col-3 ml-2">
  107 + <i
  108 + class="fa fa-trash fa-2x"
  109 + uib-tooltip="Eliminar vehiculo"
  110 + ng-click="quitarVehiculo(vehiculo)">
  111 + </i>
  112 + </div>
  113 + <div class="col-3">
  114 + <i
  115 + class="fa fa-eye fa-2x"
  116 + uib-tooltip="Ver cisternas"
  117 + ng-click="cargar(vehiculo.id, -1)">
  118 + </i>
  119 + </div>
  120 + <div class="col-3">
  121 + <i
  122 + class="fa fa-save fa-2x"
  123 + uib-tooltip="Confirmar distribuición"
  124 + ng-click="hacerHojaRuta(vehiculo)">
  125 + </i>
  126 + </div>
  127 + </div>
137 128 </div>
138   - <div class="col-3 ml-2">
139   - <i
140   - class="fa fa-trash fa-2x"
141   - uib-tooltip="Eliminar vehiculo"
142   - ng-click="quitarVehiculo(vehiculo)"></i>
  129 + <div class="card-footer text-center" ng-show="arrastrando">
  130 + <button
  131 + class="btn flashit btn-block btn-dashed text-dark"
  132 + id="{{vehiculo.id}}"
  133 + ondrop="drop(event)"
  134 + ondragover="allowDrop(event)">
  135 + Arrastrar aquí
  136 + </button>
143 137 </div>
144 138 </div>
145   - <div
146   - class="ml-1 border border-dark text-center w-100"
147   - ng-show="arrastrando"
148   - id="{{vehiculo.id}}"
149   - ondrop="drop(event)"
150   - ondragover="allowDrop(event)"
151   - >Soltar acá</div>
152 139 </div>
153 140 </div>
154 141 </div>