bugfix: altered patch key for updating template in document

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

.gitea/workflows/docker.yaml

@@ -41,11 +41,6 @@ jobs:
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
-      - name: Restart vj.srsoftware.de
-        if: github.ref == 'refs/heads/main'
-        run: |
-          curl -X POST -H "Authorization: Bearer ${{ secrets.MAKE_BEARER }}" -d vj_start https://make.srsoftware.de/launch
-
   Clean-Registry:
     runs-on: ubuntu-latest
     steps:

Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.22 AS svelte_build
-RUN apk add bash git npm
+RUN apk add npm
 RUN adduser -Dh /home/svelte svelte
 ADD . /home/svelte/Umbrella
 RUN chown -R svelte /home/svelte/Umbrella
@@ -9,7 +9,7 @@ RUN npm install && npm run build
 
 
 FROM alpine AS java_build
-RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
+RUN apk add gradle fontconfig font-opensans openjdk21-jre
 ADD . /Umbrella
 WORKDIR /Umbrella
 COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web

core/src/main/java/de/srsoftware/umbrella/core/model/Document.java

@@ -207,7 +207,7 @@ public final class Document implements Mappable {
 				case SENDER:         if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
 				case STATE:          state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
 				case POS:      if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
-				case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
+				case TEMPLATE: if (json.get(key) instanceof String templateId) template = templateId; break;
 				default:             key = null;
 			}
 			if (key != null) dirtyFields.add(key);

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).filter(match_prj_filter).map(time => ({
+    let sortedTimes = $derived.by(() => Object.values(times).map(time => ({
       ...time,
       start: display(time.start_time),
       end: display(time.end_time),
@@ -52,7 +52,6 @@
     }
 
     function calcYearMap(){
-        console.log('calcYearMap called');
         let result = {
             months : {},
             years  : {}
@@ -124,7 +123,7 @@
     function match_prj_filter(time){
         if (!project_filter) return true;
         for (var tid of time.task_ids){
-            if (tasks[tid] && project_filter == tasks[tid].project_id) return true;
+            if (project_filter == tasks[tid].project_id) return true;
         }
         return false;
     }
@@ -259,6 +258,7 @@
     </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,6 +321,7 @@
             </td>
             {/if}
         </tr>
+        {/if}
         {/each}
     </tbody>
 </table>