changed sort fields

hobbyfarm · Dec 9, 2024 · c47bd93 · c47bd93
1 parent 4d6a430
commit c47bd93
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/app/progress/progress-list/progress-list.component.html b/src/app/progress/progress-list/progress-list.component.html
@@ -1,12 +1,12 @@
 
   <clr-datagrid>
-    <clr-dg-column [clrDgField]="'progress'" class="color">Progress</clr-dg-column>
+    <clr-dg-column class="color">Progress</clr-dg-column>
     <clr-dg-column [clrDgField]="'username'" >Username</clr-dg-column>
     <clr-dg-column [clrDgField]="'scenario_name'" >Scenario</clr-dg-column>
     <clr-dg-column [clrDgField]="'course_name'" >Course</clr-dg-column>
-    <clr-dg-column [clrDgField]="'time'" >Duration</clr-dg-column>
-    <clr-dg-column  [clrDgField]="'current_step'"class="end step">Current</clr-dg-column>
-    <clr-dg-column [clrDgField]="'max_step'" class="step">Max Step</clr-dg-column>
+    <clr-dg-column [clrDgSortBy]="durationComparator" >Duration</clr-dg-column>
+    <clr-dg-column [clrDgField]="'current_step'"class="end step">Current</clr-dg-column>
+    <clr-dg-column [clrDgField]="'total_step'" class="step">Max Step</clr-dg-column>
 
     <clr-dg-row *clrDgItems="let progress of progressList">
       <clr-dg-action-overflow>

diff --git a/src/app/progress/progress-list/progress-list.component.ts b/src/app/progress/progress-list/progress-list.component.ts
@@ -9,6 +9,22 @@ import { Progress } from '../../data/progress';
 import { ProgressInfoComponent } from '../progress-info/progress-info.component';
 import { timeSince } from '../../utils';
 import { SessionProgressService } from '../session-progress.service';
+import { ClrDatagridComparatorInterface } from '@clr/angular';
+
+export class DurationComparator implements ClrDatagridComparatorInterface<Progress> {
+  compare(a: Progress, b: Progress): number {
+
+    const durationA = a.finished
+    ? a.last_update.getTime() - a.started.getTime()
+    : Date.now() - a.started.getTime();
+
+    const durationB = b.finished
+    ? b.last_update.getTime() - b.started.getTime() 
+    : Date.now() - b.started.getTime(); 
+
+  return durationA - durationB;
+  }
+}
 
 @Component({
   selector: 'progress-list',
@@ -39,6 +55,8 @@ export class ProgressListComponent {
     return this.sessionProgressService.terminateSession(p);
   }
 
+  public durationComparator = new DurationComparator();
+
   openInfo(p: Progress) {
     this.progressInfo.progress = p;
     this.progressInfo.openModal();
@@ -63,4 +81,7 @@ export class ProgressListComponent {
   public getUsername(p: Progress) {
     return this.hideUsername ? p.user : p.username;
   }
-}
+
+
+}
+