Compare View
Commits (70)
-
Master See merge request !57
-
Master See merge request !58
-
Master See merge request !59
-
Master See merge request !60
-
Master See merge request !61
-
Master See merge request !62
-
Master See merge request !63
-
Master(efernandez) See merge request !64
-
Master See merge request !65
-
Master(efernandez) See merge request !66
-
Master See merge request !68
-
Master See merge request !67
-
Master(efernandez) See merge request !69
-
Master See merge request !70
-
Master(efernandez) See merge request !71
-
Master(efernandez) See merge request !72
-
Master(efernandez) See merge request !73
-
Master(efernandez) See merge request !75
-
Master(efernandez) See merge request !76
-
Master(efernandez) See merge request !77
-
Master See merge request !74
-
Master See merge request !78
-
Master See merge request !79
-
Master See merge request !80
Showing
12 changed files
Show diff stats
gulpfile.js
... | ... | @@ -41,7 +41,7 @@ gulp.task('html', function() { |
41 | 41 | gulp.src(paths.srcHTML), |
42 | 42 | gulp.dest(paths.distHTML) |
43 | 43 | ]); |
44 | -}) | |
44 | +}); | |
45 | 45 | |
46 | 46 | gulp.task('sass', function() { |
47 | 47 | return gulp.src('src/sass/*.scss') |
... | ... | @@ -55,7 +55,7 @@ gulp.task('pre-install', function() { |
55 | 55 | replace('ssh://git@debonline.dyndns.org:', 'http://git.focasoftware.com/'), |
56 | 56 | gulp.dest('') |
57 | 57 | ]); |
58 | -}) | |
58 | +}); | |
59 | 59 | |
60 | 60 | gulp.task('post-install', function() { |
61 | 61 | pump([ |
... | ... | @@ -63,10 +63,10 @@ gulp.task('post-install', function() { |
63 | 63 | replace('http://git.focasoftware.com/', 'ssh://git@debonline.dyndns.org:'), |
64 | 64 | gulp.dest('') |
65 | 65 | ]); |
66 | -}) | |
66 | +}); | |
67 | 67 | |
68 | 68 | gulp.task('pre-commit', function() { |
69 | - pump( | |
69 | + return pump( | |
70 | 70 | [ |
71 | 71 | gulp.src(paths.srcJS), |
72 | 72 | jshint('.jshintrc'), |
... | ... | @@ -93,11 +93,12 @@ gulp.task('webserver', function() { |
93 | 93 | gulp.task('watch', function() { |
94 | 94 | gulp.watch([paths.srcJS], ['uglify']); |
95 | 95 | gulp.watch('src/sass/*.scss', ['sass']); |
96 | -}) | |
96 | +}); | |
97 | 97 | |
98 | -gulp.task('reload'), function() { | |
99 | - connect.reload(); | |
100 | -} | |
98 | +gulp.task('reload', function() { | |
99 | + gulp.src(['src/sass/*.scss', 'index.html']) | |
100 | + .pipe(connect.reload()); | |
101 | +}); | |
101 | 102 | |
102 | 103 | gulp.task('livereload', function() { |
103 | 104 | gulp.watch('css/*.css', ['reload']); |
... | ... | @@ -106,4 +107,4 @@ gulp.task('livereload', function() { |
106 | 107 | gulp.watch('index.html', ['reload']); |
107 | 108 | }); |
108 | 109 | |
109 | -gulp.task('default', ['webserver', 'livereload', 'watch']); | |
110 | +gulp.task('default', ['sass', 'webserver', 'livereload', 'watch']); |
img/marker-icon-2x-yellow.png
4.06 KB
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> |
... | ... | @@ -30,11 +37,10 @@ |
30 | 37 | <script src="./vendor/cordovaGeolocationModule.min.js"></script> |
31 | 38 | <script src="./node_modules/chart.js/dist/Chart.min.js"></script> |
32 | 39 | <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script> |
40 | + <script src="./node_modules/angular-file-saver/dist/angular-file-saver.bundle.js"></script> | |
33 | 41 | |
34 | 42 | <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script> |
35 | - <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script> | |
36 | 43 | <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> |
37 | - <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script> | |
38 | 44 | <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script> |
39 | 45 | <script src="./node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.min.js"></script> |
40 | 46 | <script src="./node_modules/foca-activar-hoja-ruta/dist/foca-activar-hoja-ruta.min.js"></script> |
... | ... | @@ -45,6 +51,7 @@ |
45 | 51 | <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script> |
46 | 52 | <script src="./node_modules/foca-cabecera-facturador/dist/foca-cabecera-facturador.min.js"></script> |
47 | 53 | <script src="./node_modules/foca-configuracion/dist/foca-configuracion.min.js"></script> |
54 | + <script src="./node_modules/foca-configurar-terminal/dist/foca-configurar-terminal.min.js"></script> | |
48 | 55 | <script src="./node_modules/foca-crear-cobranza/dist/foca-crear-cobranza.min.js"></script> |
49 | 56 | <script src="./node_modules/foca-crear-hoja-ruta/dist/foca-crear-hoja-ruta.min.js"></script> |
50 | 57 | <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script> |
... | ... | @@ -54,39 +61,33 @@ |
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> |
60 | - <script src="./node_modules/foca-modal-banco/dist/foca-modal-banco.min.js"></script> | |
61 | 68 | <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script> |
62 | 69 | <script src="./node_modules/foca-modal-cheque/dist/foca-modal-cheque.min.js"></script> |
63 | - <script src="./node_modules/foca-modal-chofer/dist/foca-modal-chofer.min.js"></script> | |
64 | - <script src="./node_modules/foca-modal-cobrador/dist/foca-modal-cobradores.min.js"></script> | |
65 | 70 | <script src="./node_modules/foca-modal-cobranza/dist/foca-modal-cobranza.min.js"></script> |
66 | 71 | <script src="./node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script> |
67 | 72 | <script src="./node_modules/foca-modal-detalle-cisternas/dist/foca-modal-detalle-cisternas.min.js"></script> |
68 | 73 | <script src="./node_modules/foca-modal-detalle-hoja-ruta/dist/foca-modal-detalle-hoja-ruta.min.js"></script> |
74 | + <script src="./node_modules/foca-modal-detalles/dist/foca-modal-detalles.min.js"></script> | |
69 | 75 | <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script> |
70 | 76 | <script src="./node_modules/foca-modal-efectivo/dist/foca-modal-efectivo.min.js"></script> |
71 | 77 | <script src="./node_modules/foca-modal-factura/dist/foca-modal-factura.min.js"></script> |
72 | 78 | <script src="./node_modules/foca-modal-factura-detalle/dist/foca-modal-factura-detalle.min.js"></script> |
73 | 79 | <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script> |
74 | 80 | <script src="./node_modules/foca-modal-grafico-cisternas/dist/foca-modal-grafico-cisternas.min.js"></script> |
81 | + <script src="./node_modules/foca-modal-informe/dist/foca-modal-informe.min.js"></script> | |
75 | 82 | <script src="./node_modules/foca-modal-lista-precio/dist/foca-modal-lista-precio.min.js"></script> |
76 | - <script src="./node_modules/foca-modal-localidad/dist/foca-modal-localidad.min.js"></script> | |
77 | 83 | <script src="./node_modules/foca-modal-localizar/dist/foca-modal-localizar.min.js"></script> |
78 | 84 | <script src="./node_modules/foca-modal-login/dist/foca-modal-login.min.js"></script> |
79 | - <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script> | |
80 | 85 | <script src="./node_modules/foca-modal-nota-pedido/dist/foca-modal-nota-pedido.min.js"></script> |
81 | 86 | <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> |
82 | - <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script> | |
83 | - <script src="./node_modules/foca-modal-provincia/dist/foca-modal-provincia.min.js"></script> | |
84 | 87 | <script src="./node_modules/foca-modal-punto-descarga/dist/foca-modal-punto-descarga.min.js"></script> |
85 | 88 | <script src="./node_modules/foca-modal-remito/dist/foca-modal-remito.min.js"></script> |
86 | 89 | <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script> |
87 | - <script src="./node_modules/foca-modal-transportista/dist/foca-modal-transportista.min.js"></script> | |
88 | 90 | <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script> |
89 | - <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script> | |
90 | 91 | <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script> |
91 | 92 | <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script> |
92 | 93 | <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script> |
... | ... | @@ -109,4 +110,5 @@ |
109 | 110 | </foca-teclado> |
110 | 111 | </div> |
111 | 112 | </body> |
113 | + | |
112 | 114 | </html> |
package.json
... | ... | @@ -4,6 +4,7 @@ |
4 | 4 | "description": "", |
5 | 5 | "main": "main.js", |
6 | 6 | "scripts": { |
7 | + "test": "unit-test.html", | |
7 | 8 | "initdev": "npm install gulp --global && npm install && npm install -g jshint", |
8 | 9 | "gulp-pre-commit": "gulp pre-commit", |
9 | 10 | "compile": "gulp uglify && gulp sass", |
... | ... | @@ -20,20 +21,23 @@ |
20 | 21 | "author": "Foca Software", |
21 | 22 | "license": "ISC", |
22 | 23 | "dependencies": { |
23 | - "angular": "^1.7.5", | |
24 | + "angular": "^1.7.7", | |
24 | 25 | "angular-chart.js": "1.1.1", |
25 | - "angular-cookies": "^1.7.5", | |
26 | - "angular-i18n": "^1.7.5", | |
26 | + "angular-cookies": "^1.7.7", | |
27 | + "angular-file-saver": "^1.1.3", | |
28 | + "angular-i18n": "^1.7.7", | |
27 | 29 | "angular-ladda": "^0.4.3", |
28 | - "angular-route": "^1.7.5", | |
29 | - "angular-sanitize": "^1.7.5", | |
30 | + "angular-mocks": "^1.7.7", | |
31 | + "angular-route": "^1.7.7", | |
32 | + "angular-sanitize": "^1.7.7", | |
33 | + "angular-ui-grid": "4.6.6", | |
30 | 34 | "angular-ui-swiper": "^2.3.8", |
31 | - "bootstrap": "^4.1.3", | |
35 | + "bootstrap": "^4.2.1", | |
32 | 36 | "chart.js": "2.7.3", |
37 | + "excel-builder": "2.0.3", | |
33 | 38 | "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git", |
34 | 39 | "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git", |
35 | 40 | "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git", |
36 | - "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git", | |
37 | 41 | "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git", |
38 | 42 | "foca-abm-vendedor-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vendedor-cobrador.git", |
39 | 43 | "foca-activar-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-activar-hoja-ruta.git", |
... | ... | @@ -44,6 +48,7 @@ |
44 | 48 | "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git", |
45 | 49 | "foca-cabecera-facturador": "git+ssh://git@debonline.dyndns.org:npm/foca-cabecera-facturador.git", |
46 | 50 | "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git", |
51 | + "foca-configurar-terminal": "git+ssh://git@debonline.dyndns.org:npm/foca-configurar-terminal.git", | |
47 | 52 | "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git", |
48 | 53 | "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git", |
49 | 54 | "foca-crear-login": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-login.git", |
... | ... | @@ -53,71 +58,66 @@ |
53 | 58 | "foca-estado-cisternas": "git+ssh://git@debonline.dyndns.org:npm/foca-estado-cisternas.git", |
54 | 59 | "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git", |
55 | 60 | "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git", |
61 | + "foca-informes": "git+ssh://git@debonline.dyndns.org:npm/foca-informes.git", | |
56 | 62 | "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git", |
57 | 63 | "foca-logistica-pedido-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-logistica-pedido-ruta.git", |
58 | 64 | "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git", |
59 | - "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git", | |
60 | 65 | "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git", |
61 | 66 | "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git", |
62 | - "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git", | |
63 | - "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git", | |
64 | 67 | "foca-modal-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobranza.git", |
65 | 68 | "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git", |
66 | 69 | "foca-modal-detalle-cisternas": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-cisternas.git", |
67 | 70 | "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git", |
71 | + "foca-modal-detalles": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalles.git", | |
68 | 72 | "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git", |
69 | 73 | "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git", |
70 | 74 | "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git", |
71 | 75 | "foca-modal-factura-detalle": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura-detalle.git", |
72 | 76 | "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git", |
73 | 77 | "foca-modal-grafico-cisternas": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-grafico-cisternas.git", |
78 | + "foca-modal-informe": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-informe.git", | |
74 | 79 | "foca-modal-lista-precio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-lista-precio.git", |
75 | - "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git", | |
76 | 80 | "foca-modal-localizar": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localizar.git", |
77 | 81 | "foca-modal-login": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-login.git", |
78 | - "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git", | |
79 | 82 | "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git", |
80 | 83 | "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git", |
81 | - "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git", | |
82 | - "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git", | |
83 | 84 | "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git", |
84 | 85 | "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git", |
85 | 86 | "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git", |
86 | - "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git", | |
87 | 87 | "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git", |
88 | - "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git", | |
89 | - "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git", | |
90 | 88 | "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git", |
91 | 89 | "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git", |
92 | 90 | "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git", |
93 | 91 | "font-awesome": "^4.7.0", |
94 | - "gulp-angular-templatecache": "^2.2.1", | |
92 | + "gulp-angular-templatecache": "^2.2.6", | |
95 | 93 | "gulp-htmlmin": "^5.0.1", |
96 | 94 | "gulp-uglify": "^3.0.1", |
97 | 95 | "gulp-uglify-es": "^1.0.4", |
98 | 96 | "jquery": "^3.3.1", |
97 | + "jszip": "2.6.1", | |
99 | 98 | "ladda": "1.0.6", |
100 | 99 | "leaflet": "1.3.4", |
100 | + "lodash": "4.17.11", | |
101 | 101 | "moment": "2.23.0", |
102 | 102 | "ngstorage": "^0.3.11", |
103 | - "node-sass": "^4.10.0", | |
103 | + "node-sass": "^4.11.0", | |
104 | + "pdfmake": "0.1.41", | |
104 | 105 | "uglify": "^0.1.5", |
105 | - "ui-bootstrap4": "^3.0.5" | |
106 | + "ui-bootstrap4": "^3.0.6" | |
106 | 107 | }, |
107 | 108 | "devDependencies": { |
108 | - "electron": "^3.0.2", | |
109 | 109 | "gulp": "3.9.1", |
110 | 110 | "gulp-clean": "^0.4.0", |
111 | 111 | "gulp-concat": "^2.6.1", |
112 | - "gulp-connect": "^5.6.1", | |
112 | + "gulp-connect": "^5.7.0", | |
113 | 113 | "gulp-jshint": "^2.1.0", |
114 | 114 | "gulp-rename": "^1.4.0", |
115 | 115 | "gulp-replace": "^1.0.0", |
116 | 116 | "gulp-sass": "^4.0.1", |
117 | 117 | "gulp-uglify": "^1.0.4", |
118 | 118 | "gulp-watch": "^5.0.1", |
119 | - "jasmine-core": "^3.2.1", | |
120 | - "jshint": "^2.9.6", | |
119 | + "jasmine-core": "^3.3.0", | |
120 | + "jshint": "^2.10.1", | |
121 | 121 | "pre-commit": "^1.2.2", |
122 | 122 | "pump": "^3.0.0" |
123 | 123 | } |
src/js/app.js
... | ... | @@ -9,11 +9,12 @@ angular.module('appWrapperDemo', [ |
9 | 9 | 'onScreenKeyboard', |
10 | 10 | 'ui.bootstrap', |
11 | 11 | 'ui.swiper', |
12 | + 'ui.grid', | |
13 | + 'ui.grid.exporter', | |
14 | + 'ngFileSaver', | |
12 | 15 | |
13 | 16 | // MODULOS FOCA |
14 | - 'focaAbmPlazoPago', | |
15 | 17 | 'focaAbmPreciosCondiciones', |
16 | - 'focaAbmSectores', | |
17 | 18 | 'focaAbmVehiculo', |
18 | 19 | 'focaAbmChofer', |
19 | 20 | 'focaAbmVendedorCobrador', |
... | ... | @@ -26,6 +27,7 @@ angular.module('appWrapperDemo', [ |
26 | 27 | 'focaBusquedaProductos', |
27 | 28 | 'focaCabeceraFacturador', |
28 | 29 | 'focaConfiguracion', |
30 | + 'focaConfigurarTerminal', | |
29 | 31 | 'focaCrearCobranza', |
30 | 32 | 'focaCrearHojaRuta', |
31 | 33 | 'focaCrearLogin', |
... | ... | @@ -35,37 +37,31 @@ angular.module('appWrapperDemo', [ |
35 | 37 | 'focaEstadoCisternas', |
36 | 38 | 'focaFiltros', |
37 | 39 | 'focaHojaRuta', |
40 | + 'focaInformes', | |
38 | 41 | 'focaLogin', |
39 | 42 | 'focaModal', |
40 | - 'focaModalBanco', | |
41 | 43 | 'focaModalCheque', |
42 | - 'focaModalChofer', | |
43 | - 'focaModalCobradores', | |
44 | 44 | 'focaModalCobranza', |
45 | 45 | 'focaModalCotizacion', |
46 | 46 | 'focaModalDetalleCisternas', |
47 | 47 | 'focaModalDetalleHojaRuta', |
48 | + 'focaModalDetalles', | |
48 | 49 | 'focaModalDomicilio', |
49 | 50 | 'focaModalEfectivo', |
50 | 51 | 'focaModalFactura', |
51 | 52 | 'focaModalFacturaDetalle', |
52 | 53 | 'focaModalFlete', |
53 | 54 | 'focaModalGraficoCisternas', |
55 | + 'focaModalInforme', | |
54 | 56 | 'focaModalListaPrecio', |
55 | - 'focaModalLocalidad', | |
56 | 57 | 'focaModalLocalizar', |
57 | 58 | 'focaModalLogin', |
58 | - 'focaModalMoneda', | |
59 | 59 | 'focaModalNotaPedido', |
60 | 60 | 'focaModalPrecioCondicion', |
61 | - 'focaModalProveedor', | |
62 | - 'focaModalProvincia', | |
63 | 61 | 'focaModalPuntoDescarga', |
64 | 62 | 'focaModalRemito', |
65 | 63 | 'focaModalTarifaFlete', |
66 | - 'focaModalTransportista', | |
67 | 64 | 'focaModalUnidadMedida', |
68 | - 'focaModalVendedores', | |
69 | 65 | 'focaNombreEmpresa', |
70 | 66 | 'focaSeguimiento', |
71 | 67 | 'focaTeclado', |
src/js/controller.js
... | ... | @@ -19,7 +19,7 @@ angular.module('appWrapperDemo') |
19 | 19 | $rootScope.$broadcast('usarTeclado', true); |
20 | 20 | }; |
21 | 21 | |
22 | - $rootScope.$on('focus', function(event) { | |
22 | + $rootScope.$on('focus', function() { | |
23 | 23 | if(!$scope.usarTeclado) { |
24 | 24 | return; |
25 | 25 | } |
... | ... | @@ -29,7 +29,7 @@ angular.module('appWrapperDemo') |
29 | 29 | $scope.$apply(); |
30 | 30 | } |
31 | 31 | }); |
32 | - $rootScope.$on('blur', function(event) { | |
32 | + $rootScope.$on('blur', function() { | |
33 | 33 | $scope.timeout = $timeout(function() { |
34 | 34 | $scope.mostrarTeclado = false; |
35 | 35 | if(!$scope.$$phase) { |
src/sass/_botonera-secundaria.scss
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | border-radius: 5px; |
4 | 4 | overflow: hidden; |
5 | 5 | } |
6 | - .btn { | |
6 | + .btn-xs { | |
7 | 7 | display: grid; |
8 | 8 | border-width: 3px !important; |
9 | 9 | border-radius: .7rem !important; |
... | ... | @@ -29,13 +29,13 @@ |
29 | 29 | } |
30 | 30 | } |
31 | 31 | @media(max-width: 992px){ |
32 | - .btn{ | |
32 | + .btn-xs{ | |
33 | 33 | font-weight: 700; |
34 | 34 | } |
35 | 35 | } |
36 | 36 | @media(min-width: 1200px){ |
37 | - .btn{ | |
38 | - min-height: 85px; | |
37 | + .btn-xs{ | |
38 | + height: 85px !important; | |
39 | 39 | } |
40 | 40 | .foca-facturador-px{ |
41 | 41 | padding-left: 3rem; |
... | ... | @@ -44,14 +44,26 @@ |
44 | 44 | } |
45 | 45 | |
46 | 46 | @media(min-width: 992px) and (max-width: 1200px){ |
47 | - .btn{ | |
48 | - min-height: 73px; | |
47 | + .btn-xs{ | |
48 | + height: 73px !important; | |
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | 52 | @media(min-width: 768px) and (max-width: 992px){ |
53 | - .btn{ | |
54 | - min-height: 62px; | |
53 | + .btn-xs{ | |
54 | + height: 62px !important; | |
55 | + } | |
56 | + } | |
57 | + | |
58 | + @media(min-width: 576px) and (max-width: 768px){ | |
59 | + .btn-xs{ | |
60 | + max-height: 51px; | |
61 | + } | |
62 | + } | |
63 | + | |
64 | + @media(max-width: 576px) { | |
65 | + .btn-xs{ | |
66 | + max-height: 13vw; | |
55 | 67 | } |
56 | 68 | } |
57 | 69 |
src/sass/_grid.scss
... | ... | @@ -0,0 +1,32 @@ |
1 | +.gridInforme { | |
2 | + width: 100%; | |
3 | + height: 350px; | |
4 | +} | |
5 | +.ui-grid-header-cell-wrapper{ | |
6 | + height: 40px !important; | |
7 | +} | |
8 | + | |
9 | + | |
10 | +.yellow { | |
11 | + max-width: unset !important; | |
12 | + >div { | |
13 | + background: yellow !important; | |
14 | + font-weight: bold; | |
15 | + } | |
16 | +} | |
17 | + | |
18 | +.red { | |
19 | + max-width: unset !important; | |
20 | + >div { | |
21 | + color: red; | |
22 | + font-weight: bold; | |
23 | + } | |
24 | +} | |
25 | + | |
26 | +.green { | |
27 | + max-width: unset !important; | |
28 | + >div { | |
29 | + color: green; | |
30 | + font-weight: bold; | |
31 | + } | |
32 | +} |
src/sass/_logistica-pedido-ruta.scss
src/sass/_paginador-abm.scss
... | ... | @@ -0,0 +1,18 @@ |
1 | +.paginador-abm { | |
2 | + margin-top: 1rem; | |
3 | + li { | |
4 | + &.active{ | |
5 | + > a { | |
6 | + background: $primary-color !important; | |
7 | + color: #FFF !important; | |
8 | + } | |
9 | + } | |
10 | + | |
11 | + > a { | |
12 | + background-color: transparent !important; | |
13 | + border-color: #67615e !important; | |
14 | + color: #000 !important; | |
15 | + | |
16 | + } | |
17 | + } | |
18 | +} |
src/sass/general.scss
... | ... | @@ -17,6 +17,8 @@ $primary-color: #e09125; |
17 | 17 | @import 'foca-crear'; |
18 | 18 | @import 'logistica-pedido-ruta'; |
19 | 19 | @import 'tabs'; |
20 | +@import 'grid'; | |
21 | +@import 'paginador-abm'; | |
20 | 22 | |
21 | 23 | |
22 | 24 | //OCULTA FLECHAS INPUT NUMBER |
... | ... | @@ -51,4 +53,24 @@ input::-webkit-inner-spin-button { |
51 | 53 | |
52 | 54 | .uib-daypicker{ |
53 | 55 | outline: 0 |
54 | -} | |
55 | 56 | \ No newline at end of file |
57 | +} | |
58 | + | |
59 | +.right-0{ | |
60 | + right: 0; | |
61 | +} | |
62 | + | |
63 | +.tabla-factura{ | |
64 | + word-wrap: break-word; | |
65 | + table-layout: fixed; | |
66 | +} | |
67 | + | |
68 | +.ladda-w-100 .ladda-label{ | |
69 | + width: 100% | |
70 | +} | |
71 | + | |
72 | +.btn-delete-image{ | |
73 | + height: 25px; | |
74 | + width: 25px; | |
75 | + top: -10px; | |
76 | + right: 0; | |
77 | +} |
unit-test.html
... | ... | @@ -0,0 +1,30 @@ |
1 | +<html> | |
2 | + <head> | |
3 | + <link rel="stylesheet" type="text/css" href="node_modules/jasmine-core/lib/jasmine-core/jasmine.css"> | |
4 | + <meta charset="UTF-8" /> | |
5 | + </head> | |
6 | + <body> | |
7 | + <script src="node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script> | |
8 | + <script src="node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script> | |
9 | + <script src="node_modules/jasmine-core/lib/jasmine-core/boot.js"></script> | |
10 | + <script src="node_modules/angular/angular.min.js"></script> | |
11 | + <script src="node_modules/angular-mocks/angular-mocks.js"></script> | |
12 | + <script src="node_modules/angular-route/angular-route.min.js"></script> | |
13 | + | |
14 | + <!-- foca-abm-vehiculo --> | |
15 | + <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script> | |
16 | + <script src="node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.spec.js"></script> | |
17 | + | |
18 | + <!-- foca-abm-chofer --> | |
19 | + <script src="node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script> | |
20 | + <script src="node_modules/foca-abm-chofer/dist/foca-abm-chofer.spec.js"></script> | |
21 | + | |
22 | + <!-- foca-abm-precios-condiciones --> | |
23 | + <script src="node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> | |
24 | + <script src="node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.spec.js"></script> | |
25 | + | |
26 | + <!-- foca-abm-vendedor-cobrador --> | |
27 | + <script src="node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.min.js"></script> | |
28 | + <script src="node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.spec.js"></script> | |
29 | + </body> | |
30 | +</html> |