bot/src/bot_graphql/mutations/scheduled_event_mutation.py

@@ -2,7 +2,6 @@ from datetime import datetime
 
 from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.service import DiscordBotServiceABC
-from discord import EntityType
 
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.scheduled_event_repository_abc import ScheduledEventRepositoryABC
@@ -86,9 +85,7 @@ class ScheduledEventMutation(QueryABC):
             if "endTime" in input
             else scheduled_event.end_time
         )
-        scheduled_event.entity_type = (
+        scheduled_event.entity_type = input["entityType"] if "entityType" in input else scheduled_event.entity_type
-            EntityType(int(input["entityType"])) if "entityType" in input else scheduled_event.entity_type
-        )
         scheduled_event.location = input["location"] if "location" in input else scheduled_event.location
 
         self._scheduled_events.update_scheduled_event(scheduled_event)

bot/src/bot_graphql/queries/scheduled_event_query.py

@@ -18,6 +18,6 @@ class ScheduledEventQuery(DataQueryWithHistoryABC):
         self.set_field("channelId", lambda x, *_: x.channel_id)
         self.set_field("startTime", lambda x, *_: x.start_time)
         self.set_field("endTime", lambda x, *_: x.end_time)
-        self.set_field("entityType", lambda x, *_: x.entity_type.value)
+        self.set_field("entityType", lambda x, *_: x.entity_type)
         self.set_field("location", lambda x, *_: x.location)
         self.set_field("server", lambda x, *_: x.server)

bot/src/modules/base/base_module.py

@@ -7,7 +7,7 @@ from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 from bot_core.abc.module_abc import ModuleABC
 from bot_core.abc.task_abc import TaskABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
-from modules.base.tasks.birthday_watcher import BirthdayWatcher
+from modules.base.birthday_watcher import BirthdayWatcher
 from modules.base.command.afk_command import AFKCommand
 from modules.base.command.game_server_group import GameServerGroup
 from modules.base.command.help_command import HelpCommand
@@ -45,7 +45,7 @@ from modules.base.events.base_on_voice_state_update_event_scheduled_event_bonus
 from modules.base.forms.bug_report_form import BugReportForm
 from modules.base.forms.complaint_form import ComplaintForm
 from modules.base.helper.base_reaction_handler import BaseReactionHandler
-from modules.base.tasks.scheduled_events_watcher import ScheduledEventsWatcher
+from modules.base.scheduled_events_watcher import ScheduledEventsWatcher
 from modules.base.service.event_service import EventService
 from modules.base.service.user_warnings_service import UserWarningsService
 

bot/src/modules/base/scheduled_events_watcher.py

@@ -66,7 +66,7 @@ class ScheduledEventsWatcher(TaskABC):
 
         return ts
 
-    @tasks.loop(hours=24)
+    @tasks.loop(minutes=1)
     async def watch(self):
         self._logger.info(__name__, "Watching scheduled events")
         try:

bot/src/modules/base/tasks/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-bot sh-edraft.de Discord bot
-~~~~~~~~~~~~~~~~~~~
-
-Discord bot for customers of sh-edraft.de
-
-:copyright: (c) 2022 - 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "modules.base.tasks"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.2"
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="2")

web/src/app/modules/view/server/scheduled-events/components/edit-scheduled-event-dialog/edit-scheduled-event-dialog.component.html

@@ -58,7 +58,7 @@
             <div style="display: flex; flex-direction: column; gap: 5px;">
               {{'view.server.scheduled_events.edit_dialog.event_info.end_date_time' | translate}}:
               <p-calendar formControlName="endTime" dateFormat="dd.mm.yy" [showIcon]="true"
-                          [showTime]="true"></p-calendar>
+                          [showTime]="true" [stepMinute]="15"></p-calendar>
             </div>
 
             <div style="display: flex; flex-direction: column; gap: 5px;">

web/src/styles/themes/default-dark-theme.scss

@@ -187,15 +187,12 @@
     }
   }
 
-
   .p-dialog-header {
-    background-color: $primaryBackgroundColor !important;
+    background-color: $secondaryBackgroundColor !important;
     color: $primaryTextColor !important;
   }
 
   .p-dialog-content {
-    background-color: $secondaryBackgroundColor !important;
-
     .content-data-name,
     .content-data-value {
       color: $primaryTextColor;
@@ -348,11 +345,9 @@
   }
 
   p-dropdown {
-
     .p-dropdown {
-      border: $default-border;
+      background-color: $primaryBackgroundColor !important;
-      border-radius: 10px;
+      border-color: $primaryTextColor !important;
-      background-color: $secondaryBackgroundColor !important;
       color: $primaryTextColor !important;
 
       span {
@@ -416,6 +411,8 @@
           }
         }
       }
+
+
     }
 
     .table-edit-input {
@@ -540,10 +537,6 @@
   }
 
   .icon-btn {
-    .p-button-label {
-      transition-duration: unset !important;
-    }
-
     &:hover {
       background-color: transparent !important;
       color: $primaryHeaderColor !important;
@@ -551,7 +544,6 @@
     }
   }
 
