diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 158ddff6..8d5f3db3 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -122,17 +122,48 @@ -
  • + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • Organizations: - + - {{organization.name}} + {{(organization.acronym) ? organization.acronym : ''}} + {{(!organization.acronym && organization.name) ? organization.name : ''}} - {{organization.name}} + {{organization.acronym}} + {{organization.name}} , , @@ -559,9 +590,9 @@ -
    - Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} -
    +
    +
    + Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
    @@ -574,7 +605,8 @@ [properties]="properties" [entityType]="'content provider'" [fields]="feedbackFields" [showForm]="showFeedback" (show)="showFeedback = $event"> - + diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 9be8420f..f98cbe10 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -96,8 +96,8 @@ export class DataProviderComponent { private reloadRelatedDatasources: boolean = true; // Organizations variables for view more/less functionality - public thresholdOrganizations: number = 10; - public showNumOrganizations: number = 10; + public thresholdOrganizations: number = 20; + public showNumOrganizations: number = 20; // Subjects variables for view more/less functionality public thresholdSubjects: number = 20; @@ -273,7 +273,7 @@ export class DataProviderComponent { private initTabs() { - if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) { + //if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) { this.reloadPublications = true; this.reloadDatasets = true; this.reloadSoftware = true; @@ -317,7 +317,7 @@ export class DataProviderComponent { // this.fetchAggregatorsSoftware = new FetchResearchResults(this._searchResearchResultsService); // this.fetchAggregatorsOrps = new FetchResearchResults(this._searchResearchResultsService); this.fetchAggregatorsResults = new FetchResearchResults(this._searchResearchResultsService); - } + //} // if (this.dataProviderInfo.resultsBy == "collectedFrom") { // //this.paramsForSearchLink = "?collectedFrom="+this.datasourceId+"&co=and"; // this.paramsForSearchLink = this.routerHelper.createQueryParams(['f0', 'fv0'], ["collectedfromdatasourceid", this.datasourceId]); @@ -346,25 +346,25 @@ export class DataProviderComponent { } private count(page: number, size: number) { - for (let i = 0; i < this.dataProviderInfo.tabs.length; i++) { - let content: string = this.dataProviderInfo.tabs[i].content; + //for (let i = 0; i < this.dataProviderInfo.tabs.length; i++) { + //let content: string = this.dataProviderInfo.tabs[i].content; - if (content == 'publicationsTab') { + //if (content == 'publicationsTab') { this.countPublications(page, size); - } else if (content == 'datasetsTab') { + //} else if (content == 'datasetsTab') { this.countDatasets(page, size); - } else if (content == 'softwareTab') { + //} else if (content == 'softwareTab') { this.countSoftware(page, size); - } else if (content == 'orpsTab') { + //} else if (content == 'orpsTab') { this.countOrps(page, size); - } else if (content == 'projectsTab') { + //} else if (content == 'projectsTab') { this.countProjects(page, size); - } else if (content == 'datasourcesTab') { + //} else if (content == 'datasourcesTab') { this.countDatasources(page, size); - }// else if(content=='relatedDatasourcesTab') { + //}// else if(content=='relatedDatasourcesTab') { // this.countRelatedDatasources(page, size); //} - } + //} } public search(content: string, page: number, size: number) { diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts index 5a796ec8..5926afeb 100644 --- a/landingPages/dataProvider/dataProvider.service.ts +++ b/landingPages/dataProvider/dataProvider.service.ts @@ -231,10 +231,21 @@ export class DataProviderService { countriesSet = new Set(); } - this.dataProviderInfo.organizations[counter] = {"name": "", "id": ""}; - this.dataProviderInfo.organizations[counter]['name'] = (mydata.legalname ? mydata.legalname : "[no title available"); + this.dataProviderInfo.organizations[counter] = {"acronym": "", "name": "", "id": ""}; + //this.dataProviderInfo.organizations[counter]['name'] = (mydata.legalname ? mydata.legalname : "[no title available"); this.dataProviderInfo.organizations[counter]['id'] = mydata['to'].content; + if(mydata.hasOwnProperty("legalshortname")) { + this.dataProviderInfo.organizations[counter]['acronym'] = mydata.legalshortname; + } + if(mydata.hasOwnProperty("legalname")) { + this.dataProviderInfo.organizations[counter]['name'] = mydata.legalname; + } + if(!this.dataProviderInfo.organizations[counter]['acronym'] && !this.dataProviderInfo.organizations[counter]['name']){ + // acronym is displayed with link and name only in tooltip + this.dataProviderInfo.organizations[counter]['acronym'] = "[no title available]"; + } + if(mydata.country != '' && mydata['country'].classname != '') { if(!countriesSet.has(mydata['country'].classname)) { this.dataProviderInfo.countries.push(mydata['country'].classname); diff --git a/landingPages/dataProvider/statisticsTab.component.ts b/landingPages/dataProvider/statisticsTab.component.ts index 8876c9c7..bac25026 100644 --- a/landingPages/dataProvider/statisticsTab.component.ts +++ b/landingPages/dataProvider/statisticsTab.component.ts @@ -7,9 +7,14 @@ import {EnvProperties} from '../../utils/properties/env-properties'; @Component({ selector: 'statisticsTab', template: ` - + - + + + +
    Research Results Timeline @@ -18,21 +23,25 @@ import {EnvProperties} from '../../utils/properties/env-properties'; Research Results Types
    -     + -
    +
    Funders in Research Results of content provider
    -
    +
    Projects with most Publications
    -
    +
    Projects with most Research Data @@ -44,6 +53,8 @@ export class StatisticsTabComponent { @Input() datasourceId; @Input() fetchPublications : FetchResearchResults; @Input() fetchDatasets : FetchResearchResults; + @Input() fetchSoftware: FetchResearchResults; + @Input() fetchOther: FetchResearchResults; private docsTimelineUrl: string; private docsTypesUrl:string; diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index be70d483..b5e5c9c2 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -264,7 +264,9 @@
    -
    +
    @@ -275,9 +277,7 @@
    -
    Software--> -
    -->
    -
    - Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} -
    +
    +
    + Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
    @@ -687,11 +686,14 @@ [status]="projectInfo.status">
    -
    + *ngIf="statsClicked && + (fetchPublications.searchUtils.status == errorCodes.DONE || fetchDatasets.searchUtils.status == errorCodes.DONE + || fetchSoftware.searchUtils.status == errorCodes.DONE || fetchOrps.searchUtils.status == errorCodes.DONE)">
    Produced research results per year diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts index dfded792..afa4c090 100644 --- a/services/searchDataproviders.service.ts +++ b/services/searchDataproviders.service.ts @@ -401,6 +401,9 @@ export class SearchDataprovidersService { } else { item['name'] = relation.legalname; } + if(!item['name']) { + item['name'] = "[no title available]"; + } item['id'] = /*OpenaireProperties.getsearchLinkToOrganization()+*/relation['to'].content; organizations.push(item); } diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts index 223f4fce..4999b25c 100644 --- a/services/searchProjects.service.ts +++ b/services/searchProjects.service.ts @@ -190,6 +190,9 @@ export class SearchProjectsService { } else { result['organizations'][countOrganizations]['name'] = relation.legalname; } + if(!result['organizations'][countOrganizations]['name']) { + result['organizations'][countOrganizations]['name'] = "[no title available]"; + } } } } diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts index 91b947b0..5b6f66c0 100644 --- a/utils/entities/dataProviderInfo.ts +++ b/utils/entities/dataProviderInfo.ts @@ -163,7 +163,7 @@ export class DataProviderInfo { ]) }; - organizations: {"name": string, "id": string}[] = []; + organizations: {"acronym": string, "name": string, "id": string}[] = []; //publications: any; //datasets: any; statistics: any; diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index a6b7bba7..a51b0f66 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -217,7 +217,7 @@ Organization: {{organization.name}} - , + , ...
    @@ -243,9 +243,10 @@
    Subject: - {{subject}} - {{(i < (result.subjects.slice(0, 10).length - 1)) ? ", " : ""}} - {{(i == result.subjects.slice(0, 10).length - 1 && result.subjects.length > 10) ? "..." : ""}} + + {{subject}} + {{(i < (result.subjects.slice(0, 10).length - 1)) ? ", " : ""}} + {{(i == result.subjects.slice(0, 10).length - 1 && result.subjects.length > 10) ? "..." : ""}}