From 632f1586c2dc391d99bbdb4735aecc2b740fe988 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 26 May 2020 14:42:47 +0000 Subject: [PATCH] [Library | Trunk]: Landing: 1. Remove uk-text-small from Results. 2. Revert copyright policy link on Journal. 3. Add tag free text keywords on subjects git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58784 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../landing-utils/availableOn.component.ts | 4 +-- .../landing-utils/fundedBy.component.ts | 6 ++-- .../landing-header.component.ts | 2 +- .../projects-in-modal.component.ts | 3 +- .../landing-utils/relatedTo.component.ts | 22 ++++++------ .../landing-utils/showPublisher.component.ts | 26 +++++++------- .../landing-utils/showSubjects.component.ts | 35 ++++++++++--------- .../organization/organization.component.html | 1 + .../organization/organization.component.ts | 22 ++++++------ .../result/resultLanding.component.html | 12 +++---- utils/authors/showAuthors.component.ts | 5 ++- .../fetchProjects.class.ts | 14 -------- .../fetchResearchResults.class.ts | 7 ++-- 13 files changed, 69 insertions(+), 90 deletions(-) diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index 3800bcd6..0b635e4d 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -25,12 +25,12 @@ import {EnvProperties} from "../../utils/properties/env-properties"; {{available.downloadName}} -
+
{{available.type}} . {{available.year}}
-
+
Provider: {{available.collectedName}} diff --git a/landingPages/landing-utils/fundedBy.component.ts b/landingPages/landing-utils/fundedBy.component.ts index f5a3e06f..0bb44afa 100644 --- a/landingPages/landing-utils/fundedBy.component.ts +++ b/landingPages/landing-utils/fundedBy.component.ts @@ -5,7 +5,6 @@ import {Project} from "../../utils/result-preview/result-preview"; @Component({ selector: 'fundedBy', template: ` -
Funded by
 @@ -26,7 +25,7 @@ import {Project} from "../../utils/result-preview/result-preview";
- Project + Project
@@ -54,13 +53,12 @@ import {Project} from "../../utils/result-preview/result-preview"; Funding stream: {{item.funding}} -
+
{{item.provenanceAction}}
, -
View less diff --git a/landingPages/landing-utils/landing-header/landing-header.component.ts b/landingPages/landing-utils/landing-header/landing-header.component.ts index cef5aa08..4ea1a937 100644 --- a/landingPages/landing-utils/landing-header/landing-header.component.ts +++ b/landingPages/landing-utils/landing-header/landing-header.component.ts @@ -7,7 +7,7 @@ import {AlertModal} from "../../../utils/modal/alert"; selector: 'landing-header', template: `
-
+
{{entityType}} diff --git a/landingPages/landing-utils/projects-in-modal.component.ts b/landingPages/landing-utils/projects-in-modal.component.ts index a3e53fe9..8fd99b29 100644 --- a/landingPages/landing-utils/projects-in-modal.component.ts +++ b/landingPages/landing-utils/projects-in-modal.component.ts @@ -8,7 +8,6 @@ import {ErrorCodes} from '../../utils/properties/errorCodes'; import {StringUtils} from '../../utils/string-utils.class'; import {RouterHelper} from '../../utils/routerHelper.class'; import {EnvProperties} from '../../utils/properties/env-properties'; -import {ResultLandingInfo} from "../../utils/entities/resultLandingInfo"; import {ResultPreview} from "../../utils/result-preview/result-preview"; import {SearchResult} from "../../utils/entities/searchResult"; import {AlertModal} from "../../utils/modal/alert"; @@ -16,7 +15,7 @@ import {AlertModal} from "../../utils/modal/alert"; @Component({ selector: 'projectsInModal', template: ` -
Filter by Funder:
+
Filter by Funder:
  • diff --git a/landingPages/landing-utils/relatedTo.component.ts b/landingPages/landing-utils/relatedTo.component.ts index 1f5ea598..c69e0a6b 100644 --- a/landingPages/landing-utils/relatedTo.component.ts +++ b/landingPages/landing-utils/relatedTo.component.ts @@ -4,22 +4,20 @@ import {HelperFunctions} from "../../utils/HelperFunctions.class"; @Component({ selector: 'relatedTo', template: ` -
    -
    Communities
    -
    - - {{item['labelContext']}} - {{item['labelCategory']}} - : {{item['labelConcept']}} - - +
    Communities
    +
    + {{item['labelContext']}} {{item['labelCategory']}} : {{item['labelConcept']}} - -
    + + + {{item['labelContext']}} + {{item['labelCategory']}} + : {{item['labelConcept']}} +
    diff --git a/landingPages/landing-utils/showPublisher.component.ts b/landingPages/landing-utils/showPublisher.component.ts index 6e2c097a..babf19e6 100644 --- a/landingPages/landing-utils/showPublisher.component.ts +++ b/landingPages/landing-utils/showPublisher.component.ts @@ -46,26 +46,24 @@ import {EnvProperties} from "../../utils/properties/env-properties"; ( - - - issn: {{journal['issn']}} - - , + issn: {{journal['issn']}} + , - - - eissn: {{journal['eissn']}} - - eissn: {{journal['eissn']}} - , + eissn: {{journal['eissn']}} + , - + lissn: {{journal['lissn']}}(kostis) + , + + + - lissn: {{journal['lissn']}} + Copyright policy - lissn: {{journal['lissn']}} ) diff --git a/landingPages/landing-utils/showSubjects.component.ts b/landingPages/landing-utils/showSubjects.component.ts index 18da4b4e..ff3a91d7 100644 --- a/landingPages/landing-utils/showSubjects.component.ts +++ b/landingPages/landing-utils/showSubjects.component.ts @@ -6,29 +6,32 @@ import {Component, Input} from '@angular/core';
    Subjects
    -
    -
    -
    +
    +
    + +
    + + {{key}}: + + {{subject}} + +
    +     +
    - {{key}}: - - {{subject}} - -
    -
    -
    -
    - {{subjects.join(', ')}} - , - - + free text keywords: + {{subjects.join(', ')}} + , + + {{otherSubjects.get(key).join(', ')}} , +
    +
    ` }) diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 4d1e2257..4bae9a6d 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -168,6 +168,7 @@
    diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index 3d8f495d..bd1bd95e 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -9,7 +9,6 @@ import {SearchResearchResultsService} from '../../services/searchResearchResults import {SearchDataprovidersService} from '../../services/searchDataproviders.service'; import {SearchProjectsService} from '../../services/searchProjects.service'; import {ErrorCodes} from '../../utils/properties/errorCodes'; -import {ProjectsInModalComponent} from '../landing-utils/projects-in-modal.component'; import {RouterHelper} from '../../utils/routerHelper.class'; import {ModalLoading} from '../../utils/modal/loading.component'; @@ -20,6 +19,8 @@ import {SEOService} from '../../sharedComponents/SEO/SEO.service'; import {HelperFunctions} from "../../utils/HelperFunctions.class"; import {HelperService} from "../../utils/helper/helper.service"; import {Location} from "@angular/common"; +import {FetchResearchResults} from "../../utils/fetchEntitiesClasses/fetchResearchResults.class"; +import {FetchDataproviders} from "../../utils/fetchEntitiesClasses/fetchDataproviders.class"; interface Total { publications: number; @@ -49,7 +50,6 @@ export class OrganizationComponent { // CSV variables public downloadURLAPI: string; public csvProjectParamsHead: string; - public csvPublicationParamsHead: string; public csvParamsTail: string; // Active tab variable for responsiveness @@ -65,10 +65,16 @@ export class OrganizationComponent { dataproviders: 0 }; public fetchProjects: FetchProjects; + public fetchPublications: FetchResearchResults; + public fetchDatasets: FetchResearchResults; + public fetchSoftware: FetchResearchResults; + public fetchOrps: FetchResearchResults; + public fetchDataproviders: FetchDataproviders + public searchNumber: number = 5; + + @ViewChild('downloadReportModal') downloadReportModal; @ViewChild('downloadFunderReportModal') downloadFunderReportModal; - // Variables for projects query (query results only if projects tab is clicked) - @ViewChild(ProjectsInModalComponent) projectsInModalComponent: ProjectsInModalComponent; @ViewChild(ModalLoading) loading: ModalLoading; // Alert box when CSV: Project Publications for a funder is requested @@ -534,14 +540,6 @@ export class OrganizationComponent { this.alertModalDeletedByInference.open(); } - openProjectsModal() { - this.projectsInModalComponent.pageChange({value: 1}); - this.projectsModal.cancelButton = false; - this.projectsModal.okButton = false; - this.projectsModal.alertTitle = "Projects of"; - this.projectsModal.open(); - } - public getTypeParam(type: string): string { if(type == 'results') { type = 'publications&type=datasets&type=software&type=other'; diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 8bed084b..0268a15b 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -126,7 +126,7 @@
    -
    +
    Abstract
    {{resultLandingInfo.description.substring(0, showNumDescription)}} 0" class="uk-margin-medium-bottom uk-width-2-3@m"> -
    Related Organizations
    +
    Related Organizations
    • @@ -204,7 +204,7 @@
      Download from + class="uk-width-1-2 uk-text-right"> View all {{resultLandingInfo.deletedByInferenceIds.length}} versions @@ -466,13 +466,13 @@
      - Powered by OpenAIRE Open Research Graph - + Powered by OpenAIRE Open Research Graph + Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}}
      -
      +
      Any information missing or wrong? Report an Issue
      diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts index 7aea1496..905c3155 100644 --- a/utils/authors/showAuthors.component.ts +++ b/utils/authors/showAuthors.component.ts @@ -30,14 +30,13 @@ import {AlertModal} from "../modal/alert";
      ORCID
      {{" "}} - + - {{" "}} - Visit diff --git a/utils/fetchEntitiesClasses/fetchProjects.class.ts b/utils/fetchEntitiesClasses/fetchProjects.class.ts index 8aea0f96..346c2ace 100644 --- a/utils/fetchEntitiesClasses/fetchProjects.class.ts +++ b/utils/fetchEntitiesClasses/fetchProjects.class.ts @@ -200,20 +200,6 @@ export class FetchProjects { } }, err => { - /*console.log(err); - //TODO check erros (service not available, bad request) - // if( ){ - // this.searchUtils.status = ErrorCodes.ERROR; - // } - //var errorCodes:ErrorCodes = new ErrorCodes(); - //this.searchUtils.status = errorCodes.ERROR; - if(err.status == '404') { - this.searchUtils.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.searchUtils.status = this.errorCodes.ERROR; - } else { - this.searchUtils.status = this.errorCodes.NOT_AVAILABLE; - }*/ this.handleError("Error getting projects for organization with id: " + organizationId, err); this.searchUtils.status = this.errorMessages.getErrorCode(err.status); } diff --git a/utils/fetchEntitiesClasses/fetchResearchResults.class.ts b/utils/fetchEntitiesClasses/fetchResearchResults.class.ts index 3f9acd55..dadd3cc3 100644 --- a/utils/fetchEntitiesClasses/fetchResearchResults.class.ts +++ b/utils/fetchEntitiesClasses/fetchResearchResults.class.ts @@ -1,12 +1,11 @@ import {SearchResearchResultsService} from '../../services/searchResearchResults.service'; import {ErrorCodes} from '../../utils/properties/errorCodes'; -import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; +import {ErrorMessagesComponent} from '../../utils/errorMessages.component'; import {SearchFields} from '../../utils/properties/searchFields'; import {SearchCustomFilter, SearchUtilsClass} from '../../searchPages/searchUtils/searchUtils.class'; -import {DOI} from '../../utils/string-utils.class'; +import {DOI, StringUtils} from '../../utils/string-utils.class'; import {Subject} from 'rxjs'; -import{EnvProperties} from '../../utils/properties/env-properties'; -import {StringUtils} from '../../utils/string-utils.class'; +import {EnvProperties} from '../../utils/properties/env-properties'; export class FetchResearchResults { private errorCodes: ErrorCodes;