Compare commits

..

No commits in common. "f04a6066a1c419c42f7b5a1f9f398954427e0986" and "c4507d3aa126100cb46ae89a56a04f426e21843c" have entirely different histories.

8 changed files with 191 additions and 250 deletions

View File

@ -1,4 +1,3 @@
from datetime import datetime
from typing import Optional
from bot_api.abc.dto_abc import DtoABC
@ -15,8 +14,6 @@ class AuthUserDTO(DtoABC):
password: str = None,
confirmation_id: Optional[str] = None,
auth_role: AuthRoleEnum = None,
created_at: datetime = None,
modified_at: datetime = None,
):
DtoABC.__init__(self)
@ -27,8 +24,6 @@ class AuthUserDTO(DtoABC):
self._password = password
self._is_confirmed = confirmation_id is None
self._auth_role = auth_role
self._created_at = created_at
self._modified_at = modified_at
@property
def id(self) -> int:
@ -82,14 +77,6 @@ class AuthUserDTO(DtoABC):
def auth_role(self, value: AuthRoleEnum):
self._auth_role = value
@property
def created_at(self) -> datetime:
return self._created_at
@property
def modified_at(self) -> datetime:
return self._modified_at
def from_dict(self, values: dict):
self._id = values["id"]
self._first_name = values["firstName"]
@ -99,9 +86,6 @@ class AuthUserDTO(DtoABC):
self._is_confirmed = values["isConfirmed"]
self._auth_role = AuthRoleEnum(values["authRole"])
self._created_at = values["createdAt"]
self._modified_at = values["modifiedAt"]
def to_dict(self) -> dict:
return {
"id": self._id,
@ -111,6 +95,4 @@ class AuthUserDTO(DtoABC):
"password": self._password,
"isConfirmed": self._is_confirmed,
"authRole": self._auth_role.value,
"createdAt": self._created_at,
"modifiedAt": self._modified_at,
}

View File

@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from bot_api.abc.transformer_abc import TransformerABC
from bot_api.model.auth_user_dto import AuthUserDTO
@ -34,6 +34,4 @@ class AuthUserTransformer(TransformerABC):
"" if password is None else password,
db.confirmation_id,
db.auth_role,
db.created_at,
db.modified_at,
)

View File

@ -1,11 +1,11 @@
import uuid
from datetime import datetime
from typing import Optional
from cpl_core.database import TableABC
from cpl_query.extension import List
from bot_data.model.auth_role_enum import AuthRoleEnum
from bot_data.model.server import Server
from bot_data.model.user import User

View File

@ -1,6 +1,6 @@
{
"name": "kdb-web",
"version": "0.3.dev78",
"version": "0.3.dev89",
"scripts": {
"ng": "ng",
"update-version": "ts-node-esm update-version.ts",

View File

@ -8,6 +8,4 @@ export interface AuthUserDTO {
password: string | null;
isConfirmed?: boolean
authRole?: AuthRoles;
createdAt?: string;
modifiedAt?: string;
}

View File

@ -70,24 +70,11 @@
</div>
</th>
<th class="table-header-small-dropdown">
<div class="table-header-label">
<div class="table-header-text">{{'admin.auth_users.headers.created_at' | translate}}</div>
</div>
</th>
<th class="table-header-small-dropdown">
<div class="table-header-label">
<div class="table-header-text">{{'admin.auth_users.headers.modified_at' | translate}}</div>
</div>
</th>
<th class="table-header-actions">
<div class="table-header-label">
<div class="table-header-text">{{'admin.auth_users.headers.actions' | translate}}</div>
</div>
</th>
</tr>
<tr>
<th>
@ -113,8 +100,6 @@
</th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</ng-template>
@ -187,26 +172,6 @@
</ng-template>
</p-cellEditor>
</td>
<td>
<p-cellEditor>
<ng-template pTemplate="input">
{{user.createdAt}}
</ng-template>
<ng-template pTemplate="output">
{{user.createdAt | date:'dd.MM.yy HH:mm'}}
</ng-template>
</p-cellEditor>
</td>
<td>
<p-cellEditor>
<ng-template pTemplate="input">
{{user.modifiedAt}}
</ng-template>
<ng-template pTemplate="output">
{{user.modifiedAt | date:'dd.MM.yy HH:mm'}}
</ng-template>
</p-cellEditor>
</td>
<td>
<div class="btn-wrapper">
<button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"

View File

@ -3,7 +3,7 @@
"WebVersion": {
"Major": "0",
"Minor": "3",
"Micro": "dev78"
"Micro": "dev89"
},
"Themes": [
{

View File

@ -64,9 +64,7 @@
"active": "Aktiv",
"role": "Rolle",
"password": "Passwort",
"actions": "Aktionen",
"created_at": "Erstellt am",
"modified_at": "Bearbeitet am"
"actions": "Aktionen"
},
"no_entries_found": "Keine Einträge gefunden",
"message": {