From 9734e24f7682bf5b57b44c839e0845ff1077a2f6 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 9 Jun 2023 20:53:14 +0300
Subject: [PATCH] Add locale in edit stakeholder form and use it in number
 pipes

---
 .../edit-stakeholder/edit-stakeholder.component.ts   | 12 +++++++++---
 src/app/monitor/monitor.component.html               |  4 ++--
 src/app/openaireLibrary                              |  2 +-
 src/app/topic/indicators.component.html              |  5 ++---
 src/app/utils/indicator-utils.ts                     |  5 +++++
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
index 2300843..882862c 100644
--- a/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
+++ b/src/app/general/edit-stakeholder/edit-stakeholder.component.ts
@@ -31,15 +31,15 @@ import {error} from "protractor";
           <div input [formInput]="stakeholderFb.get('alias')"
                placeholder="URL Alias"></div>
         </div>
-        <div class="uk-width-1-2@m">
+        <div class="uk-width-1-3@m">
           <div input [formInput]="stakeholderFb.get('index_id')"
                placeholder="Index ID"></div>
         </div>
-        <div class="uk-width-1-2@m">
+        <div class="uk-width-1-3@m">
           <div input [formInput]="stakeholderFb.get('index_name')"
                placeholder="Index Name"></div>
         </div>
-        <div class="uk-width-1-2@m">
+        <div class="uk-width-1-3@m">
           <div input [formInput]="stakeholderFb.get('index_shortName')"
                placeholder="Index Short Name"></div>
         </div>
@@ -48,6 +48,11 @@ import {error} from "protractor";
                [options]="statsProfiles" [showOptionsOnEmpty]="true"
                placeholder="Stats Profile"></div>
         </div>
+        <div class="uk-width-1-2@m">
+          <div input [formInput]="stakeholderFb.get('locale')" [type]="'select'"
+               [options]="stakeholderUtils.locales"
+               placeholder="Locale"></div>
+        </div>
         <div class="uk-width-1-1">
           <div input [type]="'textarea'" placeholder="Description"
                [rows]="4" [formInput]="stakeholderFb.get('description')"></div>
@@ -182,6 +187,7 @@ export class EditStakeholderComponent implements OnDestroy {
         index_id: this.fb.control(this.stakeholder.index_id, Validators.required),
         index_shortName: this.fb.control(this.stakeholder.index_shortName, Validators.required),
         statsProfile: this.fb.control(this.stakeholder.statsProfile, Validators.required),
+        locale: this.fb.control(this.stakeholder.locale, Validators.required),
         creationDate: this.fb.control(this.stakeholder.creationDate),
         alias: this.fb.control(this.stakeholder.alias,
           [
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 16ac02d..84ff408 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -108,7 +108,7 @@
                             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)"
-                                [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1):(numberResults.get(i + '-' + j) | numberPercentage))"></span>
+                                [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j) | numberPercentage: stakeholder.locale))"></span>
                           <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
                         </div>
                         <div *ngIf="indicator.description || indicator.additionalDescription"
@@ -159,7 +159,7 @@
                               class="uk-text-xsmall 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)"
-                                [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1):(numberResults.get(i + '-' + j) | numberPercentage))"></span>
+                                [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j) | numberPercentage: stakeholder.locale))"></span>
                             <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
                           </div>
                         </div>
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 0f265f4..f81f6d0 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 0f265f435b0cd243bdfcde3f4c4d2696246ce0c9
+Subproject commit f81f6d051e17aa9dac3efbe733fbb8dc29b04a38
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 9d2f9f0..ecdc0cd 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)" [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1):(numberResults.get(i + '-' + j) | numberPercentage))"></span>
+                    <span *ngIf="numberResults.get(i + '-' + j)" [innerHTML]="(indicator.indicatorPaths[0].format == 'NUMBER'?(numberResults.get(i + '-' + j) | numberRound: 2:1:stakeholder.locale):(numberResults.get(i + '-' + j) | numberPercentage: stakeholder.locale))"></span>
                     <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
                   </div>
                 </div>
@@ -303,8 +303,7 @@
               <div class="uk-flex uk-position-relative">
                 <span class="uk-padding number number-preview uk-flex uk-flex-column uk-flex-center uk-text-center">
                   <span *ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value !== 0"
-                        [innerHTML]="(numberIndicatorPaths.at(i).get('format').value == 'NUMBER'?(numberIndicatorPaths.at(i).get('result').value | numberRound: 2:1):(numberIndicatorPaths.at(i).get('result').value | numberPercentage))">
-                    {{numberIndicatorPaths.at(i).get('result').value | number}}
+                        [innerHTML]="(numberIndicatorPaths.at(i).get('format').value == 'NUMBER'?(numberIndicatorPaths.at(i).get('result').value | numberRound: 2:1:stakeholder.locale):(numberIndicatorPaths.at(i).get('result').value | numberPercentage: stakeholder.locale))">
                   </span>
                   <span *ngIf="numberIndicatorPaths.at(i).get('result').valid && numberIndicatorPaths.at(i).get('result').value === 0">
                     --
diff --git a/src/app/utils/indicator-utils.ts b/src/app/utils/indicator-utils.ts
index 615e116..b186f4b 100644
--- a/src/app/utils/indicator-utils.ts
+++ b/src/app/utils/indicator-utils.ts
@@ -40,6 +40,11 @@ export class StakeholderUtils {
     {icon: 'incognito', value: "PRIVATE", label: 'Private'},
   ];
   
+  locales: Option[] = [
+    {value: "en", label: 'English'},
+    {value: "eu", label: 'Europe'}
+  ];
+  
   visibilityIcon: Map<Visibility, string> = new Map<Visibility, string>([
     ["PUBLIC", 'earth'],
     ["PRIVATE", 'incognito'],