Commit 606af0f426a5c42173b60b8a39b7ddcc48b6d036
Exists in
master
Merge remote-tracking branch 'upstream/master'
Showing
4 changed files
Show diff stats
index.html
| ... | ... | @@ -39,7 +39,6 @@ |
| 39 | 39 | <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script> |
| 40 | 40 | |
| 41 | 41 | <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script> |
| 42 | - <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script> | |
| 43 | 42 | <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> |
| 44 | 43 | <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script> |
| 45 | 44 | <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script> |
| ... | ... | @@ -83,16 +82,12 @@ |
| 83 | 82 | <script src="./node_modules/foca-modal-lista-precio/dist/foca-modal-lista-precio.min.js"></script> |
| 84 | 83 | <script src="./node_modules/foca-modal-localizar/dist/foca-modal-localizar.min.js"></script> |
| 85 | 84 | <script src="./node_modules/foca-modal-login/dist/foca-modal-login.min.js"></script> |
| 86 | - <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script> | |
| 87 | 85 | <script src="./node_modules/foca-modal-nota-pedido/dist/foca-modal-nota-pedido.min.js"></script> |
| 88 | 86 | <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> |
| 89 | - <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script> | |
| 90 | 87 | <script src="./node_modules/foca-modal-punto-descarga/dist/foca-modal-punto-descarga.min.js"></script> |
| 91 | 88 | <script src="./node_modules/foca-modal-remito/dist/foca-modal-remito.min.js"></script> |
| 92 | 89 | <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script> |
| 93 | - <script src="./node_modules/foca-modal-transportista/dist/foca-modal-transportista.min.js"></script> | |
| 94 | 90 | <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script> |
| 95 | - <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script> | |
| 96 | 91 | <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script> |
| 97 | 92 | <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script> |
| 98 | 93 | <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script> |
package.json
| ... | ... | @@ -20,16 +20,17 @@ |
| 20 | 20 | "author": "Foca Software", |
| 21 | 21 | "license": "ISC", |
| 22 | 22 | "dependencies": { |
| 23 | - "angular": "^1.7.5", | |
| 23 | + "angular": "^1.7.7", | |
| 24 | 24 | "angular-chart.js": "1.1.1", |
| 25 | - "angular-cookies": "^1.7.5", | |
| 26 | - "angular-i18n": "^1.7.5", | |
| 25 | + "angular-cookies": "^1.7.7", | |
| 26 | + "angular-i18n": "^1.7.7", | |
| 27 | 27 | "angular-ladda": "^0.4.3", |
| 28 | - "angular-route": "^1.7.5", | |
| 29 | - "angular-sanitize": "^1.7.5", | |
| 28 | + "angular-mocks": "^1.7.7", | |
| 29 | + "angular-route": "^1.7.7", | |
| 30 | + "angular-sanitize": "^1.7.7", | |
| 30 | 31 | "angular-ui-grid": "4.6.6", |
| 31 | 32 | "angular-ui-swiper": "^2.3.8", |
| 32 | - "bootstrap": "^4.1.3", | |
| 33 | + "bootstrap": "^4.2.1", | |
| 33 | 34 | "chart.js": "2.7.3", |
| 34 | 35 | "excel-builder": "2.0.3", |
| 35 | 36 | "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git", |
| ... | ... | @@ -77,22 +78,17 @@ |
| 77 | 78 | "foca-modal-lista-precio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-lista-precio.git", |
| 78 | 79 | "foca-modal-localizar": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localizar.git", |
| 79 | 80 | "foca-modal-login": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-login.git", |
| 80 | - "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git", | |
| 81 | 81 | "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git", |
| 82 | 82 | "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git", |
| 83 | - "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git", | |
| 84 | 83 | "foca-modal-punto-descarga": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-punto-descarga.git", |
| 85 | 84 | "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git", |
| 86 | 85 | "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git", |
| 87 | - "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git", | |
| 88 | 86 | "foca-modal-unidad-medida": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-unidad-medida.git", |
| 89 | - "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git", | |
| 90 | - "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git", | |
| 91 | 87 | "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git", |
| 92 | 88 | "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git", |
| 93 | 89 | "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git", |
| 94 | 90 | "font-awesome": "^4.7.0", |
| 95 | - "gulp-angular-templatecache": "^2.2.1", | |
| 91 | + "gulp-angular-templatecache": "^2.2.6", | |
| 96 | 92 | "gulp-htmlmin": "^5.0.1", |
| 97 | 93 | "gulp-uglify": "^3.0.1", |
| 98 | 94 | "gulp-uglify-es": "^1.0.4", |
| ... | ... | @@ -103,24 +99,24 @@ |
| 103 | 99 | "lodash": "4.17.11", |
| 104 | 100 | "moment": "2.23.0", |
| 105 | 101 | "ngstorage": "^0.3.11", |
| 106 | - "node-sass": "^4.10.0", | |
| 102 | + "node-sass": "^4.11.0", | |
| 107 | 103 | "pdfmake": "0.1.41", |
| 108 | 104 | "uglify": "^0.1.5", |
| 109 | - "ui-bootstrap4": "^3.0.5" | |
| 105 | + "ui-bootstrap4": "^3.0.6" | |
| 110 | 106 | }, |
| 111 | 107 | "devDependencies": { |
| 112 | 108 | "gulp": "3.9.1", |
| 113 | 109 | "gulp-clean": "^0.4.0", |
| 114 | 110 | "gulp-concat": "^2.6.1", |
| 115 | - "gulp-connect": "^5.6.1", | |
| 111 | + "gulp-connect": "^5.7.0", | |
| 116 | 112 | "gulp-jshint": "^2.1.0", |
| 117 | 113 | "gulp-rename": "^1.4.0", |
| 118 | 114 | "gulp-replace": "^1.0.0", |
| 119 | 115 | "gulp-sass": "^4.0.1", |
| 120 | 116 | "gulp-uglify": "^1.0.4", |
| 121 | 117 | "gulp-watch": "^5.0.1", |
| 122 | - "jasmine-core": "^3.2.1", | |
| 123 | - "jshint": "^2.9.6", | |
| 118 | + "jasmine-core": "^3.3.0", | |
| 119 | + "jshint": "^2.10.1", | |
| 124 | 120 | "pre-commit": "^1.2.2", |
| 125 | 121 | "pump": "^3.0.0" |
| 126 | 122 | } |
src/js/app.js
| ... | ... | @@ -13,7 +13,6 @@ angular.module('appWrapperDemo', [ |
| 13 | 13 | 'ui.grid.exporter', |
| 14 | 14 | |
| 15 | 15 | // MODULOS FOCA |
| 16 | - 'focaAbmPlazoPago', | |
| 17 | 16 | 'focaAbmPreciosCondiciones', |
| 18 | 17 | 'focaAbmSectores', |
| 19 | 18 | 'focaAbmVehiculo', |
| ... | ... | @@ -57,16 +56,12 @@ angular.module('appWrapperDemo', [ |
| 57 | 56 | 'focaModalListaPrecio', |
| 58 | 57 | 'focaModalLocalizar', |
| 59 | 58 | 'focaModalLogin', |
| 60 | - 'focaModalMoneda', | |
| 61 | 59 | 'focaModalNotaPedido', |
| 62 | 60 | 'focaModalPrecioCondicion', |
| 63 | - 'focaModalProveedor', | |
| 64 | 61 | 'focaModalPuntoDescarga', |
| 65 | 62 | 'focaModalRemito', |
| 66 | 63 | 'focaModalTarifaFlete', |
| 67 | - 'focaModalTransportista', | |
| 68 | 64 | 'focaModalUnidadMedida', |
| 69 | - 'focaModalVendedores', | |
| 70 | 65 | 'focaNombreEmpresa', |
| 71 | 66 | 'focaSeguimiento', |
| 72 | 67 | 'focaTeclado', |
unit-test.html
| ... | ... | @@ -0,0 +1,19 @@ |
| 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 | + </body> | |
| 19 | +</html> |