diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 3ad5742f..2bd0a011 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -34,9 +34,36 @@ --> -
- -
+
+ + +
+ +
+ + + Powered by + OpenAIRE Research Graph + + + . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} + +
+ +
+ See an issue? + Report it here +
+
+ + +
+ +
+ +
+
@@ -45,33 +72,7 @@
- -
- -
- - - Powered by - OpenAIRE Research Graph - - - . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} - -
- -
- See an issue? - Report it here -
-
- - -
- -
- -
+
@@ -86,7 +87,7 @@
-
+
@@ -184,8 +185,7 @@
diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 0a1502fc..182e7bb5 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -32,18 +32,11 @@
--> -
-
- -
- -
-
+
-
+
@@ -63,196 +56,206 @@
-
+
- -
-
-
-
- - - - - View all {{organizationInfo.deletedByInferenceIds.length}} versions - - - - - - - - Share - - - - Download - +
+ +
+ +
+ +
+
+ + +
+
+
+
+ + + + + View all {{organizationInfo.deletedByInferenceIds.length}} versions + + + + + + + + Share + + + + Download + +
-
- -
- - -
- - - - -
-
- + + +
+ + + + +
+
+ + + + + +
+
- - - - + + + + + +
- - - - - - - - - -
- -
- Web page: - - {{organizationInfo.title.url}} - -
- -
- Country: {{organizationInfo.country}} -
-
-
- -
-
- - - - - - - - - - - - - - - - - -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
- - - - -
+ +
+
+ + + + + + + + + + + + + + + + + +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ + + + +
+
+
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 2762502d..265c6b80 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -71,17 +71,10 @@
--> -
-
- -
- -
-
+
-
+
@@ -101,423 +94,463 @@
-
+
- -
-
-
-
- - - - Link to - - - - Share - - - - Deposit - - - - Embed - - - - Download - +
+ +
+ +
+ +
+
+ + +
+
+
+
+ + + + Link to + + + + Share + + + + Deposit + + + + Embed + + + + Download + +
-
- -
- -
- - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - - - -
-
- - - - - + +
+ +
+
+
+ + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+ +
+ + + + + + + +
+
+
+ + Funder: + {{projectInfo.funding.funderName}} + + + Project code: + {{projectInfo.funding.code}} + + + Call for proposal: + {{projectInfo.funding.callIdentifier}} + +
+
+ + Funded under: + {{projectInfo.funding.fundingStream}} + + + Overall Budget: + {{projectInfo.funding.budget | number}} + {{projectInfo.funding.currency}} + + + Funder Contribution: + {{projectInfo.funding.contribution | number}} + {{projectInfo.funding.currency}} + +
+
+ + +
+ + {{projectInfo.urlInfo}} + +
+
+
Open Access mandate
+
+ + {{openaireEntities.PUBLICATIONS}}: + No + + + {{openaireEntities.DATASETS}}: + No + +
+
+
+
+
+ +
- - - - - - - -
-
-
- - Funder: - {{projectInfo.funding.funderName}} - - - Project code: - {{projectInfo.funding.code}} - - - Call for proposal: - {{projectInfo.funding.callIdentifier}} - -
-
- - Funded under: - {{projectInfo.funding.fundingStream}} - - - Overall Budget: - {{projectInfo.funding.budget | number}} - {{projectInfo.funding.currency}} - - - Funder Contribution: - {{projectInfo.funding.contribution | number}} - {{projectInfo.funding.currency}} - -
-
- - -
- - {{projectInfo.urlInfo}} - -
-
-
Open Access mandate
-
- - {{openaireEntities.PUBLICATIONS}}: - No - - - {{openaireEntities.DATASETS}}: - No - -
-
-
-
- -
-
- - - - - - - - - - - - -
-
- -
-
-
-
-
-
-
- No summary information available -
-
-
- -
-
-
Description
-
-
-
-
- - View more - + +
+
+ + + + + + + + + + + + +
+
+ +
+
+
+
+
+
+
+ No summary information available +
+
+
+ +
+
+
Description
+
+
+
+
+ + View more + +
-
-
-
-
-
- -
Partners
-
- -
- - View all - -
-
- View less -
-
-
-
-
-
-
-
+
+
+
+
+ +
Partners
+
+ +
+ + View all + +
+
+ View less +
+
+
+
+
+
+
+
+ + +
+ + +
+ + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + + + + +
+
Statistics
+ +
+
+
+
Produced + {{openaireEntities.RESULTS}} per year +
+ +
+
+
+
+
Access mode of + {{openaireEntities.RESULTS}} +
+ +
+
+
+
+
+ {{openaireEntities.RESULTS}} per datasource +
+ +
+
+
+
+ +
+ +
+ + +
+
- -
- - -
- - - -
- - -
- - -
- - -
- - -
- - -
- - - - - -
-
Statistics
- -
-
-
-
Produced - {{openaireEntities.RESULTS}} per year -
- -
-
-
-
-
Access mode of - {{openaireEntities.RESULTS}} -
- -
-
-
-
-
- {{openaireEntities.RESULTS}} per datasource -
- -
-
-
-
- -
- -
- - -
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 560305a3..e336fcdd 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -68,17 +68,10 @@
--> -
-
- -
- -
-
+
-
+
@@ -98,583 +91,595 @@
-
- -
-
-
-
- - - - - - - View all {{resultLandingInfo.deletedByInferenceIds.length}} versions - - - - - - - - Link to - - - - Share - - - - Cite - - - - - - - - +
+ +
+ +
+ +
+
+ +
+
+
+
+ + + + + + + View all {{resultLandingInfo.deletedByInferenceIds.length}} versions + + + + + + + + Link to + + + + Share + + + + Cite + + + + + + + + +
-
- -
- - - -
- - - - -
- -
- + +
+ + + +
+ + + + +
+ +
+ + + + + +
+ +
+ - + - + +
+ +
+ + + + + +
+ +
+ + +
+
+ +
- -
- - - - - -
- -
- - - - - -
- -
- - -
-
- + + + + + + + +
+ +
+ +
+ + +
- - - - - - - -
- -
- -
- - - -
-
- -
-
- - - - - - - - - - - - - - - - -
-
- -
- -
-
-
- No summary information available -
-
-
- -
-
-
Abstract
-
-
-
-
- - View more - -
-
-
-
-
- {{(resultLandingInfo.countries.length === 1) ? 'Country ' : 'Countries '}} -
-
- {{resultLandingInfo.countries.join(", ")}} + +
+
+ + + + + + + + + + + + + + + + +
+
+ +
+ +
+
+
+ No summary information available
-
- - -
- -
-
Related {{openaireEntities.ORGANIZATIONS}}
- -
- - View all - -
-
- View less -
-
-
-
- - -
- - -
-

