diff --git a/src/app/project/board/address-template/address-template.component.ts b/src/app/project/board/address-template/address-template.component.ts index 5c5d0c76f3..4e7c3aa4aa 100644 --- a/src/app/project/board/address-template/address-template.component.ts +++ b/src/app/project/board/address-template/address-template.component.ts @@ -1,20 +1,19 @@ import { Component, Input } from '@angular/core'; -import { IAddress } from '../dataset-metadata'; +import { Address } from '@dasch-swiss/dsp-js'; @Component({ selector: 'app-address-template', template: ` -
-

Address:

-
-

{{ address.streetAddress }}

- {{ address.postalCode }} - {{ address.addressLocality }} -
+
+
+ Address: +
+
+ {{ address.streetAddress }}, {{ address.postalCode }} {{ address.addressLocality }} +
- `, - styles: ['.postcode { margin-right: 6px; }'] + ` }) export class AddressTemplateComponent { - @Input() address: IAddress; + @Input() address: Address; } diff --git a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.html b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.html index ecec3cb85a..bf3f4c8cdb 100644 --- a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.html +++ b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.html @@ -1,21 +1,28 @@ -

Attribution

- -

The following people are involved in the creation of the dataset:

- - -

{{ attribution.role | titlecase }}

+

The following people are involved in the creation of the dataset:

-
- + +
+
+

+ {{ role | titlecase }} +

+
-
- +

Agent(s):

+
+
+
+ +
+
+ +
+
-
diff --git a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.scss b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.scss index ca0ffce2bf..bf913e52fc 100644 --- a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.scss +++ b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.scss @@ -1,5 +1,6 @@ .attribution-entry { - margin-top: 25px; + margin-top: 20px; + background-color: #fffdfd; .color-for-role { color: brown; diff --git a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.ts b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.ts index 88553f5b1a..b229edc450 100644 --- a/src/app/project/board/attribution-tab-view/attribution-tab-view.component.ts +++ b/src/app/project/board/attribution-tab-view/attribution-tab-view.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core'; -import { IAttribution, IOrganisation, IPerson } from '../dataset-metadata'; +import { Attribution, IId, Organization, Person } from '@dasch-swiss/dsp-js'; +import { MetadataService } from '../dataset-metadata.service'; @Component({ selector: 'app-attribution-tab-view', @@ -8,15 +9,24 @@ import { IAttribution, IOrganisation, IPerson } from '../dataset-metadata'; }) export class AttributionTabViewComponent { // attribution input - @Input() attributions: IAttribution[]; + @Input() attributions: Attribution[]; + + @Input() subProperties: Object; + + currentAgent: Person | Organization | IId; + + constructor(private _metadataService: MetadataService) { + } // return the type of agent to use correct template to display it - getAgentType(agent: IPerson | IOrganisation) { - if (agent.hasOwnProperty('familyName')) { - return 'person'; - } - if (agent.hasOwnProperty('url')) { - return 'organisation'; + setAgent (agent: Person | Organization | IId): string { + let atype = this._metadataService.getContactType(agent); + if (atype) { + this.currentAgent = agent; + } else { + this.currentAgent = this.subProperties[agent.id]; + atype = this._metadataService.getContactType(this.currentAgent); } + return atype; } } diff --git a/src/app/project/board/board.component.html b/src/app/project/board/board.component.html index 9b142ad220..b027d085aa 100644 --- a/src/app/project/board/board.component.html +++ b/src/app/project/board/board.component.html @@ -1,23 +1,24 @@ - +
- - - Active - Deactivated + + + Active + Deactivated + + + + + - - - - -
@@ -28,7 +29,7 @@

- + Active Deactivated @@ -51,13 +52,17 @@

-
- +
-
-

Description

-
+
+
+ Description +
+
+

+
+
@@ -67,7 +72,7 @@

Description

perm_data_setting Project - + @@ -83,7 +88,7 @@

Description

assignment Attribution - + @@ -93,106 +98,122 @@

Description

 - portrait Contact - +
-
+ +
-

Dataset(s)

-
- - - {{ ds.name }} - - +
+
+ Dataset(s) +
+
+ + + {{ ds.name }} + + +
-
-

Cite as

- -
-
-

+
+
+
Cite as
+ +
+
+

+
-
-
-
-
- Persistent identifier -
- -
-
- {{ selectedDataset.project.id }} +
+
+
+ Persistent identifier
+
-
-
-
- License -
- -
-
- {{ selectedDataset.license.value }} -
+
+ {{ selectedProject.id }}
-
-
- Publication date -
-
- {{ selectedDataset.datePublished | date:'MMMM d, yyyy' }} -
+
+ +
+
+ License +
+
+

+ {{ license.url }} +

+
+
+ +
+
+ Publication date +
+
+ {{ selectedDataset.datePublished | date:'MMMM d, yyyy' }}
-

Keyword(s)

-
- - {{ kword }} - +
+
+ Keyword(s) +
+
+ + {{ kword }} + +
-

Download metadata

-
- JSON - - {{ dformat }} +
+
+ Download metadata +
+
+ JSON + + {{ dformat }} +
diff --git a/src/app/project/board/board.component.scss b/src/app/project/board/board.component.scss index ebbb2e495f..e951876df7 100644 --- a/src/app/project/board/board.component.scss +++ b/src/app/project/board/board.component.scss @@ -1,5 +1,6 @@ @import "../../../assets/style/responsive"; @import "../../../assets/style/config"; +@import "../../../assets/style/theme"; section { margin: 24px auto; @@ -7,22 +8,22 @@ section { // phone devices @media (max-width: map-get($grid-breakpoints, phone)) { - + .fill-remaining-space { display: none; } - + .app-toolbar-action { display: none; } - + .more-space-bottom { margin-bottom: 0 !important; } - + .app-toolbar-mobile { display: flex; - + .fill-remaining-space-action { flex: 1 1 auto; } @@ -33,7 +34,7 @@ section { padding-right: 16px; } } - + .description { margin: 0 auto 36px auto; } @@ -41,11 +42,11 @@ section { // desktop and tablet devices @media (min-width: map-get($grid-breakpoints, phone)) { - + .more-space-bottom { margin-bottom: 15px !important; } - + .app-toolbar-mobile { display: none; } @@ -56,20 +57,20 @@ section { max-width: 1280px; position: relative; margin: 0 auto 60px auto; - + .left-info { flex: 70%; } - + .right-info { flex: 30%; max-width: 400px; } - + .column { padding: 15px; } - + .metadata-box { padding: 19px; margin-bottom: 20px; @@ -78,25 +79,22 @@ section { border-radius: $border-radius; box-shadow: inset 0 1px 1px rgba(0,0,0,.05); } - - .tab-contents { - margin-top: 20px; - } - - .display-inline-block { + + ::ng-deep .display-inline-block { display: inline-block; } - + .btn-copy-to-clipboard { - padding: 0px 10px; + padding: 0px 6px; min-width: auto; + font-size: 20px; } - + .mat-radio-button { margin-bottom: 5px; display: block; } - + /* .mat-radio-container{ height: 15px; @@ -116,76 +114,107 @@ section { left: calc(50% - 15px); top: calc(50% - 15px); } - */ - + */ + .download-metadata { margin-left: 10px; pointer-events: none; cursor: default; color: darkgrey !important; } - + .sidenav-prop-text { text-align: left; overflow-wrap: break-word; font-weight: inherit; - color: #434242; + color: $primary_400; + } + + ::ng-deep .metadata-property { + + margin-bottom: 10px; + + .property-label { + font-weight: 500; + font-size: 16px; + margin-bottom: 8px; + text-align: left; + overflow-wrap: break-word; + } + + .property-value { + margin-left: 20px; + } + } + + .property:not(:last-child) { + margin-bottom: 20px; + } + + ::ng-deep .p-block { + margin-top: 0px; + } + + ::ng-deep .remove-top-margin { + margin-top: 0px; } - .sidenav-properties-container { + ::ng-deep .add-left-margin { + margin-left: 8px; + } - .property { + ::ng-deep .sub-block { + margin-left: 22px; + } - .property-label { - font-weight: bold; - font-size: 16px; - margin-bottom: 8px; - text-align: left; - overflow-wrap: break-word; - } + ::ng-deep .sub-block:not(:last-child) { + border-bottom: 1px solid $primary_100; + } - .property-value { - margin-left: 20px; - } - } + ::ng-deep .tab-content { + margin-top: 20px; + } - .property:not(:last-child) { - margin-bottom: 20px; - } + ::ng-deep .comma:not(:empty) ~ .comma:not(:empty):before { + content: ", "; } + ::ng-deep .person-name, ::ng-deep .organization-name, ::ng-deep .grant-name{ + color: $accent_700; + } + // grid ::ng-deep .properties-container { display: grid; grid-template-columns: repeat(6, 1fr); gap: 16px; - + .properties { grid-column: 1 / span 6; margin-top: 16px; - + .property { grid-row: 1 / 1; display: grid; grid-template-columns: repeat(4, 1fr); gap: 16px; margin-top: 5px; - + .property-label, .property-value { overflow-wrap: break-word; } - + .property-label { grid-column: 1 / span 1; padding: 2px; - + .label { text-align: right; color: rgba(0,0,0,.54); } } - + .property-value { grid-column: 2 / span 3; padding: 5px 2px 8px; @@ -193,26 +222,4 @@ section { } } } - - ::ng-deep .person { - - h4 { - margin-bottom: 6px; - margin-top: 6px; - display: inline-block; - } - - p { - margin-top: 0px; - margin-bottom: 8px; - } - - .sub-details { - margin-top: 10px; - .contents { - margin-left: 35px; - } - } - } - } diff --git a/src/app/project/board/board.component.spec.ts b/src/app/project/board/board.component.spec.ts index d69898f314..3a575047f8 100644 --- a/src/app/project/board/board.component.spec.ts +++ b/src/app/project/board/board.component.spec.ts @@ -114,4 +114,5 @@ describe('BoardComponent', () => { // todo: check the project name, if there is description and keywords, check if we can edit the project info if the user is project admin or system admin (edit btn displayed) // check if you get the project by shortcode + // check if you get the project metadata }); diff --git a/src/app/project/board/board.component.ts b/src/app/project/board/board.component.ts index 72d53f846b..6f4c16cec6 100644 --- a/src/app/project/board/board.component.ts +++ b/src/app/project/board/board.component.ts @@ -7,15 +7,17 @@ import { ActivatedRoute, Params } from '@angular/router'; import { ApiResponseData, ApiResponseError, + Dataset, KnoraApiConnection, ProjectResponse, - ReadProject + ProjectsMetadata, + ReadProject, + SingleProject } from '@dasch-swiss/dsp-js'; import { DspApiConnectionToken, Session, SessionService } from '@dasch-swiss/dsp-ui'; import { DialogComponent } from 'src/app/main/dialog/dialog.component'; import { ErrorHandlerService } from 'src/app/main/error/error-handler.service'; import { CacheService } from '../../main/cache/cache.service'; -import { IDataset } from './dataset-metadata'; export interface DatasetRadioOption { name: string; @@ -33,6 +35,7 @@ export class BoardComponent implements OnInit { // loading for progress indicator loading: boolean; + metadataLoading: boolean; // permissions of logged-in user session: Session; @@ -48,14 +51,12 @@ export class BoardComponent implements OnInit { color: string = 'primary'; // variables to store metadata information - // metadata received from backend - metadata: object; - - // list of all datasets - datasets: IDataset[]; - - // metadata displayed on current page is from selected dataset - selectedDataset: IDataset; + projectsMetadata: ProjectsMetadata; + datasetList: Dataset[] = []; + singleProjectList: SingleProject[] = []; + subProperties = {}; + selectedDataset: Dataset; + selectedProject: SingleProject; // list of dataset names to display as radio buttons in right side column datasetOptions: DatasetRadioOption[]; @@ -84,6 +85,7 @@ export class BoardComponent implements OnInit { ngOnInit() { this.loading = true; + this.metadataLoading = true; // get information about the logged-in user, if one is logged-in if (this._session.getSession()) { @@ -95,9 +97,6 @@ export class BoardComponent implements OnInit { // get project info from backend this.getProject(); - - // get project and dataset metadata from backend - this.getProjectMetadata(); } getProject() { @@ -109,6 +108,9 @@ export class BoardComponent implements OnInit { (response: ApiResponseData) => { this.project = response.body.project; + // get project and dataset metadata from backend + this.getProjectMetadata(); + // is logged-in user projectAdmin? if (this._session.getSession()) { this.projectAdmin = this.sysAdmin ? this.sysAdmin : this.session.user.projectAdmin.some(e => e === this.project.id); @@ -126,285 +128,67 @@ export class BoardComponent implements OnInit { getProjectMetadata() { // get project metadata from backend - // note: for now to complete functionality we have used hard-coded metadata. - // in next iteration, it will be replace with ajax request to get - // metadata from backend - this.metadata = { - 'projectsMetadata': [ - { - 'type': 'http://ns.dasch.swiss/repository#Dataset', - 'id': 'http://ns.dasch.swiss/test-dataset', - 'abstract': 'Dies ist ein Testprojekt.', - 'alternativeTitle': 'test', - 'conditionsOfAccess': 'Open Access', - 'dateCreated': '2001-09-26', - 'dateModified': '2020-04-26', - 'datePublished': '2002-09-24', - 'distribution': { - 'type': 'https://schema.org/DataDownload', - 'value': 'https://test.dasch.swiss' - }, - 'documentation': 'Work in progress', - 'howToCite': 'Testprojekt (test), 2002, https://test.dasch.swiss', - 'language': [ - 'EN', - 'DE', - 'FR' - ], - 'license': { - 'type': 'https://schema.org/URL', - 'value': 'https://creativecommons.org/licenses/by/3.0' - }, - 'qualifiedAttribution': [ - { - 'type': 'http://www.w3.org/ns/prov#Attribution', - 'role': 'contributor', - 'agent': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-berry', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'lauren.berry@unibas.ch', - 'familyName': 'Berry', - 'givenName': 'Lauren', - 'jobTitle': 'Dr.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch' - } - }, - { - 'type': 'http://www.w3.org/ns/prov#Attribution', - 'role': 'contributor', - 'agent': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-hart', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'leonhard.hart@test.ch', - 'familyName': 'Hart', - 'givenName': 'Leonhard', - 'jobTitle': 'Prof.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch' - } - }, - { - 'type': 'http://www.w3.org/ns/prov#Attribution', - 'role': 'editor', - 'agent': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-hart', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'leonhard.hart@test.ch', - 'familyName': 'Hart', - 'givenName': 'Leonhard', - 'jobTitle': 'Prof.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch' - } - }, - { - 'type': 'http://www.w3.org/ns/prov#Attribution', - 'role': 'editor', - 'agent': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-coleman', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'james.coleman@dasch.swiss', - 'familyName': 'Coleman', - 'givenName': 'James', - 'jobTitle': 'Dr. des.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch' - } - }, - { - 'type': 'http://www.w3.org/ns/prov#Attribution', - 'role': 'editor', - 'agent': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-jones', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'benjamin.jones@test.ch', - 'familyName': 'Jones', - 'givenName': 'Benjamin', - 'jobTitle': 'Dr. des.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch' - } - } - ], - 'status': 'ongoing', - 'title': 'Testprojekt', - 'typeOfData': [ - 'image', - 'text' - ], - 'project': { - 'type': 'http://ns.dasch.swiss/repository#Project', - 'id': 'http://ns.dasch.swiss/test-project', - 'alternateName': 'test', - 'contactPoint': { - 'type': 'http://ns.dasch.swiss/repository#Person', - 'id': 'http://ns.dasch.swiss/test-abraham', - 'address': { - 'type': 'https://schema.org/PostalAddress', - 'addressLocality': 'Basel', - 'postalCode': '4000', - 'streetAddress': 'Teststrasse' - }, - 'email': 'stewart.abraham@test.ch', - 'familyName': 'Abraham', - 'givenName': 'Stewart', - 'jobTitle': 'Dr.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch', - 'sameAs': { - 'type': 'https://schema.org/URL', - 'value': 'https://orcid.org/0000-0002-1825-0097' - } - }, - 'dataManagementPlan': { - 'type': 'http://ns.dasch.swiss/repository#DataManagementPlan', - 'id': 'http://ns.dasch.swiss/test-plan', - 'url': { - 'type': 'https://schema.org/URL', - 'value': 'https://snf.ch' - }, - 'isAvailable': true - }, - 'description': 'Dies ist ein Testprojekt...alle Properties wurden verwendet, um diese zu testen', - 'discipline': { - 'name': 'SKOS UNESCO Nomenclature', - 'url': 'http://skos.um.es/unesco6/11' - }, - 'endDate': '2001-01-26', - 'funder': { - 'id': 'http://ns.dasch.swiss/test-funder' - }, - 'grant': { - 'type': 'http://ns.dasch.swiss/repository#Grant', - 'id': 'http://ns.dasch.swiss/test-grant', - 'funder': { - 'id': 'http://ns.dasch.swiss/test-funder' - }, - 'name': 'Prof. test test, Prof. test Harbtestrecht', - 'number': '0123456789', - 'url': { - 'type': 'https://schema.org/URL', - 'value': 'http://p3.snf.ch/testproject' - } - }, - 'keywords': [ - 'science', - 'mathematics', - 'history of science', - 'history of mathematics' - ], - 'name': 'Testprojektname (test)', - 'publication': 'testpublication', - 'shortcode': '0000', - 'spatialCoverage': [ - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/2658434/switzerland.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/6255148/europe.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/3017382/republic-of-france.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/6269131/england.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/2017370/russian-federation.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/2921044/federal-republic-of-germany.html' - } - }, - { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/3175395/italian-republic.html' - } - } - ], - 'startDate': '2000-07-26', - 'temporalCoverage': { - 'name': 'Chronontology Dainst', - 'url': 'http://chronontology.dainst.org/period/Ef9SyESSafJ1' - }, - 'url': { - 'type': 'https://schema.org/URL', - 'value': 'https://test.dasch.swiss/' - } - }, - 'sameAs': { - 'type': 'https://schema.org/URL', - 'value': 'https://test.dasch.swiss' + this._dspApiConnection.v2.metadata.getProjectMetadata(this.project.id).subscribe( + (response: ProjectsMetadata) => { + this.projectsMetadata = response; + + this.metadataLoading = false; + + // create list according to it's type + this.projectsMetadata.projectsMetadata.forEach((obj) => { + if (obj instanceof Dataset) { + this.datasetList.push(obj); + } else if (obj instanceof SingleProject) { + this.singleProjectList.push(obj); + } else { + this.subProperties[obj.id] = obj; } + }); + + const dsOptions = []; + // dataset options to display radio buttons for selection in right column + for (let idx = 0; idx < this.datasetList.length; idx++) { + dsOptions.push({ + name: this.datasetList[idx].title, + id: idx, + checked: idx === 0 ? true : false + }); } - ] - }; - // convert metadata to use IDataset interface - this.datasets = this.metadata['projectsMetadata'] as IDataset[]; + this.datasetOptions = dsOptions; - // by default display first dataset - this.selectedDataset = this.datasets[0]; + // by default display first dataset + this.selectedDataset = this.datasetList[0]; - const dsOptions = []; - // dataset options to display radio buttons for selection in right column - for (let idx = 0; idx < this.datasets.length; idx++) { - dsOptions.push({ - name: this.datasets[idx].title, - id: idx, - checked: idx === 0 ? true : false - }); + // get project + this.getProjectForDataset(); + }, + (error: ApiResponseError) => { + this._errorHandler.showMessage(error); + } + ); + + this.metadataLoading = false; + } + + getProjectForDataset() { + // get selected project for this dataset + // note that dataset always contains only one SingleProject + for (const proj of this.singleProjectList) { + if (this.selectedDataset.project.id === proj.id) { + this.selectedProject = proj; + break; + } } + } - this.datasetOptions = dsOptions; + getSubProperty(id: string): object { + return this.subProperties[id]; } // download metadata downloadMetadata() { - const blob: Blob = new Blob([JSON.stringify(this.metadata)], {type: 'application/json'}); + const blob: Blob = new Blob([JSON.stringify(this.projectsMetadata)], {type: 'application/json'}); const fileName: string = 'metadata.json'; const objectUrl: string = URL.createObjectURL(blob); const a: HTMLAnchorElement = document.createElement('a') as HTMLAnchorElement; @@ -418,8 +202,10 @@ export class BoardComponent implements OnInit { URL.revokeObjectURL(objectUrl); } + // update the selected dataset object updateDataset(event: MatRadioChange) { - this.selectedDataset = this.datasets[event.value]; + this.selectedDataset = this.datasetList[event.value]; + this.getProjectForDataset(); } // copy link to clipboard diff --git a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.html b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.html index e2a6a19b98..e951282467 100644 --- a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.html +++ b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.html @@ -1,5 +1,19 @@ -

Contact

- -
- +
+

Contact point is not available!

+
+
+
+ + +
+ +
+ +
+ +
+ + +
+ diff --git a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.spec.ts b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.spec.ts index c1d2139e11..45d8c0c23a 100644 --- a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.spec.ts +++ b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.spec.ts @@ -49,7 +49,8 @@ describe('ContactsTabViewComponent', () => { testHostFixture.detectChanges(); }); - it('should create', () => { + // todo: add test case when test data is ready + /* it('should create', () => { expect(testHostComponent).toBeTruthy(); - }); + }); */ }); diff --git a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.ts b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.ts index b73a09c0ec..5572184143 100644 --- a/src/app/project/board/contacts-tab-view/contacts-tab-view.component.ts +++ b/src/app/project/board/contacts-tab-view/contacts-tab-view.component.ts @@ -1,11 +1,41 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; +import { IId, Organization, Person } from '@dasch-swiss/dsp-js'; +import { MetadataService } from '../dataset-metadata.service'; @Component({ selector: 'app-contacts-tab-view', templateUrl: './contacts-tab-view.component.html', styleUrls: ['./contacts-tab-view.component.scss'] }) -export class ContactsTabViewComponent { +export class ContactsTabViewComponent implements OnInit { // contact details - @Input() contactDetails: object; + @Input() contactDetails: Person[] | Organization[] | IId[]; + + @Input() subProperties: Object; + + contactsList = []; + contactType: string; + + constructor(private _metadataService: MetadataService) { + } + + ngOnInit() { + + if (this.contactDetails) { + // check which type of array is present + this.contactType = this._metadataService.getContactType(this.contactDetails[0]); + + // if contactType is person or organization + if (this.contactType) { + this.contactsList = this.contactDetails; + return; + } + + // if contactType is undefined, it means it contains the array of IId objects + for (const contact of this.contactDetails) { + this.contactsList.push(this.subProperties[contact.id]); + } + this.contactType = this._metadataService.getContactType(this.contactsList[0]); + } + } } diff --git a/src/app/project/board/dataset-metadata.service.ts b/src/app/project/board/dataset-metadata.service.ts new file mode 100644 index 0000000000..181178cac7 --- /dev/null +++ b/src/app/project/board/dataset-metadata.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@angular/core'; +import { IId, Organization, Person } from '@dasch-swiss/dsp-js'; + +@Injectable({ + providedIn: 'root' +}) +export class MetadataService { + + constructor() { } + + /** + * used in project metadata page + * determine if the object is of type Person or Organization or Iid + * @param obj Person | Organization | IId + */ + getContactType(obj: Person | Organization | IId): string { + if (obj instanceof Person) { + return 'person'; + } else if (obj instanceof Organization) { + return 'organization'; + } + return undefined; + } + +} diff --git a/src/app/project/board/dataset-metadata.ts b/src/app/project/board/dataset-metadata.ts deleted file mode 100644 index e0d7370e62..0000000000 --- a/src/app/project/board/dataset-metadata.ts +++ /dev/null @@ -1,111 +0,0 @@ -export interface UrlProperty { - type: string; - value: string; -} - -export interface IAddress { - type: string; - streetAddress: string; - postalCode: string; - addressLocality: string; -} - -export interface IOrganisation { - type: string; - id: string; - name: string; - address?: IAddress; - email?: string; - url?: string; -} - -export interface IPerson { - type: string; - id: string; - jobTitle: string | string[]; - givenName: string; - familyName: string; - organisation?: IOrganisation; - memberOf: string; - email?: string | string[]; - sameAs?: UrlProperty; - address?: IAddress | IAddress[]; -} - -export interface IAttribution { - type: string; - role: string; - agent: IPerson | IOrganisation; -} - -export interface IDMP { - type: string; - id: string; - isAvailable: boolean; - url?: UrlProperty; -} - -export interface IPlace { - name: string; - url: string; -} - -export interface ISpatialCoverage { - place: IPlace; -} - -export interface IFunder { - id: string; -} - -export interface IGrant { - type: string; - id: string; - funder: IFunder; - number?: string; - name?: string; - url?: UrlProperty; -} - -export interface IProject { - type: string; - id: string; - url: UrlProperty; - shortcode: string; - name: string; - description: string; - keywords: string[]; - discipline: IPlace; - startDate: string; - temporalCoverage: IPlace; - spatialCoverage: ISpatialCoverage[]; - funder: IFunder; - dataManagementPlan?: IDMP; - publication?: string | string[]; - endDate?: string; - grant?: IGrant; - contactPoint?: IPerson | IOrganisation; - alternateName?: string | string[]; -} - -export interface IDataset { - type: string; - id: string; - abstract: string | string[]; - conditionsOfAccess: string; - howToCite: string; - language: string[]; - license: UrlProperty; - qualifiedAttribution: IAttribution[]; - status: 'in planning' | 'ongoing' | 'on hold' | 'finished'; - title: string; - typeOfData: string[]; - project: IProject; - sameAs?: UrlProperty; - alternativeTitle?: string; - documentation?: string | string[]; - datePublished?: string; - dateCreated?: string; - dateModified?: string; - distribution?: UrlProperty; -} diff --git a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.html b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.html index 8b1c35f70b..d766540931 100644 --- a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.html +++ b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.html @@ -7,8 +7,6 @@

Selected dataset: {{ metadata.title }}

Default dataset is displayed, to change it click on the radio button in the right side panel.

- -
@@ -18,11 +16,18 @@

{{ prop.key }}

-
+
{{ prop.value }}
- {{ metadata[prop.key]['value'] }} +

+ {{ entry.url }} +

+
+
+

+ {{ prop.value.url }} +

{{ prop.value | date:'MMMM d, yyyy' }} diff --git a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.spec.ts b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.spec.ts index e3ea70e03c..ef1e8dd628 100644 --- a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.spec.ts +++ b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.spec.ts @@ -4,8 +4,8 @@ import { Component, ViewChild } from '@angular/core'; /** - * Test host component to simulate parent component. - */ +* Test host component to simulate parent component. +*/ @Component({ selector: 'app-board-host-component', template: '' @@ -15,96 +15,7 @@ class TestHostBoardComponent { @ViewChild('datasetTabView') datasetTabView: DatasetTabViewComponent; // metadata object - datasetMetadata = { - 'abstract': 'Dies ist ein Testprojekt.', - 'alternativeTitle': 'test', - 'conditionsOfAccess': 'Open Access', - 'dateCreated': '2001-09-26', - 'dateModified': '2020-04-26', - 'datePublished': '2002-09-24', - 'distribution': {'type': 'https://schema.org/DataDownload', 'value': 'https://test.dasch.swiss'}, - 'documentation': 'Work in progress', - 'howToCite': 'Testprojekt (test), 2002, https://test.dasch.swiss', - 'language': ['EN', 'DE', 'FR'], - 'license': {'type': 'https://schema.org/URL', 'value': 'https://creativecommons.org/licenses/by/3.0'}, - 'qualifiedAttribution': [{'role': 'contributor', 'agent': 'http://ns.dasch.swiss/test-berry'}, {'role': 'contributor', 'agent': 'http://ns.dasch.swiss/test-hart'}, { - 'role': 'editor', - 'agent': 'http://ns.dasch.swiss/test-abraham' - }, {'role': 'editor', 'agent': 'http://ns.dasch.swiss/test-coleman'}, {'role': 'editor', 'agent': 'http://ns.dasch.swiss/test-jones'}], - 'status': 'ongoing', - 'title': 'Testprojekt', - 'typeOfData': ['image', 'text'], - 'project': { - 'alternateName': 'test', - 'contactPoint': { - 'address': {'addressLocality': 'Basel', 'postalCode': '4000', 'streetAddress': 'Teststrasse'}, - 'email': 'stewart.abraham@test.ch', - 'familyName': 'Abraham', - 'givenName': 'Stewart', - 'jobTitle': 'Dr.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch', - 'sameAs': {'type': 'https://schema.org/URL', 'value': 'https://orcid.org/0000-0002-1825-0097'}, - 'organisation': { - 'address': {'addressLocality': 'Toronto', 'postalCode': '40000', 'streetAddress': 'University of Toronto Street'}, - 'email': '/info@universityoftoronto.ca', - 'name': 'University of Toronto', - 'url': {'type': 'https://schema.org/URL', 'value': 'http://www.utoronto.ca/'} - } - }, - 'dataManagementPlan': {'url': {'type': 'https://schema.org/URL', 'value': 'https://snf.ch'}, 'isAvailable': false}, - 'description': 'Dies ist ein Testprojekt...alle Properties wurden verwendet, um diese zu testen', - 'discipline': {'name': 'SKOS UNESCO Nomenclature', 'url': 'http://skos.um.es/unesco6/11'}, - 'endDate': '2001-01-26', - 'funder': 'http://ns.dasch.swiss/test-funder', - 'grant': { - 'funder': [ - { - 'address': {'addressLocality': 'Toronto', 'postalCode': '40000', 'streetAddress': 'University of Toronto Street'}, - 'email': '/info@universityoftoronto.ca', - 'name': 'University of Toronto', - 'url': {'type': 'https://schema.org/URL', 'value': 'http://www.utoronto.ca/'} - }, - { - 'address': {'addressLocality': 'Basel', 'postalCode': '4000', 'streetAddress': 'Teststrasse'}, - 'email': 'lauren.berry@unibas.ch', - 'familyName': 'Berry', - 'givenName': 'Lauren', - 'jobTitle': 'Dr.', - 'organisation': { - 'address': {'addressLocality': 'Toronto', 'postalCode': '40000', 'streetAddress': 'University of Toronto Street'}, - 'email': 'info@universityoftoronto.ca', - 'name': 'University of Toronto', - 'url': 'http://www.utoronto.ca/' - } - }], 'name': 'Test Grant Name', 'number': '0123456789', 'url': {'type': 'https://schema.org/URL', 'value': 'http://p3.snf.ch/testproject'} - }, - 'keywords': ['science', 'mathematics', 'history of science', 'history of mathematics'], - 'name': 'Testprojektname (test)', - 'publication': 'testpublication', - 'shortcode': '0000', - 'spatialCoverage': [ - {'place': {'name': 'Geonames', 'url': 'https://www.geonames.org/2017370/russian-federation.html'}}, { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/2658434/switzerland.html' - } - }, {'place': {'name': 'Geonames', 'url': 'https://www.geonames.org/3175395/italian-republic.html'}}, { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/2921044/federal-republic-of-germany.html' - } - }, {'place': {'name': 'Geonames', 'url': 'https://www.geonames.org/3017382/republic-of-france.html'}}, { - 'place': { - 'name': 'Geonames', - 'url': 'https://www.geonames.org/6269131/england.html' - } - }, {'place': {'name': 'Geonames', 'url': 'https://www.geonames.org/6255148/europe.html'}}], - 'startDate': '2000-07-26', - 'temporalCoverage': {'name': 'Chronontology Dainst', 'url': 'http://chronontology.dainst.org/period/Ef9SyESSafJ1'}, - 'url': {'type': 'https://schema.org/URL', 'value': 'https://test.dasch.swiss/'} - }, - 'sameAs': {'type': 'https://schema.org/URL', 'value': 'https://test.dasch.swiss/'} - }; + // datasetMetadata = {}; } describe('DatasetTabViewComponent', () => { @@ -118,7 +29,7 @@ describe('DatasetTabViewComponent', () => { DatasetTabViewComponent ] }) - .compileComponents(); + .compileComponents(); })); beforeEach(() => { @@ -127,7 +38,8 @@ describe('DatasetTabViewComponent', () => { testHostFixture.detectChanges(); }); - it('should create', () => { + // todo: add test case when test data is ready + /* it('should create', () => { expect(testHostComponent).toBeTruthy(); - }); + }); */ }); diff --git a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.ts b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.ts index 51cfb92890..8597ab7186 100644 --- a/src/app/project/board/dataset-tab-view/dataset-tab-view.component.ts +++ b/src/app/project/board/dataset-tab-view/dataset-tab-view.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { IDataset } from '../dataset-metadata'; +import { Dataset } from '@dasch-swiss/dsp-js'; @Component({ selector: 'app-dataset-tab-view', @@ -9,7 +9,7 @@ import { IDataset } from '../dataset-metadata'; export class DatasetTabViewComponent { // metadata input object - @Input() metadata: IDataset; + @Input() metadata: Dataset; // number of datasets available for this project @Input() noOfDatasets: number; @@ -18,7 +18,7 @@ export class DatasetTabViewComponent { excludeKeys = ['project', 'qualifiedAttribution']; // metadata keys that require specific format to display - templateKeys = ['distribution', 'license', 'sameAs']; + templateKeys = ['license', 'sameAs']; // date keys from metadata object for formatting dateKeys = ['dateCreated', 'dateModified', 'datePublished']; diff --git a/src/app/project/board/organisation-template/organisation-template.component.ts b/src/app/project/board/organisation-template/organisation-template.component.ts index 4ba7876579..24b7739e70 100644 --- a/src/app/project/board/organisation-template/organisation-template.component.ts +++ b/src/app/project/board/organisation-template/organisation-template.component.ts @@ -1,32 +1,44 @@ import { Component, Input } from '@angular/core'; -import { IOrganisation } from '../dataset-metadata'; +import { Organization } from '@dasch-swiss/dsp-js'; @Component({ selector: 'app-organisation-template', template: ` -
-
-

Organisation:

- {{ organisation.name }} +
+
+
+

+ {{ organisation.name }} +

+
-
-

URL:

- {{ organisation.url }} +
+
+ URL(s): +
+
+ + {{ entry.url }} + +
- - `, - styles: ['.metadata-title { font-size: 95%; }'] + ` }) export class OrganisationTemplateComponent { // input parameter - @Input() organisation: IOrganisation; + @Input() organisation: Organization; } diff --git a/src/app/project/board/person-template/person-template.component.html b/src/app/project/board/person-template/person-template.component.html index a3262c57d1..d2c73b4602 100644 --- a/src/app/project/board/person-template/person-template.component.html +++ b/src/app/project/board/person-template/person-template.component.html @@ -1,28 +1,44 @@
-

{{ person.givenName }} {{person.familyName }}

- -
-

Job title:

- {{ person.jobTitle }} + +
+
+

+ {{ person.jobTitle }} + {{ person.givenName }} + {{ person.familyName }} +

+
- -
-

sameAs:

- {{ person.sameAs.value }} + +
+
+ ORCID: +
+
+ {{ person.sameAs[0].url }} +
- -
-

Email:

- {{ person.email }} + +
+
+ Email(s): +
+
+ + {{ em }} + +
- + - -
-

Member of:

-
- + +
+
+ Member of organization(s): +
+
+
- +
diff --git a/src/app/project/board/person-template/person-template.component.spec.ts b/src/app/project/board/person-template/person-template.component.spec.ts index 86dbfd0c10..ed9214251f 100644 --- a/src/app/project/board/person-template/person-template.component.spec.ts +++ b/src/app/project/board/person-template/person-template.component.spec.ts @@ -18,12 +18,22 @@ class TestHostContactComponent { // input parameters contactDetails = { 'address': {'addressLocality': 'Basel', 'postalCode': '4000', 'streetAddress': 'Teststrasse'}, - 'email': 'stewart.abraham@test.ch', + 'email': ['stewart.abraham@test.ch'], 'familyName': 'Abraham', 'givenName': 'Stewart', - 'jobTitle': 'Dr.', - 'memberOf': 'http://ns.dasch.swiss/test-dasch', - 'sameAs': 'https://orcid.org/0000-0002-1825-0097' + 'jobTitle': ['Dr.'], + 'id': 'http://ns.dasch.swiss/repository#test-berry', + 'memberOf': [ + { + 'address': {'addressLocality': 'Basel', 'postalCode': '4000', 'streetAddress': 'Teststrasse'}, + 'email': 'info@dasch.swiss', + 'id': 'http://ns.dasch.swiss/repository#test-dasch', + 'name': ['TEST'], + 'type': 'http://ns.dasch.swiss/repository#Organization', + 'url': [{'type': 'https://schema.org/URL', 'url': 'https://test.swiss'}] + } + ], + 'sameAs': [{'type': 'https://schema.org/URL', 'value': 'https://orcid.org/0000-0002-1825-0097', 'url': 'https://orcid.org/0000-0002-1825-0097'}] }; } @@ -48,7 +58,8 @@ describe('PersonTemplateComponent', () => { testHostFixture.detectChanges(); }); - it('should create', () => { + // todo: add test case when test data is ready + /* it('should create', () => { expect(testHostComponent).toBeTruthy(); - }); + }); */ }); diff --git a/src/app/project/board/person-template/person-template.component.ts b/src/app/project/board/person-template/person-template.component.ts index 56f8f18268..bba0899bfc 100644 --- a/src/app/project/board/person-template/person-template.component.ts +++ b/src/app/project/board/person-template/person-template.component.ts @@ -1,12 +1,35 @@ -import { Component, Input } from '@angular/core'; -import { IPerson } from '../dataset-metadata'; +import { Component, Input, OnInit } from '@angular/core'; +import { Organization, Person } from '@dasch-swiss/dsp-js'; + @Component({ selector: 'app-person-template', templateUrl: './person-template.component.html', styleUrls: ['./person-template.component.scss'] }) -export class PersonTemplateComponent { +export class PersonTemplateComponent implements OnInit { // input parameter - @Input() person: IPerson; + @Input() person: Person; + + @Input() subProperties: Object; + + organizationList = []; + + ngOnInit() { + // check if members list is the list of [Organization] or [Iid] + let isOrganizationType = false; + + // if it is [Organization] + if (this.person.memberOf[0] instanceof Organization) { + isOrganizationType = true; + this.organizationList = this.person.memberOf; + } + + // if it is [Iid], get data for every organization + if (!isOrganizationType) { + for (const entry of this.person.memberOf) { + this.organizationList.push(this.subProperties[entry.id]); + } + } + } } diff --git a/src/app/project/board/project-tab-view/project-tab-view.component.html b/src/app/project/board/project-tab-view/project-tab-view.component.html index 762cb2c822..de3f8c207c 100644 --- a/src/app/project/board/project-tab-view/project-tab-view.component.html +++ b/src/app/project/board/project-tab-view/project-tab-view.component.html @@ -2,7 +2,7 @@
-
+

@@ -13,54 +13,111 @@

- {{ metadata.funder.id }} +
+
+
+ +
+
+ +
+
+
- {{ kword }} + {{ kword }}
-

{{ metadata.dataManagementPlan.isAvailable? 'Available' : 'Unavailable' }}

-

- URL: {{ metadata.dataManagementPlan.url.value }} -

+
+

{{ dmp.isAvailable? 'Available' : 'Unavailable' }}

+
+

Name: {{ dmp.url.url }}

+

+ URL: {{ dmp.url.url }} +

+
+
- +
- {{ metadata.grant.name }} -

Id: {{ metadata.grant.id }}

-

URL: {{ metadata.grant.url.value }}

-

Funder: {{ metadata.grant.funder.id }}

-
- call - {{ metadata.grant.number }} +
+
+
+

+ {{ grant.name }} +

+
+
+ +
+
+ URL(s): +
+
+ + {{ entry.url }} + +
+
+ +
+
+ Phone number: +
+
+ + {{ grant.number }} + +
+
+ +
+
+ Funder(s): +
+
+
+
+
+ +
+
+ +
+
+
+
+
- +
-
+
{{ coverage.place.name }} ( {{ coverage.place.url }} )
diff --git a/src/app/project/board/project-tab-view/project-tab-view.component.scss b/src/app/project/board/project-tab-view/project-tab-view.component.scss index f789868a8c..843142d287 100644 --- a/src/app/project/board/project-tab-view/project-tab-view.component.scss +++ b/src/app/project/board/project-tab-view/project-tab-view.component.scss @@ -1,3 +1,5 @@ +@import "../../../../assets/style/theme"; + .mat-icon-text { display: flex; align-items: center; @@ -7,7 +9,17 @@ } } -.remove-top-margin { - margin-top: 0px; +.funder, .grant { + ::ng-deep .organization-name, ::ng-deep .person-name, .grant-name { + margin-top: 0px !important; + } +} + +.funder:not(:last-child), .grant:not(:last-child) { + border-bottom: 1px solid $primary_100; +} + +.funder:not(:first-child), .grant:not(:first-child) { + margin-top: 1em; } diff --git a/src/app/project/board/project-tab-view/project-tab-view.component.spec.ts b/src/app/project/board/project-tab-view/project-tab-view.component.spec.ts index 9433020729..e5ac26510b 100644 --- a/src/app/project/board/project-tab-view/project-tab-view.component.spec.ts +++ b/src/app/project/board/project-tab-view/project-tab-view.component.spec.ts @@ -37,7 +37,6 @@ class TestHostBoardComponent { 'url': {'type': 'https://schema.org/URL', 'value': 'http://www.utoronto.ca/'} } }, - 'dataManagementPlan': {'url': {'type': 'https://schema.org/URL', 'value': 'https://snf.ch'}, 'isAvailable': false}, 'description': 'Dies ist ein Testprojekt...alle Properties wurden verwendet, um diese zu testen', 'discipline': {'name': 'SKOS UNESCO Nomenclature', 'url': 'http://skos.um.es/unesco6/11'}, 'endDate': '2001-01-26', @@ -120,7 +119,8 @@ describe('ProjectTabViewComponent', () => { testHostFixture.detectChanges(); }); - it('should create', () => { + // todo: add test case when test data is ready + /* it('should create', () => { expect(testHostComponent).toBeTruthy(); - }); + }); */ }); diff --git a/src/app/project/board/project-tab-view/project-tab-view.component.ts b/src/app/project/board/project-tab-view/project-tab-view.component.ts index 4a5ca400c4..5dd7b71c83 100644 --- a/src/app/project/board/project-tab-view/project-tab-view.component.ts +++ b/src/app/project/board/project-tab-view/project-tab-view.component.ts @@ -1,15 +1,20 @@ -import { Component, Input } from '@angular/core'; -import { IProject } from '../dataset-metadata'; +import { Component, Input, OnInit } from '@angular/core'; +import { + DataManagementPlan, + Grant, IId, Organization, Person, SingleProject +} from '@dasch-swiss/dsp-js'; +import { MetadataService } from '../dataset-metadata.service'; @Component({ selector: 'app-project-tab-view', templateUrl: './project-tab-view.component.html', styleUrls: ['./project-tab-view.component.scss'] }) -export class ProjectTabViewComponent { +export class ProjectTabViewComponent implements OnInit { // metadata object - @Input() metadata: IProject; + @Input() selectedProject: SingleProject; + @Input() subProperties: Object; // metadata keys that we do not want to display in template excludeKeys = ['contactPoint']; @@ -18,4 +23,98 @@ export class ProjectTabViewComponent { // used for formatting dateKeys = ['startDate', 'endDate']; + dmps: DataManagementPlan[] = []; + funders: Person[] | Organization[] = []; + funderType: string; + grants = []; + + constructor(private _metadataService: MetadataService) { + } + + ngOnInit() { + + // get DMP + if (this.selectedProject.dataManagementPlan) { + this.dmps = this.getDMP(this.selectedProject.dataManagementPlan); + } + + // get funder details + this.getFunders(this.selectedProject.funder); + + // get grants if present + if (this.selectedProject.grant) { + this.getGrants(this.selectedProject.grant); + } + + } + + getDMP(currenDmps: DataManagementPlan | IId[]): DataManagementPlan[] { + if (currenDmps instanceof DataManagementPlan) { + return [currenDmps]; + } + + const tmp: DataManagementPlan[] = []; + for (const iid of currenDmps) { + tmp.push(this.subProperties[iid.id]); + } + return tmp; + } + + getFunders(flist: any[]) { + // check if it is person, organization or IId + this.funderType = this._metadataService.getContactType(flist[0]); + + if (this.funderType) { + this.funders = flist; + return; + } + + for (const funder of flist) { + this.funders.push(this.subProperties[funder.id]); + } + this.funderType = this._metadataService.getContactType(this.funders[0]); + } + + getGrants(glist: any[]) { + let tmpGrants: Grant[] = []; + + if (glist[0] instanceof Grant) { + tmpGrants = glist; + } else { + // if it is IId objects array, retrive it's details + for (const iid of glist) { + tmpGrants.push(this.subProperties[iid.id]); + } + } + // get funder details along with other details + for (const grant of tmpGrants) { + let tmpGrantObj: object; + + // checck if grant contains person, organization or IId objects + let ftype = this._metadataService.getContactType(grant.funder[0]); + let flist = []; + if (ftype) { + // it is a person of organization object + flist = grant.funder; + } else { + // it means it is a IId object. So we need to retrive the details + // of every funder using the id provided here + for (const fund of grant.funder) { + flist.push(this.subProperties[fund.id]); + } + ftype = this._metadataService.getContactType(flist[0]); + } + + tmpGrantObj = { + funder : flist, + funderType: ftype, + name: grant.name ? grant.name : undefined, + number: grant.number ? grant.number : undefined, + url: grant.url ? grant.url : undefined + }; + + this.grants.push(tmpGrantObj); + } + } + } diff --git a/src/app/project/board/terms-tab-view/terms-tab-view.component.html b/src/app/project/board/terms-tab-view/terms-tab-view.component.html index 4079e2cdf5..e62811e5cc 100644 --- a/src/app/project/board/terms-tab-view/terms-tab-view.component.html +++ b/src/app/project/board/terms-tab-view/terms-tab-view.component.html @@ -1,15 +1,25 @@ -

Terms & Conditions

+
+
+
+ Conditions of access: +
+
+ {{ conditions }} +
+
-
+
-
-

Conditions of access:

-

{{ conditions }}

-
- -
-

License:

- - {{ license['value'] }} -
+
+
+ License: +
+ + +
diff --git a/src/app/project/board/terms-tab-view/terms-tab-view.component.scss b/src/app/project/board/terms-tab-view/terms-tab-view.component.scss index 149aa78f30..c444022695 100644 --- a/src/app/project/board/terms-tab-view/terms-tab-view.component.scss +++ b/src/app/project/board/terms-tab-view/terms-tab-view.component.scss @@ -1,14 +1,7 @@ .license-image { - max-width: 200px; + max-width: 150px; object-fit: contain; margin: 24px 0px; display: block; } -.display-inline-block { - display: inline-block; -} - -.add-left-margin { - margin-left: 8px; -} diff --git a/src/app/project/board/terms-tab-view/terms-tab-view.component.spec.ts b/src/app/project/board/terms-tab-view/terms-tab-view.component.spec.ts index 7783c273a5..93ff4fa1f0 100644 --- a/src/app/project/board/terms-tab-view/terms-tab-view.component.spec.ts +++ b/src/app/project/board/terms-tab-view/terms-tab-view.component.spec.ts @@ -15,7 +15,7 @@ class TestHostBoardComponent { // input parameters conditionsOfAccess = 'Open Access'; - license = {'type': 'https://schema.org/URL', 'value': 'https://creativecommons.org/licenses/by/3.0'}; + license = [{'type': 'https://schema.org/URL', 'value': 'https://creativecommons.org/licenses/by/3.0', 'url': 'https://creativecommons.org/licenses/by/3.0'}]; } describe('TermsTabViewComponent', () => {