Commit cc2e165467386003f0157f0f60d7fb49774dc010
1 parent
3d7d90c8c2
Exists in
master
Primera versión
Showing
10 changed files
with
501 additions
and
0 deletions
Show diff stats
.gitignore
.jshintrc
... | ... | @@ -0,0 +1,64 @@ |
1 | +{ | |
2 | + /* | |
3 | + * ENVIRONMENTS | |
4 | + * ================= | |
5 | + */ | |
6 | + | |
7 | + // Define globals exposed by modern browsers. | |
8 | + "browser": true, | |
9 | + | |
10 | + // Define globals exposed by jQuery. | |
11 | + "jquery": true, | |
12 | + | |
13 | + // Define globals exposed by Node.js. | |
14 | + "node": true, | |
15 | + | |
16 | + // Allow ES6. | |
17 | + "esversion": 6, | |
18 | + | |
19 | + /* | |
20 | + * ENFORCING OPTIONS | |
21 | + * ================= | |
22 | + */ | |
23 | + | |
24 | + // Force all variable names to use either camelCase style or UPPER_CASE | |
25 | + // with underscores. | |
26 | + "camelcase": true, | |
27 | + | |
28 | + // Prohibit use of == and != in favor of === and !==. | |
29 | + "eqeqeq": true, | |
30 | + | |
31 | + // Enforce tab width of 2 spaces. | |
32 | + "indent": 4, | |
33 | + | |
34 | + // Prohibit use of a variable before it is defined. | |
35 | + "latedef": false, | |
36 | + | |
37 | + // Enforce line length to 100 characters | |
38 | + "maxlen": 100, | |
39 | + | |
40 | + // Require capitalized names for constructor functions. | |
41 | + "newcap": true, | |
42 | + | |
43 | + // Enforce use of single quotation marks for strings. | |
44 | + "quotmark": "single", | |
45 | + | |
46 | + // Enforce placing 'use strict' at the top function scope | |
47 | + "strict": false, | |
48 | + | |
49 | + // Prohibit use of explicitly undeclared variables. | |
50 | + "undef": true, | |
51 | + | |
52 | + // Warn when variables are defined but never used. | |
53 | + "unused": true, | |
54 | + | |
55 | + // Para que funcione en angular | |
56 | + "predef": ["angular", "alert", "spyOn", "expect", "it", "inject", "beforeEach", "describe"], | |
57 | + /* | |
58 | + * RELAXING OPTIONS | |
59 | + * ================= | |
60 | + */ | |
61 | + | |
62 | + // Suppress warnings about == null comparisons. | |
63 | + "eqnull": true | |
64 | +} |
gulpfile.js
... | ... | @@ -0,0 +1,75 @@ |
1 | +const templateCache = require('gulp-angular-templatecache'); | |
2 | +const concat = require('gulp-concat'); | |
3 | +const htmlmin = require('gulp-htmlmin'); | |
4 | +const rename = require('gulp-rename'); | |
5 | +const uglify = require('gulp-uglify'); | |
6 | +const gulp = require('gulp'); | |
7 | +const pump = require('pump'); | |
8 | +const jshint = require('gulp-jshint'); | |
9 | +const replace = require('gulp-replace'); | |
10 | +const connect = require('gulp-connect'); | |
11 | +const clean = require('gulp-clean'); | |
12 | + | |
13 | +var paths = { | |
14 | + srcJS: 'src/js/*.js', | |
15 | + srcViews: 'src/views/*.html', | |
16 | + tmp: 'tmp', | |
17 | + dist: 'dist/' | |
18 | +}; | |
19 | + | |
20 | +gulp.task('templates', function() { | |
21 | + return pump( | |
22 | + [ | |
23 | + gulp.src(paths.srcViews), | |
24 | + htmlmin(), | |
25 | + templateCache('views.js', { | |
26 | + module: 'focaModalFlete', | |
27 | + root: '' | |
28 | + }), | |
29 | + gulp.dest(paths.tmp) | |
30 | + ] | |
31 | + ); | |
32 | +}); | |
33 | + | |
34 | +gulp.task('uglify', ['templates'], function() { | |
35 | + return pump( | |
36 | + [ | |
37 | + gulp.src([ | |
38 | + paths.srcJS, | |
39 | + 'tmp/views.js' | |
40 | + ]), | |
41 | + concat('foca-modal-flete.js'), | |
42 | + replace('src/views/', ''), | |
43 | + replace("['ui.bootstrap', 'focaDirectivas']", '[]'), | |
44 | + gulp.dest(paths.tmp), | |
45 | + rename('foca-modal-flete.min.js'), | |
46 | + uglify(), | |
47 | + gulp.dest(paths.dist) | |
48 | + ] | |
49 | + ); | |
50 | +}); | |
51 | + | |
52 | +gulp.task('pre-commit', function() { | |
53 | + return pump( | |
54 | + [ | |
55 | + gulp.src(paths.srcJS), | |
56 | + jshint('.jshintrc'), | |
57 | + jshint.reporter('default'), | |
58 | + jshint.reporter('fail') | |
59 | + ] | |
60 | + ); | |
61 | +}); | |
62 | + | |
63 | +gulp.task('webserver', function() { | |
64 | + pump [ | |
65 | + connect.server({port: 3000}) | |
66 | + ] | |
67 | +}); | |
68 | + | |
69 | +gulp.task('clean-post-install', function(){ | |
70 | + return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js', | |
71 | + 'index.html'], {read: false}) | |
72 | + .pipe(clean()); | |
73 | +}); | |
74 | + | |
75 | +gulp.task('default', ['webserver']); |
index.html
... | ... | @@ -0,0 +1,61 @@ |
1 | +<html ng-app="focaModalFlete"> | |
2 | + <head> | |
3 | + <meta charset="UTF-8"/> | |
4 | + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> | |
5 | + | |
6 | + <!--CSS--> | |
7 | + <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> | |
8 | + <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/> | |
9 | + | |
10 | + <!--VENDOR JS--> | |
11 | + <script src="node_modules/jquery/dist/jquery.min.js"></script> | |
12 | + <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script> | |
13 | + <script src="node_modules/angular/angular.min.js"></script> | |
14 | + <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script> | |
15 | + <script src="node_modules/foca-directivas/dist/foca-directivas.min.js"></script> | |
16 | + | |
17 | + <!-- BUILD --> | |
18 | + <script src="src/js/app.js"></script> | |
19 | + <script src="src/js/controller.js"></script> | |
20 | + <script src="src/js/service.js"></script> | |
21 | + | |
22 | + <!-- /BUILD --> | |
23 | + | |
24 | + <!-- CONFIG PARA DEVELOP --> | |
25 | + <script src="src/etc/develop.js"></script> | |
26 | + <script type="text/javascript"> | |
27 | + angular.module('focaModalFlete') | |
28 | + .controller('controller', [ | |
29 | + '$scope', | |
30 | + '$uibModal', | |
31 | + '$timeout', | |
32 | + function($scope, $uibModal, $timeout) { | |
33 | + openModal(); | |
34 | + | |
35 | + function openModal() { | |
36 | + var modalInstance = $uibModal.open( | |
37 | + { | |
38 | + ariaLabelledBy: 'Busqueda de Precio Condicion', | |
39 | + templateUrl: 'src/views/modal-flete.html', | |
40 | + controller: 'focaModalFleteController', | |
41 | + size: 'lg' | |
42 | + } | |
43 | + ); | |
44 | + | |
45 | + modalInstance.result.then( | |
46 | + function (selectedItem) { | |
47 | + console.info(selectedItem); | |
48 | + $timeout(openModal, 500); | |
49 | + }, function () { | |
50 | + console.info('modal-component dismissed at: ' + new Date()); | |
51 | + $timeout(openModal, 500); | |
52 | + } | |
53 | + ); | |
54 | + } | |
55 | + } | |
56 | + ]); | |
57 | + </script> | |
58 | + </head> | |
59 | + <body ng-controller="controller"> | |
60 | + </body> | |
61 | +</html> |
package.json
... | ... | @@ -0,0 +1,42 @@ |
1 | +{ | |
2 | + "name": "foca-modal-flete", | |
3 | + "version": "0.0.1", | |
4 | + "description": "Modal de búsqueda de fletes", | |
5 | + "main": "index.js", | |
6 | + "scripts": { | |
7 | + "test": "echo \"Error: no test specified\" && exit 1", | |
8 | + "gulp-pre-commit": "gulp pre-commit", | |
9 | + "compile": "gulp uglify", | |
10 | + "postinstall": "npm run compile && gulp clean-post-install", | |
11 | + "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git" | |
12 | + }, | |
13 | + "pre-commit": [ | |
14 | + "gulp-pre-commit" | |
15 | + ], | |
16 | + "repository": { | |
17 | + "type": "git", | |
18 | + "url": "https://debo.suite.repo/modulos-npm/foca-modal-flete.git" | |
19 | + }, | |
20 | + "author": "Foca Software", | |
21 | + "license": "ISC", | |
22 | + "devDependencies": { | |
23 | + "angular": "^1.7.5", | |
24 | + "bootstrap": "^4.1.3", | |
25 | + "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", | |
26 | + "font-awesome": "^4.7.0", | |
27 | + "gulp": "^3.9.1", | |
28 | + "gulp-angular-templatecache": "^2.2.2", | |
29 | + "gulp-clean": "^0.4.0", | |
30 | + "gulp-concat": "^2.6.1", | |
31 | + "gulp-connect": "^5.6.1", | |
32 | + "gulp-htmlmin": "^5.0.1", | |
33 | + "gulp-jshint": "^2.1.0", | |
34 | + "gulp-rename": "^1.4.0", | |
35 | + "gulp-replace": "^1.0.0", | |
36 | + "gulp-uglify": "^3.0.1", | |
37 | + "jquery": "^3.3.1", | |
38 | + "jshint": "^2.9.6", | |
39 | + "pump": "^3.0.0", | |
40 | + "ui-bootstrap4": "^3.0.5" | |
41 | + } | |
42 | +} |
src/etc/develop.js.ejemplo
src/js/app.js
... | ... | @@ -0,0 +1 @@ |
1 | +angular.module('focaModalFlete', ['ui.bootstrap', 'focaDirectivas']); |
src/js/controller.js
... | ... | @@ -0,0 +1,156 @@ |
1 | +angular.module('focaModalFlete') | |
2 | + .controller('focaModalFleteController', | |
3 | + [ | |
4 | + '$filter', | |
5 | + '$scope', | |
6 | + '$uibModalInstance', | |
7 | + 'focaModalFleteService', | |
8 | + function($filter, $scope, $uibModalInstance, focaModalFleteService) { | |
9 | + focaModalFleteService.getFletes().then( | |
10 | + function(res) { | |
11 | + $scope.flete = res.data; | |
12 | + $scope.search(); | |
13 | + } | |
14 | + ); | |
15 | + | |
16 | + // pagination | |
17 | + $scope.numPerPage = 10; | |
18 | + $scope.currentPage = 1; | |
19 | + $scope.filteredFlete = []; | |
20 | + $scope.currentPageFlete = []; | |
21 | + $scope.selectedFlete = -1; | |
22 | + | |
23 | + //METODOS | |
24 | + $scope.search = function() { | |
25 | + $scope.filteredFlete = $filter('filter')( | |
26 | + $scope.flete, | |
27 | + {$: $scope.filters} | |
28 | + ); | |
29 | + | |
30 | + $scope.lastPage = Math.ceil( | |
31 | + $scope.filteredFlete.length / $scope.numPerPage | |
32 | + ); | |
33 | + | |
34 | + $scope.resetPage(); | |
35 | + }; | |
36 | + | |
37 | + $scope.resetPage = function() { | |
38 | + $scope.currentPage = 1; | |
39 | + $scope.selectPage(1); | |
40 | + }; | |
41 | + | |
42 | + $scope.selectPage = function(page) { | |
43 | + var start = (page - 1) * $scope.numPerPage; | |
44 | + var end = start + $scope.numPerPage; | |
45 | + $scope.paginas = []; | |
46 | + $scope.paginas = calcularPages(page); | |
47 | + $scope.currentPageFlete = | |
48 | + $scope.filteredFlete.slice(start, end); | |
49 | + $scope.currentPage = page; | |
50 | + }; | |
51 | + | |
52 | + $scope.select = function(flete) { | |
53 | + $uibModalInstance.close(flete); | |
54 | + }; | |
55 | + | |
56 | + $scope.cancel = function() { | |
57 | + $uibModalInstance.dismiss('cancel'); | |
58 | + }; | |
59 | + | |
60 | + $scope.busquedaDown = function(key) { | |
61 | + if (key === 40) { | |
62 | + primera(key); | |
63 | + } | |
64 | + }; | |
65 | + | |
66 | + $scope.busquedaPress = function(key) { | |
67 | + if (key === 13) { | |
68 | + primera(key); | |
69 | + } | |
70 | + }; | |
71 | + | |
72 | + $scope.itemProducto = function(key) { | |
73 | + if (key === 38) { | |
74 | + anterior(key); | |
75 | + } | |
76 | + | |
77 | + if (key === 40) { | |
78 | + siguiente(key); | |
79 | + } | |
80 | + | |
81 | + if (key === 37) { | |
82 | + retrocederPagina(); | |
83 | + } | |
84 | + | |
85 | + if (key === 39) { | |
86 | + avanzarPagina(); | |
87 | + } | |
88 | + }; | |
89 | + | |
90 | + function calcularPages(paginaActual) { | |
91 | + var paginas = []; | |
92 | + paginas.push(paginaActual); | |
93 | + | |
94 | + if (paginaActual - 1 > 1) { | |
95 | + | |
96 | + paginas.unshift(paginaActual - 1); | |
97 | + if (paginaActual - 2 > 1) { | |
98 | + paginas.unshift(paginaActual - 2); | |
99 | + } | |
100 | + } | |
101 | + | |
102 | + if (paginaActual + 1 < $scope.lastPage) { | |
103 | + paginas.push(paginaActual + 1); | |
104 | + if (paginaActual + 2 < $scope.lastPage) { | |
105 | + paginas.push(paginaActual + 2); | |
106 | + } | |
107 | + } | |
108 | + | |
109 | + if (paginaActual !== 1) { | |
110 | + paginas.unshift(1); | |
111 | + } | |
112 | + | |
113 | + if (paginaActual !== $scope.lastPage) { | |
114 | + paginas.push($scope.lastPage); | |
115 | + } | |
116 | + | |
117 | + return paginas; | |
118 | + } | |
119 | + | |
120 | + function primera() { | |
121 | + $scope.selectedFlete = 0; | |
122 | + } | |
123 | + | |
124 | + function anterior() { | |
125 | + if ($scope.selectedFlete === 0 && $scope.currentPage > 1) { | |
126 | + retrocederPagina(); | |
127 | + } else { | |
128 | + $scope.selectedFlete--; | |
129 | + } | |
130 | + } | |
131 | + | |
132 | + function siguiente() { | |
133 | + if ($scope.selectedFlete < | |
134 | + $scope.currentPageFlete.length - 1 ) { | |
135 | + $scope.selectedFlete++; | |
136 | + } else { | |
137 | + avanzarPagina(); | |
138 | + } | |
139 | + } | |
140 | + | |
141 | + function retrocederPagina() { | |
142 | + if ($scope.currentPage > 1) { | |
143 | + $scope.selectPage($scope.currentPage - 1); | |
144 | + $scope.selectedFlete = $scope.numPerPage - 1; | |
145 | + } | |
146 | + } | |
147 | + | |
148 | + function avanzarPagina() { | |
149 | + if ($scope.currentPage < $scope.lastPage) { | |
150 | + $scope.selectPage($scope.currentPage + 1); | |
151 | + $scope.selectedFlete = 0; | |
152 | + } | |
153 | + } | |
154 | + } | |
155 | + ] | |
156 | + ); |
src/js/service.js
src/views/modal-flete.html
... | ... | @@ -0,0 +1,81 @@ |
1 | +<div class="modal-header"> | |
2 | + <h3 class="modal-title">Busqueda de Flete</h3> | |
3 | +</div> | |
4 | +<div class="modal-body" id="modal-body"> | |
5 | + <div class="input-group mb-3"> | |
6 | + <input | |
7 | + type="text" | |
8 | + class="form-control" | |
9 | + placeholder="Busqueda" | |
10 | + ng-model="filters" | |
11 | + ng-change="search()" | |
12 | + ng-keydown="busquedaDown($event.keyCode)" | |
13 | + ng-keypress="busquedaPress($event.keyCode)" | |
14 | + foca-focus="selectedFlete == -1" | |
15 | + ng-focus="selectedFlete = -1" | |
16 | + > | |
17 | + <table class="table table-striped table-sm"> | |
18 | + <thead> | |
19 | + <tr> | |
20 | + <th>Nombre</th> | |
21 | + <th>CUIT</th> | |
22 | + <th>Costo x km</th> | |
23 | + <th></th> | |
24 | + </tr> | |
25 | + </thead> | |
26 | + <tbody> | |
27 | + <tr ng-repeat="(key,flete) in currentPageFlete"> | |
28 | + <td ng-bind="flete.nombre"></td> | |
29 | + <td ng-bind="flete.CUIT"></td> | |
30 | + <td ng-bind="flete.costoKilometro"></td> | |
31 | + <td> | |
32 | + <button | |
33 | + type="button" | |
34 | + class="btn p-2 float-right" | |
35 | + ng-class="{ | |
36 | + 'btn-secondary': selectedFlete != key, | |
37 | + 'btn-primary': selectedFlete == key | |
38 | + }" | |
39 | + ng-click="select(flete)" | |
40 | + foca-focus="selectedFlete == {{key}}" | |
41 | + ng-keydown="itemProducto($event.keyCode)" | |
42 | + > | |
43 | + <i class="fa fa-arrow-right" aria-hidden="true"></i> | |
44 | + </button> | |
45 | + </td> | |
46 | + </tr> | |
47 | + </tbody> | |
48 | + </table> | |
49 | + <nav> | |
50 | + <ul class="pagination justify-content-end"> | |
51 | + <li class="page-item" ng-class="{'disabled': currentPage == 1}"> | |
52 | + <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)"> | |
53 | + <span aria-hidden="true">«</span> | |
54 | + <span class="sr-only">Anterior</span> | |
55 | + </a> | |
56 | + </li> | |
57 | + <li | |
58 | + class="page-item" | |
59 | + ng-repeat="pagina in paginas" | |
60 | + ng-class="{'active': pagina == currentPage}" | |
61 | + > | |
62 | + <a | |
63 | + class="page-link" | |
64 | + href="#" | |
65 | + ng-click="selectPage(pagina)" | |
66 | + ng-bind="pagina" | |
67 | + ></a> | |
68 | + </li> | |
69 | + <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> | |
70 | + <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)"> | |
71 | + <span aria-hidden="true">»</span> | |
72 | + <span class="sr-only">Siguiente</span> | |
73 | + </a> | |
74 | + </li> | |
75 | + </ul> | |
76 | + </nav> | |
77 | + </div> | |
78 | +</div> | |
79 | +<div class="modal-footer"> | |
80 | + <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> | |
81 | +</div> |