Merge branch 'master' into 'master'

agrego foca-botonera-lateral See merge request !13

Merge branch 'master' into 'master'
agrego foca-botonera-lateral See merge request !13
Eric Fernandez
2 parents cc633aa21d e9e49925da
Showing 4 changed files Show diff stats
gulpfile.js
src/js/app.js
src/js/controller.js
src/views/foca-admin-seguimiento.html
@@ -43,7 +43,7 @@ gulp.task(&#39;uglify&#39;, [&#39;templates&#39;], function() {
             gulp.dest(paths.tmp),
             rename('foca-admin-seguimiento.min.js'),
             uglify(),
-            replace('"ngRoute","ui.bootstrap"', ''),
+            replace('"ngRoute","ui.bootstrap","focaBotoneraLateral"', ''),
             gulp.dest(paths.dist)
         ]
     );
 angular.module('focaAdminSeguimiento', [
     'ngRoute',
-    'ui.bootstrap'
+    'ui.bootstrap',
+    'focaBotoneraLateral'
 ]);
 angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoController', [
-    '$scope', 'focaAdminSeguimientoService', '$location', '$routeParams',
-    function($scope, focaAdminSeguimientoService, $location, $routeParams) {
+    '$scope', '$timeout', 'focaAdminSeguimientoService',
+    'focaBotoneraLateralService','$location', '$routeParams',
+    function($scope, $timeout, focaAdminSeguimientoService,
+        focaBotoneraLateralService, $location, $routeParams) {
+
         $scope.actividad = '';
  
         $scope.now = new Date();
@@ -21,6 +24,11 @@ angular.module(&#39;focaAdminSeguimiento&#39;) .controller(&#39;focaAdminSeguimientoControll
         $scope.marcadores = [];
         getSeguimiento();
  
+        //SETEO BOTONERA LATERAL
+        focaBotoneraLateralService.showSalir(true);
+        focaBotoneraLateralService.showPausar(false);
+        focaBotoneraLateralService.showGuardar(false);
+
         $scope.general = function() {
             $scope.idUsuario = 0;
             getSeguimiento();
@@ -59,13 +59,6 @@
                     ng-show="actividad == 'Cobranza'"
                 >
             </div>
-            <button 
-                type="button" 
-                class="btn col-12 my-1 boton-salir" 
-                ng-click="salir()"
-            >
-                Salir
-            </button>
         </div>
     </div>
 </div>
...	...	@@ -43,7 +43,7 @@ gulp.task('uglify', ['templates'], function() {
43	43	gulp.dest(paths.tmp),
44	44	rename('foca-admin-seguimiento.min.js'),
45	45	uglify(),
46		- replace('"ngRoute","ui.bootstrap"', ''),
	46	+ replace('"ngRoute","ui.bootstrap","focaBotoneraLateral"', ''),
47	47	gulp.dest(paths.dist)
48	48	]
49	49	);
1	1	angular.module('focaAdminSeguimiento', [
2	2	'ngRoute',
3		- 'ui.bootstrap'
	3	+ 'ui.bootstrap',
	4	+ 'focaBotoneraLateral'
4	5	]);
1	1	angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoController', [
2		- '$scope', 'focaAdminSeguimientoService', '$location', '$routeParams',
3		- function($scope, focaAdminSeguimientoService, $location, $routeParams) {
	2	+ '$scope', '$timeout', 'focaAdminSeguimientoService',
	3	+ 'focaBotoneraLateralService','$location', '$routeParams',
	4	+ function($scope, $timeout, focaAdminSeguimientoService,
	5	+ focaBotoneraLateralService, $location, $routeParams) {
	6	+
4	7	$scope.actividad = '';
5	8
6	9	$scope.now = new Date();
...	...	@@ -21,6 +24,11 @@ angular.module('focaAdminSeguimiento') .controller('focaAdminSeguimientoControll
21	24	$scope.marcadores = [];
22	25	getSeguimiento();
23	26
	27	+ //SETEO BOTONERA LATERAL
	28	+ focaBotoneraLateralService.showSalir(true);
	29	+ focaBotoneraLateralService.showPausar(false);
	30	+ focaBotoneraLateralService.showGuardar(false);
	31	+
24	32	$scope.general = function() {
25	33	$scope.idUsuario = 0;
26	34	getSeguimiento();
...	...	@@ -59,13 +59,6 @@
59	59	ng-show="actividad == 'Cobranza'"
60	60	>
61	61	</div>
62		- <button
63		- type="button"
64		- class="btn col-12 my-1 boton-salir"
65		- ng-click="salir()"
66		- >
67		- Salir
68		- </button>
69	62	</div>
70	63	</div>
71	64	</div>