From 33fc6db16a837adfe891616b785dea7aa4c37b72 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 5 Apr 2024 20:33:00 +0300 Subject: [PATCH 1/4] [develop]: Add multi indicator Paths in monitor page. --- src/app/monitor/monitor.component.html | 65 +++++++++++++------------- src/app/monitor/monitor.component.ts | 1 - src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 5f707ca..bd6e69b 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -104,12 +104,11 @@
-
{{indicator.name}}
+
{{indicator.name}}
- - -- + + --
@@ -158,9 +157,9 @@
{{indicator.name}}
- - -- + + --
@@ -178,40 +177,42 @@
{{chart.title}}
{{chart.title}}
-
-
+ [class.semiFiltered]="getActiveIndicatorPath(indicator).filtersApplied < countSelectedFilters()"> +
{{indicator.name + " "}}
- +
- -
- -
- -
+
+ +
+ +
(); - this.chartsActiveType = new Map(); subscription = this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => { if (stakeholder) { this.stakeholder = stakeholder; diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index b34f423..e91830f 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b34f42326ca8069b6ade0e1934c7e7cd021112cb +Subproject commit e91830f2f8c1182c6e728f87a03af3a2932d816e diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 954a1fe..43ed7e2 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 954a1fe8af0653740882c7db4b9bf92b8f9000f4 +Subproject commit 43ed7e267915bcae7f3ab03fab8c98136810f269 -- 2.17.1 From 40f245505b77c6c5870a5705544321ca84d6dfe6 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Sat, 6 Apr 2024 03:11:21 +0300 Subject: [PATCH 2/4] Update library --- src/app/monitor/monitor.component.html | 20 ++++++++++---------- src/app/openaireLibrary | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index bd6e69b..044a7b4 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -203,16 +203,16 @@ [src]="getActiveIndicatorPath(indicator).safeResourceUrl" class="uk-width-1-1" allowfullscreen="true" mozallowfullscreen="true" [ngClass]="'uk-height-' + (indicator.height?indicator.height.toLowerCase():'medium')"> -
- -
- -
+
+ +
+ +
Date: Mon, 8 Apr 2024 15:18:19 +0300 Subject: [PATCH 3/4] [develop]: Add dashboard in role verification --- src/app/app.component.html | 3 ++- src/app/openaireLibrary | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 9c28256..850d25b 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -66,5 +66,6 @@
- + diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4f10c5c..901f9f7 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4f10c5c5f4a42629ac4eb13f3a1e3977ab353b86 +Subproject commit 901f9f769d85aeeb6511810b0f998aa024ec27bf -- 2.17.1 From 91063d5999b671620a8302ad8a9251bba2cbf49c Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 12 Apr 2024 13:59:09 +0300 Subject: [PATCH 4/4] [develop | DONE | CHANGED] monitor: change filter labels to smaller ones --- src/app/monitor/monitor.component.html | 4 ++-- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 044a7b4..8d0de5c 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -4,7 +4,7 @@
  • - + {{periodFilter.selectedFromAndToValues}}