test into main (#728)

* feat(ZMS-3141): optimize user list page * feat(ZMS-3141): fix test * feat(ZMS-3141): fix test * feat(ZMS-3141): fix tests * feat(ZMS-3141): fix tests * feat(ZMS-3141): refactoring * feat(ZMS-3141): fix test * fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#630) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#631) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-2970: fully load for the appointment form * ZMS-2970: fully load for the appointment form * feat(ZMS-2528): multilanguage ticketprinter * feat(ZMS-2528): revert unwanted changes * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * fix(ZMS-3112): fix custom field validation * fix(ZMS-3112): fix tests * fix(ZMS-3112): fix validation * fix(deps): update dependency league/csv to v9.17.0 (#634) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency firebase/php-jwt to v6.10.1 (#620) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648) * ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt * ZMS-3240 Template-anpassungen, Für den status 'preconfirmed' werden die Links in der Warteschlange entfernt * feat(ZMS-2778): Monitor logged in sessions by scope and department (#651) * feat(ZMS-2778): Add three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Add token session duration to expiry. * feat(ZMS-2778): Add to expiry to user table. * feat(ZMS-2778): Change status query and fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey * feat(ZMS-3150): show called appointments * feat(ZMS-3150): fix tests * feat(ZMS-3150): show user queues * feat(ZMS-3150): fix tests * feat(ZMS-3150): fix tests * feat(ZMS-3150): fix tests * feat(ZMS-3150): fix showing all called appointments for user * feat(ZMS-3150): fix showing all called appointments for user * feat(ZMS-2215): Merge user-search-in-user-list into next (#645) * feat(ZMS-2215): Global user search working * Feat(ZMS-2215): Cleanup twig stuff * feat(ZMS-2215): User search for department admin working * feat(ZMS-2215): Add view users by role * feat(ZMS-2215): set user rights view by role * feat(ZMS-2215): fix up api rights and major cleanup * feat(ZMS-2215): grammar in twig * feat(ZMS-2215): fix unit test * feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig * feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig * feat(ZMS-2215): Update UseraccountSearch.php * feat(ZMS-2215): Update Useraccount.php * feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list * feat(ZMS-2215): cleanup some * feat(ZMS-2215): re-enable twig cache * feat(ZMS-2215): sneak in one more improvement * feat(ZMS-2215): sneak in one more improvement * fix(ZMS-2215): Fix unit test after next update * feat(ZMS-2215): Add department id visibility for superusers --------- Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-2563): optimization (#654) * Next into test (#657) * feat(ZMS-3141): optimize user list page * feat(ZMS-3141): fix test * feat(ZMS-3141): fix test * feat(ZMS-3141): fix tests * feat(ZMS-3141): fix tests * feat(ZMS-3141): refactoring * feat(ZMS-3141): fix test * fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#630) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#631) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-2970: fully load for the appointment form * ZMS-2970: fully load for the appointment form * feat(ZMS-2528): multilanguage ticketprinter * feat(ZMS-2528): revert unwanted changes * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * fix(ZMS-3112): fix custom field validation * fix(ZMS-3112): fix tests * fix(ZMS-3112): fix validation * fix(deps): update dependency league/csv to v9.17.0 (#634) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency firebase/php-jwt to v6.10.1 (#620) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648) * ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt * feat(ZMS-2778): Monitor logged in sessions by scope and department (#651) * feat(ZMS-2778): Add three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Add token session duration to expiry. * feat(ZMS-2778): Add to expiry to user table. * feat(ZMS-2778): Change status query and fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey * feat(ZMS-2215): Merge user-search-in-user-list into next (#645) * feat(ZMS-2215): Global user search working * Feat(ZMS-2215): Cleanup twig stuff * feat(ZMS-2215): User search for department admin working * feat(ZMS-2215): Add view users by role * feat(ZMS-2215): set user rights view by role * feat(ZMS-2215): fix up api rights and major cleanup * feat(ZMS-2215): grammar in twig * feat(ZMS-2215): fix unit test * feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig * feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig * feat(ZMS-2215): Update UseraccountSearch.php * feat(ZMS-2215): Update Useraccount.php * feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list * feat(ZMS-2215): cleanup some * feat(ZMS-2215): re-enable twig cache * feat(ZMS-2215): sneak in one more improvement * feat(ZMS-2215): sneak in one more improvement * fix(ZMS-2215): Fix unit test after next update * feat(ZMS-2215): Add department id visibility for superusers --------- Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-2563): optimization (#654) --------- Co-authored-by: Igor Manjencic <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <[email protected]> Co-authored-by: Fabian Weiß <[email protected]> Co-authored-by: MoDaae <[email protected]> Co-authored-by: Thomas Fink <[email protected]> * fix(ZMS-2215) Fix spelling * Next into test correct spelling (#658) * feat(ZMS-3141): optimize user list page * feat(ZMS-3141): fix test * feat(ZMS-3141): fix test * feat(ZMS-3141): fix tests * feat(ZMS-3141): fix tests * feat(ZMS-3141): refactoring * feat(ZMS-3141): fix test * fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#630) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#631) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-2970: fully load for the appointment form * ZMS-2970: fully load for the appointment form * feat(ZMS-2528): multilanguage ticketprinter * feat(ZMS-2528): revert unwanted changes * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * fix(ZMS-3112): fix custom field validation * fix(ZMS-3112): fix tests * fix(ZMS-3112): fix validation * fix(deps): update dependency league/csv to v9.17.0 (#634) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency firebase/php-jwt to v6.10.1 (#620) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648) * ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt * feat(ZMS-2778): Monitor logged in sessions by scope and department (#651) * feat(ZMS-2778): Add three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Add token session duration to expiry. * feat(ZMS-2778): Add to expiry to user table. * feat(ZMS-2778): Change status query and fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey * feat(ZMS-2215): Merge user-search-in-user-list into next (#645) * feat(ZMS-2215): Global user search working * Feat(ZMS-2215): Cleanup twig stuff * feat(ZMS-2215): User search for department admin working * feat(ZMS-2215): Add view users by role * feat(ZMS-2215): set user rights view by role * feat(ZMS-2215): fix up api rights and major cleanup * feat(ZMS-2215): grammar in twig * feat(ZMS-2215): fix unit test * feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig * feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig * feat(ZMS-2215): Update UseraccountSearch.php * feat(ZMS-2215): Update Useraccount.php * feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list * feat(ZMS-2215): cleanup some * feat(ZMS-2215): re-enable twig cache * feat(ZMS-2215): sneak in one more improvement * feat(ZMS-2215): sneak in one more improvement * fix(ZMS-2215): Fix unit test after next update * feat(ZMS-2215): Add department id visibility for superusers --------- Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-2563): optimization (#654) * fix(ZMS-2215) Fix spelling --------- Co-authored-by: Igor Manjencic <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <[email protected]> Co-authored-by: Fabian Weiß <[email protected]> Co-authored-by: MoDaae <[email protected]> Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-3150): fix getting department scopes * fix(ZMS): improve user department selection * Next into test (#663) * feat(ZMS-3141): optimize user list page * feat(ZMS-3141): fix test * feat(ZMS-3141): fix test * feat(ZMS-3141): fix tests * feat(ZMS-3141): fix tests * feat(ZMS-3141): refactoring * feat(ZMS-3141): fix test * fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#622) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#630) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency league/csv to v9.17.0 (#631) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-2970: fully load for the appointment form * ZMS-2970: fully load for the appointment form * feat(ZMS-2528): multilanguage ticketprinter * feat(ZMS-2528): revert unwanted changes * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * feat(ZMS-2528): fix tests * fix(ZMS-3112): fix custom field validation * fix(ZMS-3112): fix tests * fix(ZMS-3112): fix validation * fix(deps): update dependency league/csv to v9.17.0 (#634) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency firebase/php-jwt to v6.10.1 (#620) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648) * ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt * feat(ZMS-2778): Monitor logged in sessions by scope and department (#651) * feat(ZMS-2778): Add three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Update three queries to status to monitor active sessions * feat(ZMS-2778): Add token session duration to expiry. * feat(ZMS-2778): Add to expiry to user table. * feat(ZMS-2778): Change status query and fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Fix tests * feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey * feat(ZMS-2215): Merge user-search-in-user-list into next (#645) * feat(ZMS-2215): Global user search working * Feat(ZMS-2215): Cleanup twig stuff * feat(ZMS-2215): User search for department admin working * feat(ZMS-2215): Add view users by role * feat(ZMS-2215): set user rights view by role * feat(ZMS-2215): fix up api rights and major cleanup * feat(ZMS-2215): grammar in twig * feat(ZMS-2215): fix unit test * feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig * feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig * feat(ZMS-2215): Update UseraccountSearch.php * feat(ZMS-2215): Update Useraccount.php * feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list * feat(ZMS-2215): cleanup some * feat(ZMS-2215): re-enable twig cache * feat(ZMS-2215): sneak in one more improvement * feat(ZMS-2215): sneak in one more improvement * fix(ZMS-2215): Fix unit test after next update * feat(ZMS-2215): Add department id visibility for superusers --------- Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-2563): optimization (#654) * fix(ZMS-2215) Fix spelling * fix(ZMS): improve user department selection --------- Co-authored-by: Igor Manjencic <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <[email protected]> Co-authored-by: Fabian Weiß <[email protected]> Co-authored-by: MoDaae <[email protected]> Co-authored-by: Thomas Fink <[email protected]> * feat(ZMS-2528): fix buttons translations * fix(ZMS-2215): Spelling * ZMS-3258 URL wird aktualisiert wenn der Kunde nicht erschienen oder wenn der Termin geparkt wird * fix(ZMS-2215): Spelling * feat(ZMS-2528): fix buttons translations * feat(ZMS-3150): adjust swagger docu * feat(ZMS-3150): adjust html id * feat(ZMS-2184): All scss and js builds in the pipeline and local env (#673) * feat(ZMS-2184): Add all SCSS and JS builds in the pipeline and local * feat(ZMS-2184): Delete css and js builds. * feat(ZMS-2184): remove lock files * feat(ZMS-2184): remove lock files * feat(ZMS-2184): fix unit test * feat(ZMS-2184): remove compiled react js * feat(ZMS-2184): remove node engine from package.json * feat(ZMS-2184): remove composer.lock files from gitignore * feat(ZMS-2184): remove package.lock files from gitignore --------- Co-authored-by: Thomas Fink <[email protected]> * cleanup(ZMS-2184): Remove duplicate loop function in cli * docs(zms): Update CONTRIBUTING.md * feat(ZMS-3213): call display appointment order (#676) * feat(ZMS-3213): add sortByCallTime function for queueList sorting * feat(ZMS-3213): add missing queueListArray initialization * feat(ZMS-2528): delete custom templates * feat(ZMS-2528): remove text before button * feat(ZMS-2528): fix tests * fix(ZMS-3267): fix calling appointment again * fix(ZMS-3267): fix calling appointment * feat(ZMS-2528): revert text before button * fix(deps): update dependency giggsey/libphonenumber-for-php to v8.13.50 (#661) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-3190 Felder nur für die Rolle rights.superuser einblinden * ZMS-3229 Removed Automatic Expansion of New Availabilities, and only the availability whose id or tempId matches this.isExpanded will be expanded * feat(ZMS-3374): added muc changelog to application * ZMS-3190 Wartenummernausgabe am Kiosk ist auch nur fuer Superuser * feat(ZMS-2333): changed message text for username and removed e-mail field * feat(ZMS-3180): hide certain fields in department and cluster config (#694) * feat(ZMS-3180): hide certain fields if user is not superuser * feat(ZMS-3180): hide fields also in cluster config and add description for technical admin * feat(ZMS-3180): do not display superuser note in bold type * chore(deps): update dependency postcss to v8.4.49 (#688) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(ZMS-3258): fix typo * next into test (#722) * fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.4 [security] (#690) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * ZMS-2670 button "wieder aufnehmen" und "wieder aufrufen" nur für Sachbearbeiterplatz * clean(ZMS-3377): changed labels * clean(ZMS-3377): changed info label to mins * clean(ZMS-3377): fixed unit tests * ZMS-3420 Update condition to display main content only when at least one button is enabled across multiple scopes * feat(ZMS-3418) OU in pageheader nicht anzeigen bei mehreren Standorten * clean(ZMS-2872): added scope and department to delete message * clean(ZMS-3377): added new migration to change default text * clean(ZMS-2872): fixed unit tests * CleanUpdate zmsdb/migrations/91732870750-custom-textfiled-label.sql Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * feat(ZMS-3152): show traffic light indicator * clean(ZMS-2872): added default to varibles and deleted outcommentted code * feat(ZMS-3152): fix tests * feat(ZMS-3152): fix tests * feat(ZMS-3152): fix tests * feat(ZMS-3152): fix tests * feat(ZMS-3152): fix tests * feat(ZMS-3152): fix tests * Revert "Merge pull request #708 from it-at-m/cleanup-zms-3377-change-labels" This reverts commit bd65587, reversing changes made to 56de6ac. * clean(ZMS-3377): revert the revert * clean(ZMS-3377): revert the revert revert * clean(ZMS-3377): change readme to trigger actions * chore(ZMS-3237): Switch php base image from Berlin to Munich (#704) * chore(ZMS-3237): Switch php base image from Berlin to Munich * chore(ZMS-3237): Upgrade zmsclient to php 7.4 * chore(ZMS-3237): Upgrade zmsclient to php 8.0 * chore(ZMS-3237): Upgrade zmsclient to php 8.0 fix unit test * chore(ZMS-3237): change old gitlab pipelines * chore(ZMS-3237): cleanup old pipeline versions * chore(ZMS-3237): cleanup old pipeline versions * feat(ZMS-3433): search log by all values in data * feat(ZMS-3433): fix tests * feat(ZMS-3433): fix tests * feat(ZMS-3433): add more tests * feat(ZMS-3433): fix tests * feat(ZMS-3433): fix tests * feat(ZMS-3418) keine Referatsangabe in pageheader.twig * feat(ZMS-3418) fix unit test * clean(ZMS-3377): reserved default label change * feat(ZMS-3152): remove unused class * feat(ZMS-3401): added new calldisplay layouts (#714) * feat(ZMS-3433): fix showing log by id * fix(deps): update dependency giggsey/libphonenumber-for-php to v8.13.51 (#716) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * cleanup(TV-47): reduce and improve logging in cronjobs (#719) * fix(TV-47): Php 0 undefined warning for logging * fix(TV-47): Php status undefined warning for logging * fix(TV-47): Add createdTimestamp to email log * feat(ZMS-3433): fix order * feat(ZMS-3433): change parameter name --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <[email protected]> Co-authored-by: Fabian Breitling <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Igor Manjencic <[email protected]> Co-authored-by: Thomas Fink <[email protected]> Co-authored-by: MoDaae <[email protected]> Co-authored-by: Fabian Weiß <[email protected]> --------- Co-authored-by: Igor Manjencic <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <[email protected]> Co-authored-by: Fabian Weiß <[email protected]> Co-authored-by: MoDaae <[email protected]> Co-authored-by: Thomas Fink <[email protected]> Co-authored-by: Thomas Fink <[email protected]> Co-authored-by: Fabian Breitling <[email protected]> Co-authored-by: Thomas Fink <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
it-at-m · Dec 10, 2024 · 6d5de5d · 6d5de5d
1 parent 71d9636
commit 6d5de5d
Show file tree

Hide file tree

Showing 61 changed files with 663 additions and 202 deletions.
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -7,7 +7,7 @@ jobs:
   module-test:
     runs-on: ubuntu-latest
     container:
-      image: "registry.gitlab.com/eappointment/php-base:${{ matrix.php_version }}-dev"
+      image: "ghcr.io/it-at-m/eappointment-php-base:${{ matrix.php_version }}-dev"
     steps:
       - name: Checkout GitHub Action
         uses: actions/checkout@main
@@ -44,7 +44,7 @@ jobs:
   zmsapi-test:
     runs-on: ubuntu-latest
     container:
-      image: "registry.gitlab.com/eappointment/php-base:8.0-dev"
+      image: "ghcr.io/it-at-m/eappointment-php-base:8.0-dev"
     services:
       mariadb:
         image: mariadb:10.6
@@ -96,7 +96,7 @@ jobs:
   zmsdb-test:
     runs-on: ubuntu-latest
     container:
-      image: "registry.gitlab.com/eappointment/php-base:8.0-dev"
+      image: "ghcr.io/it-at-m/eappointment-php-base:8.0-dev"
     services:
       mariadb:
         image: mariadb:10.6

diff --git a/.resources/Containerfile b/.resources/Containerfile
@@ -1,5 +1,5 @@
 ARG PHP_VERSION
-FROM registry.gitlab.com/eappointment/php-base:${PHP_VERSION}-dev as build
+FROM ghcr.io/it-at-m/eappointment-php-base:${PHP_VERSION}-dev as build
 RUN useradd --shell /bin/bash --create-home build
 COPY --chown=build:build . /build
 ARG MODULE
@@ -8,8 +8,7 @@ USER build:build
 RUN make live
 
 ARG PHP_VERSION
-FROM registry.gitlab.com/eappointment/php-base:${PHP_VERSION}-base
+FROM ghcr.io/it-at-m/eappointment-php-base:${PHP_VERSION}-base
 RUN docker-apt-clean-install libfcgi-bin
 ARG MODULE
 COPY --from=build --chown=0:0 /build/${MODULE} /var/www/html
-
diff --git a/README.md b/README.md
@@ -184,4 +184,3 @@ The branch name must match the following regular expression:
 [license-shield]: https://img.shields.io/github/license/it-at-m/eappointment.svg?style=for-the-badge
 [license-url]: https://github.com/it-at-m/eappointment/blob/main/LICENSE
 [product-screenshot]: images/screenshot.png
-
diff --git a/zmsadmin/.gitlab-ci.yml b/zmsadmin/.gitlab-ci.yml
@@ -1,10 +1,10 @@
 include:
     remote: https://gitlab.com/eappointment/php-base/-/raw/main/template-php-ci.yml
 
-test-php-73:
+test-php-80:
     variables:
-      PHP_VERSION: 7.3
-    image: registry.gitlab.com/eappointment/php-base:${PHP_VERSION}-dev
+      PHP_VERSION: 8.0
+    image: ghcr.io/it-at-m/eappointment-php-base:${PHP_VERSION}-dev
     script:
         - $CLI_COMPOSER
         - $CLI_PHPCS
@@ -19,7 +19,7 @@ test-php-73:
         - npm install --legacy-peer-deps
         - make css
     variables:
-        PHP_VERSION: "7.3"
+        PHP_VERSION: "8.0"
     only:
         changes:
             - .gitlab-ci.yml

diff --git a/zmsadmin/Dockerfile b/zmsadmin/Dockerfile
@@ -1,9 +1,9 @@
 ARG PHP_VERSION
-FROM registry.gitlab.com/eappointment/php-base:${PHP_VERSION}-dev as build
+FROM ghcr.io/it-at-m/eappointment-php-base:${PHP_VERSION}-dev as build
 COPY --chown=1000:1000 . /build
 WORKDIR /build
 USER 1000:1000
 RUN make live
 
-FROM registry.gitlab.com/eappointment/php-base:${PHP_VERSION}-base
+FROM ghcr.io/it-at-m/eappointment-php-base:${PHP_VERSION}-base
 COPY --from=build --chown=0:0 /build /var/www/html
diff --git a/zmsadmin/custom_templates/block/appointment/form.twig b/zmsadmin/custom_templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>
@@ -248,7 +248,7 @@
                         {% endif %}
                         {{ formgroup(
                             {
-                                "label": "Anmerkung",
+                                "label": "Anmerkung (nur intern sichtbar)",
                                 "checked": scope.preferences.client.amendmentActivated,
                                 "class": "form-group--nomaxwidth",
                                 "errors": formData.amendment.messages

diff --git a/zmsadmin/custom_templates/block/element/helper/messages.twig b/zmsadmin/custom_templates/block/element/helper/messages.twig
@@ -104,7 +104,7 @@
 
 	    {% block department_deleted %}
     	{{ block('success_start') }}
-        	Die Behörde wurde {{ timeString }} erfolgreich entfernt.
+        	Die Behörde {{ departmentName }} wurde {{ timeString }} erfolgreich entfernt.
         {{ block('success_end') }}
     	{% endblock %}
 
@@ -167,7 +167,7 @@
     	{% block scope_deleted %}
 			{% set successTitle = "Löschen erfolgreich" %}
 	    	{{ block('success_start') }}
-	        	Der Standort wurde {{ timeString }} erfolgreich entfernt.
+	        	Der Standort {{ scopeName }} wurde {{ timeString }} erfolgreich entfernt.
 	        {{ block('success_end') }}
     	{% endblock %}
 

diff --git a/zmsadmin/custom_templates/block/queue/table.twig b/zmsadmin/custom_templates/block/queue/table.twig
@@ -165,8 +165,10 @@
 								</td>
 								<td>
 									<p>
-										<a title="{% trans %}wieder aufrufen{% endtrans %}" href="{{ urlGet('workstation', {}, {'calledprocess': item.id}) }}" data-process="{{ item.id }}">wieder aufrufen</a>
+                                        {% if workstation.name %}
+										    <a title="{% trans %}wieder aufrufen{% endtrans %}" href="{{ urlGet('workstation', {}, {'calledprocess': item.id}) }}" data-process="{{ item.id }}">wieder aufrufen</a>
 										{{ callCount|raw }}
+										{% endif %}
                                     </p>
 								</td>
 							</tr>
@@ -539,7 +541,9 @@
 								</td>
 								<td>
 									<p>
-										<a title="{% trans %}wieder aufnehmen{% endtrans %}" href="#" data-id="{{ item.id }}" class="process-reset">wieder aufnehmen</a>
+                                        {% if workstation.name %}
+										    <a title="{% trans %}wieder aufnehmen{% endtrans %}" href="#" data-id="{{ item.id }}" class="process-reset">wieder aufnehmen</a>
+									    {% endif %}
 									</p>
 								</td>
 							</tr>

diff --git a/zmsadmin/custom_templates/element/helper/messages.twig b/zmsadmin/custom_templates/element/helper/messages.twig
@@ -104,7 +104,7 @@
 
 	    {% block department_deleted %}
     	{{ block('success_start') }}
-        	Die Behörde wurde {{ timeString }} erfolgreich entfernt.
+        	Die Behörde {{ departmentName }} wurde {{ timeString }} erfolgreich entfernt.
         {{ block('success_end') }}
     	{% endblock %}
 
@@ -167,7 +167,7 @@
     	{% block scope_deleted %}
 			{% set successTitle = "Löschen erfolgreich" %}
 	    	{{ block('success_start') }}
-	        	Der Standort wurde {{ timeString }} erfolgreich entfernt.
+	        	Der Standort {{ scopeName }} wurde {{ timeString }} erfolgreich entfernt.
 	        {{ block('success_end') }}
     	{% endblock %}
 

diff --git a/zmsadmin/js/block/calldisplay/config/index.js b/zmsadmin/js/block/calldisplay/config/index.js
@@ -337,14 +337,17 @@ class CallDisplayConfigView extends Component {
                                 { name: '10 Aufrufe | Platz (engl. site)', value: 'default_platz' },
                                 { name: '10 Aufrufe | Tür (engl. door)', value: 'default_tuer' },
                                 { name: '10 Aufrufe | Raum (engl. room)', value: 'default_raum' },
+                                { name: '10 Aufrufe | Tisch (engl. desk)', value: 'default_tisch' },
                                 { name: '8 Aufrufe | Schalter (engl. counter)', value: 'default_counter8' },
                                 { name: '8 Aufrufe | Platz (engl. site)', value: 'default_platz8' },
                                 { name: '8 Aufrufe | Tür (engl. door)', value: 'default_tuer8' },
                                 { name: '8 Aufrufe | Raum (engl. room)', value: 'default_raum8' },
+                                { name: '8 Aufrufe | Tisch (engl. desk)', value: 'default_tisch8' },
                                 { name: '6 Aufrufe | Schalter (engl. counter)', value: 'default_counter6' },
                                 { name: '6 Aufrufe | Platz (engl. site)', value: 'default_platz6' },
                                 { name: '6 Aufrufe | Tür (engl. door)', value: 'default_tuer6' },
-                                { name: '6 Aufrufe | Raum (engl. room)', value: 'default_raum6' }
+                                { name: '6 Aufrufe | Raum (engl. room)', value: 'default_raum6' },
+                                { name: '6 Aufrufe | Tisch (engl. desk)', value: 'default_tisch6' }
                             ]}
                             value={this.state.template}
                             onChange={onTemplateStatusChange} />

diff --git a/zmsadmin/src/Zmsadmin/DepartmentDelete.php b/zmsadmin/src/Zmsadmin/DepartmentDelete.php
@@ -26,15 +26,20 @@ public function readResponse(
         array $args
     ) {
         $entityId = Validator::value($args['id'])->isNumber()->getValue();
+
+        $entity = \App::$http->readGetResult('/department/' . $entityId . '/')->getEntity();
+        $departmentName = $entity->name;
+
+
         \App::$http->readDeleteResult(
             '/department/'. $entityId .'/'
         )->getEntity();
         return \BO\Slim\Render::redirect(
             'owner_overview',
             array(),
             array(
-                'success' => 'department_deleted'
-            )
+                'success' => 'department_deleted',
+                'departmentName' => $departmentName            )
         );
     }
 }
diff --git a/zmsadmin/src/Zmsadmin/Helper/WorkstationInfo.php b/zmsadmin/src/Zmsadmin/Helper/WorkstationInfo.php
@@ -30,6 +30,32 @@ public static function getInfoBoxData(\BO\Zmsentities\Workstation $workstation,
             static::getWorkstationsByScope($scope->getId());
 
         $queueListHelper = (new QueueListHelper($clusterHelper, $selectedDate));
+
+        $workstationRequest = new \BO\Zmsclient\WorkstationRequests(\App::$http, $workstation);
+        $processList = $workstationRequest->readProcessListByDate(
+            new \DateTime($selectedDate)
+        );
+
+        $withAppointment = [];
+        $withoutAppointment = [];
+
+        foreach ($processList as $process) {
+            if (!in_array($process->queue->status, ['queued', 'confirmed']) || $process->queue->waitingTime === 0) {
+                continue;
+            }
+
+            if ($process->queue->withAppointment) {
+                $withAppointment[] = self::stringTimeToMinute($process->queue->waitingTime);
+                continue;
+            }
+
+            $withoutAppointment[] = self::stringTimeToMinute($process->queue->waitingTime);
+        }
+
+        $infoData['averageWaitingTimeWithAppointment'] =
+            count($withAppointment) ? array_sum($withAppointment) / count($withAppointment) : 0;
+        $infoData['averageWaitingTimeWithoutAppointment'] =
+            count($withoutAppointment) ? array_sum($withoutAppointment) / count($withoutAppointment) : 0;
 
         $infoData['countCurrentlyProcessing'] = count($queueListHelper->getFullList()->withStatus(['called', 'processing']));
 
@@ -42,6 +68,20 @@ public static function getInfoBoxData(\BO\Zmsentities\Workstation $workstation,
         return $infoData;
     }
 
+    public static function stringTimeToMinute($time) {
+        $timeArray = explode(':', $time);
+
+        if (count($timeArray) === 3) {
+            $minutes = (int) $timeArray[0] * 60 * 24 + (int) $timeArray[1] * 60 + (int) $timeArray[2];
+        } else if (count($timeArray) === 2) {
+            $minutes = (int) $timeArray[0] * 60 + (int) $timeArray[1];
+        } else {
+            $minutes = (int) $timeArray[0];
+        }
+
+        return $minutes;
+    }
+
 
     public static function getWorkstationsByScope($scopeId)
     {

diff --git a/zmsadmin/src/Zmsadmin/OwnerOverview.php b/zmsadmin/src/Zmsadmin/OwnerOverview.php
@@ -19,7 +19,9 @@ public function readResponse(
     ) {
         $workstation = \App::$http->readGetResult('/workstation/', ['resolveReferences' => 1])->getEntity();
         $ownerList = \App::$http->readGetResult('/owner/', array('resolveReferences' => 4))->getCollection();
-        $success = $request->getAttribute('validator')->getParameter('success')->isString()->getValue();
+        $success = $request->getAttribute('validator')->getParameter('success')->isString()->setDefault('')->getValue();
+        $scopeName = $request->getAttribute('validator')->getParameter('scopeName')->isString()->setDefault('')->getValue(); 
+        $departmentName = $request->getAttribute('validator')->getParameter('departmentName')->isString()->setDefault('')->getValue(); 
         return \BO\Slim\Render::withHtml(
             $response,
             'page/ownerOverview.twig',
@@ -28,7 +30,9 @@ public function readResponse(
                 'menuActive' => 'owner',
                 'workstation' => $workstation,
                 'ownerList' => $ownerList,
-                'success' => $success
+                'success' => $success,
+                'scopeName' => $scopeName,
+                'departmentName' => $departmentName
             )
         );
     }

diff --git a/zmsadmin/src/Zmsadmin/ProcessSearch.php b/zmsadmin/src/Zmsadmin/ProcessSearch.php
@@ -40,7 +40,8 @@ public function readResponse(
         }
 
         $processList = $processList ? $processList : new \BO\Zmsentities\Collection\ProcessList();
-        if (preg_match('#^\d{4,}$#', $queryString) && $workstation->hasAuditAccount()) {
+        if ($workstation->hasAuditAccount()) {
+            $queryString = urlencode($queryString);
             $logList = \App::$http->readGetResult("/log/process/$queryString/")->getCollection();
             $logList = $this->filterLogListForUserRights($logList, $scopeIds);
         }
@@ -59,7 +60,7 @@ public function readResponse(
                 'processList' => $processList,
                 'processListOther' => $processListOther,
                 'logList' => $logList ?? [],
-                'searchProcessQuery' => $queryString,
+                'searchProcessQuery' => urldecode($queryString),
                 'menuActive' => 'search'
             )
         );

diff --git a/zmsadmin/src/Zmsadmin/ScopeDelete.php b/zmsadmin/src/Zmsadmin/ScopeDelete.php
@@ -28,13 +28,18 @@ public function readResponse(
     ) {
         $entityId = Validator::value($args['id'])->isNumber()
             ->getValue();
+
+            $entity = \App::$http->readGetResult('/scope/' . $entityId . '/')->getEntity();
+            $scopeName = $entity->offsetGet('contact')->offsetGet('name'); 
+
         \App::$http->readDeleteResult('/scope/' . $entityId . '/')
             ->getEntity();
         return \BO\Slim\Render::redirect(
             'owner_overview',
             array(),
             array(
-                'success' => 'scope_deleted'
+                'success' => 'scope_deleted',
+                'scopeName' => $scopeName
             )
         );
     }

diff --git a/zmsadmin/templates/block/appointment/form.twig b/zmsadmin/templates/block/appointment/form.twig
@@ -4,9 +4,9 @@
 
     {% block board_title %}
         {% if selectedProcess %}
-            <span id="appointment-edit-title" tabindex="0">Terminvereinbarung Aktualisieren</span>
+            <span id="appointment-edit-title" tabindex="0">Termin aktualisieren</span>
         {% else %}
-            Terminvereinbarung Neu
+            Termin erstellen
         {% endif %}
 
         <script>
@@ -248,7 +248,7 @@
                         {% endif %}
                         {{ formgroup(
                             {
-                                "label": "Anmerkung",
+                                "label": "Anmerkung (nur intern sichtbar)",
                                 "checked": scope.preferences.client.amendmentActivated,
                                 "class": "form-group--nomaxwidth",
                                 "errors": formData.amendment.messages

diff --git a/zmsadmin/templates/block/appointment/formRedirect.twig b/zmsadmin/templates/block/appointment/formRedirect.twig
@@ -34,7 +34,7 @@
 
             {{ formgroup(
                 {
-                    "label": "Anmerkung",
+                    "label": "Anmerkung (nur intern sichtbar)",
                     "checked": scope.preferences.client.amendmentActivated,
                     "class": "form-group--nomaxwidth",
                     "errors": formData.amendment.messages
Original file line number	Diff line number	Diff line change
Expand Up		@@ -184,4 +184,3 @@ The branch name must match the following regular expression:
		[license-shield]: https://img.shields.io/github/license/it-at-m/eappointment.svg?style=for-the-badge
		[license-url]: https://github.com/it-at-m/eappointment/blob/main/LICENSE
		[product-screenshot]: images/screenshot.png