diff --git a/package-lock.json b/package-lock.json index 1a327bd3f320964d2775392c7b6cc789c722ae91..8edf0c163619dc1c655c3b9ae441b1bb35b11a1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6729,19 +6729,12 @@ "dev": true }, "chart.js": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.1.tgz", - "integrity": "sha512-pX1oQAY86MiuyZ2hY593Acbl4MLHKrBBhhmZ1YqSadzQbbsBE2rnd6WISoHjIsdf0WDeC0hbePYCz2ZxkV8L+g==", + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.4.tgz", + "integrity": "sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==", "requires": { - "chartjs-color": "~2.2.0", - "moment": "~2.18.0" - }, - "dependencies": { - "moment": { - "version": "2.18.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", - "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=" - } + "chartjs-color": "^2.1.0", + "moment": "^2.10.2" } }, "chartjs-color": { @@ -6761,6 +6754,14 @@ "color-name": "^1.0.0" } }, + "chartjs-plugin-zoom": { + "version": "0.7.7", + "resolved": "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-0.7.7.tgz", + "integrity": "sha512-8fOHPPiZTT2+K0w278TQWYs/DtPg06s1OpTqdXxPpdfH7QQbl6Io/WuE1FjPehDWVCxpe3tSTts+dPbxgq2Z5g==", + "requires": { + "hammerjs": "^2.0.8" + } + }, "cheerio": { "version": "1.0.0-rc.10", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", diff --git a/package.json b/package.json index 74801a860f30563f2058d1f7df28a263416a3477..96716238842d1bcbb40eedd36dd783a0028ebb8c 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,8 @@ "angular2-chartjs": "0.4.1", "apexcharts": "^3.27.1", "bootstrap": "4.3.1", - "chart.js": "2.7.1", + "chart.js": "2.9.4", + "chartjs-plugin-zoom": "^0.7.7", "ckeditor": "4.7.3", "classlist.js": "1.1.20150312", "core-js": "2.5.1", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index e8d59942aef012eaf9924595dc4bcb1cb0b32104..bfeec5ff8155288d44787165bfe8c0b116157b95 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,6 +30,9 @@ import { AuthLogoutComponent } from './auth/logout/auth-logout.component'; import { MarkdownModule } from 'ngx-markdown'; + import { ChartModule } from 'angular2-chartjs'; + import 'chartjs-plugin-zoom'; + export function configFactory(http: HttpClient): ConfigLoader { return new ConfigHttpLoader(http, './assets/config.json'); }