diff --git a/src/app/portal/components/single/single-project/single-project.component.html b/src/app/portal/components/single/single-project/single-project.component.html index 0655cc17b..7604d7463 100644 --- a/src/app/portal/components/single/single-project/single-project.component.html +++ b/src/app/portal/components/single/single-project/single-project.component.html @@ -66,18 +66,43 @@
0">
-
0"> + {{source.dataSource.trim()}}
- -Tiedon lähde ei saatavilla.
diff --git a/src/app/portal/components/single/single-project/single-project.component.ts b/src/app/portal/components/single/single-project/single-project.component.ts index 39aa168f8..97cc68368 100644 --- a/src/app/portal/components/single/single-project/single-project.component.ts +++ b/src/app/portal/components/single/single-project/single-project.component.ts @@ -115,13 +115,21 @@ export class SingleProjectComponent implements OnInit, OnDestroy { tooltip: $localize`:@@spParticipantsTooltip:Hankkeeseen osallistuvat organisaatiot ja henkilöt`, showOnlyLabel: true, subFields: [{ - label: $localize`:@@spOrganizations:Organisaatiot`, + label: $localize`:@@spResponsibleOrganization:Vastuuorganisaatio`, field: 'responsibleOrganizations', showOnlyLabel: false }, + { + label: $localize`:@@spOriginalOrganizations:Alkuperäinen vastuuorganisaatio`, + field: 'originalResponsibleOrganization', + }, { label: $localize`:@@spPersons:Henkilöt`, field: 'responsiblePersons', + }, + { + label: $localize`:@@spRelatedOrganizations:Liittyvät organisaatiot`, + field: 'relatedOrganizations', }] }, { @@ -237,6 +245,7 @@ export class SingleProjectComponent implements OnInit, OnDestroy { // .pipe(map(responseData => [responseData])) .subscribe({ next: (responseData) => { + console.log(responseData); this.responseData = responseData; const project = this.responseData.projects[0]; if (project) { diff --git a/src/app/portal/models/project/project.model.ts b/src/app/portal/models/project/project.model.ts index 89cd353a7..ce398a39b 100644 --- a/src/app/portal/models/project/project.model.ts +++ b/src/app/portal/models/project/project.model.ts @@ -24,9 +24,14 @@ export class Project { public projectURL: string, public responsibleOrganizations: object[], public responsibleOrganization: string, + public relatedOrganizations: object[], + public relatedOrganization: string, + public originalOrganizations: object[], + public originalOrganization: string, public responsiblePerson: object[], public keywords: string, - public completions: object[] + public completions: object[], + public dataSource: string ) { } } @@ -51,7 +56,33 @@ export class ProjectAdapter implements Adapter