Test into main (#632)

* feat(ZMS-2962): extend log data * feat(ZMS-2962): cronjob for deleting log data * feat(ZMS-2969): load mail template from database * feat(ZMS-2962): log deletion config in scope * Main CSS Proberty anpassen * feat(ZMS-2534): custom mails for scopes * feat(ZMS-2962): fix migration * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2962): fix tests * feat(ZMS-2969): fix loading mail content * migration:notrufinitiierung,notrufantwort Tabellen erweitert(VARCHAR 8) Scope.php (kein paresn für die Platznummer zum Integer) * feat(ZMS-2962): adjust logging property names * feat(ZMS-2962): add logging action * feat(ZMS-2962): remove unused method * feat(ZMS-3140): improve speed * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * feat(ZMS-2962): fix log action call * Update README.md * added recommended vscode gitignore settings * onPublishAvailability: validation on submit button hasErrors: check if conflictList is undefined * clean(ZMS-2405): remove excess mail logging and set multiprocessing to 50 into next (#577) * clean(ZMS-2405): remove excess mail logging and set multiprocessing to 50 from 100 * clean(ZMS-2405): remove excess mail logging and set multiprocessing to 50 from 100 --------- Co-authored-by: Thomas Fink <thomasafink@Thomass-MacBook-Air.local> * Update CHANGELOG.md (#581) into next (#582) * main into next (#579) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Revert "main into next (#579)" (#580) This reverts commit 175fc4b. * Update CHANGELOG.md (#581) Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * fix(ZMS-3166): fix refreshing * fix(ZMS-3166): fix refreshing * fix(ZMS-3166): fix refreshing * fix(ZMS-3166): cleanup * bugfix(zms-3109): opening hours empty date (#573) * Catch misbehavior with empty date * bugfix(zms-3109): add closeDatePicker * bugfix(zms-3109): adjust datepicker * bugfix(zms-3109): remove console.warn * create .coderabbit.yaml (#590) * main into next (#579) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Revert "main into next (#579)" (#580) This reverts commit 175fc4b. * Update CHANGELOG.md (#581) Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * create .coderabbit.yaml (#589) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Test into next (#602) * main into next (#579) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Revert "main into next (#579)" (#580) This reverts commit 175fc4b. * Update CHANGELOG.md (#581) Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * create .coderabbit.yaml (#589) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * test into main (#601) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Test into next (#604) * main into next (#579) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Revert "main into next (#579)" (#580) This reverts commit 175fc4b. * Update CHANGELOG.md (#581) Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * create .coderabbit.yaml (#589) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * test into main (#601) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * main into test (#603) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot * Create renovate.json --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Update dependency symfony/twig-bridge to v5.4.31 [SECURITY] (#606) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot * Create renovate.json * Update dependency symfony/twig-bridge to v5.4.31 [SECURITY] --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> Co-authored-by: Thomas Fink <53316058+ThomasAFink@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * main into test (#612) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot * Create renovate.json * Update renovate.json --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * test into next (#613) * main into next (#579) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * Revert "main into next (#579)" (#580) This reverts commit 175fc4b. * Update CHANGELOG.md (#581) Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * create .coderabbit.yaml (#589) * Update CHANGELOG.md * Create .coderabbit.yaml --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * test into main (#601) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * main into test (#603) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot * Create renovate.json --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * main into test (#612) * Update CHANGELOG.md * Create .coderabbit.yaml * Update CODE_OF_CONDUCT.md to trigger renovate bot * Create renovate.json * Update renovate.json --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> --------- Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> * fix(deps): update dependency giggsey/libphonenumber-for-php to v8.13.47 (#615) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency slim/psr7 to v1.5.1 [security] (#605) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat(ZMS-3088): add default label for custom text field (#599) * feat(ZMS-3088): add description for custom text field * feat(ZMS-3088): add default label for custom text field * Revert "feat(ZMS-3088): add default label for custom text field (#599)" This reverts commit 9848840. * Feature zms 3088 add default label for custom text field (#616) * feat(ZMS-3088): add description for custom text field * feat(ZMS-3088): add default label for custom text field --------- Co-authored-by: Fabinatix97 <fabian@fabi-online.de> * fix(ZMS-3080): catching null waiting times when queue is empty (#600) * fix(ZMS-3080): catching null waiting times when queue is empty * fix(ZMS-3080): rename waitingTimeOptim to waitingTimeOptimistic * feat(ZMS-2962): revert moving config in scope * feat(ZMS-2962): fix logging * feat(ZMS-2534): fix e-mail template link visibility --------- Co-authored-by: Igor Manjencic <manjak.igor@gmail.com> Co-authored-by: MoDaae <user@nbo00397660.itm.muenchen.de> Co-authored-by: MoDaae <90261750+MoDaae@users.noreply.github.com> Co-authored-by: mohamad.daaeboul <mohamad.daaeboul@muenchen.de> Co-authored-by: Thomas Fink <thomasafink@Thomass-MacBook-Air.local> Co-authored-by: Fabian Weiß <98973281+Fabinatix97@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Fabinatix97 <fabian@fabi-online.de>
it-at-m · Oct 14, 2024 · 28b29ff · 28b29ff
1 parent affe4c8
commit 28b29ff
Show file tree

Hide file tree

Showing 72 changed files with 939 additions and 177,153 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 .idea/
 .ddev/.env
 /local/
-.DS_Store
+.DS_Store
+.vscode/launch.json
+.vscode/settings.json
+.vscode/tasks.json
+.vscode/terminals.json
diff --git a/README.md b/README.md
@@ -113,4 +113,40 @@ To run unit tests locally refer to the Github Workflows: https://github.com/it-a
 - `cd {zmsadmin, zmscalldisplay, zmsdldb, zmsentities, zmsmessaging, zmsslim, zmsstatistic, zmsticketprinter}`
 - `./vendor/bin/phpunit`
 
-For zmsapi and zmsdb you must first import the test data which unfortunately overwrites your local database. For zmsclient you need the php base image.
+For zmsapi and zmsdb you must first import the test data which unfortunately overwrites your local database. For zmsclient you need the php base image.
+
+
+## Branch Naming Convention
+To keep our branch names organized and easily understandable, we follow a specific naming convention for all branches created in this repository. Please adhere to this convention when creating new branches:
+
+1. **type**: The type of work the branch represents. This should be one of the following:
+   - `feature`: For new features or enhancements.
+   - `bugfix`: For bug fixes.
+   - `hotfix`: For urgent fixes that need to be applied quickly.
+   - `cleanup`: For code refactoring, documentation updates, or other maintenance work.
+
+2. **project**: The project identifier. This should be:
+   - `zms` for the ZMS project.
+   - `mpdzbs` for the MPDZBS project.
+
+3. **issue number**: The ticket or issue number related to this branch (use digits only). This helps track the branch to a specific issue in the project management system.
+
+4. **description**: A brief, lowercase description of the branch's purpose, using only lowercase letters, numbers, and hyphens (`-`).
+
+- Always use lowercase letters and hyphens for the description.
+- The issue number should be a numeric ID corresponding to the relevant ticket or task.
+- Descriptions should be concise and informative, summarizing the branch's purpose.
+
+#### Examples
+
+- **Feature Branch**: `feature-zms-12345-this-is-a-feature-in-the-zms-project`
+- **Bugfix Branch**: `bugfix-mpdzbs-67890-fix-crash-on-startup`
+- **Hotfix Branch**: `hotfix-zms-98765-critical-fix-for-login`
+- **Cleanup Branch**: `cleanup-mpdzbs-11111-remove-unused-code`
+
+#### Regular Expression
+
+The branch name must match the following regular expression:
+`^(feature|hotfix|bugfix|cleanup)-(zms|mpdzbs)-[0-9]+-[a-z0-9-]+$`
+
+**For further commit rules please refer to https://www.conventionalcommits.org/en/v1.0.0-beta.4/**
diff --git a/zmsadmin/custom_templates/block/scope/form.twig b/zmsadmin/custom_templates/block/scope/form.twig
@@ -465,7 +465,8 @@
 
 					{{ formgroup(
                         {
-                            "label": "Freitextfeldlabel:"
+                            "label": "Freitextfeldlabel:",
+                            "description": "Der hier eingetragene Text wird als Name für das Freitextfeld angezeigt (bspw. Bemerkung). Im Freitextfeld können Bürger*innen Informationen hinterlassen, die für den Termin relevant sein könnten."
                         },
                         [{
                             "type":"input",

diff --git a/zmsadmin/custom_templates/block/search/searchresults.twig b/zmsadmin/custom_templates/block/search/searchresults.twig
@@ -1,25 +1,25 @@
 {% embed "block/scaffholding/board.twig" with {'class': 'board--spaceless searchresults'} %}
 
-        {% block board_title %}
-            <span tabindex="1" id="search-result-title">{% trans %}Suchergebnisse für {% endtrans %} "{{ searchQuery }}"</span>
-        {% endblock %}
+    {% block board_title %}
+        <span tabindex="1" id="search-result-title">{% trans %}Suchergebnisse für {% endtrans %} "{{ searchQuery }}"</span>
+    {% endblock %}
 
-        {% block board_body %}
+    {% block board_body %}
         <script>
             document.getElementById("search-result-title").focus();
         </script>
 
         <div tabindex="1" class="table-responsive-wrapper">
             <table class="table--base" data-processList-count="{{ processList.count() }}"  data-processListOther-count="{{ processListOther.count() }}">
                 <thead>
-                    <tr>
-                        <th>Name (Nr.)</th>
-                        <th>Datum</th>
-                        <th>Ort</th>
-                        <th>Telefon</th>
-                        <th>E-Mail</th>
-                        <th>Anmerkung</th>
-                    </tr>
+                <tr>
+                    <th>Name (Nr.)</th>
+                    <th>Datum</th>
+                    <th>Ort</th>
+                    <th>Telefon</th>
+                    <th>E-Mail</th>
+                    <th>Anmerkung</th>
+                </tr>
                 </thead>
                 <tbody>
                 {% for process in processList %}
@@ -45,7 +45,7 @@
                 {% for process in processListOther %}
                     <tr>
                         <td>
-                                {{process.clients.0.familyName}} ({{process.id}})
+                            {{process.clients.0.familyName}} ({{process.id}})
                         </td>
                         <td>{{process.appointments.0.date|date('d.m.Y, H:i')}}&nbsp;Uhr</td>
                         <td>{{process.scope.contact.name}} {{process.scope.shortName}}</td>
@@ -61,18 +61,26 @@
                     <tr>
                         <th colspan="7">Log-Ergebnisse:</th>
                     </tr>
-                {% for log in logList %}
-                    <tr>
-                        <td>{{ log.reference }}</td>
-                        <td>{{log.ts|date('d.m.Y, H:i:s')}}&nbsp;Uhr</td>
-                        <td colspan="7">{{ log.message }}</td>
-                    </tr>
-                {% endfor %}
+                    {% for log in logList %}
+                        {% set data = log.data %}
+                        <tr>
+                            <td>{{ log.reference }}</td>
+                            <td>{{log.ts|date('d.m.Y, H:i:s')}}&nbsp;Uhr</td>
+                            <td colspan="4">
+                                {{ log.message }}<br>
+                                {% if data is defined %}
+                                    {% for key, value in data %}
+                                        <b>{{ key }}</b>: {{ value }}<br/>
+                                    {% endfor %}
+                                {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
                 {% endif %}
                 </tbody>
             </table>
         </div>
-        {% endblock %}
+    {% endblock %}
 
 
 {% endembed %}
diff --git a/zmsadmin/custom_templates/page/mailtemplates.twig b/zmsadmin/custom_templates/page/mailtemplates.twig
@@ -1,7 +1,7 @@
 {% extends "layout/main.twig" %}
 {% from 'element/helper/snippets.twig' import headline1 %}
 {% block headline %}
-    {{ headline1("Mail Templates") }}
+    {{ headline1(pageTitle) }}
     <button class="button button-submit" onclick="previewEmail('appointment')">Confirmation</button>
     <button class="button button-submit" onclick="previewEmail('deleted')">Delete</button>
     <button class="button button-submit" onclick="previewEmail('preconfirmed')">Preconfirmed</button>
@@ -103,7 +103,7 @@
 
 
         function saveMailTemplate(templateId, editorId) {
-            const url = '{{ includeUrl() }}/mailtemplates/';
+            const url = '{{ includeUrl() }}/mailtemplates/{{ scopeId }}/';
             const data = {
                 templateId: templateId,
                 templateContent: getContentOfEditor(editorId)
@@ -128,7 +128,7 @@
         }
 
         function deleteCustomization(templateId, editorId) {
-            const url = '{{ includeUrl() }}/mailtemplates/deleteCustomization/';
+            const url = '{{ includeUrl() }}/mailtemplates/deleteCustomization/{{ scopeId }}/';
             const data = {
                 templateId: templateId
             };
@@ -149,7 +149,7 @@
         }
 
         function createCustomization(templateName, editorId) {
-            const url = '{{ includeUrl() }}/mailtemplates/createCustomization/';
+            const url = '{{ includeUrl() }}/mailtemplates/createCustomization/{{ scopeId }}/';
             const data = {
                 templateName: templateName,
                 templateContent: getContentOfEditor(editorId)
@@ -175,18 +175,18 @@
             templateObjects.forEach((templateObject) => {
                 templateObject.templateContent = getContentOfEditor(templateObject.elementId)
             });
-            
-            const url = '{{ includeUrl() }}/mailtemplates/previewEmail/'+mailStatus+'/';
+
+            const url = '{{ includeUrl() }}/mailtemplates/previewEmail/'+mailStatus+'/{{ scopeId }}/';
             const data = {
                 templates: templateObjects
             };
 
             fetch(url, {
-                method: 'POST', 
+                method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
                 },
-                body: JSON.stringify(data), 
+                body: JSON.stringify(data),
             })
             .then(response => response.json())
             .then(data => {

diff --git a/zmsadmin/js/page/availabilityDay/form/datepicker.js b/zmsadmin/js/page/availabilityDay/form/datepicker.js
@@ -156,6 +156,10 @@ class AvailabilityDatePicker extends Component
     }
 
     handleChange(name, date) {
+        if (!date) {
+            this.closeDatePicker();
+            return;
+        }
         if ('startDate' == name) {
             if (this.state.availability.startDate != moment(date).startOf('day').unix()) {
                 this.props.onChange("startDate", moment(date).unix());

diff --git a/zmsadmin/js/page/availabilityDay/index.js b/zmsadmin/js/page/availabilityDay/index.js
@@ -68,6 +68,8 @@ class AvailabilityPage extends Component {
     }
 
     onPublishAvailability() {
+        this.getValidationList();
+        this.getConflictList();
         let state = {};
         state = { selectedAvailability: null }
         this.setState(state, () => {
@@ -413,17 +415,22 @@ class AvailabilityPage extends Component {
     hasErrors(availability) {
         let hasError = false;
         let hasConflict = false;
-        Object.values(this.state.errorList).forEach(errorItem => {
-            if (availability.id === errorItem.id)
-                hasError = true;
-        })
 
-        Object.values(this.state.conflictList.conflictIdList).forEach(id => {
-            if (availability.id === id)
-                hasConflict = true;
-        })
-
-        return (hasError || hasConflict);
+        if (this.state.errorList) {
+            Object.values(this.state.errorList).forEach(errorItem => {
+                if (availability.id === errorItem.id)
+                    hasError = true;
+            });
+        }
+
+        if (this.state.conflictList && this.state.conflictList.conflictIdList) {
+            this.state.conflictList.conflictIdList.forEach(id => {
+                if (availability.id === id)
+                    hasConflict = true;
+            });
+        }
+
+        return hasError || hasConflict;
     }
 
     getValidationList(list = []) {