diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index db94c6f..93ae81c 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -32,29 +32,31 @@ - - + + -
+

{{stakeholder.name}}

-
- +
+ +
+ + + + + +
@@ -93,62 +95,93 @@
-
-
{{number.title}}
- -
-
-
-
{{indicator.name}}
-
- - -- + +
+
{{number.title}}
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+ + + + + +
-
- - - - - -
-
-
-
- - - - - -
-
-

- {{indicator.description}} -

-

- {{indicator.additionalDescription}} -

+
+
+ + + + + +
+
+

+ {{indicator.description}} +

+

+ {{indicator.additionalDescription}} +

+
+ +
+ + +
{{number.title}}
+
+
+ +
+
+
+
{{indicator.name}}
+
+ + -- +
+
+
+
+
- -
+
+
-
{{chart.title}}
+ class="uk-grid uk-grid-small uk-grid-match uk-margin-medium-bottom uk-flex uk-flex-middle" uk-grid + uk-height-match="target: .uk-card"> +
{{chart.title}}
+
{{chart.title}}
+ [ngClass]="getChartClassBySize(indicator.width)">
+ [class.semiFiltered]="chartsActiveType.get(i + '-' + j).filtersApplied < countSelectedFilters()">
{{indicator.name + " "}}
@@ -165,14 +198,14 @@ Filtered: {{chartsActiveType.get(i + '-' + j).filtersApplied}} out of {{countSelectedFilters()}}
--> + *ngIf=" !properties.disableFrameLoad && chartsActiveType.get(i + '-' + j).source !== 'image'" + [src]="chartsActiveType.get(i + '-' + j).safeResourceUrl" + class="uk-width-1-1" allowfullscreen="true" mozallowfullscreen="true" + [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')">
+ [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')" + src="assets/chart-placeholder.png">
-
- -
-
+
-
+
Powered by OpenAIRE Research Graph @@ -237,7 +268,7 @@
-
+
Send us your feedback . @@ -248,7 +279,8 @@
- + {{countSelectedFilters()}}
@@ -269,7 +301,8 @@
Sign in to apply filters.
  • -
    • @@ -279,9 +312,9 @@
-
- If your filter selection cannot be applied to a chart, that chart will appear grayed-out. -
+ + * If your filter selection cannot be applied to a chart, that chart will appear grayed-out. +
diff --git a/src/app/monitor/monitor.component.less b/src/app/monitor/monitor.component.less index ce91f44..c50e616 100644 --- a/src/app/monitor/monitor.component.less +++ b/src/app/monitor/monitor.component.less @@ -1,7 +1,7 @@ @import (reference) "~src/assets/openaire-theme/less/_import-variables"; -.uk-card { - &.semiFiltered, &.semiFiltered > * > .highcharts-series-group { +&.semiFiltered { + &, & > * > .highcharts-series-group { opacity: 0.5; } } diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 8a91d71..ce435ad 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -80,6 +80,9 @@ export class MonitorComponent implements OnInit, OnDestroy { public statsUpdateDate: Date; public showDescriptionOverlay: boolean[] = []; public isFullscreen: boolean = false; + public isMobile: boolean = false; + + @HostListener('fullscreenchange', ['$event']) @HostListener('webkitfullscreenchange', ['$event']) @HostListener('mozfullscreenchange', ['$event']) @@ -118,10 +121,11 @@ export class MonitorComponent implements OnInit, OnDestroy { })); } this.keyword = this._fb.control(''); - this.subscriptions.push(this.keyword.valueChanges.subscribe(value => { - //TODO do a real action - })); let subscription: Subscription; + this.layoutService.isMobile.subscribe(isMobile => { + this.isMobile = isMobile; + this.cdr.detectChanges(); + }); this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { this.user = user; this.subscriptions.push(this.route.params.subscribe(params => { @@ -323,10 +327,6 @@ export class MonitorComponent implements OnInit, OnDestroy { return count; } - public get isSmallScreen() { - return this.layoutService.isSmallScreen; - } - public get open() { return this.layoutService.open; } diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 5c2dc07..6986246 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -26,13 +26,18 @@ import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; import {filters, graph, incognito} from "../openaireLibrary/utils/icons/icons"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {NumberRoundModule} from "../openaireLibrary/utils/pipes/number-round.module"; +import {SliderTabsModule} from "../openaireLibrary/sharedComponents/tabs/slider-tabs.module"; +import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module"; +import { + SidebarMobileToggleModule +} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule, UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule, IconsModule, - LogoUrlPipeModule, NumberRoundModule + LogoUrlPipeModule, NumberRoundModule, SliderTabsModule, SliderUtilsModule, SidebarMobileToggleModule ], declarations: [ MonitorComponent diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5454509..679cae5 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5454509b55e817b9320a128920d03cb75b5ac44d +Subproject commit 679cae51f2435a97faf1cc019de854c922e93d14 diff --git a/src/assets/common-assets b/src/assets/common-assets index 4455b94..540ba93 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 4455b94804936a853baa3654e6e3398875a17a12 +Subproject commit 540ba93c0fc9a4be88b2102033fc18ee16ea8673 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 78c51f0..3b10e32 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 78c51f00f766b53cd516eac381e676f0be9ad20f +Subproject commit 3b10e32e0df3103a23b36d58b2c6656396b18428