fix pr_p1 report name, working on dsr table display
This commit is contained in:
parent
ae3b932a9f
commit
b39bcccbd7
|
@ -89,29 +89,29 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
<ng-container *ngFor="let item of r5report[reportItems]; let i=index">
|
||||
<tr *ngIf="chosenReport === 'DSR'; else notDsrRow">
|
||||
<td>{{item.Dataset_Title}}</td>
|
||||
<td>{{item.YOP}}</td>
|
||||
<td>{{item.Publisher}}</td>
|
||||
<td>{{item.Access_Method}}</td>
|
||||
</tr>
|
||||
<ng-template #notDsrRow>
|
||||
<tr>
|
||||
<tr>
|
||||
<ng-container *ngIf="chosenReport === 'DSR'; else notDsrRow">
|
||||
<td>{{item.Dataset_Title}}</td>
|
||||
<td>{{item.Publisher}}</td>
|
||||
<td>{{item.YOP}}</td>
|
||||
<td>{{item.Access_Method}}</td>
|
||||
</ng-container>
|
||||
<ng-template #notDsrRow>
|
||||
<td>{{item.Platform}}</td>
|
||||
<td *ngIf="chosenReport === 'PR'">{{item.Data_Type}}</td>
|
||||
<td>{{item.Access_Method}}</td>
|
||||
<ng-container *ngIf="granularity === 'Totals'">
|
||||
<td *ngFor="let instance of item.Performance[0].Instance">
|
||||
{{instance.Count}}
|
||||
</td>
|
||||
</ng-container>
|
||||
<td class="uk-text-center" *ngIf="granularity === 'Monthly'">
|
||||
<a *ngIf="item?.Performance?.length > 0" (click)="displayItemPerformance(i)">
|
||||
{{ (selectedItemIndex === i) ? 'Hide' : 'See' }} results
|
||||
</a>
|
||||
</ng-template>
|
||||
<ng-container *ngIf="granularity === 'Totals'">
|
||||
<td *ngFor="let instance of item.Performance[0].Instance">
|
||||
{{instance.Count}}
|
||||
</td>
|
||||
</tr>
|
||||
</ng-template>
|
||||
</ng-container>
|
||||
<td class="uk-text-center" *ngIf="granularity === 'Monthly'">
|
||||
<a *ngIf="item?.Performance?.length > 0" (click)="displayItemPerformance(i)">
|
||||
{{ (selectedItemIndex === i) ? 'Hide' : 'See' }} results
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr *ngIf="(selectedItemIndex === i)">
|
||||
<td colspan="6">
|
||||
<div class="uk-animation-slide-top-medium uk-margin-small-top">
|
||||
|
|
|
@ -72,7 +72,7 @@ export class MetricsUsagestatsReportResultsComponent implements OnInit {
|
|||
this.params.append('Granularity', qparams['granularity']);
|
||||
this.granularity = qparams['granularity'];
|
||||
// this.params.append('MetricType', qparams['metricTypes']);
|
||||
if (qparams['report'] !== 'PR_1') {
|
||||
if (qparams['report'] !== 'PR_P1') {
|
||||
if (qparams['totalItemRequests'])
|
||||
this.params.append('MetricType', qparams['totalItemRequests']);
|
||||
if (qparams['totalItemInvestigations'])
|
||||
|
|
|
@ -39,9 +39,9 @@
|
|||
</div>
|
||||
<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>
|
||||
<a [routerLink]="['R5','PR_P1']" class="uk-position-cover"></a>
|
||||
<div class="uk-card-media-top " style="background-color: #001a6e">
|
||||
<h1 class="uk-padding-large font-weight-bolder md-color-white">PR_1</h1>
|
||||
<h1 class="uk-padding-large font-weight-bolder md-color-white">PR_P1</h1>
|
||||
</div>
|
||||
<div class="uk-card-body uk-padding-small">
|
||||
<h3 class="uk-card-title uk-margin-small-bottom">
|
||||
|
|
Loading…
Reference in New Issue