From 8077d58cd7952c4c0583a63272ca2fc46ab80663 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Wed, 21 Dec 2022 13:40:47 +0200
Subject: [PATCH] Round numbers in monitor and admin indicators

---
 src/app/monitor/monitor.component.html  | 2 +-
 src/app/monitor/monitor.module.ts       | 3 ++-
 src/app/openaireLibrary                 | 2 +-
 src/app/topic/indicators.component.html | 2 +-
 src/app/topic/topic.module.ts           | 3 ++-
 src/assets/openaire-theme               | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 1ae6fda..3cea78d 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -103,7 +103,7 @@
                     <div *ngIf="!showDescriptionOverlay[j]">
                       <div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
                       <div class="number uk-text-small uk-text-bold">
-                        <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
+                        <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | numberRound}}</span>
                         <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
                       </div>
                       <div *ngIf="indicator.description || indicator.additionalDescription"
diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts
index d119467..5c2dc07 100644
--- a/src/app/monitor/monitor.module.ts
+++ b/src/app/monitor/monitor.module.ts
@@ -25,13 +25,14 @@ import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
 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";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule, ErrorMessagesModule,
     HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule,
     UserMiniModule, ClickModule, BottomModule, RangeFilterModule, SearchFilterModule, PageContentModule, IconsModule,
-    LogoUrlPipeModule
+    LogoUrlPipeModule, NumberRoundModule
   ],
   declarations: [
     MonitorComponent
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 10130d3..328198b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 10130d368a1e3c72e6785fe2291234529040bf84
+Subproject commit 328198b6a56c3f3ecb38c7928073914a9609ddc0
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 741d5d3..ebddaca 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -68,7 +68,7 @@
                   </div>
                   <div class="uk-text-small uk-text-truncate uk-margin-xsmall-bottom uk-margin-right">{{indicator.name}}</div>
                   <div class="number uk-text-small uk-text-bold">
-                    <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
+                    <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | numberRound}}</span>
                     <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
                   </div>
                 </div>
diff --git a/src/app/topic/topic.module.ts b/src/app/topic/topic.module.ts
index 5062668..aab1645 100644
--- a/src/app/topic/topic.module.ts
+++ b/src/app/topic/topic.module.ts
@@ -20,11 +20,12 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
 import {NotifyFormModule} from "../openaireLibrary/notifications/notify-form/notify-form.module";
 import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
 import {TransitionGroupModule} from "../openaireLibrary/utils/transition-group/transition-group.module";
+import {NumberRoundModule} from "../openaireLibrary/utils/pipes/number-round.module";
 
 @NgModule({
   imports: [
     CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
-    ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule, TransitionGroupModule
+    ReactiveFormsModule, InputModule, IconsModule, PageContentModule, LoadingModule, NotifyFormModule, LogoUrlPipeModule, TransitionGroupModule, NumberRoundModule
   ],
   declarations: [
     TopicComponent, IndicatorsComponent
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 2882ccd..be12d26 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 2882ccde4eb93bd01b4cdb480790cc04b394794d
+Subproject commit be12d2637a68e4d17b3a45befe40af2ee8431b6a