From b8d27cc682e84232e528676e7520290d261c366f Mon Sep 17 00:00:00 2001
From: Sven Heidemann <sven.heidemann@sh-edraft.de>
Date: Sun, 15 Oct 2023 16:18:09 +0200
Subject: [PATCH] Fixed sorting

---
 bot/src/bot/bot.json                                          | 3 ++-
 web/package-lock.json                                         | 4 ++--
 web/package.json                                              | 2 +-
 web/src/app/modules/shared/base/hideable-component.ts         | 4 +++-
 .../components/hideable-header/hideable-header.component.html | 2 +-
 .../app/modules/view/server/members/members.component.html    | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bot/src/bot/bot.json b/bot/src/bot/bot.json
index f732df34..96b50f38 100644
--- a/bot/src/bot/bot.json
+++ b/bot/src/bot/bot.json
@@ -31,7 +31,8 @@
       "icmplib==3.0.4",
       "ariadne==0.20.1",
       "cryptography==41.0.4",
-      "discord==2.3.2"
+      "discord==2.3.2",
+      "bs4==0.0.1"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",
diff --git a/web/package-lock.json b/web/package-lock.json
index aa28d9bb..b19c0429 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,11 +1,11 @@
 {
-    "name": "kdb-web",
+    "name": "web",
     "version": "1.2.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "kdb-web",
+            "name": "web",
             "version": "1.2.0",
             "dependencies": {
                 "@angular/animations": "^15.1.4",
diff --git a/web/package.json b/web/package.json
index cdce16e1..dce1efde 100644
--- a/web/package.json
+++ b/web/package.json
@@ -52,4 +52,4 @@
         "tslib": "^2.4.1",
         "typescript": "~4.9.5"
     }
-}
+}
\ No newline at end of file
diff --git a/web/src/app/modules/shared/base/hideable-component.ts b/web/src/app/modules/shared/base/hideable-component.ts
index 4421ff91..3626eb48 100644
--- a/web/src/app/modules/shared/base/hideable-component.ts
+++ b/web/src/app/modules/shared/base/hideable-component.ts
@@ -5,9 +5,11 @@ import { ComponentWithTable } from "../../../base/component-with-table";
 export class HideableComponent {
   @HostBinding("class.hidden-column")
   get hidden() {
-    return !(this.parent?.isColumnVisible(this.column) ?? true);
+    const column = this.subColumn ?? this.column;
+    return !(this.parent?.isColumnVisible(column) ?? true);
   };
 
   @Input() column!: string;
+  @Input() subColumn!: string;
   @Input() parent!: ComponentWithTable;
 }
diff --git a/web/src/app/modules/shared/components/hideable-header/hideable-header.component.html b/web/src/app/modules/shared/components/hideable-header/hideable-header.component.html
index f35a2a42..dd36bef3 100644
--- a/web/src/app/modules/shared/components/hideable-header/hideable-header.component.html
+++ b/web/src/app/modules/shared/components/hideable-header/hideable-header.component.html
@@ -2,7 +2,7 @@
   <ng-content></ng-content>
 </ng-template>
 
-<div *ngIf="sortable; else without" [pSortableColumn]="column">
+<div *ngIf="sortable; else without" [pSortableColumn]="subColumn ?? column">
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </div>
 
diff --git a/web/src/app/modules/view/server/members/members.component.html b/web/src/app/modules/view/server/members/members.component.html
index cb4271ed..ba4baabd 100644
--- a/web/src/app/modules/view/server/members/members.component.html
+++ b/web/src/app/modules/view/server/members/members.component.html
@@ -72,10 +72,10 @@
             </div>
           </th>
 
-          <th hideable-th="level" [parent]="this" [sortable]="true">
+          <th hideable-th="level" subColumn="level.min_xp" [parent]="this" [sortable]="true">
             <div class="table-header-label">
               <div class="table-header-text">{{'common.level' | translate}}</div>
-              <p-sortIcon field="level.name" class="table-header-icon"></p-sortIcon>
+              <p-sortIcon field="level" class="table-header-icon"></p-sortIcon>
             </div>
           </th>