diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index ca76ea43..0a6418a6 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -21,21 +21,11 @@ - +
  • - - - - - -
    • - -
  • - + @@ -53,8 +43,8 @@
    - - Powered by OpenAIRE Research Graph + + Powered by OpenAIRE Research Graph . Last update of records in OpenAIRE: {{indexUpdateDate | date: 'MMM dd, yyyy'}} @@ -113,28 +103,28 @@
    - + [tabTitle]="openaireEntities.PUBLICATIONS" [tabId]="'publications'"> + [tabTitle]="openaireEntities.DATASETS" [tabId]="'datasets'"> + [tabTitle]="openaireEntities.SOFTWARE" [tabId]="'software'"> + [tabTitle]="openaireEntities.OTHER" [tabId]="'other'">
    @@ -187,6 +177,13 @@
    +
    + +
    + + + @@ -212,89 +209,93 @@ - - + +
    -
    -
      -
    • -
      - - all research outcomes (CSV) -
      -
      • -
    • -
      - - publications (CSV) -
      -
      • -
    • -
      - - research data (CSV) -
      -
      • -
    • -
      - - software (CSV) -
      -
      • -
    • -
      - - other research products (CSV) -
      -
      • -
    -
    - No reports available -
    -
    -
    -
    -     - - -
    -
    -
    -
    -
      -
    • +
      +
      +
      + Content report +
      +
        +
      • + [class]="total > 0 ? '' : 'uk-disabled uk-text-muted'" + (click)="downloadFile(getCSVAffiliated('results'), 'results' + '-report')"> - projects (CSV) + all {{openaireEntities.RESULTS}} (CSV)
        • -
      • -
        +
      • +
        - {{contentType[1]}} (CSV) + {{openaireEntities.PUBLICATIONS}} (CSV) +
        +
        • +
      • +
        + + {{openaireEntities.DATASETS}} (CSV) +
        +
        • +
      • +
        + + {{openaireEntities.SOFTWARE}} (CSV) +
        +
        • +
      • +
        + + {{openaireEntities.OTHER}} (CSV)
      +
      + No reports available +
      +
      +
      + Funder report +
      +
      +
      +
      +
        +
      • +
        + + {{openaireEntities.PROJECTS}} (CSV) +
        +
        • +
      • +
        + + {{contentType[1]}} (CSV) +
        +
        • +
      +
      +
      +
    diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index d94fbf76..d03a3596 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -24,6 +24,7 @@ import {FetchDataproviders} from "../../utils/fetchEntitiesClasses/fetchDataprov import {IndexInfoService} from "../../utils/indexInfo.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; +import {OpenaireEntities} from '../../utils/properties/searchFields'; @Component({ selector: 'organization', @@ -52,7 +53,7 @@ export class OrganizationComponent { public fetchDatasets: FetchResearchResults; public fetchSoftware: FetchResearchResults; public fetchOrps: FetchResearchResults; - public fetchDataproviders: FetchDataproviders + public fetchDataproviders: FetchDataproviders; public searchNumber: number = 5; // Request results of each tab only the one time (first time tab is clicked) @@ -64,7 +65,8 @@ export class OrganizationComponent { // Active tab variable for responsiveness public activeTab: string = ""; - + + @ViewChild('downloadReportsModal') downloadReportsModal; @ViewChild('downloadReportModal') downloadReportModal; @ViewChild('downloadFunderReportModal') downloadFunderReportModal; @ViewChild('addThisModal') addThisModal; @@ -82,11 +84,11 @@ export class OrganizationComponent { // Helper variables to specify funder in downloadPublicationsFile function public contentTypes: [string, string][] = [ - ['results', 'all research outcomes'], - ['publications', 'publications'], - ['datasets', 'research data'], - ['software', 'software'], - ['other', 'other research products'], + ['results', 'all ' + OpenaireEntities.RESULTS], + ['publications', OpenaireEntities.PUBLICATIONS], + ['datasets', OpenaireEntities.DATASETS], + ['software', OpenaireEntities.SOFTWARE], + ['other', OpenaireEntities.OTHER], ]; public funderContentType: string = ''; public funder: any = ""; @@ -101,6 +103,7 @@ export class OrganizationComponent { subscriptions = []; innerReportSubscriptions = []; properties: EnvProperties; + public openaireEntities = OpenaireEntities public indexUpdateDate: Date; public showFeedback: boolean = false; public feedbackFields: string [] = ['Name', 'Country', 'Other']; @@ -545,8 +548,7 @@ export class OrganizationComponent { } private openLoading() { - this.closeDownloadReportModal(); - this.closeDownloadFunderReportModal(); + this.closeDownloadReportsModal(); if (this.loading) { this.loading.open(); @@ -626,27 +628,16 @@ export class OrganizationComponent { console.log(value); } - openDownloadReportModal() { - this.downloadReportModal.cancelButton = false; - this.downloadReportModal.okButton = false; - this.downloadReportModal.alertTitle = "Download content report"; - this.downloadReportModal.open(); - } + openDownloadReportsModal() { + this.funder = this.fetchProjects.funders[0]; + this.downloadReportsModal.cancelButton = false; + this.downloadReportsModal.okButton = false; + this.downloadReportsModal.alertTitle = "Download"; + this.downloadReportsModal.open(); + } - closeDownloadReportModal() { - this.downloadReportModal.cancel(); - } - - openDownloadFunderReportModal() { - this.funder = this.fetchProjects.funders[0]; - this.downloadFunderReportModal.cancelButton = false; - this.downloadFunderReportModal.okButton = false; - this.downloadFunderReportModal.alertTitle = "Download funder report"; - this.downloadFunderReportModal.open(); - } - - closeDownloadFunderReportModal() { - this.downloadFunderReportModal.cancel(); + closeDownloadReportsModal() { + this.downloadReportsModal.cancel(); } public openAddThisModal() { diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index af8c60a9..78f44256 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -155,7 +155,7 @@
    -
    +
    @@ -211,7 +211,7 @@ search
    -
    +
    +
    {{quickFilter.value}}