-  .danger-btn,
   .danger-icon-btn {
     background-color: transparent !important;
     color: $primaryTextColor !important;
@@ -568,11 +560,25 @@
     }
   }
 
+  .danger-btn {
+    background-color: $primaryErrorColor !important;
+    color: $primaryErrorColor !important;
+    border: 0 !important;
+
+    &:hover {
+      background-color: $primaryErrorColor !important;
+      color: $primaryTextColor !important;
+      border: 0;
+    }
+
+    .pi {
+      font-size: 1.275rem !important;
+    }
+  }
+
   .p-datatable .p-sortable-column.p-highlight,
-  .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon,
+  .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon {
-  .p-datatable .p-sortable-column:not(.p-highlight):hover {
     color: $primaryHeaderColor !important;
-    background-color: transparent !important;
   }
 
   .p-dropdown:not(.p-disabled):hover,
@@ -610,27 +616,6 @@
     }
   }
 
-  .p-selectbutton {
-    .p-highlight {
-      background-color: $primaryHeaderColor !important;
-    }
-
-    .p-button {
-
-      border: 1px solid $primaryHeaderColor !important;
-
-      &:hover {
-        background-color: $secondaryHeaderColor !important;
-        border: 1px solid $secondaryHeaderColor !important;
-      }
-
-      &:focus {
-        border-color: $primaryHeaderColor !important;
-        box-shadow: none !important;
-      }
-    }
-  }
-
   .p-multiselect {
     background-color: $primaryBackgroundColor !important;
     color: $primaryTextColor !important;
@@ -676,141 +661,4 @@
       }
     }
   }
-
-  .p-inputswitch.p-inputswitch-checked .p-inputswitch-slider {
-    background: $primaryHeaderColor !important;
-  }
-
-  .p-inputswitch.p-focus .p-inputswitch-slider {
-    box-shadow: none !important;
-  }
-
-  p-inputNumber {
-    background-color: $primaryBackgroundColor !important;
-  }
-
-  p-calendar > span > button {
-    background-color: $primaryHeaderColor !important;
-    border: 1px solid $primaryHeaderColor !important;
-
-    &:focus {
-      box-shadow: none !important;
-    }
-  }
-
-  .p-calendar {
-    .p-datepicker:not(.p-datepicker-inline) {
-      background-color: $secondaryBackgroundColor !important;
-    }
-
-    .p-datepicker {
-      color: $primaryTextColor !important;
-
-      .p-datepicker-header {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-
-        .p-datepicker-title .p-datepicker-year,
-        .p-datepicker-title .p-datepicker-month,
-        .p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month {
-          color: $primaryTextColor !important;
-
-          &:hover {
-            color: $primaryHeaderColor !important;
-          }
-
-          &:focus {
-            box-shadow: none !important;
-          }
-        }
-      }
-    }
-
-    table td > span {
-      color: $primaryTextColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-
-    table td.p-datepicker-today > span {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    table td > span.p-highlight {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    .p-yearpicker .p-yearpicker-year,
-    .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight) {
-      color: $primaryTextColor !important;
-      background-color: $secondaryBackgroundColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-  }
-
-  .edit-dialog {
-    textarea {
-      background-color: $secondaryBackgroundColor;
-      color: $primaryTextColor;
-
-      &:hover {
-        border-color: $primaryHeaderColor;
-      }
-
-      &:focus {
-        border-color: $primaryHeaderColor;
-      }
-    }
-
-    .p-dialog-content {
-      .p-tabview {
-        .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
-          box-shadow: none !important;
-        }
-
-        .p-tabview-nav li.p-highlight .p-tabview-nav-link {
-          color: $primaryHeaderColor !important;
-          border-color: $primaryHeaderColor !important;
-        }
-
-        .p-tabview-nav,
-        .p-tabview-nav li .p-tabview-nav-link,
-        .p-tabview-panels {
-          background-color: $secondaryBackgroundColor !important;
-          color: $primaryTextColor !important;
-        }
-      }
-    }
-  }
-
-  .p-radiobutton {
-    .p-radiobutton-box.p-highlight {
-      border-color: $primaryHeaderColor !important;
-      background: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled):not(.p-highlight):hover {
-      border-color: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled).p-focus {
-      box-shadow: none !important;
-    }
-  }
 }

web/src/styles/themes/default-light-theme.scss

@@ -544,7 +544,6 @@
     }
   }
 
