From 16406f04d46c6dc356242a5144703e05da753a57 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 18 May 2018 12:47:26 +0000 Subject: [PATCH] 1. Add pipe for numbers. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@52096 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../claimResultSearchForm.component.html | 12 +- .../displayClaims.component.html | 4 +- .../claimsByToken.component.html | 4 +- .../directLinking.component.html | 2 +- .../linking/bulkClaim/bulkClaim.component.ts | 2 +- .../insertClaim/insertClaim.component.ts | 2 +- claims/linking/linkingGeneric.component.html | 6 +- .../selected/selectedContexts.component.ts | 4 +- .../selected/selectedProjects.component.ts | 4 +- .../selected/selectedResults.component.ts | 2 +- .../depositBySubjectResult.component.html | 2 +- deposit/depositResult.component.ts | 4 +- .../dataProvider/dataProvider.component.html | 24 ++-- .../dataProvider/datasetsTab.component.ts | 2 +- .../dataProvider/datasourcesTab.component.ts | 2 +- .../organizationsTab.component.ts | 2 +- .../dataProvider/projectsTab.component.ts | 2 +- .../dataProvider/publicationsTab.component.ts | 2 +- .../relatedDatasourcesTab.component.ts | 6 +- .../dataProvider/softwareTab.component.ts | 2 +- landingPages/dataset/dataset.component.html | 8 +- .../htmlProjectReport.component.ts | 6 +- .../landing-utils/availableOn.component.ts | 2 +- .../landing-utils/metrics.component.ts | 107 ++---------------- .../searchingProjectsInTab.component.ts | 6 +- .../landing-utils/showAuthors.component.ts | 2 +- .../showIdentifiers.component.ts | 4 +- .../landing-utils/tabPaging.component.ts | 2 +- .../landing-utils/tabTable.component.ts | 2 +- .../organization/organization.component.html | 16 +-- landingPages/project/project.component.html | 18 +-- .../publication/publication.component.html | 32 +++--- landingPages/software/software.component.html | 8 +- .../dataProviders/journals.component.ts | 2 +- searchPages/find/search.component.html | 36 +++--- .../browseStatistic.component.html | 6 +- .../searchFilterModal.component.ts | 2 +- .../searchPageTableView.component.html | 4 +- .../searchUtils/searchPaging.component.ts | 4 +- .../entitiesAutoComplete.component.ts | 2 +- utils/pagingFormatter.component.ts | 14 +-- utils/pagingFormatterNoLoad.component.ts | 14 +-- .../staticAutoComplete.component.ts | 2 +- 43 files changed, 151 insertions(+), 238 deletions(-) diff --git a/claims/claim-utils/claimResultSearchForm.component.html b/claims/claim-utils/claimResultSearchForm.component.html index df6e0eec..b721724f 100644 --- a/claims/claim-utils/claimResultSearchForm.component.html +++ b/claims/claim-utils/claimResultSearchForm.component.html @@ -19,12 +19,12 @@
diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index 426e7c5d..d4a4c3af 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -44,7 +44,7 @@ - Showing {{(size*page - size +1)}} to {{(size*page>resultsNum)?resultsNum:(size*page)}} of {{resultsNum}} claims + Showing {{(size*page - size +1) | number}} to {{(size*page>resultsNum)?(resultsNum | number):((size*page) | number)}} of {{resultsNum | number}} claims
@@ -65,7 +65,7 @@
- You have selected {{selected.length}} claim(s) + You have selected {{selected.length | number}} claim(s)
diff --git a/claims/claimsByToken/claimsByToken.component.html b/claims/claimsByToken/claimsByToken.component.html index 6d61f438..fca3b5ca 100644 --- a/claims/claimsByToken/claimsByToken.component.html +++ b/claims/claimsByToken/claimsByToken.component.html @@ -47,7 +47,7 @@
- {{totalPendingResults.count}} pending claims, page {{activePendingPage.page}} of {{totalPages(totalPendingResults.count)}} + {{totalPendingResults.count | number}} pending claims, page {{activePendingPage.page | number}} of {{totalPages(totalPendingResults.count) | number}} @@ -99,7 +99,7 @@ - {{totalCuratedResults.count}} curated claims, page {{activeCuratedPage.page}} of {{totalPages(totalCuratedResults.count)}} + {{totalCuratedResults.count | number}} curated claims, page {{activeCuratedPage.page | number}} of {{totalPages(totalCuratedResults.count) | number}} diff --git a/claims/directLinking/directLinking.component.html b/claims/directLinking/directLinking.component.html index efb0d94c..bb72662a 100644 --- a/claims/directLinking/directLinking.component.html +++ b/claims/directLinking/directLinking.component.html @@ -42,7 +42,7 @@

  • - {{(projects.length + contexts.length + results.length)}} + {{(projects.length + contexts.length + results.length) | number}}

    Uploaded file contains {{allIds.length}} rows. {{foundIds.length}} results were sucefully fetched from CrossRef and Datacite.
    -
    {{duplicateIds.length}} duplicate DOIs.
    +
    {{duplicateIds.length | number}} duplicate DOIs.
    Couldn't be found:
    • "{{id}}"
      • diff --git a/claims/linking/insertClaim/insertClaim.component.ts b/claims/linking/insertClaim/insertClaim.component.ts index f0a097e3..d964856e 100644 --- a/claims/linking/insertClaim/insertClaim.component.ts +++ b/claims/linking/insertClaim/insertClaim.component.ts @@ -15,7 +15,7 @@ import{EnvProperties} from '../../../utils/properties/env-properties'; template: `
      -
      {{insertedClaims.length}} claims created, follow the link to manage your claims
      +
      {{insertedClaims.length | number}} claims created, follow the link to manage your claims
      diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html index 9aa63bf6..7b953276 100644 --- a/claims/linking/linkingGeneric.component.html +++ b/claims/linking/linkingGeneric.component.html @@ -37,7 +37,7 @@

      - {{(projects.length + contexts.length + results.length)}} + {{(projects.length + contexts.length + results.length) | number}}

    • - Projects ({{projects.length}}) + Projects ({{projects.length | number}})
    • - Communities ({{contexts.length}}) + Communities ({{contexts.length | number}})
      diff --git a/claims/linking/selected/selectedContexts.component.ts b/claims/linking/selected/selectedContexts.component.ts index ca728220..66790b05 100644 --- a/claims/linking/selected/selectedContexts.component.ts +++ b/claims/linking/selected/selectedContexts.component.ts @@ -9,9 +9,9 @@ import {ClaimContext} from '../../claim-utils/claimEntities.class';
      - +
      -
      Selected Communities ({{contexts.length}})
      +
      Selected Communities ({{contexts.length | number}})
      • diff --git a/claims/linking/selected/selectedProjects.component.ts b/claims/linking/selected/selectedProjects.component.ts index a84d20ea..dc346a8d 100644 --- a/claims/linking/selected/selectedProjects.component.ts +++ b/claims/linking/selected/selectedProjects.component.ts @@ -8,9 +8,9 @@ import {RouterHelper} from '../../../utils/routerHelper.class';
        - +
        -
        Selected Projects ({{projects.length}})
        +
        Selected Projects ({{projects.length | number}})
        • {{project.funderName}} | {{project.projectName}} {{(project.projectAcronym)?'('+project.projectAcronym+')':''}} diff --git a/claims/linking/selected/selectedResults.component.ts b/claims/linking/selected/selectedResults.component.ts index 98f30f83..f933bb6a 100644 --- a/claims/linking/selected/selectedResults.component.ts +++ b/claims/linking/selected/selectedResults.component.ts @@ -13,7 +13,7 @@ import {Dates} from '../../../utils/string-utils.class';
          There are no selected research results
          -
          {{title}} ({{results.length}})
          +
          {{title}} ({{results.length | number}})
    • diff --git a/deposit/datasets/depositBySubjectResult.component.html b/deposit/datasets/depositBySubjectResult.component.html index d4dda194..827ecada 100644 --- a/deposit/datasets/depositBySubjectResult.component.html +++ b/deposit/datasets/depositBySubjectResult.component.html @@ -42,7 +42,7 @@
    - {{fetchDataproviders.searchUtils.totalResults}} content providers, page {{fetchDataproviders.searchUtils.page}} of {{(totalPages())}} + {{fetchDataproviders.searchUtils.totalResults | number}} content providers, page {{fetchDataproviders.searchUtils.page | number}} of {{(totalPages()) | number}}
    - View all {{fetchDataproviders.searchUtils.totalResults}} results + View all {{fetchDataproviders.searchUtils.totalResults | number}} results
    - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} - {{fetchDatasets.searchUtils.totalResults}} + {{fetchDatasets.searchUtils.totalResults | number}} - {{fetchSoftware.searchUtils.totalResults}} + {{fetchSoftware.searchUtils.totalResults | number}} - {{fetchProjects.searchUtils.totalResults}} + {{fetchProjects.searchUtils.totalResults | number}} - {{fetchDataproviders.searchUtils.totalResults}} + {{fetchDataproviders.searchUtils.totalResults | number}} - {{dataProviderInfo.organizations.length}} + {{dataProviderInfo.organizations.length | number}} @@ -110,22 +110,22 @@ {{tab.name}} - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} - {{fetchDatasets.searchUtils.totalResults}} + {{fetchDatasets.searchUtils.totalResults | number}} - {{fetchSoftware.searchUtils.totalResults}} + {{fetchSoftware.searchUtils.totalResults | number}} - {{fetchProjects.searchUtils.totalResults}} + {{fetchProjects.searchUtils.totalResults | number}} - {{fetchDataproviders.searchUtils.totalResults}} + {{fetchDataproviders.searchUtils.totalResults | number}} - {{dataProviderInfo.organizations.length}} + {{dataProviderInfo.organizations.length | number}} diff --git a/landingPages/dataProvider/datasetsTab.component.ts b/landingPages/dataProvider/datasetsTab.component.ts index 89e0e288..d48eb521 100644 --- a/landingPages/dataProvider/datasetsTab.component.ts +++ b/landingPages/dataProvider/datasetsTab.component.ts @@ -22,7 +22,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
    - View all {{fetchDatasets.searchUtils.totalResults}} results + View all {{fetchDatasets.searchUtils.totalResults | number}} results
    - View all {{fetchDataproviders.searchUtils.totalResults}} results + View all {{fetchDataproviders.searchUtils.totalResults | number}} results
    - {{organizations.length}} organizations, page {{organizationsPage}} of {{totalPages(organizations.length)}} + {{organizations.length | number}} organizations, page {{organizationsPage | number}} of {{totalPages(organizations.length) | number}}
    diff --git a/landingPages/dataProvider/projectsTab.component.ts b/landingPages/dataProvider/projectsTab.component.ts index 609b9854..f6832c70 100644 --- a/landingPages/dataProvider/projectsTab.component.ts +++ b/landingPages/dataProvider/projectsTab.component.ts @@ -22,7 +22,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
    - View all {{fetchProjects.searchUtils.totalResults}} results + View all {{fetchProjects.searchUtils.totalResults | number}} results
    - View all {{fetchPublications.searchUtils.totalResults}} results + View all {{fetchPublications.searchUtils.totalResults | number}} results
    - {{results.size}} related content providers, page {{page}} of {{totalPages(results.size)}} + {{results.size | number}} related content providers, page {{page | number}} of {{totalPages(results.size) | number}}
    @@ -61,7 +61,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';     @@ -69,7 +69,7 @@ import{EnvProperties} from '../../utils/properties/env-properties'; diff --git a/landingPages/dataProvider/softwareTab.component.ts b/landingPages/dataProvider/softwareTab.component.ts index abc61bf1..7edd1575 100644 --- a/landingPages/dataProvider/softwareTab.component.ts +++ b/landingPages/dataProvider/softwareTab.component.ts @@ -22,7 +22,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
    - View all {{fetchSoftware.searchUtils.totalResults}} results + View all {{fetchSoftware.searchUtils.totalResults | number}} results
    Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}} @@ -94,7 +94,7 @@ Similar Research Results 0 - {{datasetInfo.similarResearchResults.length}} + {{datasetInfo.similarResearchResults.length | number}} @@ -119,7 +119,7 @@ Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}} @@ -130,7 +130,7 @@ Similar Research Results 0 - {{datasetInfo.similarResearchResults.length}} + {{datasetInfo.similarResearchResults.length | number}} diff --git a/landingPages/htmlProjectReport/htmlProjectReport.component.ts b/landingPages/htmlProjectReport/htmlProjectReport.component.ts index 4dd4f82c..e01269d1 100644 --- a/landingPages/htmlProjectReport/htmlProjectReport.component.ts +++ b/landingPages/htmlProjectReport/htmlProjectReport.component.ts @@ -153,11 +153,11 @@ export class HtmlProjectReportComponent{ ); if(this.resultsType == "publication") { - this.header2 += this.totalResults + " publications"; + this.header2 += this.totalResults.toLocaleString('en-US') + " publications"; } else if(this.resultsType == "research data") { - this.header2 += this.totalResults + " research data"; + this.header2 += this.totalResults.toLocaleString('en-US') + " research data"; } else if(this.resultsType == "software") { - this.header2 += this.totalResults + " software"; + this.header2 += this.totalResults.toLocaleString('en-US') + " software"; } } diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index abc02560..61408b5e 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -15,7 +15,7 @@ import {Component, Input, ElementRef} from '@angular/core'; - [{{i+1}}] + [{{(i+1) | number}}] diff --git a/landingPages/landing-utils/metrics.component.ts b/landingPages/landing-utils/metrics.component.ts index 40391a17..b4bc1560 100644 --- a/landingPages/landing-utils/metrics.component.ts +++ b/landingPages/landing-utils/metrics.component.ts @@ -9,118 +9,31 @@ import{EnvProperties} from '../../utils/properties/env-properties'; @Component({ selector: 'metrics', template: ` - - - - - - - -
    Project metrics are derived from aggregating individual research results metrics.
    - -
    {{pageViews}}
    -
    views in OpenAIRE
    - - - +
    {{pageViews | number}}
    +
    views in OpenAIRE
    - -
    {{metrics.totalViews}} +
    {{metrics.totalViews | number}} - ( {{metrics.totalOpenaireViews}} from OpenAIRE ) + ( {{metrics.totalOpenaireViews | number}} from OpenAIRE )
    views in local repository
    - - - - -
    - -
    {{metrics.totalDownloads}} +
    {{metrics.totalDownloads | number}} - ( {{metrics.totalOpenaireDownloads}} from OpenAIRE ) + ( {{metrics.totalOpenaireDownloads | number}} from OpenAIRE )
    downloads in local repository
    - - - - - -
    @@ -144,15 +57,15 @@ import{EnvProperties} from '../../utils/properties/env-properties';
    diff --git a/landingPages/landing-utils/searchingProjectsInTab.component.ts b/landingPages/landing-utils/searchingProjectsInTab.component.ts index 0122804b..a08d169a 100644 --- a/landingPages/landing-utils/searchingProjectsInTab.component.ts +++ b/landingPages/landing-utils/searchingProjectsInTab.component.ts @@ -25,7 +25,7 @@ import{EnvProperties} from '../../utils/properties/env-properties';
    - View all {{fetchProjects.searchUtils.totalResultsNoFilters}} results + View all {{fetchProjects.searchUtils.totalResultsNoFilters | number}} results
    @@ -39,11 +39,11 @@ import{EnvProperties} from '../../utils/properties/env-properties'; - {{value.name}} ({{value.number}}) + {{value.name}} ({{value.number | number}}) -
  • Filtered {{fetchProjects.searchUtils.totalResults}} results of {{fetchProjects.searchUtils.totalResultsNoFilters}} total results
    • +
  • Filtered {{fetchProjects.searchUtils.totalResults | number}} results of {{fetchProjects.searchUtils.totalResultsNoFilters | number}} total results
  • diff --git a/landingPages/landing-utils/showAuthors.component.ts b/landingPages/landing-utils/showAuthors.component.ts index 1ea03b85..4b656039 100644 --- a/landingPages/landing-utils/showAuthors.component.ts +++ b/landingPages/landing-utils/showAuthors.component.ts @@ -27,7 +27,7 @@ import {RouterHelper} from '../../utils/routerHelper.class'; - view all {{authors.length}} authors + view all {{authors.length | number}} authors diff --git a/landingPages/landing-utils/showIdentifiers.component.ts b/landingPages/landing-utils/showIdentifiers.component.ts index 1ddc4035..19ed1113 100644 --- a/landingPages/landing-utils/showIdentifiers.component.ts +++ b/landingPages/landing-utils/showIdentifiers.component.ts @@ -24,7 +24,7 @@ import {Component, Input, ElementRef} from '@angular/core'; - view all {{countIdentifiers()}} identifiers + view all {{countIdentifiers() | number}} identifiers @@ -48,7 +48,7 @@ export class ShowIdentifiersComponent { constructor (private element: ElementRef) { this.doiURL = "https://dx.doi.org/"; this.pmcURL = "http://europepmc.org/articles/"; - this.handleURL = "http://hdl.handle.net/"; + this.handleURL = "http://hdl.handle.net/"; } ngOnInit() {} diff --git a/landingPages/landing-utils/tabPaging.component.ts b/landingPages/landing-utils/tabPaging.component.ts index f0671764..1eb6bd08 100644 --- a/landingPages/landing-utils/tabPaging.component.ts +++ b/landingPages/landing-utils/tabPaging.component.ts @@ -5,7 +5,7 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; template: `
    -
    view all {{length}}
    +
    view all {{length | number}}
    ` diff --git a/landingPages/landing-utils/tabTable.component.ts b/landingPages/landing-utils/tabTable.component.ts index 15e31283..59b78734 100644 --- a/landingPages/landing-utils/tabTable.component.ts +++ b/landingPages/landing-utils/tabTable.component.ts @@ -7,7 +7,7 @@ import{EnvProperties} from '../../utils/properties/env-properties'; selector: 'tabTable', template: `
    - {{info.length}} research results, page {{page}} of {{totalPages(info.length)}} + {{info.length | number}} research results, page {{page | number}} of {{totalPages(info.length) | number}}
    diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 3d7cc302..892facee 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -19,7 +19,7 @@ Publications - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} @@ -29,7 +29,7 @@ Projects - {{fetchProjects.searchUtils.totalResultsNoFilters}} + {{fetchProjects.searchUtils.totalResultsNoFilters | number}} @@ -42,7 +42,7 @@ {{organizationInfo.dataProviders.length}} - {{fetchDataproviders.searchUtils.totalResults}} + {{fetchDataproviders.searchUtils.totalResults | number}} @@ -59,7 +59,7 @@ Publications - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} @@ -68,7 +68,7 @@ Projects - {{fetchProjects.searchUtils.totalResultsNoFilters}} + {{fetchProjects.searchUtils.totalResultsNoFilters | number}} @@ -77,7 +77,7 @@ Content Providers - {{fetchDataproviders.searchUtils.totalResults}} + {{fetchDataproviders.searchUtils.totalResults | number}} @@ -97,7 +97,7 @@
    - View all {{fetchPublications.searchUtils.totalResults}} results + View all {{fetchPublications.searchUtils.totalResults | number}} results
    - View all {{fetchDataproviders.searchUtils.totalResults}} results + View all {{fetchDataproviders.searchUtils.totalResults | number}} results
    Publications - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} @@ -92,7 +92,7 @@ Research Data - {{fetchDatasets.searchUtils.totalResults}} + {{fetchDatasets.searchUtils.totalResults | number}} @@ -101,7 +101,7 @@ Software - {{fetchSoftware.searchUtils.totalResults}} + {{fetchSoftware.searchUtils.totalResults | number}} @@ -132,7 +132,7 @@ Publications - {{fetchPublications.searchUtils.totalResults}} + {{fetchPublications.searchUtils.totalResults | number}} @@ -141,7 +141,7 @@ Research Data - {{fetchDatasets.searchUtils.totalResults}} + {{fetchDatasets.searchUtils.totalResults | number}} @@ -150,7 +150,7 @@ Software - {{fetchSoftware.searchUtils.totalResults}} + {{fetchSoftware.searchUtils.totalResults | number}} @@ -188,7 +188,7 @@
    - View all {{fetchPublications.searchUtils.totalResults}} results + View all {{fetchPublications.searchUtils.totalResults | number}} results
    - View all {{fetchDatasets.searchUtils.totalResults}} results + View all {{fetchDatasets.searchUtils.totalResults | number}} results - View all {{fetchSoftware.searchUtils.totalResults}} results + View all {{fetchSoftware.searchUtils.totalResults | number}} results 0 - {{publicationInfo.references.length}} + {{publicationInfo.references.length | number}} @@ -123,7 +123,7 @@ Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}} @@ -133,7 +133,7 @@ Similar Research Results 0 - {{publicationInfo.similarResearchResults.length}} + {{publicationInfo.similarResearchResults.length | number}} @@ -143,7 +143,7 @@ Related Organizations 0 - {{publicationInfo.organizations.length}} + {{publicationInfo.organizations.length | number}} @@ -151,14 +151,14 @@ [class]="activeTab == 'Bioentities'?'uk-active':''"> Bioentities - {{bioentitiesNum}} + {{bioentitiesNum | number}}
  • Software - {{publicationInfo.software.length}} + {{publicationInfo.software.length | number}}
  • 0 - {{publicationInfo.references.length}} + {{publicationInfo.references.length | number}}
    • @@ -193,7 +193,7 @@ Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}} @@ -203,7 +203,7 @@ Similar Research Results 0 - {{publicationInfo.similarResearchResults.length}} + {{publicationInfo.similarResearchResults.length | number}} @@ -213,7 +213,7 @@ Related Organizations 0 - {{publicationInfo.organizations.length}} + {{publicationInfo.organizations.length | number}} @@ -221,14 +221,14 @@ [class]="activeTab == 'Bioentities'?'uk-active':''"> Bioentities - {{bioentitiesNum}} + {{bioentitiesNum | number}}
  • Software - {{publicationInfo.software.length}} + {{publicationInfo.software.length | number}}
  • - {{publicationInfo.references.length}} references, page {{referencesPage}} of {{totalPages(publicationInfo.references.length)}} + {{publicationInfo.references.length | number}} references, page {{referencesPage | number}} of {{totalPages(publicationInfo.references.length) | number}}
    @@ -317,7 +317,7 @@
    - {{publicationInfo.organizations.length}} organizations, page {{organizationsPage}} of {{totalPages(publicationInfo.organizations.length)}} + {{publicationInfo.organizations.length | number}} organizations, page {{organizationsPage | number}} of {{totalPages(publicationInfo.organizations.length) | number}}
    @@ -368,7 +368,7 @@
    - {{bioentitiesNum}} bioentities, page {{bioentitiesPage}} of {{totalPages(bioentitiesNum)}} + {{bioentitiesNum | number}} bioentities, page {{bioentitiesPage | number}} of {{totalPages(bioentitiesNum) | number}}
    @@ -402,7 +402,7 @@
    - {{publicationInfo.software.length}} software results, page {{softwarePage}} of {{totalPages(publicationInfo.software.length)}} + {{publicationInfo.software.length | number}} software results, page {{softwarePage | number}} of {{totalPages(publicationInfo.software.length) | number}}
    diff --git a/landingPages/software/software.component.html b/landingPages/software/software.component.html index 06e4f143..86e37bcd 100644 --- a/landingPages/software/software.component.html +++ b/landingPages/software/software.component.html @@ -85,7 +85,7 @@ Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}}
    • @@ -96,7 +96,7 @@ Similar Research Results 0 - {{softwareInfo.similarResearchResults.length}} + {{softwareInfo.similarResearchResults.length | number}} @@ -121,7 +121,7 @@ Related Research Results - {{relatedResearchResultsNum}} + {{relatedResearchResultsNum | number}} @@ -132,7 +132,7 @@ Similar Research Results 0 - {{softwareInfo.similarResearchResults.length}} + {{softwareInfo.similarResearchResults.length | number}} diff --git a/searchPages/dataProviders/journals.component.ts b/searchPages/dataProviders/journals.component.ts index 899f9d12..fc7615e0 100644 --- a/searchPages/dataProviders/journals.component.ts +++ b/searchPages/dataProviders/journals.component.ts @@ -23,9 +23,9 @@ import{EnvProperties} from '../../utils/properties/env-properties'; (queryChange)="queryChanged($event)" [csvParams]="csvParams" csvPath="resources" [disableForms]="disableForms" - [tableViewLink]="'/search/journals-table'" searchFormClass="journalsSearchForm"> + ` }) diff --git a/searchPages/find/search.component.html b/searchPages/find/search.component.html index 34ac35c2..4cab96a9 100644 --- a/searchPages/find/search.component.html +++ b/searchPages/find/search.component.html @@ -18,42 +18,42 @@
  • Publications - {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchPublications.searchUtils.totalResults :'')}} + {{((fetchPublications.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchPublications.searchUtils.totalResults | number) :'')}}
  • Research Data - {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}} + {{((fetchDatasets.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDatasets.searchUtils.totalResults | number) :'')}}
  • Software - {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchSoftware.searchUtils.totalResults :'')}} + {{((fetchSoftware.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchSoftware.searchUtils.totalResults | number) :'')}}
  • Projects - {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchProjects.searchUtils.totalResults :'')}} + {{((fetchProjects.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchProjects.searchUtils.totalResults | number) :'')}}
  • Content Providers - {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}} + {{((fetchDataproviders.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchDataproviders.searchUtils.totalResults | number) :'')}}
  • Organizations - {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? fetchOrganizations.searchUtils.totalResults :'')}} + {{((fetchOrganizations.searchUtils.status != errorCodes.LOADING && keyword.length > 0)? (fetchOrganizations.searchUtils.totalResults | number) :'')}}
    • @@ -67,42 +67,42 @@ Publications - {{((keyword.length > 0)? fetchPublications.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchPublications.searchUtils.totalResults | number) :'')}}
  • Research Data - {{((keyword.length > 0)? fetchDatasets.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchDatasets.searchUtils.totalResults | number) :'')}}
  • Software - {{((keyword.length > 0)? fetchSoftware.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchSoftware.searchUtils.totalResults | number) :'')}}
  • Projects - {{((keyword.length > 0)? fetchProjects.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchProjects.searchUtils.totalResults | number) :'')}}
  • Content Providers - {{((keyword.length > 0)? fetchDataproviders.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchDataproviders.searchUtils.totalResults | number) :'')}}
  • Organizations - {{((keyword.length > 0)? fetchOrganizations.searchUtils.totalResults :'')}} + {{((keyword.length > 0)? (fetchOrganizations.searchUtils.totalResults | number) :'')}}
    • @@ -118,7 +118,7 @@ - View all {{fetchPublications.searchUtils.totalResults}} results + View all {{fetchPublications.searchUtils.totalResults | number}} results - View all {{fetchDatasets.searchUtils.totalResults}} results + View all {{fetchDatasets.searchUtils.totalResults | number}} results - View all {{fetchSoftware.searchUtils.totalResults}} results + View all {{fetchSoftware.searchUtils.totalResults | number}} results - View all {{fetchProjects.searchUtils.totalResults}} results + View all {{fetchProjects.searchUtils.totalResults | number}} results - View all {{fetchDataproviders.searchUtils.totalResults}} results + View all {{fetchDataproviders.searchUtils.totalResults | number}} results - View all {{fetchOrganizations.searchUtils.totalResults}} results + View all {{fetchOrganizations.searchUtils.totalResults | number}} results -
    {{_formatName(value)}}
    ({{value.number}})     +
    {{_formatName(value)}}
    ({{value.number | number}})
  • View more @@ -25,7 +25,7 @@
    • - {{results.get(id).countPublications}} + {{results.get(id).countPublications | number}} - - {{results.get(id).countDatasets}} + {{results.get(id).countDatasets | number}} - - {{metrics.infos.get(key).numOfViews}} + {{metrics.infos.get(key).numOfViews | number}} - ( {{metrics.infos.get(key).openaireViews}} from OpenAIRE ) + ( {{metrics.infos.get(key).openaireViews | number}} from OpenAIRE ) - {{metrics.infos.get(key).numOfDownloads}} + {{metrics.infos.get(key).numOfDownloads | number}} - ( {{metrics.infos.get(key).openaireDownloads}} from OpenAIRE ) + ( {{metrics.infos.get(key).openaireDownloads | number}} from OpenAIRE )