kdb-bot/src/bot_graphql/model/__init__.py

@@ -1,26 +1 @@
-# -*- coding: utf-8 -*-
-
-"""
-bot Keksdose bot
-~~~~~~~~~~~~~~~~~~~
-
-Discord bot  for the Keksdose discord Server
-
-:copyright: (c) 2022 - 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "bot_graphql.model"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0rc4"
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0.rc4")

kdb-web/src/app/base/component-with-table.ts

@@ -15,7 +15,7 @@ export class ComponentWithTable {
     return this._hiddenColumns;
   }
 
-  public name: string = "";
+  private name: string = "";
   public columns: Column[] = [];
 
   constructor(

kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html

@@ -16,7 +16,7 @@
               </ng-container>
               {{'admin.auth_users.users' | translate}}
             </div>
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">

kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.html

@@ -1,13 +1,13 @@
 <div class="table-caption-column-select">
   <p-multiSelect display="chip" [options]="columns" [(ngModel)]="hiddenColumns" optionLabel="name" placeholder="{{'common.hidden_columns' | translate}}" [filter]=false>
-    <ng-template pTemplate="selectedItems">
+    <ng-template let-value pTemplate="selectedItems">
-      <div *ngFor="let item of visibleHiddenColumns; let i = index;">
+      <div *ngFor="let item of hiddenColumns; let i = index;">
         <div *ngIf="item.name">
           {{'common.' + item.name | translate}}<span *ngIf="i < columns.length-1">,</span>
         </div>
         <div *ngIf="!item.name">{{'common.hidden_columns' | translate}}</div>
       </div>
-      <div *ngIf="!visibleHiddenColumns || visibleHiddenColumns.length === 0">{{'common.hidden_columns' | translate}}</div>
+      <div *ngIf="!hiddenColumns || hiddenColumns.length === 0">{{'common.hidden_columns' | translate}}</div>
     </ng-template>
 
     <ng-template let-item pTemplate="item">

kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.ts

@@ -10,8 +10,6 @@ export class MultiSelectColumnsComponent {
   @Input() columns: Column[] = [];
 
   private _hiddenColumns: Column[] = [];
-  @Input() table: String = "";
-
   @Input()
   set hiddenColumns(columns: Column[]) {
     this._hiddenColumns = columns;
@@ -22,9 +20,5 @@ export class MultiSelectColumnsComponent {
     return this._hiddenColumns;
   }
 
-  get visibleHiddenColumns(): Column[] {
-    return this._hiddenColumns.filter(x => x.key.startsWith(`${this.table}_`));
-  }
-
   @Output() hiddenColumnsChange: EventEmitter<Column[]> = new EventEmitter<Column[]>();
 }

kdb-web/src/app/modules/view/server/achievements/components/achievement/achievement.component.html

@@ -17,7 +17,7 @@
               {{'view.server.achievements.achievements' | translate}}
             </div>
 
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">

kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html

@@ -16,7 +16,7 @@
               </ng-container>
               {{'view.server.auto_roles.rules.auto_roles' | translate}}
             </div>
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">

kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html

@@ -17,7 +17,7 @@
               {{'view.server.auto_roles.auto_roles' | translate}}
             </div>
 
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">

kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html

@@ -17,7 +17,7 @@
               {{'view.server.levels.levels' | translate}}
             </div>
 
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">

kdb-web/src/app/modules/view/server/members/members.component.html

@@ -17,7 +17,7 @@
               {{'view.server.members.members' | translate}}
             </div>
 
-            <app-multi-select-columns [table]="name" [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
+            <app-multi-select-columns [columns]="columns" [(hiddenColumns)]="hiddenColumns"></app-multi-select-columns>
           </div>
 
           <div class="table-caption-btn-wrapper btn-wrapper">