Merge branch 'DAVE-449_Kalendertabelle' into DAVE-294-synchronisierun…

…g-unaufaelliger-tage

.github/workflows/build_push_feature.yaml

@@ -0,0 +1,62 @@
+name: Build feature branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'What should the image be tagged as?'
+        required: false
+        default: 'dev'
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            # use tag from input
+            type=raw,value=${{ github.event.inputs.tag }},enable=true
+          labels: |
+            maintainer=it@m, Landeshauptstadt Muenchen (LHM)
+
+      - name: Install Java and Maven
+        uses: actions/setup-java@v3
+        with:
+          java-version: "21"
+          distribution: "temurin"
+          cache: "maven"
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Build with Maven
+        run: mvn -B verify -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build_push_ghcr.yaml → .github/workflows/build_push_stable.yaml

@@ -9,23 +9,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  compliance:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Advance Security Policy as Code
-        uses: advanced-security/[email protected]
-        with:
-          policy: it-at-m/policy-as-code
-          policy-path: default.yaml
-          token: ${{ secrets.GITHUB_TOKEN }}
-          argvs: "--disable-dependabot --disable-secret-scanning --disable-code-scanning --display"
-
   build-and-push-image:
-    needs: compliance
     runs-on: ubuntu-latest
 
     permissions:
@@ -48,6 +32,11 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            # set latest tag for sprint branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'sprint') }}
+            # set stable tag for main-ls2 branch
+            type=raw,value=stable,enable=${{ github.ref == format('refs/heads/{0}', 'main-ls2') }}
           labels: |
             maintainer=it@m, Landeshauptstadt Muenchen (LHM)
       

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>de.muenchen.dave</groupId>
     <artifactId>dave-backend</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
     <name>dave_backend</name>
     <description>Backend für DAVe</description>
 
@@ -553,8 +553,8 @@
                         <eclipse>
                             <file>itm-java-codeformat/java_codestyle_formatter.xml</file>
                         </eclipse>
-                        <trimTrailingWhitespace/>
-                        <endWithNewline/>
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
                     </java>
                 </configuration>
                 <executions>

src/main/resources/pdf/templates/datentabelle.mustache

@@ -31,6 +31,7 @@
 </tr>
 </table>
 <br/>
+<h5 class="datentabelle">{{tableTitle}}</h5>
 {{{datentabelleTableMustachePart}}}
 {{{zusatzinformationenMustachePart}}}
 </body>

src/main/resources/pdf/templates/messstelle/datentabelle.mustache

@@ -23,10 +23,16 @@
   <h5>{{tableTitle}}</h5>
 </div>
 
+<table><tr>
 <h4>{{documentTitle}}</h4>
 {{{messstelleninformationenMustachePart}}}
 {{{schematischeUebersichtMustachePart}}}
+</tr></table>
 <br/>
+<table>
+    <tr class="blank_row"> <td></td></tr>
+    <tr><td><h5 class="datentabelle">{{tableTitle}}</h5></td></tr>
+</table>
 {{{datentabelleTableMustachePart}}}
 </body>
 </html>

src/main/resources/pdf/templates/parts/datentabelle-css.mustache

@@ -139,4 +139,9 @@
     width: 8%;
   }
 
+  .blank_row
+  {
+      height: 55px;
+  }
+
 </style>

src/main/resources/pdf/templates/parts/datentabelle-table.mustache

@@ -1,5 +1,4 @@
 {{#datentabelleZaehldaten}}
-  <h5 class="datentabelle">{{tableTitle}}</h5>
   <table class="datentabelle">
     <thead>
     <tr>