Merge branch 'bugfix/time_filtered_by_prj' into dev

implemented bugfix: selecting times by project id broke layout
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 08:49:30 +01:00 · 2026-01-05 08:48:57 +01:00 · 2026-01-03 23:55:31 +01:00 · 2026-01-03 23:54:41 +01:00 · 2026-01-03 23:53:20 +01:00 · 2026-01-03 22:17:39 +01:00
7 changed files with 118 additions and 5 deletions
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -0,0 +1,71 @@
+name: Build Docker Image
+run-name: ${{ gitea.actor }} building ${{ gitea.ref_name }}
+on:
+  push:
+    branches:
+      - main
+      - dev
+
+jobs:
+  Docker-Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v4
+
+      - name: Build docker image
+        run: docker build -t umbrella .
+
+      - name: Store tag date
+        run: |
+          TAG=$(date +%Y%m%d_%H%M)_${{ gitea.ref_name }}
+          echo $TAG > /tmp/tag
+          echo Using '"'$TAG'"' as tag.
+
+      - name: Tag image for upload
+        run: |
+          TAG=$(cat /tmp/tag)
+          docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
+          docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
+
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.REGISTRY_PATH }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASS }}
+
+      - name: Push to registry
+        run: |
+          TAG=$(cat /tmp/tag)
+          docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
+          docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
+
+  Clean-Registry:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get tag list
+        run: |
+          TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
+          COUNT=$(echo "$TAGS" | wc -l)
+          if [ $COUNT -gt 10 ]; then
+            REMAIN=$((COUNT - 10))
+            echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
+          else
+            echo less than 10 tags, skipping cleanup
+            echo "" > /tmp/old_tags
+          fi
+
+      - name: Remove tags
+        run: |
+          cat /tmp/old_tags | while read TAG; do
+            if [ -n "$TAG" ]; then
+              DIGEST=$(curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -H 'Accept: application/vnd.docker.distribution.manifest.v2+json' -o /dev/null -w '%header{Docker-Content-Digest}' https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$TAG)
+              if [ -n "$DIGEST" ]; then
+                echo about to delete $TAG
+                curl -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" -sS -X DELETE https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/manifests/$DIGEST
+              else
+                echo failed to get digest for $TAG
+              fi
+            fi
+          done
--- a/29
+++ b/29
@@ -0,0 +1,29 @@
+FROM alpine:3.22 AS svelte_build
+RUN apk add bash git npm
+RUN adduser -Dh /home/svelte svelte
+ADD . /home/svelte/Umbrella
+RUN chown -R svelte /home/svelte/Umbrella
+USER svelte
+WORKDIR /home/svelte/Umbrella/frontend
+RUN npm install && npm run build
+
+
+FROM alpine AS java_build
+RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
+ADD . /Umbrella
+WORKDIR /Umbrella
+COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
+RUN gradle --no-daemon build
+
+
+FROM alpine
+RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
+RUN adduser -D umbrella
+COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
+RUN chown -R umbrella /home/umbrella
+ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
+USER umbrella
+WORKDIR /home/umbrella
+RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
+EXPOSE 80
+CMD java -jar jar/backend.jar
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -9,6 +9,7 @@
  </head>
  <body>
    <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
+    <script type="module" src="/src/main.js">
+    </script>
  </body>
 </html>
--- a/frontend/src/routes/time/Index.svelte
+++ b/frontend/src/routes/time/Index.svelte
@@ -20,7 +20,7 @@
    let projects = {};
    let project_filter = $state(null);
    if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project');
