From 8b65f4f5b0f58043fe1f50696106c936e11b6bae Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 19 Oct 2021 09:52:19 +0300
Subject: [PATCH] Add description overlay in indicators

---
 src/app/monitor/monitor.component.html  | 24 +++++++++++++++++++++
 src/app/topic/indicators.component.html | 28 +++++++++++++++++++++++--
 src/assets/dashboard-theme              |  2 +-
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 4ed40ea..6f5b9ac 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -143,6 +143,16 @@
                     </h3>
                     <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
                   </div>
+                  <div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
+                    <div class="uk-padding-small">
+                      <div *ngIf="indicator.description">
+                        {{indicator.description}}
+                      </div>
+                      <div *ngIf="indicator.additionalDescription">
+                        {{indicator.additionalDescription}}
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </ng-template>
@@ -190,6 +200,20 @@
                         (indicator.height?indicator.height.toLowerCase():'medium')">
                       <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
                     </div>
+                    <div *ngIf="indicator.description || indicator.additionalDescription"
+                         class="uk-overlay uk-position-bottom">
+                      <div class="uk-padding-small multi-line-ellipsis lines-3">
+                        <p class="uk-margin-remove">
+                          <span *ngIf="indicator.description">
+                            {{indicator.description}}
+                          </span>
+                          <br>
+                          <span *ngIf="indicator.additionalDescription">
+                            {{indicator.additionalDescription}}
+                          </span>
+                        </p>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </ng-template>
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 7f8e375..dbae836 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -83,6 +83,17 @@
                 </h3>
                 <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
               </div>
+              <div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
+                <p class="uk-margin-remove">
+                  <span *ngIf="indicator.description">
+                    {{indicator.description}}
+                  </span>
+                  <br>
+                  <span *ngIf="indicator.additionalDescription">
+                    {{indicator.additionalDescription}}
+                  </span>
+                </p>
+              </div>
             </div>
           </div>
         </ng-template>
@@ -201,6 +212,19 @@
                 </div>
                 <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
               </div>
+              <div *ngIf="indicator.description || indicator.additionalDescription" class="uk-overlay uk-position-bottom">
+                <div class="uk-padding-small multi-line-ellipsis lines-3">
+                  <p class="uk-margin-remove">
+                    <span *ngIf="indicator.description">
+                      {{indicator.description}}
+                    </span>
+                    <br>
+                    <span *ngIf="indicator.additionalDescription">
+                      {{indicator.additionalDescription}}
+                    </span>
+                  </p>
+                </div>
+              </div>
             </div>
           </div>
         </ng-template>
@@ -366,8 +390,8 @@
     <div *ngIf="chartIndicatorFb" [formGroup]="chartIndicatorFb" class="uk-grid" uk-grid>
       <div dashboard-input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('name')" placeholder="Write a title"
            label="Title"></div>
-      <div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 && (  (indicator.description &&
-      indicator.description.length > 0) || !stakeholder.defaultId)"
+      <div dashboard-input class="uk-width-1-1" *ngIf="stakeholder.defaultId !=-1 &&
+           ((indicator.description && indicator.description.length > 0) || !stakeholder.defaultId)"
            [formInput]="chartIndicatorFb.get('description')" placeholder="Write a description"
            label="Default Description" type="textarea">
       </div>
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 3e966ab..72f3272 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 3e966ab23829756c256c266a2201042785f83963
+Subproject commit 72f3272e41d93e82042a293e8e85493fe8cfe6c2