Merge pull request 'Erstellt am & Zuletzt bearbeitet am in Benutzertabellen #78' (#204) from #78 into 1.0.0

Reviewed-on: sh-edraft.de/kd_discord_bot#204
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #78

kdb-bot/src/bot_api/model/auth_user_dto.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Optional
 
 from bot_api.abc.dto_abc import DtoABC
@@ -14,6 +15,8 @@ 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)
 
@@ -24,6 +27,8 @@ 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:
@@ -77,6 +82,14 @@ 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"]
@@ -86,6 +99,9 @@ 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,
@@ -95,4 +111,6 @@ class AuthUserDTO(DtoABC):
             "password": self._password,
             "isConfirmed": self._is_confirmed,
             "authRole": self._auth_role.value,
+            "createdAt": self._created_at,
+            "modifiedAt": self._modified_at,
         }

kdb-bot/src/bot_api/transformer/auth_user_transformer.py

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

kdb-bot/src/bot_data/model/auth_user.py

@@ -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
 
 

kdb-web/package.json

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

kdb-web/src/app/models/auth/auth-user.dto.ts

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

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

@@ -70,11 +70,24 @@
             </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>
@@ -100,6 +113,8 @@
           </th>
           <th></th>
           <th></th>
+          <th></th>
+          <th></th>
         </tr>
       </ng-template>
 
@@ -172,6 +187,26 @@
               </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"

kdb-web/src/assets/config.json

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

kdb-web/src/assets/i18n/de.json

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