- {{item.name}} - - - [{{getReferenceIdName(id)}} - OpenAIRE] - - -

-
- - -
- - - - - -
- - -
- - -
-
- {{keyIn}} -
- - {{keyIn}} - -
- - -
- - -
- - -
-
- Enermaps tool preview -
-

Visit - Enermaps tool -

-
-
-
    - -
  • - {{detail[0]}}: - - - {{word}} - {{word}} - - -
    • -     -
-
- - -
- -
    - -
  • -
    -
    -
    -
    -
    - BIP! -
    - Impact by - BIP! -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Citations - - {{resultLandingInfo.measure.citations}} -
    - - - Popularity - - {{resultLandingInfo.measure.popularity}} -
    - - - Influence - - {{resultLandingInfo.measure.influence}} -
    - - - Impulse - - {{resultLandingInfo.measure.impulse}} -
    -
    +
    + +
    +
    +
    Abstract
    +
    +
    -
    -
    - -
    -
    -
    -
    -
    - OpenAIRE UsageCounts -
    - Usage by - UsageCounts -
    -
    - - - - - - - - - - - - - -
    - - - Downloads - - {{resultLandingInfo.measure.downloads}} -
    - - - Views - - {{resultLandingInfo.measure.views}} -
    -
    +
    + + View more +
    -
    • - -
  • -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Citations - - {{resultLandingInfo.measure.citations}} -
    - - - Popularity - - {{resultLandingInfo.measure.popularity}} -
    - - - Influence - - {{resultLandingInfo.measure.influence}} -
    - - - Impulse - - {{resultLandingInfo.measure.impulse}} -
    +
    +
    + {{(resultLandingInfo.countries.length === 1) ? 'Country ' : 'Countries '}}
    -
    - Chart -
    -
    -
    - Powered by - BIP! - BIP! -
    -
    • - -
  • - -
    • - -
  • -
    - Stats -
    -
    -
    - - -
    -
    - -
    + {{resultLandingInfo.countries.join(", ")}}
    -
    - Powered by - OpenAIRE UsageCounts +
    + +
    -
    • -
-
- -
-
- - -
+ +
+
Related {{openaireEntities.ORGANIZATIONS}}
+ +
+ + View all + +
+
+ View less +
+
+
+
+ + +
+ + +
+

+ {{item.name}} + + + [{{getReferenceIdName(id)}} + OpenAIRE] + + +

+
+ + +
+ + + + + +
+ + +
+ + +
+
+ {{keyIn}} +
+ + {{keyIn}} + +
+ + +
+ + +
+ + +
+
+ Enermaps tool preview +
+

Visit + Enermaps tool +

+
+
+
    + +
  • + {{detail[0]}}: + + + {{word}} + {{word}} + + +
    • +     +