-  .danger-btn,
   .danger-icon-btn {
     background-color: transparent !important;
     color: $primaryTextColor !important;
@@ -561,6 +560,22 @@
     }
   }
 
+  .danger-btn {
+    background-color: $primaryErrorColor !important;
+    color: $primaryErrorColor !important;
+    border: 0 !important;
+
+    &:hover {
+      background-color: $primaryErrorColor !important;
+      color: $primaryTextColor !important;
+      border: 0;
+    }
+
+    .pi {
+      font-size: 1.275rem !important;
+    }
+  }
+
   .p-datatable .p-sortable-column.p-highlight,
   .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon {
     color: $primaryHeaderColor !important;
@@ -587,23 +602,16 @@
     color: $primaryHeaderColor !important;
   }
 
-  .p-selectbutton {
+  .input-number {
-    .p-highlight {
+    span {
-      background-color: $primaryHeaderColor !important;
+      .p-button {
-    }
+        background-color: $primaryHeaderColor !important;
+        border: 1px solid $primaryHeaderColor !important;
 
-    .p-button {
+        &:hover {
-
+          background-color: $secondaryHeaderColor !important;
-      border: 1px solid $primaryHeaderColor !important;
+          border: 1px solid $secondaryHeaderColor !important;
-
+        }
-      &:hover {
-        background-color: $secondaryHeaderColor !important;
-        border: 1px solid $secondaryHeaderColor !important;
-      }
-
-      &:focus {
-        border-color: $primaryHeaderColor !important;
-        box-shadow: none !important;
       }
     }
   }
@@ -621,12 +629,12 @@
 
     .p-multiselect-panel {
       .p-multiselect-header {
-        background-color: $primaryBackgroundColor !important;
+        background-color: $secondaryBackgroundColor !important;
       }
 
       .p-multiselect-items,
       .p-multiselect-item {
-        background-color: $secondaryBackgroundColor !important;
+        background-color: $primaryBackgroundColor !important;
       }
 
       .p-multiselect-item {
@@ -653,141 +661,4 @@
       }
     }
   }
-
-  .p-inputswitch.p-inputswitch-checked .p-inputswitch-slider {
-    background: $primaryHeaderColor !important;
-  }
-
-  .p-inputswitch.p-focus .p-inputswitch-slider {
-    box-shadow: none !important;
-  }
-
-  p-inputNumber {
-    background-color: $primaryBackgroundColor !important;
-  }
-
-  p-calendar > span > button {
-    background-color: $primaryHeaderColor !important;
-    border: 1px solid $primaryHeaderColor !important;
-
-    &:focus {
-      box-shadow: none !important;
-    }
-  }
-
-  .p-calendar {
-    .p-datepicker:not(.p-datepicker-inline) {
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    .p-datepicker {
-      color: $primaryTextColor !important;
-
-      .p-datepicker-header {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-
-        .p-datepicker-title .p-datepicker-year,
-        .p-datepicker-title .p-datepicker-month,
-        .p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month {
-          color: $primaryTextColor !important;
-
-          &:hover {
-            color: $primaryHeaderColor !important;
-          }
-
-          &:focus {
-            box-shadow: none !important;
-          }
-        }
-      }
-    }
-
-    table td > span {
-      color: $primaryTextColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-
-    table td.p-datepicker-today > span {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    table td > span.p-highlight {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    .p-yearpicker .p-yearpicker-year,
-    .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight) {
-      color: $primaryTextColor !important;
-      background-color: $secondaryBackgroundColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-  }
-
-  .edit-dialog {
-    textarea {
-      background-color: $primaryBackgroundColor;
-      color: $primaryTextColor;
-
-      &:hover {
-        border-color: $primaryHeaderColor;
-      }
-
-      &:focus {
-        border-color: $primaryHeaderColor;
-      }
-    }
-
-    .p-dialog-content {
-      .p-tabview {
-        .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
-          box-shadow: none !important;
-        }
-
-        .p-tabview-nav li.p-highlight .p-tabview-nav-link {
-          color: $primaryHeaderColor !important;
-          border-color: $primaryHeaderColor !important;
-        }
-
-        .p-tabview-nav,
-        .p-tabview-nav li .p-tabview-nav-link,
-        .p-tabview-panels {
-          background-color: $primaryBackgroundColor !important;
-          color: $primaryTextColor !important;
-        }
-      }
-    }
-  }
-
-  .p-radiobutton {
-    .p-radiobutton-box.p-highlight {
-      border-color: $primaryHeaderColor !important;
-      background: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled):not(.p-highlight):hover {
-      border-color: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled).p-focus {
-      box-shadow: none !important;
-    }
-  }
 }

web/src/styles/themes/sh-edraft-light-theme.scss

@@ -544,7 +544,6 @@
     }
   }
 
-  .danger-btn,
   .danger-icon-btn {
     background-color: transparent !important;
     color: $primaryTextColor !important;
@@ -561,6 +560,22 @@
     }
   }
 
+  .danger-btn {
+    background-color: $primaryErrorColor !important;
+    color: $primaryErrorColor !important;
+    border: 0 !important;
+
+    &:hover {
+      background-color: $primaryErrorColor !important;
+      color: $primaryTextColor !important;
+      border: 0;
+    }
+
+    .pi {
+      font-size: 1.275rem !important;
+    }
+  }
+
   .p-datatable .p-sortable-column.p-highlight,
   .p-datatable .p-sortable-column.p-highlight .p-sortable-column-icon {
     color: $primaryHeaderColor !important;
@@ -646,142 +661,4 @@
       }
     }
   }
