Commit 4e539b67eab70790133a56046c0369bcb3574b5d

Authored by Nicolás Guarnieri
Exists in master

Merge remote-tracking branch 'upstream/master'

... ... @@ -28,6 +28,8 @@
28 28 <script src="./node_modules/leaflet/dist/leaflet.js"></script>
29 29 <script src="./node_modules/ngstorage/ngStorage.min.js"></script>
30 30 <script src="./vendor/cordovaGeolocationModule.min.js"></script>
  31 + <script src="./node_modules/chart.js/dist/Chart.min.js"></script>
  32 + <script src="./node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
31 33  
32 34 <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
33 35 <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script>
... ... @@ -67,6 +69,7 @@
67 69 <script src="./node_modules/foca-modal-factura/dist/foca-modal-factura.min.js"></script>
68 70 <script src="./node_modules/foca-modal-factura-detalle/dist/foca-modal-factura-detalle.min.js"></script>
69 71 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
  72 + <script src="./node_modules/foca-modal-grafico-cisternas/dist/foca-modal-grafico-cisternas.min.js"></script>
70 73 <script src="./node_modules/foca-modal-lista-precio/dist/foca-modal-lista-precio.min.js"></script>
71 74 <script src="./node_modules/foca-modal-localidad/dist/foca-modal-localidad.min.js"></script>
72 75 <script src="./node_modules/foca-modal-login/dist/foca-modal-login.min.js"></script>
... ... @@ -21,6 +21,7 @@
21 21 "license": "ISC",
22 22 "dependencies": {
23 23 "angular": "^1.7.5",
  24 + "angular-chart.js": "1.1.1",
24 25 "angular-cookies": "^1.7.5",
25 26 "angular-i18n": "^1.7.5",
26 27 "angular-ladda": "^0.4.3",
... ... @@ -28,6 +29,7 @@
28 29 "angular-sanitize": "^1.7.5",
29 30 "angular-ui-swiper": "^2.3.8",
30 31 "bootstrap": "^4.1.3",
  32 + "chart.js": "2.7.3",
31 33 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
32 34 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
33 35 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
... ... @@ -48,6 +48,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
48 48 'focaModalFactura',
49 49 'focaModalFacturaDetalle',
50 50 'focaModalFlete',
  51 + 'focaModalGraficoCisternas',
51 52 'focaModalListaPrecio',
52 53 'focaModalLocalidad',
53 54 'focaModalLogin',