diff --git a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts index 6ee6bfb2..adfd7788 100644 --- a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts +++ b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts @@ -54,80 +54,51 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe';
- - - {{totalPendingResults.count}} pending claims, page {{activePendingPage.page}} of {{totalPages(totalPendingResults.count)}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Research ResultClaimed ByClaimed DateApprove
- Filter pending claims: - -
{{claim1.userMail}}{{claim1.date}} +
+
+ +
+
- - -
+ + {{totalPendingResults.count}} pending claims, page {{activePendingPage.page}} of {{totalPages(totalPendingResults.count)}} + + + + + + + + + + + + + + + + + + + + + +
Research ResultClaimed ByClaimed DateApprove
{{claim1.userMail}}{{claim1.date}} + + +
+
*Note that claims you did not approved or disapproved are considered as right (but not curated)
+ +

Already Curated Claims

@@ -135,48 +106,36 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe';
- + + - - {{totalCuratedResults.count}} curated claims, page {{activeCuratedPage.page}} of {{totalPages(totalCuratedResults.count)}} - - - - - - - + + + @@ -184,59 +143,34 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe'; - - - - - - - - - - - - - + + + + + + + + - - - - - -
Research Result Claimed byCurated by Curation Date Approved
- Filter curated claims: - -
{{claim.userMail}}{{claim.date}}{{claim.curatedBy}}{{claim.curationDate}} + +
{{claim.userMail}}{{claim.date}}{{claim.curatedBy}}{{claim.curationDate}} - - - - -
+ + + + + + + +
-
*Note that claims you did not approved or disapproved are considered as right (but not curated)
- - @@ -244,7 +178,6 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe'; }) export class ClaimsByTokenComponent { - //change true - false to accept: yes - no public token: string = ""; public sub: any; public project: any; @@ -256,7 +189,7 @@ export class ClaimsByTokenComponent { public editable: Set; public contact_person: string[] = ["Konstantina", "Argiro", "Katerina"]; - // when 'empty' show form to fill email, when 'valid' show proper claims, when 'invalid' show no matched entry-wanna retry + // when 'valid' show proper claims, when 'invalid' show no matched entry-wanna retry public accessStatus: string;// = "empty"; public rowsOnPage = 5; diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html index 0c67aa9d..d794635e 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html @@ -17,12 +17,12 @@
-
Type:
-
{{dataProviderInfo.type}}
-
Compatibility:
-
{{dataProviderInfo.compatibility}}
-
OAI-PMH:
-
+
Type:
+
{{dataProviderInfo.type}}
+
Compatibility:
+
{{dataProviderInfo.compatibility}}
+
OAI-PMH:
+
{{dataProviderInfo.oaiPmhURL}} @@ -30,7 +30,7 @@
Countries:
-
{{dataProviderInfo.countries}}
+
{{dataProviderInfo.countries}}
+ + + + +

Latest Documents Timeline

diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts index 5174f4fa..4a945579 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts @@ -12,7 +12,7 @@ import { FetchProjects } from '../../utils/fetchEntitiesClasses/fetchProjects.cl import { SearchProjectsService } from '../../services/searchProjects.service'; import { FetchDataproviders } from '../../utils/fetchEntitiesClasses/fetchDataproviders.class'; import { SearchDataprovidersService } from '../../services/searchDataproviders.service'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'dataprovider', @@ -69,6 +69,9 @@ export class DataProviderComponent { public routerHelper:RouterHelper = new RouterHelper(); showTabs:boolean = false; + + public errorCodes:ErrorCodes = new ErrorCodes(); + constructor (private element: ElementRef, private _dataproviderService: DataProviderService, private route: ActivatedRoute, @@ -82,7 +85,7 @@ export class DataProviderComponent { this.fetchDatasets = new FetchDatasets(this._searchDatasetsService); this.fetchProjects = new FetchProjects(this._searchProjectsService); this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - + this.updateUrl(OpenaireProperties.getBaseLink()+this._router.url); } @@ -196,10 +199,9 @@ export class DataProviderComponent { } private count(page: number, size: number) { - console.info("number of tabs: "+this.dataProviderInfo.tabs.length); - for(let i=1; i + + + + + +
@@ -29,6 +34,7 @@ export class DatasetsTabComponent { @Input() paramsForSearchLink = {}; @Input() fetchDatasets : FetchDatasets; public linkToSearchDatasets = ""; + public errorCodes:ErrorCodes = new ErrorCodes(); constructor () {} diff --git a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts index 602e420d..fb3dffb3 100644 --- a/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/datasourcesTab.component.ts @@ -1,14 +1,19 @@ import {Component, Input} from '@angular/core'; import { FetchDataproviders } from '../../utils/fetchEntitiesClasses/fetchDataproviders.class'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'datasourcesTab', template: ` -
+ + + + + +
@@ -31,13 +36,12 @@ export class DatasourcesTabComponent { @Input() paramsForSearchLink = {}; @Input() fetchDataproviders : FetchDataproviders; public linkToSearchDataproviders = ""; + public errorCodes:ErrorCodes = new ErrorCodes(); constructor () {} ngOnInit() { - console.info("datasources tab: init"); this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders(); - // console.info(this.linkToSearchDataproviders); } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts index d247ac28..c10205f4 100644 --- a/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/organizationsTab.component.ts @@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core'; @Component({ selector: 'organizationsTab', template: ` -
+ diff --git a/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts index ef260b8b..78b510d3 100644 --- a/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/projectsTab.component.ts @@ -2,14 +2,19 @@ import {Component, Input} from '@angular/core'; import { FetchProjects } from '../../utils/fetchEntitiesClasses/fetchProjects.class'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'projectsTab', template: ` -
+ + + + + +
@@ -31,6 +36,7 @@ export class ProjectsTabComponent { @Input() paramsForSearchLink = {}; @Input() fetchProjects : FetchProjects; public linkToSearchProjects = ""; + public errorCodes:ErrorCodes = new ErrorCodes(); constructor () {} diff --git a/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts index 6b00c3ce..55562441 100644 --- a/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/publicationsTab.component.ts @@ -1,14 +1,19 @@ import {Component, Input} from '@angular/core'; import { FetchPublications } from '../../utils/fetchEntitiesClasses/fetchPublications.class'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'publicationsTab', template: ` -
+ + + + + +
@@ -32,12 +37,12 @@ export class PublicationsTabComponent { @Input() paramsForSearchLink = {};//: string = ""; @Input() fetchPublications : FetchPublications; public linkToSearchPublications = ""; + public errorCodes:ErrorCodes = new ErrorCodes(); constructor () {} ngOnInit() { this.linkToSearchPublications = OpenaireProperties.getLinkToAdvancedSearchPublications();//+this.paramsForSearchLink; - console.info("publications tab: init"); } ngOnDestroy() {} diff --git a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts index d858f9fe..3d23b2be 100644 --- a/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/relatedDatasourcesTab.component.ts @@ -3,16 +3,20 @@ import {Component, Input} from '@angular/core'; import { FetchPublications } from '../../utils/fetchEntitiesClasses/fetchPublications.class'; import { FetchDatasets } from '../../utils/fetchEntitiesClasses/fetchDatasets.class'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; import {RouterHelper} from '../../utils/routerHelper.class'; @Component({ selector: 'relatedDatasourcesTab', template: ` + + + + -
+
@@ -49,9 +53,11 @@ export class RelatedDatasourcesTabComponent { @Input() type: string; @Input() dataproviderId: string; @Input() fetchResults : any; + public linkToSearchResults: string = ""; public searchLinkToDataProvider: string = ""; public routerHelper:RouterHelper = new RouterHelper(); + public errorCodes:ErrorCodes = new ErrorCodes(); //public queryParams: string[] = []; //public queryParamsIds: string[] = []; @@ -59,7 +65,6 @@ export class RelatedDatasourcesTabComponent { constructor () {} ngOnInit() { - console.info("related datasources tab: init"); if(this.type == "publications") { this.linkToSearchResults = OpenaireProperties.getLinkToAdvancedSearchPublications();//+"?&hostedBy=";//+ +"&ho=and&collectedFrom="+ +"&co=and"; } else { diff --git a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts index a32c2610..bacc8551 100644 --- a/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/statisticsTab.component.ts @@ -1,16 +1,25 @@ import {Component, Input} from '@angular/core'; import { SearchDatasetsComponent } from '../../searchPages/simple/searchDatasets.component'; import { SearchPublicationsComponent } from '../../searchPages/simple/searchPublications.component'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'statisticsTab', template: `
-
+ + + + + + +

Latest Documents Timeline

Documents Types

@@ -51,6 +60,8 @@ export class StatisticsTabComponent { private pubsFunderUrl:string; private dataProjectsUrl:string ; private pubsProjectsUrl:string; + public errorCodes:ErrorCodes = new ErrorCodes(); + constructor () {} ngOnInit() { diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.html b/portal-2/src/app/landingPages/dataset/dataset.component.html index c6d6db47..8bbbc7fd 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.html +++ b/portal-2/src/app/landingPages/dataset/dataset.component.html @@ -9,7 +9,7 @@
- Record in preview @@ -27,12 +27,12 @@
-
Publisher:
-
{{datasetInfo.publisher}}
+
Publisher:
+
{{datasetInfo.publisher}}
Type:
{{datasetInfo.type}}
-
Embargo end date:
-
{{datasetInfo.embargoEndDate}}
+
Embargo end date:
+
{{datasetInfo.embargoEndDate}}
Similar Research Results - 0 - + 0 + {{datasetInfo.similarResearchResults.length}} @@ -78,10 +78,10 @@
  • -
    +
    There are no related research results
    -
    +

    {{provenanceaction}}

    @@ -91,10 +91,10 @@
  • -
    +
    There are no similar research results
    -
    +
    • @@ -122,18 +122,18 @@
- -
  • +
  • Download from
    - {{key}} @@ -200,8 +200,8 @@ View less
    -
    ...
    -
    +
    ...
    +
    View more @@ -215,13 +215,13 @@
    {{item['labelContext']}} - -> {{item['labelCategory']}} - : {{item['labelConcept']}} + -> {{item['labelCategory']}} + : {{item['labelConcept']}} {{item['labelContext']}} - -> {{item['labelCategory']}} - : {{item['labelConcept']}} + -> {{item['labelCategory']}} + : {{item['labelConcept']}}
    Add links to contexts
    @@ -230,7 +230,7 @@
    • -
  • +
  • Collected from
    diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.ts b/portal-2/src/app/landingPages/dataset/dataset.component.ts index a439cd32..facc0f81 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.ts +++ b/portal-2/src/app/landingPages/dataset/dataset.component.ts @@ -147,7 +147,7 @@ export class DatasetComponent { public buildFundingTooltip(item: { "id": string, "acronym": string, "title": string, "funderShortname": string, "funderName": string, "funding": string, "code": string, inline: boolean}) { - let tooltipContent: string = ""; + let tooltipContent: string = "
    "; if(item.title) { tooltipContent += "

    "+item.title+"

    "; @@ -176,6 +176,7 @@ export class DatasetComponent { tooltipContent = "
    " + tooltipContent + "
    "; } + tooltipContent+="
    " return tooltipContent; } } diff --git a/portal-2/src/app/landingPages/dataset/dataset.service.ts b/portal-2/src/app/landingPages/dataset/dataset.service.ts index 7ac6c2d7..1950877a 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.service.ts +++ b/portal-2/src/app/landingPages/dataset/dataset.service.ts @@ -496,7 +496,8 @@ export class DatasetService { } } - if(this.datasetInfo.publisher != null + if( this.datasetInfo.publisher != null + && this.datasetInfo.publisher != "" && this.datasetInfo.identifiers != null && this.datasetInfo.identifiers.has("doi")) { diff --git a/portal-2/src/app/landingPages/organization/organization.component.html b/portal-2/src/app/landingPages/organization/organization.component.html index afa5cdb9..e0d4d4df 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.html +++ b/portal-2/src/app/landingPages/organization/organization.component.html @@ -24,10 +24,10 @@
    -
    Name:
    -
    {{organizationInfo.name}}
    -
    Country:
    -
    {{organizationInfo.country}}
    +
    Name:
    +
    {{organizationInfo.name}}
    +
    Country:
    +
    {{organizationInfo.country}}
      @@ -113,9 +113,14 @@
    • -
      + + + + + +
      @@ -164,16 +169,22 @@ - Projects report(CSV) for {{funder.name}} + Project list for {{funder.name}} (CSV)
    • - Publications report(CSV) for {{funder.name}} + Project Publications for {{funder.name}} (CSV)
      • +
    • diff --git a/portal-2/src/app/landingPages/organization/organization.component.ts b/portal-2/src/app/landingPages/organization/organization.component.ts index 3f7abef2..c564c0a0 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.ts +++ b/portal-2/src/app/landingPages/organization/organization.component.ts @@ -10,7 +10,7 @@ import {SearchPublicationsService} from '../../services/searchPublications.servi import {SearchDataprovidersService} from '../../services/searchDataproviders.service'; import {SearchProjectsService} from '../../services/searchProjects.service'; import { Meta} from '../../../angular2-meta'; -import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openaireProperties'; import {SearchingProjectsTabComponent} from '../searchingProjectsInTab.component'; import {RouterHelper} from '../../utils/routerHelper.class'; @@ -56,6 +56,8 @@ export class OrganizationComponent { private funderId: string; private count: number; + public errorCodes:ErrorCodes = new ErrorCodes(); + constructor (private element: ElementRef, private _organizationService: OrganizationService, private route: ActivatedRoute, @@ -197,7 +199,7 @@ export class OrganizationComponent { private searchDataproviders() { this.fetchDataproviders.getResultsForEntity("organization", this.organizationId, 1, 10); - this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders();// + "?organization=" + this.organizationId + "&or=and";; + this.linkToSearchDataproviders = OpenaireProperties.getLinkToAdvancedSearchDataProviders(); } private searchDataprovidersInit() { diff --git a/portal-2/src/app/landingPages/person/person.component.ts b/portal-2/src/app/landingPages/person/person.component.ts index 3c5022df..30f585ce 100644 --- a/portal-2/src/app/landingPages/person/person.component.ts +++ b/portal-2/src/app/landingPages/person/person.component.ts @@ -123,14 +123,16 @@ export class PersonComponent { this.updateTitle(this.personInfo.fullname); this.updateDescription("person, publication, research data, search, open access, "+this.personInfo.fullname); - this._searchDatasetsService.numOfEntityDatasets(this.personId, "people/").subscribe( + /*this._searchDatasetsService.numOfEntityDatasets("people/"+this.personId).subscribe( data => { this.fetchDatasets.searchUtils.totalResults = data; }, err => { console.log(err); } - ); + );*/ + this.fetchDatasets.getNumResultsForEntity("people", this.personId); + }, err => { diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index addcf5ef..014da05f 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -12,41 +12,41 @@
    -
    Title:
    -
    {{projectInfo.title}}
    -
    Funding:
    -
    {{projectInfo.funding}}
    -
    Call:
    -
    {{projectInfo.callIdentifier}}
    -
    Contract (GA) number:
    -
    {{projectInfo.contractNum}}
    -
    Start Date:
    -
    {{projectInfo.startDate}}
    -
    End Date:
    -
    {{projectInfo.endDate}}
    -
    Open Access mandate:
    -
    {{projectInfo.openAccessMandate}}
    -
    Special Clause 39:
    -
    {{projectInfo.specialClause39}}
    -
    Organizations:
    -
    +
    Title:
    +
    {{projectInfo.title}}
    +
    Funding:
    +
    {{projectInfo.funding}}
    +
    Call:
    +
    {{projectInfo.callIdentifier}}
    +
    Contract (GA) number:
    +
    {{projectInfo.contractNum}}
    +
    Start Date:
    +
    {{projectInfo.startDate}}
    +
    End Date:
    +
    {{projectInfo.endDate}}
    +
    Open Access mandate:
    +
    {{projectInfo.openAccessMandate}}
    +
    Special Clause 39:
    +
    {{projectInfo.specialClause39}}
    +
    Organizations:
    +
    - {{organization.name}} + *ngIf="!organization.id"> {{organization.name}},
    -
    More information:
    -
    +
    More information:
    +
    {{projectInfo.urlInfo}} @@ -89,15 +89,17 @@