Added R5 report titles

This commit is contained in:
TheQuaker 2023-03-22 15:30:25 +02:00
parent 3f5919b2df
commit 2259b7b701
4 changed files with 48 additions and 33 deletions

View File

@ -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');

View File

@ -137,22 +137,22 @@
<h5>Metric Type</h5>
<div>
<label>
<input type="checkbox" class="uk-checkbox" value="Total_Item_Requests" (change)="updateTotalItemRequests($event)"> Total Item Requests
<input type="checkbox" class="uk-checkbox" value="Total_Item_Requests" checked (change)="updateTotalItemRequests($event)"> Total Item Requests
</label>
</div>
<div>
<label>
<input type="checkbox" class="uk-checkbox" value="Total_Item_Investigations" (change)="updateTotalItemInvestigations($event)"> Total Item Investigations
<input type="checkbox" class="uk-checkbox" value="Total_Item_Investigations" checked (change)="updateTotalItemInvestigations($event)"> Total Item Investigations
</label>
</div>
<div>
<label>
<input type="checkbox" class="uk-checkbox" value="Unique_Item_Requests" (change)="updateUniqueItemRequests($event)"> UniqueItem Requests
<input type="checkbox" class="uk-checkbox" value="Unique_Item_Requests" checked (change)="updateUniqueItemRequests($event)"> UniqueItem Requests
</label>
</div>
<div>
<label>
<input type="checkbox" class="uk-checkbox" value="Unique_Item_Investigations" (change)="updateUniqueItemInvestigations($event)"> Unique Item Investigations
<input type="checkbox" class="uk-checkbox" value="Unique_Item_Investigations" checked (change)="updateUniqueItemInvestigations($event)"> Unique Item Investigations
</label>
</div>
</div>

View File

@ -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
}
});

View File

@ -27,11 +27,11 @@
<div class="uk-width-1-3">
<div class="uk-text-center md-card md-card-hover">
<a [routerLink]="['R5','PR']" class="uk-position-cover"></a>
<div class="uk-card-media-top">
<img class="" src="../../../../assets/imgs/Icons_Reports_wide_AR1.png" alt="" style="width: 100%;">
<div class="uk-card-media-top " style="background-color: #001a6e">
<h1 class="uk-padding-large font-weight-bolder md-color-white">PR</h1>
</div>
<div class="uk-card-body">
<h3 class="uk-margin uk-card-title uk-margin-small-bottom">
<div class="uk-card-body uk-padding-small">
<h3 class="uk-card-title uk-margin-small-bottom">
A report summarizing usage activity for the repository by month, metric type and item type
</h3>
</div>
@ -40,11 +40,11 @@
<div class="uk-width-1-3">
<div class="uk-text-center md-card md-card-hover">
<a [routerLink]="['R5','PR_1']" class="uk-position-cover"></a>
<div class="uk-card-media-top">
<img class="" src="../../../../assets/imgs/Icons_Reports_wide_AR1.png" alt="" style="width: 100%;">
<div class="uk-card-media-top " style="background-color: #001a6e">
<h1 class="uk-padding-large font-weight-bolder md-color-white">PR_1</h1>
</div>
<div class="uk-card-body">
<h3 class="uk-margin uk-card-title uk-margin-small-bottom">
<div class="uk-card-body uk-padding-small">
<h3 class="uk-card-title uk-margin-small-bottom">
A report summarizing usage activity for the repository by month, broken down by metric type
</h3>
</div>
@ -53,11 +53,11 @@
<div class="uk-width-1-3">
<div class="uk-text-center md-card md-card-hover">
<a [routerLink]="['R5','IR']" class="uk-position-cover"></a>
<div class="uk-card-media-top">
<img class="" src="../../../../assets/imgs/Icons_Reports_wide_AR1.png" alt="" style="width: 100%;">
<div class="uk-card-media-top " style="background-color: #001a6e">
<h1 class="uk-padding-large font-weight-bolder md-color-white">IR</h1>
</div>
<div class="uk-card-body">
<h3 class="uk-margin uk-card-title uk-margin-small-bottom">
<div class="uk-card-body uk-padding-small">
<h3 class="uk-card-title uk-margin-small-bottom">
A report for items requests by month metric_type, item type and repository
</h3>
</div>
@ -69,11 +69,11 @@
<div class="uk-width-1-3">
<div class="uk-text-center md-card md-card-hover">
<a [routerLink]="['R5','DSR']" class="uk-position-cover"></a>
<div class="uk-card-media-top">
<img class="" src="../../../../assets/imgs/Icons_Reports_wide_AR1.png" alt="" style="width: 100%;">
<div class="uk-card-media-top " style="background-color: #001a6e">
<h1 class="uk-padding-large font-weight-bolder md-color-white">DSR</h1>
</div>
<div class="uk-card-body">
<h3 class="uk-margin uk-card-title uk-margin-small-bottom">
<div class="uk-card-body uk-padding-small">
<h3 class="uk-card-title uk-margin-small-bottom">
A report for datasets requests by month metric type and repository
</h3>
</div>