From f9c5aa616d26108fece19dcdca79c338f0f190d9 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Tue, 12 Apr 2022 13:03:47 +0300 Subject: [PATCH] update methodology page content, new css rules for printing, new description for indicators --- src/app/methodology/methodology.component.ts | 233 +++++++++++++++++-- src/app/monitor/monitor.component.css | 16 +- src/app/monitor/monitor.component.html | 52 +++-- src/app/monitor/monitor.component.ts | 6 + src/assets/dashboard-theme | 2 +- src/assets/print.css | 11 +- 6 files changed, 280 insertions(+), 40 deletions(-) diff --git a/src/app/methodology/methodology.component.ts b/src/app/methodology/methodology.component.ts index 83f9a4c..fb387ed 100644 --- a/src/app/methodology/methodology.component.ts +++ b/src/app/methodology/methodology.component.ts @@ -20,8 +20,11 @@ import {ActivatedRoute, Router} from "@angular/router"; Entities
  • - Attributes of Entities + Inherited and Inferred Attributes
    • +
  • + Constructed Attributes +
    • @@ -219,7 +396,25 @@ import {ActivatedRoute, Router} from "@angular/router";

    Inclusion, transparency,
    quality, state of the art
    technology.

    +
    +

    Our methodological approach is based on the following operational quality criteria:

    +
      +
    • Openness and transparency: Methodological assumptions are openly and clearly presented.
      • +
    • Coverage and accuracy: As detailed in graph.openaire.eu + multiple data sources are ingested in the OpenAIRE research graph for coverage to the fullest extent possible, in order to provide meaningful indicators.
      • +
    • Clarity and replicability: We describe our construction methodology in detail, so that + it can be verified and used by the scholarly communication community to create ongoing updates to our proposed statistics and indicators.
      • +
    • Readiness and timeliness: The methodology is built around well-established open databases + and already tested knowledge extraction technologies - natural language processing (NLP)/machine-learning (ML) - using operational + workflows in OpenAIRE to warrant timely results.
      • +
    • Trust and robustness: Our methodology also strives to be reliable, robust, and aligned + to other assessment methods so that it can be operationalized, used and reused, in conjunction with other assessment methods.
      • +
    +
    The text above is modified from this report (DOI: 10.2777/268348).
    +
    +

    Step-by-step

    diff --git a/src/app/monitor/monitor.component.css b/src/app/monitor/monitor.component.css index eab7e42..5137474 100644 --- a/src/app/monitor/monitor.component.css +++ b/src/app/monitor/monitor.component.css @@ -1,7 +1,21 @@ .uk-card { min-height: 270px; } - .uk-card.semiFiltered, .uk-card.semiFiltered > * > .highcharts-series-group { opacity: 0.5; } +.custom-description-overlay { + position: absolute; + top: 0; + left: 0; + background: rgba(0,0,0,0.8); + width: 100%; + height: 100%; +} +.custom-description-overlay .inner { + background: #fff; + border-radius: 6px; + width: 75%; + max-height: 75%; + overflow: auto; +} diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index e11b093..e2a7fc4 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -122,10 +122,13 @@ {{numberResults.get(i + '-' + j) | number}} -- + + {{numberResults.get(i + '-' + j) | number}} +
    {{indicator.name}}
    -
    +
    @@ -148,9 +151,9 @@
    -
    -
    +

    {{indicator.name + " "}}

    @@ -176,21 +179,34 @@ [src]="chartsActiveType.get(i + '-' + j).safeResourceUrl" class="uk-width-1-1 uk-blend-multiply" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
    -
    -
    -

    - - {{indicator.description}} - -
    - - {{indicator.additionalDescription}} - -

    -
    + class="uk-position-bottom-left uk-margin-left uk-margin-small-bottom"> + + + + Description + +
    +
    +
    +
    + + + +
    +
    +

    + {{indicator.description}} +

    +

    + {{indicator.additionalDescription}} +

    +
    +
    +
    diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 9e60a71..e620bdb 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -79,6 +79,7 @@ export class MonitorComponent implements OnInit, OnDestroy { public keyword: FormControl; public statsUpdateDate: Date; public stickyPageHeader: boolean = false; + public showDescriptionOverlay: boolean[] = []; constructor( private route: ActivatedRoute, @@ -568,4 +569,9 @@ export class MonitorComponent implements OnInit, OnDestroy { logIn() { this.userManagementService.login(); } + + toggleDescriptionOverlay(j) { + console.log(j); + this.showDescriptionOverlay[j] = !this.showDescriptionOverlay[j]; + } } diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme index 1831614..5d7edb0 160000 --- a/src/assets/dashboard-theme +++ b/src/assets/dashboard-theme @@ -1 +1 @@ -Subproject commit 1831614eefba657a94a9548846cff28f5987c670 +Subproject commit 5d7edb030d589492011316208ee45a1d2c54e764 diff --git a/src/assets/print.css b/src/assets/print.css index b96c843..ab42c8f 100644 --- a/src/assets/print.css +++ b/src/assets/print.css @@ -6,13 +6,19 @@ #notifications-switcher, .getDataButton, .hideInfo, - .footer-light-background { + .footer-light-background, + #filters_switcher_toggle, + .monitor_dashboard-menu, + #main-menu, + .uk-sticky-placeholder { display: none !important; top: 0 !important; left: 0 !important; right: 0 !important; padding: 0 !important; margin: 0 !important; + position: relative !important; + height: 0px !important; } #page_content, .uk-navbar-center { @@ -23,4 +29,7 @@ padding: 0 !important; margin: 0 !important; } + .uk-hidden { + display:unset !important; + } } \ No newline at end of file