diff --git a/kdb-bot/src/bot_graphql/model/__init__.py b/kdb-bot/src/bot_graphql/model/__init__.py index 425ab6c1..383396b9 100644 --- a/kdb-bot/src/bot_graphql/model/__init__.py +++ b/kdb-bot/src/bot_graphql/model/__init__.py @@ -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") diff --git a/kdb-web/src/app/base/component-with-table.ts b/kdb-web/src/app/base/component-with-table.ts index b8550644..9386a28f 100644 --- a/kdb-web/src/app/base/component-with-table.ts +++ b/kdb-web/src/app/base/component-with-table.ts @@ -15,7 +15,7 @@ export class ComponentWithTable { return this._hiddenColumns; } - private name: string = ""; + public name: string = ""; public columns: Column[] = []; constructor( diff --git a/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html b/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html index 6699495b..2f9db7c1 100644 --- a/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html +++ b/kdb-web/src/app/modules/admin/auth-users/components/auth-user/auth-user.component.html @@ -16,7 +16,7 @@ {{'admin.auth_users.users' | translate}} - +
diff --git a/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.html b/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.html index 248a5dbc..67e7a114 100644 --- a/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.html +++ b/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.html @@ -1,13 +1,13 @@
- -
+ +
{{'common.' + item.name | translate}},
{{'common.hidden_columns' | translate}}
-
{{'common.hidden_columns' | translate}}
+
{{'common.hidden_columns' | translate}}
diff --git a/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.ts b/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.ts index db458e39..773006ea 100644 --- a/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.ts +++ b/kdb-web/src/app/modules/shared/base/multi-select-columns/multi-select-columns.component.ts @@ -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 = new EventEmitter(); } diff --git a/kdb-web/src/app/modules/view/server/achievements/components/achievement/achievement.component.html b/kdb-web/src/app/modules/view/server/achievements/components/achievement/achievement.component.html index 23ea6dd2..6f505f81 100644 --- a/kdb-web/src/app/modules/view/server/achievements/components/achievement/achievement.component.html +++ b/kdb-web/src/app/modules/view/server/achievements/components/achievement/achievement.component.html @@ -17,7 +17,7 @@ {{'view.server.achievements.achievements' | translate}}
- +
diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html index 3b2c6864..6128b503 100644 --- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html +++ b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html @@ -16,7 +16,7 @@ {{'view.server.auto_roles.rules.auto_roles' | translate}}
- +
diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html index a2d6dfb1..aa3440fe 100644 --- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html +++ b/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}}
- +
diff --git a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html index d7351d70..6e35edb5 100644 --- a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html +++ b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html @@ -17,7 +17,7 @@ {{'view.server.levels.levels' | translate}}
- +
diff --git a/kdb-web/src/app/modules/view/server/members/members.component.html b/kdb-web/src/app/modules/view/server/members/members.component.html index e2a31ec0..f1d3db30 100644 --- a/kdb-web/src/app/modules/view/server/members/members.component.html +++ b/kdb-web/src/app/modules/view/server/members/members.component.html @@ -17,7 +17,7 @@ {{'view.server.members.members' | translate}}
- +