diff --git a/src/app/pages/repository/metrics/metrics-usagestats-report-results.component.ts b/src/app/pages/repository/metrics/metrics-usagestats-report-results.component.ts
index b20a88ea7..0238a4da5 100755
--- a/src/app/pages/repository/metrics/metrics-usagestats-report-results.component.ts
+++ b/src/app/pages/repository/metrics/metrics-usagestats-report-results.component.ts
@@ -58,10 +58,11 @@ export class MetricsUsagestatsReportResultsComponent implements OnInit {
this.params.append('DatasetIdentifier', qparams['datasetIdentifier']);
this.params.append('ItemDataType', qparams['itemIdentifier']);
this.params.append('Granularity', qparams['granularity']);
- this.params.append('MetricType', qparams['totalItemRequests']);
- this.params.append('MetricType', qparams['totalItemInvestigations']);
- this.params.append('MetricType', qparams['uniqueItemRequests']);
- this.params.append('MetricType', qparams['uniqueItemInvestigations']);
+ this.params.append('MetricType', qparams['metricTypes']);
+ // this.params.append('MetricType', qparams['totalItemRequests']);
+ // this.params.append('MetricType', qparams['totalItemInvestigations']);
+ // this.params.append('MetricType', qparams['uniqueItemRequests']);
+ // this.params.append('MetricType', qparams['uniqueItemInvestigations']);
});
this.chosenReport = this.params.get('Report');
diff --git a/src/app/pages/repository/metrics/metrics-usagestats-report.component.html b/src/app/pages/repository/metrics/metrics-usagestats-report.component.html
index 07d627b45..968512f8b 100755
--- a/src/app/pages/repository/metrics/metrics-usagestats-report.component.html
+++ b/src/app/pages/repository/metrics/metrics-usagestats-report.component.html
@@ -137,22 +137,22 @@
Metric Type
diff --git a/src/app/pages/repository/metrics/metrics-usagestats-report.component.ts b/src/app/pages/repository/metrics/metrics-usagestats-report.component.ts
index 403047faa..bb6f26891 100755
--- a/src/app/pages/repository/metrics/metrics-usagestats-report.component.ts
+++ b/src/app/pages/repository/metrics/metrics-usagestats-report.component.ts
@@ -30,11 +30,11 @@ export class MetricsUsagestatsReportComponent implements OnInit {
beginDate = '';
endDate = '';
itemIdentifier = '';
- datasetIdentifier = null;
- totalItemRequests = null;
- totalItemInvestigations = null;
- uniqueItemRequests = null;
- uniqueItemInvestigations = null;
+ datasetIdentifier = '';
+ totalItemRequests = 'Total_Item_Requests';
+ totalItemInvestigations = 'Total_Item_Investigations';
+ uniqueItemRequests = 'Unique_Item_Requests';
+ uniqueItemInvestigations = 'Unique_Item_Investigations';
itemDataType = '';
granularity = 'Monthly';
@@ -182,6 +182,19 @@ export class MetricsUsagestatsReportComponent implements OnInit {
goToReport() {
if (!this.useCurrentRepo) { this.shownRepoId = ''; }
+ const metricTypes: string[] = [];
+ if (this.totalItemRequests !== null) {
+ metricTypes.push(this.totalItemRequests);
+ }
+ if (this.totalItemInvestigations !== null) {
+ metricTypes.push(this.totalItemRequests);
+ }
+ if (this.uniqueItemRequests !== null) {
+ metricTypes.push(this.uniqueItemRequests);
+ }
+ if (this.uniqueItemInvestigations !== null) {
+ metricTypes.push(this.uniqueItemInvestigations);
+ }
this.router.navigate(['usagestats-report-results'], {
relativeTo: this.route.parent,
queryParams: {
@@ -194,10 +207,11 @@ export class MetricsUsagestatsReportComponent implements OnInit {
itemIdentifier: this.itemIdentifier,
datasetIdentifier: this.datasetIdentifier,
granularity: this.granularity,
- totalItemRequests: this.totalItemRequests,
- totalItemInvestigations: this.totalItemInvestigations,
- uniqueItemRequests: this.uniqueItemRequests,
- uniqueItemInvestigations: this.uniqueItemInvestigations
+ metricTypes: metricTypes,
+ // totalItemRequests: this.totalItemRequests,
+ // totalItemInvestigations: this.totalItemInvestigations,
+ // uniqueItemRequests: this.uniqueItemRequests,
+ // uniqueItemInvestigations: this.uniqueItemInvestigations
}
});
diff --git a/src/app/pages/repository/metrics/metrics-usagestats.component.html b/src/app/pages/repository/metrics/metrics-usagestats.component.html
index 1c13caf4d..695752e5c 100755
--- a/src/app/pages/repository/metrics/metrics-usagestats.component.html
+++ b/src/app/pages/repository/metrics/metrics-usagestats.component.html
@@ -27,11 +27,11 @@