Mauricio Cattafi / foca-botonera-principal

Download as
Browse Code ยป

Commit ff487d865e8cad56c04e4ca22140bac74a4998f8

Authored by Eric Fernandez
2 parents ad4ad9b64d e7ed83b094
Exists in master and in 2 other branches demo, develop

Merge branch 'master' into 'master' 

10 elementos en swiper, agrego componente botonera

See merge request !1
Showing 4 changed files   Show diff stats
... ... @@ -33,7 +33,7 @@
33 33 "gulp-uglify": "^3.0.1",
34 34 "jquery": "^3.3.1",
35 35 "pump": "^3.0.0",
36   - "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git"
  36 + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git"
37 37 },
38 38 "devDependencies": {
39 39 "angular": "^1.7.5",
... ... @@ -55,6 +55,6 @@
55 55 "pre-commit": "^1.2.2",
56 56 "pump": "^3.0.0",
57 57 "ui-bootstrap4": "^3.0.5",
58   - "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal.git"
  58 + "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git"
59 59 }
60 60 }
1   -angular.module('focaBotoneraPrincipal', []);
  1 +angular.module('focaBotoneraPrincipal', [
  2 + 'focaBotoneraLateral'
  3 +]);
src/js/controller.js
Diff comments   View file @ ff487d8
1 1 angular.module('focaBotoneraPrincipal')
2 2 .controller('focaBotoneraPrincipalController', [
3   - '$scope', '$location', '$localStorage', 'botones', 'focaModalService', 'APP',
4   - function($scope, $location, $localStorage, botones, focaModalService, APP) {
  3 + '$scope', '$rootScope', '$timeout', '$location', '$localStorage',
  4 + 'botones', 'focaModalService', 'APP', 'focaBotoneraLateralService',
  5 + function($scope, $rootScope, $timeout, $location, $localStorage,
  6 + botones, focaModalService, APP, focaBotoneraLateralService) {
5 7 $scope.paginas = [];
6   - var botonesPorPagina = 12;
  8 + var botonesPorPagina = 10;
7 9 if(APP === 'distribuidor' || APP === 'transportista') {
8 10 botonesPorPagina = 3;
9 11 }
... ... @@ -11,6 +13,10 @@ angular.module('focaBotoneraPrincipal')
11 13 $scope.paginas.push(botones.data.slice(i, i + botonesPorPagina));
12 14 }
13 15  
  16 + focaBotoneraLateralService.showGuardar(false);
  17 + focaBotoneraLateralService.showPausar(false);
  18 + focaBotoneraLateralService.showSalir(false);
  19 +
14 20 $scope.irA = function(accion) {
15 21 $location.path(accion);
16 22 };
src/views/foca-botonera-principal.html
Diff comments   View file @ ff487d8
... ... @@ -29,7 +29,7 @@
29 29 >
30 30 <i class="fa fa-info-circle" aria-hidden="true"></i>
31 31 </a>
32   - <a class="btn btn-outline-dark mt-5 btn-lg float-right"
  32 + <a class="btn btn-outline-dark mt-5 btn-lg"
33 33 href="javascript:void()"
34 34 ng-click="logout()"
35 35 >