Commit 3fb8e3289f4e26e268fa3bda956e3597a050dde5
Exists in
master
Merge branch 'master' into 'master'
Master See merge request !61
Showing
3 changed files
Show diff stats
index.html
| ... | ... | @@ -8,6 +8,7 @@ |
| 8 | 8 | <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> |
| 9 | 9 | <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/> |
| 10 | 10 | <link href="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.css" rel="stylesheet"/> |
| 11 | + <link href="./node_modules/angular-ui-grid/ui-grid.min.css" rel="stylesheet"/> | |
| 11 | 12 | <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/> |
| 12 | 13 | <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/> |
| 13 | 14 | <link href="./css/general.css" rel="stylesheet"/> |
| ... | ... | @@ -22,6 +23,12 @@ |
| 22 | 23 | <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script> |
| 23 | 24 | <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script> |
| 24 | 25 | <script src="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.js"></script> |
| 26 | + <script src="./node_modules/pdfmake/build/pdfmake.min.js"></script> | |
| 27 | + <script src="./node_modules/pdfmake/build/vfs_fonts.js"></script> | |
| 28 | + <script src="./node_modules/lodash/lodash.min.js"></script> | |
| 29 | + <script src="./node_modules/jszip/dist/jszip.min.js"></script> | |
| 30 | + <script src="./node_modules/excel-builder/dist/excel-builder.dist.min.js"></script> | |
| 31 | + <script src="./node_modules/angular-ui-grid/ui-grid.min.js"></script> | |
| 25 | 32 | <script src="./node_modules/ladda/dist/spin.min.js"></script> |
| 26 | 33 | <script src="./node_modules/ladda/dist/ladda.min.js"></script> |
| 27 | 34 | <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script> |
| ... | ... | @@ -54,6 +61,7 @@ |
| 54 | 61 | <script src="./node_modules/foca-estado-cisternas/dist/foca-estado-cisternas.min.js"></script> |
| 55 | 62 | <script src="./node_modules/foca-filtros/dist/foca-filtros.min.js"></script> |
| 56 | 63 | <script src="./node_modules/foca-hoja-ruta/dist/foca-hoja-ruta.min.js"></script> |
| 64 | + <script src="./node_modules/foca-informes/dist/foca-informes.min.js"></script> | |
| 57 | 65 | <script src="./node_modules/foca-login/dist/foca-login.min.js"></script> |
| 58 | 66 | <script src="./node_modules/foca-logistica-pedido-ruta/dist/foca-logistica-pedido-ruta.min.js"></script> |
| 59 | 67 | <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script> |
| ... | ... | @@ -72,6 +80,7 @@ |
| 72 | 80 | <script src="./node_modules/foca-modal-factura-detalle/dist/foca-modal-factura-detalle.min.js"></script> |
| 73 | 81 | <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script> |
| 74 | 82 | <script src="./node_modules/foca-modal-grafico-cisternas/dist/foca-modal-grafico-cisternas.min.js"></script> |
| 83 | + <script src="./node_modules/foca-modal-informe-hoja-ruta/dist/foca-modal-informe-hoja-ruta.min.js"></script> | |
| 75 | 84 | <script src="./node_modules/foca-modal-lista-precio/dist/foca-modal-lista-precio.min.js"></script> |
| 76 | 85 | <script src="./node_modules/foca-modal-localidad/dist/foca-modal-localidad.min.js"></script> |
| 77 | 86 | <script src="./node_modules/foca-modal-localizar/dist/foca-modal-localizar.min.js"></script> |
package.json
| ... | ... | @@ -27,9 +27,11 @@ |
| 27 | 27 | "angular-ladda": "^0.4.3", |
| 28 | 28 | "angular-route": "^1.7.5", |
| 29 | 29 | "angular-sanitize": "^1.7.5", |
| 30 | + "angular-ui-grid": "4.6.6", | |
| 30 | 31 | "angular-ui-swiper": "^2.3.8", |
| 31 | 32 | "bootstrap": "^4.1.3", |
| 32 | 33 | "chart.js": "2.7.3", |
| 34 | + "excel-builder": "2.0.3", | |
| 33 | 35 | "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git", |
| 34 | 36 | "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git", |
| 35 | 37 | "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git", |
| ... | ... | @@ -96,11 +98,14 @@ |
| 96 | 98 | "gulp-uglify": "^3.0.1", |
| 97 | 99 | "gulp-uglify-es": "^1.0.4", |
| 98 | 100 | "jquery": "^3.3.1", |
| 101 | + "jszip": "2.6.1", | |
| 99 | 102 | "ladda": "1.0.6", |
| 100 | 103 | "leaflet": "1.3.4", |
| 104 | + "lodash": "4.17.11", | |
| 101 | 105 | "moment": "2.23.0", |
| 102 | 106 | "ngstorage": "^0.3.11", |
| 103 | 107 | "node-sass": "^4.10.0", |
| 108 | + "pdfmake": "0.1.41", | |
| 104 | 109 | "uglify": "^0.1.5", |
| 105 | 110 | "ui-bootstrap4": "^3.0.5" |
| 106 | 111 | }, |
src/js/app.js
| ... | ... | @@ -9,6 +9,8 @@ angular.module('appWrapperDemo', [ |
| 9 | 9 | 'onScreenKeyboard', |
| 10 | 10 | 'ui.bootstrap', |
| 11 | 11 | 'ui.swiper', |
| 12 | + 'ui.grid', | |
| 13 | + 'ui.grid.exporter', | |
| 12 | 14 | |
| 13 | 15 | // MODULOS FOCA |
| 14 | 16 | 'focaAbmPlazoPago', |
| ... | ... | @@ -35,6 +37,7 @@ angular.module('appWrapperDemo', [ |
| 35 | 37 | 'focaEstadoCisternas', |
| 36 | 38 | 'focaFiltros', |
| 37 | 39 | 'focaHojaRuta', |
| 40 | + 'focaInformes', | |
| 38 | 41 | 'focaLogin', |
| 39 | 42 | 'focaModal', |
| 40 | 43 | 'focaModalBanco', |
| ... | ... | @@ -51,6 +54,7 @@ angular.module('appWrapperDemo', [ |
| 51 | 54 | 'focaModalFacturaDetalle', |
| 52 | 55 | 'focaModalFlete', |
| 53 | 56 | 'focaModalGraficoCisternas', |
| 57 | + 'focaModalInformeHojaRuta', | |
| 54 | 58 | 'focaModalListaPrecio', |
| 55 | 59 | 'focaModalLocalidad', |
| 56 | 60 | 'focaModalLocalizar', |