Merge branch 'dev' into feature-MPDZBS-877-zmscitizenapi

it-at-m · Dec 2, 2024 · 707c4bc · 707c4bc
2 parents ac5a905 + 69302c1
commit 707c4bc
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -12,31 +12,12 @@
 <br />
 <div align="center">
   <a href="https://github.com/it-at-m/eappointment-buergeransicht">
-    <img src="images/logo.png" alt="Logo" height="200">
+    <img src="https://assets.muenchen.de/logos/itm/itM_Basislogo_gelb_schwarz-128.png" alt="Logo">
   </a>
 
 <h3 align="center">E-appointment Frontend</h3>
 </div>
 
-<!-- TABLE OF CONTENTS -->
-<details>
-  <summary>Table of Contents</summary>
-  <ol>
-    <li>
-      <a href="#about-the-project">About The Project</a>
-      <ul>
-        <li><a href="#built-with">Built With</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#getting-started">Getting Started</a>
-    </li>
-    <li><a href="#contributing">Contributing</a></li>
-    <li><a href="#license">License</a></li>
-    <li><a href="#contact">Contact</a></li>
-  </ol>
-</details>
-
 
 <!-- ABOUT THE PROJECT -->
 ## About The Project
@@ -66,6 +47,32 @@ This project is built with:
 <!-- GETTING STARTED -->
 ## Getting Started
 
+## For Mac
+
+Install Java Node and Maven
+
+ `brew install openjdk@17 && brew install nodejs && brew install maven`
+
+Set Env
+```
+/usr/libexec/java_home -v 17
+
+echo 'export PATH="/usr/local/opt/openjdk@17/bin:$PATH"' >> ~/.zshrc
+echo 'export JAVA_HOME=$(/usr/libexec/java_home -v 17)' >> ~/.zshrc
+echo 'export PATH="/usr/local/opt/openjdk@17/bin:$PATH"' >> ~/.bashrc
+echo 'export JAVA_HOME=$(/usr/libexec/java_home -v 17)' >> ~/.bashrc
+
+source ~/.zshrc
+source ~/.bashrc
+```
+
+```
+java -version
+node -v
+npm -v
+mvn -v
+```
+
 _Below is an example of how you can installing and setup up your service_
 
 1. `git clone `
@@ -93,20 +100,44 @@ Make sure you have provided all the necessary dependencies in your vuetify proje
 <p align="right">(<a href="#top">back to top</a>)</p>
 
 <!-- CONTRIBUTING -->
-## Contributing
+## 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:
 
-Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+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, or documentation updates.
+   - `docs`: For updating documentation such as the README.md CODE_OF_CONDUCT.md LICENSE.md CHANGELOG.md CONTRIBUTING.md. Providing a ticket number or project for docs is optional.
+   - `chore`: For maintaining and updating dependencies, libraries, PHP/Node/Twig Versions, or other maintenance work.
 
-If you have a suggestion that would make this better, please fork the repo and create a pull request. You can also simply open an issue with the tag "enhancement".
-Don't forget to give the project a star! Thanks again!
+2. **project**: The project identifier. This should be:
+   - `zms` for the ZMS project.
+   - `mpdzbs` for the MPDZBS project.
 
-1. Fork the Project
-2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`)
-3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
-4. Push to the Branch (`git push origin feature/AmazingFeature`)
-5. Open a Pull Request
+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.
 
-<p align="right">(<a href="#top">back to top</a>)</p>
+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`
+- **Chore Branch**: `chore-zms-2964-composer-update`
+- **Docs Branch**: `docs-zms-0000-update-readme` `docs-zms-release-40-update-changelog`
+
+#### Regular Expression
+
+The branch name must match the following regular expression:
+`^(feature|hotfix|bugfix|cleanup|maintenance|docs)-(zms|mpdzbs)-[0-9]+-[a-z0-9-]+$`
+
+**For further commit rules please refer to https://www.conventionalcommits.org/en/v1.0.0-beta.4/**
 
 <!-- LICENSE -->
 ## License
@@ -122,6 +153,10 @@ it@m - [email protected]
 
 <p align="right">(<a href="#top">back to top</a>)</p>
 
