Skip to content

Commit 1386451

Browse files
alisaismailatiDavide Negretti
alisaismailati
authored and
Davide Negretti
committed
Merged in task/dspace-cris-2023_02_x/DSC-884 (pull request DSpace#1707)
[DSC-884] added metrics for person | org-unit | project | journal - search-result-list-element Approved-by: Davide Negretti
2 parents de43a0a + 14d2730 commit 1386451

File tree

4 files changed

+81
-56
lines changed

4 files changed

+81
-56
lines changed

‎src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,32 @@
1111
</span>
1212
</div>
1313
<div [ngClass]="showThumbnails ? 'col-9 col-xl-10' : 'col-md-12'">
14-
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
15-
<ds-truncatable [id]="dso.id">
16-
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
17-
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
18-
[innerHTML]="dsoTitle"></a>
19-
<span *ngIf="linkType == linkTypes.None"
20-
class="lead item-list-title dont-break-out"
21-
[innerHTML]="dsoTitle"></span>
22-
<span class="text-muted">
23-
<ds-truncatable-part [id]="dso.id" [minLines]="1">
24-
<span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
25-
class="item-list-journals">
26-
<span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
27-
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
28-
</span>
29-
</span>
30-
</ds-truncatable-part>
31-
</span>
32-
</ds-truncatable>
14+
<div class="d-flex justify-content-between">
15+
<div class="flex-fill">
16+
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
17+
<ds-truncatable [id]="dso.id">
18+
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
19+
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
20+
[innerHTML]="dsoTitle"></a>
21+
<span *ngIf="linkType == linkTypes.None"
22+
class="lead item-list-title dont-break-out"
23+
[innerHTML]="dsoTitle"></span>
24+
<span class="text-muted">
25+
<ds-truncatable-part [id]="dso.id" [minLines]="1">
26+
<span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
27+
class="item-list-journals">
28+
<span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
29+
<span [innerHTML]="value"><span [innerHTML]="value"></span></span>
30+
</span>
31+
</span>
32+
</ds-truncatable-part>
33+
</span>
34+
</ds-truncatable>
35+
<ds-metric-badges *ngIf="showMetrics" class="d-block clearfix" [item]="dso"></ds-metric-badges>
36+
</div>
37+
<div class="align-self-center">
38+
<ds-metric-donuts [item]="dso"></ds-metric-donuts>
39+
</div>
40+
</div>
3341
</div>
3442
</div>

‎src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,29 @@
1818
</span>
1919
</div>
2020
<div [ngClass]="showThumbnails ? 'col-9 col-xl-10' : 'col-md-12'">
21-
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
22-
<ds-truncatable [id]="dso.id">
23-
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
24-
[attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
25-
[routerLink]="[itemPageRoute]" class="lead"
26-
[innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
27-
<span *ngIf="linkType == linkTypes.None"
28-
class="lead"
29-
[innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
30-
<div *ngIf="dso.allMetadata(['dc.description.*']).length > 0" class="text-muted">
31-
<ds-truncatable-part [id]="dso.id" [minLines]="3">
32-
<span class="item-list-org-unit-description" [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
33-
</ds-truncatable-part>
34-
</div>
35-
<ds-additional-metadata [object]="dso"></ds-additional-metadata>
36-
</ds-truncatable>
21+
<div class="d-flex justify-content-between">
22+
<div class="flex-fill">
23+
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
24+
<ds-truncatable [id]="dso.id">
25+
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
26+
[attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
27+
[routerLink]="[itemPageRoute]" class="lead"
28+
[innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
29+
<span *ngIf="linkType == linkTypes.None"
30+
class="lead"
31+
[innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
32+
<div *ngIf="dso.allMetadata(['dc.description.*']).length > 0" class="text-muted">
33+
<ds-truncatable-part [id]="dso.id" [minLines]="3">
34+
<span class="item-list-org-unit-description" [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
35+
</ds-truncatable-part>
36+
</div>
37+
<ds-additional-metadata [object]="dso"></ds-additional-metadata>
38+
</ds-truncatable>
39+
<ds-metric-badges *ngIf="showMetrics" class="d-block clearfix" [item]="dso"></ds-metric-badges>
40+
</div>
41+
<div class="align-self-center" *ngIf="showMetrics">
42+
<ds-metric-donuts [item]="dso"></ds-metric-donuts>
43+
</div>
3744
</div>
45+
</div>
3846
</div>

‎src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
</div>
4242
<ds-additional-metadata [object]="dso"></ds-additional-metadata>
4343
</ds-truncatable>
44+
<ds-metric-badges *ngIf="showMetrics" class="d-block clearfix" [item]="dso"></ds-metric-badges>
4445
</div>
4546
<div class="align-self-center" *ngIf="showMetrics">
4647
<ds-metric-donuts [item]="dso"></ds-metric-donuts>

‎src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,34 @@
1818
</span>
1919
</div>
2020
<div [ngClass]="showThumbnails ? 'col-9 col-xl-10' : 'col-md-12'">
21-
<ds-truncatable [id]="dso.id">
22-
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
23-
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
24-
[attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
25-
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
26-
[innerHTML]="dsoTitle"></a>
27-
<span *ngIf="linkType == linkTypes.None"
28-
class="lead item-list-title dont-break-out"
29-
[innerHTML]="dsoTitle"></span>
30-
<!--<span class="text-muted">-->
31-
<!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
32-
<!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
33-
<!--class="item-list-status">-->
34-
<!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
35-
<!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
36-
<!--</span>-->
37-
<!--</span>-->
38-
<!--</ds-truncatable-part>-->
39-
<!--</span>-->
40-
<ds-additional-metadata [object]="dso"></ds-additional-metadata>
41-
</ds-truncatable>
21+
<div class="d-flex justify-content-between">
22+
<div class="flex-fill">
23+
<ds-truncatable [id]="dso.id">
24+
<ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
25+
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
26+
[attr.rel]="(linkType == linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
27+
[routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
28+
[innerHTML]="dsoTitle"></a>
29+
<span *ngIf="linkType == linkTypes.None"
30+
class="lead item-list-title dont-break-out"
31+
[innerHTML]="dsoTitle"></span>
32+
<!--<span class="text-muted">-->
33+
<!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
34+
<!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
35+
<!--class="item-list-status">-->
36+
<!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
37+
<!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
38+
<!--</span>-->
39+
<!--</span>-->
40+
<!--</ds-truncatable-part>-->
41+
<!--</span>-->
42+
<ds-additional-metadata [object]="dso"></ds-additional-metadata>
43+
</ds-truncatable>
44+
<ds-metric-badges *ngIf="showMetrics" class="d-block clearfix" [item]="dso"></ds-metric-badges>
45+
</div>
46+
<div class="align-self-center">
47+
<ds-metric-donuts [item]="dso"></ds-metric-donuts>
48+
</div>
49+
</div>
4250
</div>
4351
</div>

0 commit comments

Comments
 (0)