Merge branch 'master' into 'master'

botones See merge request modulos-npm/foca-admin-seguimiento!3

Merge branch 'master' into 'master'
botones See merge request modulos-npm/foca-admin-seguimiento!3
Pablo Marco del Pont
2 parents 95666e8459 f3ed67c517
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-admin-seguimiento.html
@@ -11,6 +11,8 @@ angular.module(&#39;focaAdminSeguimiento&#39;) .controller(&#39;focaAdminSeguimientoControll
             $scope.actividad = 'Entrega de producto';
         }
  
+        $scope.general = true;
+
         console.info($scope.actividad);
         $scope.marcadores = [];
  
@@ -18,6 +20,15 @@ angular.module(&#39;focaAdminSeguimiento&#39;) .controller(&#39;focaAdminSeguimientoControll
             $scope.marcadores = datos.data;
         });
  
+        $scope.general = function() {
+            $scope.general = true;
+        };
+
+        $scope.individual = function() {
+            $scope.general = false;
+
+        };
+
         $scope.salir = function() {
             $location.path('/');
         };
 <div class="foca-admin-seguimiento">
     <div class="row">
-        <div class="offset-1 col-10">
+        <div class="offset-1 col-9">
             <osm
                 latitud="-32.89214159952345"
                 longitud="-68.84572999101856"
@@ -8,8 +8,26 @@
                 marcadores="marcadores"
             />
         </div>
-        <div class="col-1">
-            <button type="button" class="btn btn-default" ng-click="salir()">Salir</button>
+        <div class="col-2 pl-0">
+            <button 
+                type="button" 
+                ng-class="{'active': general}" 
+                class="btn col-12 my-1" 
+                ng-click="general()"
+            >General</button>
+            <button 
+                type="button" 
+                ng-class="{'active': !general}" 
+                class="btn col-12 my-1" 
+                ng-click="individual()"
+            >Individual</button>
+            <button 
+                type="button" 
+                class="btn col-12 my-1 boton-salir" 
+                ng-click="salir()"
+            >
+                Salir
+            </button>
         </div>
     </div>
 </div>
...	...	@@ -11,6 +11,8 @@ angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoControll
11	11	$scope.actividad = 'Entrega de producto';
12	12	}
13	13
	14	+ $scope.general = true;
	15	+
14	16	console.info($scope.actividad);
15	17	$scope.marcadores = [];
16	18
...	...	@@ -18,6 +20,15 @@ angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoControll
18	20	$scope.marcadores = datos.data;
19	21	});
20	22
	23	+ $scope.general = function() {
	24	+ $scope.general = true;
	25	+ };
	26	+
	27	+ $scope.individual = function() {
	28	+ $scope.general = false;
	29	+
	30	+ };
	31	+
21	32	$scope.salir = function() {
22	33	$location.path('/');
23	34	};
1	1	<div class="foca-admin-seguimiento">
2	2	<div class="row">
3		- <div class="offset-1 col-10">
	3	+ <div class="offset-1 col-9">
4	4	<osm
5	5	latitud="-32.89214159952345"
6	6	longitud="-68.84572999101856"
...	...	@@ -8,8 +8,26 @@
8	8	marcadores="marcadores"
9	9	/>
10	10	</div>
11		- <div class="col-1">
12		- <button type="button" class="btn btn-default" ng-click="salir()">Salir</button>
	11	+ <div class="col-2 pl-0">
	12	+ <button
	13	+ type="button"
	14	+ ng-class="{'active': general}"
	15	+ class="btn col-12 my-1"
	16	+ ng-click="general()"
	17	+ >General</button>
	18	+ <button
	19	+ type="button"
	20	+ ng-class="{'active': !general}"
	21	+ class="btn col-12 my-1"
	22	+ ng-click="individual()"
	23	+ >Individual</button>
	24	+ <button
	25	+ type="button"
	26	+ class="btn col-12 my-1 boton-salir"
	27	+ ng-click="salir()"
	28	+ >
	29	+ Salir
	30	+ </button>
13	31	</div>
14	32	</div>
15	33	</div>