diff --git a/Mohem/angular.json b/Mohem/angular.json index 42b54182..eb6b8116 100644 --- a/Mohem/angular.json +++ b/Mohem/angular.json @@ -42,7 +42,7 @@ "input": "src/app/app.scss" } ], - "scripts": [], + "scripts": ["node_modules/chart.js/dist/Chart.js"], "es5BrowserSupport": true }, "configurations": { diff --git a/Mohem/config.xml b/Mohem/config.xml index 3054d5f0..20f4924f 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -1,5 +1,5 @@ - + MOHEMM an app created by cloud Solutions Cloud Solutions diff --git a/Mohem/package.json b/Mohem/package.json index 04862f1d..a096b849 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -105,6 +105,7 @@ "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2", "ngx-gauge": "^1.0.0-beta.10", + "npm": "^6.14.11", "phonegap-nfc": "^1.2.0", "phonegap-plugin-barcodescanner": "^8.1.0", "phonegap-plugin-multidex": "^1.0.0", diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index c02b9e87..ec019152 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -222,6 +222,27 @@ export class HomeComponent implements OnInit { assignDataToFilters() { this.filters[0].value = this.worklistNotifications.P_OPEN_NTF_NUMBER; + this.filters[1].value = this.totalHR; + this.filters[2].value = this.totalPO; + this.filters[3].value = this.totalPR; + this.filters[4].value = this.totalMR; + + if (this.totalHR === 0) { + this.data.datasets[0].data[0] = 0; + } + + if (this.totalPO === 0) { + this.data.datasets[0].data[1] = 0; + } + + if (this.totalPR === 0) { + this.data.datasets[0].data[2] = 0; + } + + if (this.totalMR === 0) { + this.data.datasets[0].data[3] = 0; + } + const openNotificationsArray = this.worklistNotifications.GetOpenNotificationsList; for (const notification of openNotificationsArray) {