-
-
-  .p-inputswitch.p-inputswitch-checked .p-inputswitch-slider {
-    background: $primaryHeaderColor !important;
-  }
-
-  .p-inputswitch.p-focus .p-inputswitch-slider {
-    box-shadow: none !important;
-  }
-
-  p-inputNumber {
-    background-color: $primaryBackgroundColor !important;
-  }
-
-  p-calendar > span > button {
-    background-color: $primaryHeaderColor !important;
-    border: 1px solid $primaryHeaderColor !important;
-
-    &:focus {
-      box-shadow: none !important;
-    }
-  }
-
-  .p-calendar {
-    .p-datepicker:not(.p-datepicker-inline) {
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    .p-datepicker {
-      color: $primaryTextColor !important;
-
-      .p-datepicker-header {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-
-        .p-datepicker-title .p-datepicker-year,
-        .p-datepicker-title .p-datepicker-month,
-        .p-datepicker .p-datepicker-header .p-datepicker-title .p-datepicker-month {
-          color: $primaryTextColor !important;
-
-          &:hover {
-            color: $primaryHeaderColor !important;
-          }
-
-          &:focus {
-            box-shadow: none !important;
-          }
-        }
-      }
-    }
-
-    table td > span {
-      color: $primaryTextColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-        background-color: $primaryBackgroundColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-
-    table td.p-datepicker-today > span {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    table td > span.p-highlight {
-      color: $primaryHeaderColor !important;
-      background-color: $primaryBackgroundColor !important;
-    }
-
-    .p-yearpicker .p-yearpicker-year,
-    .p-monthpicker .p-monthpicker-month:not(.p-disabled):not(.p-highlight) {
-      color: $primaryTextColor !important;
-      background-color: $secondaryBackgroundColor !important;
-
-      &:hover {
-        color: $primaryHeaderColor !important;
-      }
-
-      &:focus {
-        box-shadow: none !important;
-      }
-    }
-  }
-
-  .edit-dialog {
-    textarea {
-      background-color: $primaryBackgroundColor;
-      color: $primaryTextColor;
-
-      &:hover {
-        border-color: $primaryHeaderColor;
-      }
-
-      &:focus {
-        border-color: $primaryHeaderColor;
-      }
-    }
-
-    .p-dialog-content {
-      .p-tabview {
-        .p-tabview-nav li .p-tabview-nav-link:not(.p-disabled):focus {
-          box-shadow: none !important;
-        }
-
-        .p-tabview-nav li.p-highlight .p-tabview-nav-link {
-          color: $primaryHeaderColor !important;
-          border-color: $primaryHeaderColor !important;
-        }
-
-        .p-tabview-nav,
-        .p-tabview-nav li .p-tabview-nav-link,
-        .p-tabview-panels {
-          background-color: $primaryBackgroundColor !important;
-          color: $primaryTextColor !important;
-        }
-      }
-    }
-  }
-
-  .p-radiobutton {
-    .p-radiobutton-box.p-highlight {
-      border-color: $primaryHeaderColor !important;
-      background: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled):not(.p-highlight):hover {
-      border-color: $primaryHeaderColor !important;
-    }
-
-    .p-radiobutton-box:not(.p-disabled).p-focus {
-      box-shadow: none !important;
-    }
-  }
 }