Merge remote-tracking branch 'upstream/master'

Nicolás Guarnieri
2 parents 8aac173c17 27794b6011
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-admin-seguimiento.html
@@ -37,7 +37,7 @@ angular.module(&#39;focaAdminSeguimiento&#39;) .controller(&#39;focaAdminSeguimientoControll
                 label: 'General',
                 valor: ''
             });
-        })
+        });
  
         //SETEO BOTONERA LATERAL
         focaBotoneraLateralService.showSalir(true);
@@ -31,7 +31,7 @@
                 class="btn col-12 my-1" 
                 ng-click="general()"
             >General</button>
-            <button 
+            <button
                 type="button" 
                 ng-class="{'active': idUsuario != 0}" 
                 class="btn col-12 my-1" 
@@ -66,6 +66,66 @@
                     ng-show="actividad == 'Cobranza'"
                 >
             </div>
+            <div ng-show="actividad === 'Entrega de producto'">
+                <div class="custom-control custom-radio">
+                    <input
+                    type="radio"
+                    class="custom-control-input"
+                    id="idTodos"
+                    name="filtro"
+                    ng-model="filtroEstado"
+                    ng-change="search()"
+                    checked>
+                    <label class="custom-control-label pb-3" for="idTodos"></label>
+                    <img src="img/marker-icon-grey.png">
+                    <strong>Todos</strong>
+                </div>
+                <div class="custom-control custom-radio">
+                    <input
+                    type="radio"
+                    class="custom-control-input"
+                    id="entregado"
+                    name="filtro"
+                    ng-model="filtroEstado"
+                    ng-change="search()"
+                    ng-value="false">
+                    <label class="custom-control-label pb-3" for="entregado"></label>
+                    <img src="img/marker-icon-green.png">
+                    <strong>Entregado</strong>
+                </div>
+                <div class="custom-control custom-radio">
+                    <input
+                    type="radio"
+                    class="custom-control-input"
+                    id="noEntregado"
+                    name="filtro"
+                    ng-model="filtroEstado"
+                    ng-change="search()"
+                    ng-value="true">
+                    <label class="custom-control-label pb-3" for="noEntregado"></label>
+                    <img src="img/marker-icon-yellow.png">
+                    <strong>No entregado</strong>
+                </div>
+            </div>
         </div>
     </div>
+    <div ng-show="actividad === 'Entrega de producto'">
+        <strong>Remitos pendientes de entrega</strong>
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Remito Nº</th>
+                    <th>Cliente</th>
+                    <th>Dirección</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>ejemplo</td>
+                    <td>ejemplo</td>
+                    <td>ejemplo</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 </div>
...	...	@@ -37,7 +37,7 @@ angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoControll
37	37	label: 'General',
38	38	valor: ''
39	39	});
40		- })
	40	+ });
41	41
42	42	//SETEO BOTONERA LATERAL
43	43	focaBotoneraLateralService.showSalir(true);
...	...	@@ -31,7 +31,7 @@
31	31	class="btn col-12 my-1"
32	32	ng-click="general()"
33	33	>General</button>
34		- <button
	34	+ <button
35	35	type="button"
36	36	ng-class="{'active': idUsuario != 0}"
37	37	class="btn col-12 my-1"
...	...	@@ -66,6 +66,66 @@
66	66	ng-show="actividad == 'Cobranza'"
67	67	>
68	68	</div>
	69	+ <div ng-show="actividad === 'Entrega de producto'">
	70	+ <div class="custom-control custom-radio">
	71	+ <input
	72	+ type="radio"
	73	+ class="custom-control-input"
	74	+ id="idTodos"
	75	+ name="filtro"
	76	+ ng-model="filtroEstado"
	77	+ ng-change="search()"
	78	+ checked>
	79	+ <label class="custom-control-label pb-3" for="idTodos"></label>
	80	+ <img src="img/marker-icon-grey.png">
	81	+ <strong>Todos</strong>
	82	+ </div>
	83	+ <div class="custom-control custom-radio">
	84	+ <input
	85	+ type="radio"
	86	+ class="custom-control-input"
	87	+ id="entregado"
	88	+ name="filtro"
	89	+ ng-model="filtroEstado"
	90	+ ng-change="search()"
	91	+ ng-value="false">
	92	+ <label class="custom-control-label pb-3" for="entregado"></label>
	93	+ <img src="img/marker-icon-green.png">
	94	+ <strong>Entregado</strong>
	95	+ </div>
	96	+ <div class="custom-control custom-radio">
	97	+ <input
	98	+ type="radio"
	99	+ class="custom-control-input"
	100	+ id="noEntregado"
	101	+ name="filtro"
	102	+ ng-model="filtroEstado"
	103	+ ng-change="search()"
	104	+ ng-value="true">
	105	+ <label class="custom-control-label pb-3" for="noEntregado"></label>
	106	+ <img src="img/marker-icon-yellow.png">
	107	+ <strong>No entregado</strong>
	108	+ </div>
	109	+ </div>
69	110	</div>
70	111	</div>
	112	+ <div ng-show="actividad === 'Entrega de producto'">
	113	+ <strong>Remitos pendientes de entrega</strong>
	114	+ <table class="table">
	115	+ <thead>
	116	+ <tr>
	117	+ <th>Remito Nº</th>
	118	+ <th>Cliente</th>
	119	+ <th>Dirección</th>
	120	+ </tr>
	121	+ </thead>
	122	+ <tbody>
	123	+ <tr>
	124	+ <td>ejemplo</td>
	125	+ <td>ejemplo</td>
	126	+ <td>ejemplo</td>
	127	+ </tr>
	128	+ </tbody>
	129	+ </table>
	130	+ </div>
71	131	</div>