From 7616aa9581d9bb2fe97eafdbf97743d32744dee4 Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Wed, 16 Jul 2025 21:53:11 +0200
Subject: [PATCH] re-implemented rendering of document

---
 .../umbrella/documents/DocumentApi.java           |  1 -
 .../umbrella/documents/TemplateDoc.java           | 15 +++++++--------
 .../umbrella/documents/TemplateProcessor.java     |  1 -
 .../main/resources/SRSoftware 2020.html.template  |  6 +++---
 frontend/src/routes/document/View.svelte          |  7 +------
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
index f1bd72d..fb4b87f 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
@@ -48,7 +48,6 @@ import de.srsoftware.umbrella.core.model.Token;
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import de.srsoftware.umbrella.documents.model.*;
 import de.srsoftware.umbrella.documents.model.Customer;
-
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateDoc.java b/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateDoc.java
index dd02cd3..6709a94 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateDoc.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateDoc.java
@@ -1,14 +1,6 @@
 /* © SRSoftware 2025 */
 package de.srsoftware.umbrella.documents;
 
-import de.srsoftware.configuration.JsonConfig;
-import de.srsoftware.document.api.*;
-import de.srsoftware.umbrella.core.model.UmbrellaUser;
-import org.json.JSONObject;
-
-import java.util.*;
-import java.util.regex.Pattern;
-
 import static de.srsoftware.tools.MimeType.*;
 import static de.srsoftware.umbrella.core.Constants.ERROR_MISSING_FIELD;
 import static de.srsoftware.umbrella.core.Constants.USER;
@@ -17,6 +9,13 @@ import static java.lang.System.Logger.Level.TRACE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.text.MessageFormat.format;
 
+import de.srsoftware.configuration.JsonConfig;
+import de.srsoftware.document.api.*;
+import de.srsoftware.umbrella.core.model.UmbrellaUser;
+import java.util.*;
+import java.util.regex.Pattern;
+import org.json.JSONObject;
+
 public abstract class TemplateDoc implements Document {
 	private static final Pattern TOKEN_PATTERN = Pattern.compile("<\\? (([^?]|\\?[^>])+) \\?>");
 	private static final Pattern POSITION_PATTERN = Pattern.compile("<!-- positions -->(.*)<!-- positions -->",Pattern.DOTALL);
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateProcessor.java b/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateProcessor.java
index ab9d46d..3fa9dcf 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateProcessor.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/TemplateProcessor.java
@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.documents;
 import de.srsoftware.document.api.Document;
 import de.srsoftware.document.api.DocumentFactory;
 import de.srsoftware.document.api.DocumentRegistry;
-
 import java.util.stream.Stream;
 
 public class TemplateProcessor implements DocumentFactory {
diff --git a/documents/src/main/resources/SRSoftware 2020.html.template b/documents/src/main/resources/SRSoftware 2020.html.template
index ebcd534..c1c34f9 100644
--- a/documents/src/main/resources/SRSoftware 2020.html.template	
+++ b/documents/src/main/resources/SRSoftware 2020.html.template	
@@ -142,7 +142,7 @@
             <span class="right"><? document.date ?></span>
         </h2>
         <hr/>
-        <div class="head"><? document.head ?></div>
+        <div class="head"><? document.head.rendered ?></div>
         <table>
             <tr>
                 <th><? Position ?></th>
@@ -165,7 +165,7 @@
             </tr>
             <tr>
                 <td><? optional ?></td>
-                <td colspan="5" class="description"><? description ?></td>
+                <td colspan="5" class="description"><? description.rendered ?></td>
             </tr>
 
             <!-- positions -->
@@ -191,7 +191,7 @@
                 <th class="right"><? document.gross_sum ?></th>
             </tr>
         </table>
-        <div class="foot"><? document.footer ?></div>
+        <div class="foot"><? document.footer.rendered ?></div>
         <table class="bottom">
             <tr>
                 <td><? document.sender.name ?></td>
diff --git a/frontend/src/routes/document/View.svelte b/frontend/src/routes/document/View.svelte
index 5f7cfcc..54313ff 100644
--- a/frontend/src/routes/document/View.svelte
+++ b/frontend/src/routes/document/View.svelte
@@ -81,12 +81,7 @@
 
     async function render(){
         const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/document/${doc.id}/pdf`;
-        const resp = fetch(url,{credentials:'include'});
-        if (resp.ok){
-            error = null;
-        } else {
-            error = await resp.text();
-        }
+        location.href = url;
     }
 
     onMount(loadDoc);