From 014f467867e2ad6ee38c80bde50948926260a230 Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Tue, 18 Dec 2018 16:49:07 -0300 Subject: [PATCH] 10 elementos en swiper, agrego componente botonera --- package.json | 4 ++-- src/js/app.js | 4 +++- src/js/controller.js | 13 ++++++++++--- src/views/foca-botonera-principal.html | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4e6b1b5..bd13118 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "gulp-uglify": "^3.0.1", "jquery": "^3.3.1", "pump": "^3.0.0", - "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git" + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git" }, "devDependencies": { "angular": "^1.7.5", @@ -55,6 +55,6 @@ "pre-commit": "^1.2.2", "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5", - "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git" + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git" } } diff --git a/src/js/app.js b/src/js/app.js index fb579a6..d1faea5 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1,3 @@ -angular.module('focaBotoneraPrincipal', []); +angular.module('focaBotoneraPrincipal', [ + 'focaBotoneraLateral' +]); diff --git a/src/js/controller.js b/src/js/controller.js index 6e44e09..609f2d2 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,9 +1,12 @@ angular.module('focaBotoneraPrincipal') .controller('focaBotoneraPrincipalController', [ - '$scope', '$location', '$localStorage', 'botones', 'focaModalService', 'APP', - function($scope, $location, $localStorage, botones, focaModalService, APP) { + '$scope', '$rootScope', '$timeout', '$location', '$localStorage', + 'botones', 'focaModalService', 'APP', 'focaBotoneraLateralService', + function($scope, $rootScope, $timeout, $location, $localStorage, + botones, focaModalService, APP, focaBotoneraLateralService) { + $scope.paginas = []; - var botonesPorPagina = 12; + var botonesPorPagina = 10; if(APP === 'distribuidor' || APP === 'transportista') { botonesPorPagina = 3; } @@ -11,6 +14,10 @@ angular.module('focaBotoneraPrincipal') $scope.paginas.push(botones.data.slice(i, i + botonesPorPagina)); } + focaBotoneraLateralService.showGuardar(false); + focaBotoneraLateralService.showPausar(false); + focaBotoneraLateralService.showSalir(false); + $scope.irA = function(accion) { $location.path(accion); }; diff --git a/src/views/foca-botonera-principal.html b/src/views/foca-botonera-principal.html index 81fc8f8..2b270a7 100644 --- a/src/views/foca-botonera-principal.html +++ b/src/views/foca-botonera-principal.html @@ -29,7 +29,7 @@ > - -- 1.9.1