+
+ + +
+ +
    + +
  • +
    +
    +
    +
    +
    + BIP! +
    + Impact by + BIP! +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + Citations + + {{resultLandingInfo.measure.citations}} +
    + + + Popularity + + {{resultLandingInfo.measure.popularity}} +
    + + + Influence + + {{resultLandingInfo.measure.influence}} +
    + + + Impulse + + {{resultLandingInfo.measure.impulse}} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + OpenAIRE UsageCounts +
    + Usage by + UsageCounts +
    +
    + + + + + + + + + + + + + +
    + + + Downloads + + {{resultLandingInfo.measure.downloads}} +
    + + + Views + + {{resultLandingInfo.measure.views}} +
    +
    +
    +
    +
    +
    • + +
  • +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + Citations + + {{resultLandingInfo.measure.citations}} +
    + + + Popularity + + {{resultLandingInfo.measure.popularity}} +
    + + + Influence + + {{resultLandingInfo.measure.influence}} +
    + + + Impulse + + {{resultLandingInfo.measure.impulse}} +
    +
    +
    + +
    +
    +
    + Powered by + BIP! + BIP! +
    +
    • + +
  • + +
    • + +
  • +
    +
    + Stats +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + Powered by + OpenAIRE UsageCounts +
    +
    • +
+
+ +
+
+ + +
+
+
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 4c5ab6a6..75ba17d1 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -72,6 +72,7 @@ export class ResultLandingComponent { public totalViews: number = null; public totalDownloads: number = null; public pageViews: number = null; + public bipFrameUrl: string; // Custom tab paging variables public referencesPage: number = 1; @@ -456,6 +457,7 @@ export class ResultLandingComponent { this.viewsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly views","type":"column","query":{"name":"usagestats.results.views.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly views"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}'); this.downloadsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly downloads","type":"column","query":{"name":"usagestats.results.downloads.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly downloads"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}'); + this.bipFrameUrl = this.properties.bipFrameAPIURL + this.id; let pid:Identifier = Identifier.getPIDFromIdentifiers(this.resultLandingInfo.identifiers); if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType this.updateUrlWithType(pid); diff --git a/landingPages/result/resultLanding.service.ts b/landingPages/result/resultLanding.service.ts index 72212d64..d8ff3308 100644 --- a/landingPages/result/resultLanding.service.ts +++ b/landingPages/result/resultLanding.service.ts @@ -428,8 +428,6 @@ export class ResultLandingService { this.resultLandingInfo.measure['influence'] = 'Top 1%'; } else if (data[0].measure[i].class == 'C4') { this.resultLandingInfo.measure['influence'] = 'Top 10%'; - } else if (data[0].measure[i].class == 'C5') { - this.resultLandingInfo.measure['influence'] = 'Average/low'; } else if (data[0].measure[i].class == 'A') { this.resultLandingInfo.measure['influence'] = 'Exceptional'; } else if (data[0].measure[i].class == 'B') { @@ -447,8 +445,6 @@ export class ResultLandingService { this.resultLandingInfo.measure['popularity'] = 'Top 1%'; } else if (data[0].measure[i].class == 'C4') { this.resultLandingInfo.measure['popularity'] = 'Top 10%'; - } else if (data[0].measure[i].class == 'C5') { - this.resultLandingInfo.measure['popularity'] = 'Average/low'; } else if (data[0].measure[i].class == 'A') { this.resultLandingInfo.measure['popularity'] = 'Exceptional'; } else if (data[0].measure[i].class == 'B') { @@ -469,8 +465,6 @@ export class ResultLandingService { this.resultLandingInfo.measure['impulse'] = 'Top 1%'; } else if (data[0].measure[i].class == 'C4') { this.resultLandingInfo.measure['impulse'] = 'Top 10%'; - } else if (data[0].measure[i].class == 'C5') { - this.resultLandingInfo.measure['impulse'] = 'Average/low'; } else if (data[0].measure[i].class == 'A') { this.resultLandingInfo.measure['impulse'] = 'Exceptional'; } else if (data[0].measure[i].class == 'B') { diff --git a/services/searchResearchResults.service.ts b/services/searchResearchResults.service.ts index e026e951..0b450eb7 100644 --- a/services/searchResearchResults.service.ts +++ b/services/searchResearchResults.service.ts @@ -213,8 +213,6 @@ export class SearchResearchResultsService { result.measure[3] = 'Top 1% in'; } else if (resData['measure'][i].class == 'C4') { result.measure[3] = 'Top 10% in'; - } else if (resData['measure'][i].class == 'C5') { - result.measure[3] = 'Average/low'; } else if (resData['measure'][i].class == 'A') { result.measure[3] = 'Exceptional'; } else if (resData['measure'][i].class == 'B') { @@ -233,8 +231,6 @@ export class SearchResearchResultsService { result.measure[2] = 'Top 1% in'; } else if (resData['measure'][i].class == 'C4') { result.measure[2] = 'Top 10% in'; - } else if (resData['measure'][i].class == 'C5') { - result.measure[2] = 'Average/low'; } else if (resData['measure'][i].class == 'A') { result.measure[2] = 'Exceptional'; } else if (resData['measure'][i].class == 'B') { diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index f0f7aacf..a89f9d38 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -17,6 +17,7 @@ export interface EnvProperties { framesAPIURL?: string; statisticsFrameAPIURL?: string; statisticsFrameNewAPIURL?: string; + bipFrameAPIURL?: string; useNewStatistisTool?: boolean; useOldStatisticsSchema?: boolean; monitorStatsFrameUrl?:string;