From dd1687e61cd8c5b4a29b3e77f1c24bc37641b7e2 Mon Sep 17 00:00:00 2001
From: abqcif_bitbucket <alejandro.bulgaris@qcif.edu.au>
Date: Tue, 25 Jul 2023 17:25:09 +0930
Subject: [PATCH] Feature disable sorting in dashboard for consolidated tables

---
 .../dashboard/src/app/dashboard.component.html             | 3 ++-
 .../dashboard/src/app/dashboard.component.ts               | 7 +++++++
 assets/styles/default-theme.scss                           | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.html b/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.html
index 9b4249bef9..23e9beed87 100644
--- a/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.html
+++ b/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.html
@@ -13,7 +13,8 @@ <h2 *ngIf="workflowSteps.length == 1 && (dashboardTypeSelected == 'standard' ||
                     <thead>
                     <tr>
                     <th *ngFor="let rowConfig of tableConfig[workflowStep.config.workflow.stage]"> 
-                        <sort [title]="rowConfig.title | i18next" [variable]="rowConfig.variable" [step]="workflowStep.config.workflow.stage" [sort]="sortMap[workflowStep.config.workflow.stage][rowConfig.variable]['sort']" (sortChanged)="sortChanged($event)"> </sort>
+                        <sort *ngIf="enableSort" [title]="rowConfig.title | i18next" [variable]="rowConfig.variable" [step]="workflowStep.config.workflow.stage" [sort]="sortMap[workflowStep.config.workflow.stage][rowConfig.variable]['sort']" (sortChanged)="sortChanged($event)"> </sort>
+                        <span *ngIf="!enableSort" class="dashboard-heading-no-sort">{{rowConfig.title | i18next}}</span>
                     </th>
                     </tr>
                     </thead>
diff --git a/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.ts b/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.ts
index d2abb4070c..45244bbb5c 100644
--- a/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.ts
+++ b/angular/projects/researchdatabox/dashboard/src/app/dashboard.component.ts
@@ -27,6 +27,7 @@ export class DashboardComponent extends BaseComponent {
   dashboardTypeSelected: string;
   rulesService: object;
   currentUser: object = {};
+  enableSort: boolean = true;
 
   defaultTableConfig = [
     {
@@ -238,6 +239,12 @@ export class DashboardComponent extends BaseComponent {
         };
       }
 
+      if(this.dashboardTypeSelected == 'consolidated') {
+        this.enableSort = false;
+      } else {
+        this.enableSort = true;
+      }
+
       let packageType = '';
       let stepName = '';
       let evaluateStepName = '';
diff --git a/assets/styles/default-theme.scss b/assets/styles/default-theme.scss
index 6df8134f28..e97e897f70 100644
--- a/assets/styles/default-theme.scss
+++ b/assets/styles/default-theme.scss
@@ -262,6 +262,12 @@ div.logo img {
   margin-left: 0.5em;
 }
 
+.dashboard-heading-no-sort {
+    margin-left: 0.5em;
+    font-weight: bold;
+    font-size: 110%;
+}
+
 .key-value-list {
   padding: 0;
 }