sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Merge pull request 'Fixed hidden columns #1.1.0.rc4' (#346) from 1.1.0.rc4 into 1.1.0

Browse Source 
Reviewed-on: sh-edraft.de/kd_discord_bot#346
This commit is contained in:
Sven Heidemann 2023-08-17 21:27:31 +02:00
commit 9338e35504
10 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kdb-bot/src/bot_graphql/model/__init__.py
View File

@ -1 +1,26 @@
# -*- 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")

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

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

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

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

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

@ -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 let-value pTemplate="selectedItems">
<div *ngFor="let item of hiddenColumns; let i = index;">
<ng-template pTemplate="selectedItems">
<div *ngFor="let item of visibleHiddenColumns; 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="!hiddenColumns || hiddenColumns.length === 0">{{'common.hidden_columns' | translate}}</div>
<div *ngIf="!visibleHiddenColumns || visibleHiddenColumns.length === 0">{{'common.hidden_columns' | translate}}</div>
</ng-template>
<ng-template let-item pTemplate="item">

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

@ -10,6 +10,8 @@ export class MultiSelectColumnsComponent {
@Input() columns: Column[] = [];
private _hiddenColumns: Column[] = [];
@Input() table: String = "";
@Input()
set hiddenColumns(columns: Column[]) {
this._hiddenColumns = columns;
@ -20,5 +22,9 @@ 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[]>();
}

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

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

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

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

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

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

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

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

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

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