diff --git a/landingPages/landing-utils/showSubjects.component.ts b/landingPages/landing-utils/showSubjects.component.ts index 31767075..df8255bd 100644 --- a/landingPages/landing-utils/showSubjects.component.ts +++ b/landingPages/landing-utils/showSubjects.component.ts @@ -13,7 +13,7 @@ import {properties} from "../../../../environments/environment"; @Component({ selector: 'showSubjects', template: ` - +
Subjects by Vocabulary
@@ -22,10 +22,11 @@ import {properties} from "../../../../environments/environment"; -
+ -
+
Keywords
@@ -33,6 +34,16 @@ import {properties} from "../../../../environments/environment"; View all
+ + +
+ EOSC Subjects +
+
+ +
+
@@ -78,7 +89,7 @@ import {properties} from "../../../../environments/environment";
-

+

@@ -91,13 +102,17 @@ import {properties} from "../../../../environments/environment";

+ +

+ {{getValue(eoscSubjects).join(', ')}} +

- +
` @@ -234,4 +249,8 @@ export class ShowSubjectsComponent { this.openSubjectsByVocabularyModal(); } } + + getValue(eosSubjects) { + return eosSubjects.map(res => res.value); + } } diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index dc4e35d5..d102c511 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -283,7 +283,7 @@ - - + @@ -549,7 +549,7 @@

- +
Subjects @@ -736,7 +736,7 @@ + *ngIf="hasSubjects"> diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index ad3d0311..b25b77e5 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -1171,6 +1171,10 @@ export class ResultLandingComponent { return "Not available access"; } + public get hasSubjects(): boolean { + return !!(this.resultLandingInfo.subjects || this.resultLandingInfo.otherSubjects || (this.resultLandingInfo.classifiedSubjects && this.properties.environment == 'production') || this.resultLandingInfo.eoscSubjects); + } + public getEoscParams() { let params = ""; if(this.prevPath) {