-    let sortedTimes = $derived.by(() => Object.values(times).map(time => ({
+    let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).map(time => ({
      ...time,
      start: display(time.start_time),
      end: display(time.end_time),
@@ -52,6 +52,7 @@
    }

    function calcYearMap(){
+        console.log('calcYearMap called');
        let result = {
            months : {},
            years  : {}
@@ -123,7 +124,7 @@
    function match_prj_filter(time){
        if (!project_filter) return true;
        for (var tid of time.task_ids){
-            if (project_filter == tasks[tid].project_id) return true;
+            if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
        }
        return false;
    }
@@ -258,7 +259,6 @@
    </thead>
    <tbody>
        {#each sortedTimes as time,line}
-        {#if match_prj_filter(time)}
        <tr class={selected[time.id]?'selected':''}>
            {#if timeMap.years[line]}
            <td class="year" rowspan={timeMap.years[line]} onclick={e => toggleRange(time.start.substring(0,4))} title={time.start.substring(0,4)} >
@@ -321,7 +321,6 @@
            </td>
            {/if}
        </tr>
-        {/if}
        {/each}
    </tbody>
 </table>
--- a/web/src/main/resources/web/css/bloodshed.css
+++ b/web/src/main/resources/web/css/bloodshed.css
@@ -153,6 +153,10 @@ li.task > button{
    display: none;
 }

+li.task > button:nth-child(2){
+	display: initial;
+}
+
 li.task{
    padding: 5px 0;
 }
--- a/web/src/main/resources/web/css/default.css
+++ b/web/src/main/resources/web/css/default.css
@@ -240,6 +240,10 @@ li.task > button{
    display: none;
 }

+li.task > button:nth-child(2){
+	display: initial;
+}
+
 li.task{
    padding: 5px 0;
 }
--- a/web/src/main/resources/web/css/winter.css
+++ b/web/src/main/resources/web/css/winter.css
@@ -19,6 +19,7 @@ body {
 code {
    font-size: 16px;
 }
+
 fieldset {
    border: 1px solid;
    border-radius: 4px;
@@ -152,6 +153,10 @@ li.task > button{
    display: none;
 }

+li.task > button:nth-child(2){
+	display: initial;
+}
+
 li.task{
    padding: 5px 0;
 }
Author	SHA1	Message	Date
Stephan Richter	73994d3a4e	Merge branch 'bugfix/time_filtered_by_prj' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m40s Details Build Docker Image / Clean-Registry (push) Successful in 3s Details	2026-01-05 08:49:30 +01:00
Stephan Richter	dddba981c0	implemented bugfix: selecting times by project id broke layout Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-05 08:48:57 +01:00
Stephan Richter	ac2f974e5a	Merge branch 'workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m31s Details Build Docker Image / Clean-Registry (push) Successful in 3s Details	2026-01-03 23:55:31 +01:00
Stephan Richter	b17275a623	dropped workflow branch from trigger list All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m40s Details Build Docker Image / Clean-Registry (push) Successful in 4s Details Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 23:54:41 +01:00
Stephan Richter	c1adce5a9e	overhauling image creation and management All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m31s Details Build Docker Image / Clean-Registry (push) Successful in 3s Details	2026-01-03 23:53:20 +01:00
Stephan Richter	cd25d23246	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m40s Details	2026-01-03 22:17:39 +01:00
Stephan Richter	8d2f3ef88e	fixed tagging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:17:30 +01:00
Stephan Richter	8e53d3b306	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 41s Details	2026-01-03 22:14:28 +01:00
Stephan Richter	bd95c3d0c4	debugging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:14:22 +01:00
Stephan Richter	421a350f57	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Has been cancelled Details	2026-01-03 22:13:31 +01:00
Stephan Richter	dceb84669b	debugging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:13:21 +01:00
Stephan Richter	eaeb625d51	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m32s Details	2026-01-03 22:03:10 +01:00
Stephan Richter	e980dbf884	working on tag creation Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:03:04 +01:00
Stephan Richter	dfa991b90a	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m31s Details	2026-01-03 21:41:56 +01:00
Stephan Richter	a278f73c2e	bugfix: forgot to load date Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m29s Details Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:41:51 +01:00
Stephan Richter	3b40250488	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m29s Details	2026-01-03 21:37:50 +01:00
Stephan Richter	218d14090c	improved date-tagging Some checks failed Build Docker Image / Docker-Build (push) Has been cancelled Details Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:37:39 +01:00
Stephan Richter	8e8992f534	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m39s Details	2026-01-03 21:32:59 +01:00
Stephan Richter	6f2bbdf635	trying to pass date via tmp Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:32:53 +01:00
Stephan Richter	076efda195	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m46s Details	2026-01-03 21:23:29 +01:00
Stephan Richter	8cff93c469	dropped reatagging, adding date tag Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:23:23 +01:00
Stephan Richter	5c1e802a6f	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m42s Details	2026-01-03 21:13:42 +01:00
Stephan Richter	1efed60696	working on image retagging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:13:36 +01:00
Stephan Richter	750e0f16e1	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m43s Details	2026-01-03 21:07:38 +01:00
Stephan Richter	c6dac692de	fixed syntax Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:07:34 +01:00
Stephan Richter	c06083476f	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 0s Details	2026-01-03 21:06:39 +01:00
Stephan Richter	202d7deeb9	trying to re-tag image Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 21:06:31 +01:00
Stephan Richter	fc2e484aec	added dev to branches that trigger commit Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 20:41:51 +01:00
Stephan Richter	bedb275fe3	disabled build on every push Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 18:15:39 +01:00
Stephan Richter	ff9b520449	Started workflow definition All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m55s Details	2026-01-03 18:13:57 +01:00
Stephan Richter	2f4c939e93	created workflow file Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 15:47:40 +01:00
Stephan Richter	e596b0cdad	starting Dockerfile for Git workflow Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 15:43:11 +01:00
Stephan Richter	e50702d0b3	Merge branch 'main' into module/messagebus	2025-12-28 14:10:18 +01:00
Stephan Richter	f784ec6109	Merge branch 'main' into dev	2025-12-28 14:10:06 +01:00
Stephan Richter	f5cd51bc3b	improving CSS Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2025-12-28 14:09:59 +01:00