From bfd19dfaf3941d47033e517db5dab280aa9e87f8 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 8 Nov 2022 16:37:44 +0200
Subject: [PATCH] Change description in numbers card in monitor dashboard. Fix
 infinite loop from last commit in error page.

---
 src/app/app.component.ts               |  5 --
 src/app/monitor/monitor.component.html | 72 +++++++++++---------------
 src/app/monitor/monitor.component.ts   |  1 -
 src/assets/common-assets               |  2 +-
 4 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 6bc753f..ba74792 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -201,11 +201,6 @@ export class AppComponent implements OnInit, OnDestroy {
       } else {
         this.activeCategory = this.activeTopic.categories.find(category => this.isPublicOrIsMember(category.visibility));
       }
-      if(!this.activeCategory) {
-        this.navigateToError();
-      }
-    } else {
-      this.navigateToError();
     }
   }
   
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 8e266d8..13d8147 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -102,49 +102,39 @@
               <h5 *ngIf="number.title" class="uk-width-1-1 uk-margin-bottom">{{number.title}}</h5>
               <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
                 <div *ngIf="isPublicOrIsMember(indicator.visibility)" [ngClass]="getNumberClassBySize(indicator.width)">
-                  <div class="uk-card uk-card-default uk-padding-small number-card"
+                  <div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative"
                        [class.semiFiltered]="indicator.indicatorPaths[0].filtersApplied < countSelectedFilters()">
-                    <!--<div *ngIf="properties.environment === 'development'">
-                      Filtered:{{indicator.indicatorPaths[0].filtersApplied}}out of{{countSelectedFilters()}}
-                    </div>-->
-                    <div class="uk-text-xsmall uk-margin-xsmall-bottom">{{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)">--</span>
+                    <div *ngIf="!showDescriptionOverlay[j]">
+                      <div 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)">{{numberResults.get(i + '-' + j) | number}}</span>
+                        <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
+                      </div>
+                      <div *ngIf="indicator.description || indicator.additionalDescription"
+                           class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
+                        <a class="uk-display-inline-block uk-button uk-button-link" uk-tooltip="Note" (click)="toggleDescriptionOverlay($event, j)">
+                          <span class="uk-flex uk-flex-middle">
+                            <icon name="analytics" type="outlined" [flex]="true"></icon>
+                          </span>
+                        </a>
+                      </div>
                     </div>
-                    <!-- for printing only -->
-                    <span *ngIf="numberResults.get(i + '-' + j)"
-                          class="uk-text-bold uk-hidden">{{numberResults.get(i + '-' + j) | number}}</span>
-                    <!-- ----------------- -->
-                    <div *ngIf="indicator.description || indicator.additionalDescription"
-                         class="uk-position-bottom-right uk-text-center uk-margin-small-bottom uk-margin-small-right">
-                      <a class="uk-display-inline-block uk-button uk-button-text"
-                         (click)="toggleDescriptionOverlay($event, j)">
-                        <span class="uk-flex uk-flex-middle">
-                          <icon name="analytics" type="outlined" [flex]="true"></icon>
-                          <span class="uk-margin-small-left">Note</span>
-                        </span>
-                      </a>
-                    </div>
-                    <div *ngIf="showDescriptionOverlay[j] && (indicator.description || indicator.additionalDescription)"
-                         class="indicator-description uk-card uk-card-default uk-flex uk-flex-middle uk-flex-center">
-                      <div class="inner" click-outside-or-esc
-                           (clickOutside)="closeDescriptionOverlay($event, j)">
-                        <div class="uk-padding-small">
-                          <div class="uk-flex uk-flex-right">
-                            <button class="uk-close uk-icon" (click)="toggleDescriptionOverlay($event, j)">
-                              <icon name="close" ratio="1"></icon>
-                            </button>
-                          </div>
-                          <div class="uk-padding-small uk-padding-remove-horizontal">
-                            <p *ngIf="indicator.description">
-                              {{indicator.description}}
-                            </p>
-                            <p *ngIf="indicator.additionalDescription">
-                              {{indicator.additionalDescription}}
-                            </p>
-                          </div>
-                        </div>
+                    <div *ngIf="showDescriptionOverlay[j] && (indicator.description || indicator.additionalDescription)" click-outside-or-esc class="uk-overflow-auto"
+                      (clickOutside)="closeDescriptionOverlay($event, j)">
+                      <div class="uk-position-top-right uk-text-center uk-margin-small-top uk-margin-small-right">
+                        <a class="uk-display-inline-block uk-button uk-button-link" (click)="toggleDescriptionOverlay($event, j)">
+                          <span class="uk-flex uk-flex-middle">
+                            <icon name="close" type="outlined" [flex]="true"></icon>
+                          </span>
+                        </a>
+                      </div>
+                      <div class="uk-margin-small-top uk-margin-right">
+                        <p *ngIf="indicator.description">
+                          {{indicator.description}}
+                        </p>
+                        <p *ngIf="indicator.additionalDescription">
+                          {{indicator.additionalDescription}}
+                        </p>
                       </div>
                     </div>
                   </div>
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index 5185168..7372b41 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -78,7 +78,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
   privateStakeholder = false;
   public keyword: UntypedFormControl;
   public statsUpdateDate: Date;
-  public stickyPageHeader: boolean = false;
 	public showDescriptionOverlay: boolean[] = [];
 
 	public isFullscreen: boolean = false;
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 75433ae..2477972 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 75433ae50ab42a5ad1aea2a26ec26c57e78e4a25
+Subproject commit 24779729b6f6bd4f099ed5645786b6452120d3d6