+## Screenshot
+![screenshot](https://github.com/user-attachments/assets/a378bbc9-ba4b-4a36-a968-8e9017f4e96c)
+<p align="right">(<a href="#top">back to top</a>)</p>
+
 <!-- MARKDOWN LINKS & IMAGES -->
 <!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
 [contributors-shield]: https://img.shields.io/github/contributors/it-at-m/eappointment-buergeransicht.svg?style=for-the-badge

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,7 +20,7 @@
     "@vue/test-utils": "^1.3.5",
     "@vue/vue2-jest": "^27.0.0-alpha.3",
     "@vue/web-component-wrapper": "^1.3.0",
-    "axios": "^0.26.0",
+    "axios": "^0.28.0",
     "core-js": "^3.8.3",
     "jest-environment-jsdom": "^27.0.0-alpha.3",
     "moment": "^2.29.1",

diff --git a/frontend/public/css/style.css b/frontend/public/css/style.css
@@ -195,6 +195,10 @@ p, span, div, button, td, th, .v-label, .v-list-item__title {
 }
 
 .appointment-count {
+    font-family: Roboto Condensed, Arial, sans-serif;
+    font-weight: 600;
+    font-size: 1.17em;
+    color: #3a5368 !important;
     margin: 0 0.5rem;
 }
 

diff --git a/frontend/src/components/AppointmentForm.vue b/frontend/src/components/AppointmentForm.vue
@@ -87,7 +87,7 @@
                 {{ $t('appointment') }}
               </v-expansion-panel-header>
               <v-expansion-panel-content>
-                <TheCalendar v-if="$store.state.step === 2" @next="openPanel(3)" :key="$store.state.data.selectedServices" />
+                <TheCalendar v-if="$store.state.step >= 2" @next="openPanel(3)" :key="$store.state.data.selectedServices" />
               </v-expansion-panel-content>
             </v-expansion-panel>
 

diff --git a/frontend/src/components/ServiceFinder.vue b/frontend/src/components/ServiceFinder.vue
@@ -63,13 +63,13 @@
               @click="decreaseAppointments($store.state.data.service)">
               <v-icon>{{ minusSvg }}</v-icon>
             </v-btn>
-            <h3 tabindex="0"
-              :aria-label="`Akuelle Anzahl ausgewählter Dienstleistungen ` + appointmentCounts[$store.state.data.service.id]"
+            <span tabindex="0"
+              :aria-label="`Aktuelle Anzahl ausgewählter Dienstleistungen ` + appointmentCounts[$store.state.data.service.id]"
               class="appointment-count" :key="appointmentCounts[$store.state.data.service.id]">
               {{ appointmentCounts[$store.state.data.service.id] }}
-            </h3>
+            </span>
             <v-btn id="button-up" ref="buttonUp" class="appointment-count-button"
-              :aria-label="`Anzahl der Dienstleistung erhöhen auf` + (appointmentCounts[$store.state.data.service.id] + 1)"
+              :aria-label="`Anzahl der Dienstleistung erhöhen auf ` + (appointmentCounts[$store.state.data.service.id] + 1)"
               :aria-describedby="`appointment-count-name-` + $store.state.data.service.id"
               :disabled="!canIncreaseAppointments($store.state.data.service)" fab
               @click="increaseAppointments($store.state.data.service)">
@@ -96,11 +96,11 @@
                   :disabled="!canDecreaseAppointments(subService)" fab @click="decreaseAppointments(subService)">
                   <v-icon>{{ minusSvg }}</v-icon>
                 </v-btn>
-                <h3 tabindex="0"
+                <span tabindex="0"
                   :aria-label="getServiceName(subService.id) + ` Anzahl: ` + appointmentCounts[subService.id]"
                   class="appointment-count" :key="appointmentCounts[subService.id]">
                   {{ appointmentCounts[subService.id] }}
-                </h3>
+                </span>
                 <v-btn id="button-up" ref="buttonUp" class="appointment-count-button"
                   :aria-label="`Anzahl der Dienstleistung erhöhen auf ` + (appointmentCounts[subService.id] + 1)"
                   :aria-describedby="`appointment-count-name-` + subService.id"