-
-
-
Supplementary Outcomes
-
-
-
-
-
-
-
-
Outcomes Supplemented by this {{getTypeName()}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{header}}
+
+ Filter by relation:
+
+ All relations
+ {{relatedClass}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
Related research
-
-
-
-
-
-
-
-
Similar Outcomes
-
-
-
-
-
-
+
-
@@ -476,18 +553,36 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0) {
this.activeTab = 'references';
- } else if ((this.resultLandingInfo.supplementaryResearchResults && this.resultLandingInfo.supplementaryResearchResults.length > 0) ||
- (this.resultLandingInfo.supplementedByResearchResults && this.resultLandingInfo.supplementedByResearchResults.length > 0)) {
- this.activeTab = 'supplementary';
- } else if ((this.resultLandingInfo.relatedResearchResults && this.resultLandingInfo.relatedResearchResults.length > 0) ||
- (this.resultLandingInfo.similarResearchResults && this.resultLandingInfo.similarResearchResults.length > 0)) {
- this.activeTab = 'related';
+ // } else if ((this.resultLandingInfo.supplementaryResearchResults && this.resultLandingInfo.supplementaryResearchResults.length > 0) ||
+ // (this.resultLandingInfo.supplementedByResearchResults && this.resultLandingInfo.supplementedByResearchResults.length > 0)) {
+ // this.activeTab = 'supplementary';
+ // } else if ((this.resultLandingInfo.relatedResearchResults && this.resultLandingInfo.relatedResearchResults.length > 0) ||
+ // (this.resultLandingInfo.similarResearchResults && this.resultLandingInfo.similarResearchResults.length > 0)) {
+ // this.activeTab = 'related';
+ } else if (this.resultLandingInfo.relatedResults && this.resultLandingInfo.relatedResults.length > 0) {
+ this.activeTab = "all_related";
} else if (this.resultLandingInfo.bioentities && this.bioentitiesNum > 0) {
this.activeTab = 'bioentities';
} else if(this.enermapsId && this.properties.enermapsURL) {
@@ -417,6 +422,10 @@ export class ResultLandingComponent {
if(this.communityId && this.communityId == "enermaps" && properties.enermapsURL){
this.enermapsId = ParsingFunctions.getEnermapsConceptId(this.resultLandingInfo.contexts);
}
+
+ this.relatedClassSelected = "";
+ this.filteredRelatedResults = this.resultLandingInfo.relatedResults;
+
this.showLoading = false;
this.setActiveTab();
},
@@ -579,7 +588,7 @@ export class ResultLandingComponent {
}
public getResultPreview(result: RelationResult): ResultPreview {
- return ResultPreview.relationResultConvert(result, this.relation);
+ return ResultPreview.relationResultConvert(result);
}
updateUrlWithType(pid) {
@@ -675,10 +684,11 @@ export class ResultLandingComponent {
|| (resultLandingInfo.organizations && resultLandingInfo.organizations.length > 0)
|| resultLandingInfo.bioentities || (resultLandingInfo.references && resultLandingInfo.references.length > 0)
- || (resultLandingInfo.relatedResearchResults && resultLandingInfo.relatedResearchResults.length > 0)
- || (resultLandingInfo.similarResearchResults && resultLandingInfo.similarResearchResults.length > 0)
- || (resultLandingInfo.supplementaryResearchResults && resultLandingInfo.supplementaryResearchResults.length > 0)
- || (resultLandingInfo.supplementedByResearchResults && resultLandingInfo.supplementedByResearchResults.length > 0)
+ // || (resultLandingInfo.relatedResearchResults && resultLandingInfo.relatedResearchResults.length > 0)
+ // || (resultLandingInfo.similarResearchResults && resultLandingInfo.similarResearchResults.length > 0)
+ // || (resultLandingInfo.supplementaryResearchResults && resultLandingInfo.supplementaryResearchResults.length > 0)
+ // || (resultLandingInfo.supplementedByResearchResults &&
+ || (resultLandingInfo.relatedResults && resultLandingInfo.relatedResults.length > 0)
)
);
// console.log("rich content " + allow)
@@ -754,4 +764,9 @@ export class ResultLandingComponent {
public enrichContexts(contextsWithLink: any) {
this.contextsWithLink = contextsWithLink;
}
+
+ public relatedClassChanged() {
+ this.relatedPage = 1;
+ this.filteredRelatedResults = this.resultLandingInfo.relatedResults.filter(result => !this.relatedClassSelected || result.relationName.toLowerCase() == this.relatedClassSelected.toLowerCase());
+ }
}
diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts
index 901c02d8..486697c5 100644
--- a/landingPages/result/resultLanding.module.ts
+++ b/landingPages/result/resultLanding.module.ts
@@ -29,6 +29,8 @@ import {FeedbackModule} from "../feedback/feedback.module";
import {TabsModule} from "../../utils/tabs/tabs.module";
import {LoadingModule} from "../../utils/loading/loading.module";
import {OrcidModule} from "../../orcid/orcid.module";
+import {MatFormFieldModule} from "@angular/material/form-field";
+import {MatSelectModule} from "@angular/material/select";
@NgModule({
imports: [
@@ -37,7 +39,7 @@ import {OrcidModule} from "../../orcid/orcid.module";
MetricsModule, AltMetricsModule, Schema2jsonldModule, SEOServiceModule,
DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule,
AnnotationModule, LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule,
- OrcidModule
+ OrcidModule, MatFormFieldModule, MatSelectModule
],
declarations: [
ResultLandingComponent
diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts
index 700be798..fdc27957 100644
--- a/landingPages/result/resultLanding.service.ts
+++ b/landingPages/result/resultLanding.service.ts
@@ -187,21 +187,19 @@ export class ResultLandingService {
if(relation.hasOwnProperty("to")) {
if(relation['to'].class && relation['to'].class.toLowerCase() == "isproducedby") {
this.resultLandingInfo.fundedByProjects = this.parsingFunctions.parseFundingByProjects(this.resultLandingInfo.fundedByProjects, relation, provenanceActionVocabulary);
- } else if(relation['to'].class && relation['to'].class.toLowerCase() == "isrelatedto") {
+ }
+ if(relation['to'].scheme && relation['to'].scheme == "dnet:result_result_relations") {
+ let relationName = relation.to.class;
+ if(!this.resultLandingInfo.relatedClassFilters.has(relationName)) {
+ this.resultLandingInfo.relatedClassFilters.add(relationName);
+ }
+
let provenanceAction: string = "";
if(provenanceActionVocabulary != null && relation.provenanceaction in provenanceActionVocabulary) {
provenanceAction = provenanceActionVocabulary[relation.provenanceaction];
}
- this.resultLandingInfo.relatedResearchResults = this.parsingFunctions.parseRelatedResearchResults(this.resultLandingInfo.relatedResearchResults, relation, provenanceAction);
- } else if(relation['to'].class && relation['to'].class.toLowerCase() == "hasamongtopnsimilardocuments") {
- this.resultLandingInfo.similarResearchResults = this.parsingFunctions.parseSimilarResearchResults(this.resultLandingInfo.similarResearchResults, relation);
- } else if(relation['to'].class && relation['to'].class.toLowerCase() == "hasauthorinstitution") {
- this.resultLandingInfo.organizations = this.parseRelatedOrganizations(this.resultLandingInfo.organizations, relation);
- } else if(relation['to'].class && relation['to'].class.toLowerCase() == "issupplementedby") {
- this.resultLandingInfo.supplementaryResearchResults = this.parsingFunctions.parseSupplementaryResearchResults(this.resultLandingInfo.supplementaryResearchResults, relation);
- } else if(relation['to'].class && relation['to'].class.toLowerCase() == "issupplementto") {
- this.resultLandingInfo.supplementedByResearchResults = this.parsingFunctions.parseSupplementedByResearchResults(this.resultLandingInfo.supplementedByResearchResults, relation);
+ this.resultLandingInfo.relatedResults = this.parsingFunctions.parseResults(this.resultLandingInfo.relatedResults, relation, provenanceAction);
}
}
}
@@ -395,10 +393,8 @@ export class ResultLandingService {
return (item != undefined && item.fullName != undefined);
});
}
- this.resultLandingInfo.relatedResearchResults = this.parsingFunctions.sortByPercentage(this.resultLandingInfo.relatedResearchResults);
- this.resultLandingInfo.similarResearchResults = this.parsingFunctions.sortByPercentage(this.resultLandingInfo.similarResearchResults);
- this.resultLandingInfo.supplementaryResearchResults = this.parsingFunctions.sortByPercentage(this.resultLandingInfo.supplementaryResearchResults);
- this.resultLandingInfo.supplementedByResearchResults = this.parsingFunctions.sortByPercentage(this.resultLandingInfo.supplementedByResearchResults);
+
+ this.resultLandingInfo.relatedResults = this.parsingFunctions.sortByPercentage(this.resultLandingInfo.relatedResults);
return this.resultLandingInfo;
}
diff --git a/utils/entities/resultLandingInfo.ts b/utils/entities/resultLandingInfo.ts
index 561c9de4..d3158508 100644
--- a/utils/entities/resultLandingInfo.ts
+++ b/utils/entities/resultLandingInfo.ts
@@ -51,15 +51,65 @@ export class ResultLandingInfo {
classifiedSubjects: Map; //
showEgiNotebookButton: boolean = false;
- // percentage is for trust
- relatedResearchResults: RelationResult[];
- // percentage is for similarity
- similarResearchResults: RelationResult[];
- //isSupplementedBy
- supplementaryResearchResults: RelationResult[];
- //isSupplementTo
- supplementedByResearchResults: RelationResult[];
-
+ // // percentage is for trust
+ // relatedResearchResults: RelationResult[];
+ // // percentage is for similarity
+ // similarResearchResults: RelationResult[];
+ // //isSupplementedBy
+ // supplementaryResearchResults: RelationResult[];
+ // //isSupplementTo
+ // supplementedByResearchResults: RelationResult[];
+ //
+ // // IsPartOf
+ // parentResearchResults: RelationResult[];
+ // // HasPart
+ // childrenResearchResults: RelationResult[];
+ // // Reviews
+ // reviewedByResearchResults: RelationResult[];
+ // // IsReviewedBy
+ // reviewerResearchResults: RelationResult[];
+ // // References
+ // referencedByResearchResults: RelationResult[];
+ // // IsReferencedBy
+ // refererResearchResults: RelationResult[];
+ // // IsIdenticalTo
+ // identicalResearchResults: RelationResult[];
+ // // IsContinuedBy
+ // continuatorResearchResults: RelationResult[];
+ // // Continues
+ // continuedByResearchResults: RelationResult[];
+ // // IsDocumentedBy
+ // documentaryResearchResults: RelationResult[];
+ // // Documents
+ // documentedByResearchResults: RelationResult[];
+ // // IsCompiledBy
+ // compilerResearchResults: RelationResult[];
+ // // Compiles
+ // compiledByResearchResults: RelationResult[];
+ // // IsPreviousVersionOf
+ // newerResearchResults: RelationResult[];
+ // // IsNewVersionOf
+ // previousResearchResults: RelationResult[];
+ // // IsVersionOf
+ // versionedByResearchResults: RelationResult[];
+ // // HasVersion
+ // isVersionResearchResults: RelationResult[];
+ // // IsSourceOf
+ // derivedResearchResults: RelationResult[];
+ // // IsDerivedFrom
+ // sourceResearchResults: RelationResult[];
+ // // IsVariantFormOf
+ // originalResearchResults: RelationResult[];
+ // // IsOriginalFormOf
+ // variantResearchResults: RelationResult[];
+ // // IsObsoletedBy
+ // obsoleteResearchResults: RelationResult[];
+ // // Obsolete
+ // obsoletedByResearchResults: RelationResult[];
+
+ relatedResults: RelationResult[];
+ relatedClassFilters: Set = new Set();
+
contexts: { "labelContext": string, "idContext": string,
"labelCategory": string, "idCategory": string,
"labelConcept": string, "idConcept": string}[];
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 0f2eca11..f27706df 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -112,6 +112,12 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
if(this.result.provenanceAction) {
this.beforeTitle.push(this.result.provenanceAction);
}
+ if(this.result.relationName) {
+ this.beforeTitle.push(this.result.relationName);
+ }
+ // if(this.result.percentage) {
+ // this.beforeTitle.push((this.result.relation ? this.result.relation+": " : "") + this.result.percentage.toString() + "%");
+ // }
}
public getTypeName(type: string): string {
diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts
index b1d5d860..a3de23c5 100644
--- a/utils/result-preview/result-preview.ts
+++ b/utils/result-preview/result-preview.ts
@@ -28,8 +28,10 @@ export interface RelationResult {
id: string;
date: string;
percentage: number;
+ percentageName?: string;
class: string
provenanceAction?: string;
+ relationName?: string;
}
export interface Project {
@@ -131,6 +133,7 @@ export class ResultPreview {
types: string[];
// Relation result
+ relationName: string;
relation: string;
percentage: number;
provenanceAction: string;
@@ -217,7 +220,7 @@ export class ResultPreview {
return resultPreview;
}
- public static relationResultConvert(result: RelationResult, relation: string = 'trust'): ResultPreview {
+ public static relationResultConvert(result: RelationResult): ResultPreview {
let resultPreview: ResultPreview = new ResultPreview();
resultPreview.id = result.id;
resultPreview.title = result.name;
@@ -225,7 +228,8 @@ export class ResultPreview {
if(result.date) {
resultPreview.year = result.date.toString();
}
- resultPreview.relation = relation;
+ resultPreview.relationName = result.relationName;
+ resultPreview.relation = result.percentageName;
resultPreview.percentage = result.percentage;
resultPreview.provenanceAction = result.provenanceAction;
return resultPreview;