preparing document display

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

documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java

@@ -3,7 +3,7 @@ package de.srsoftware.umbrella.documents;
 
 import static de.srsoftware.tools.MimeType.MIME_FORM_URL;
 import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
-import static de.srsoftware.umbrella.core.Constants.SENDER;
+import static de.srsoftware.umbrella.core.Constants.*;
 import static de.srsoftware.umbrella.core.Paths.LIST;
 import static de.srsoftware.umbrella.core.Util.request;
 import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.missingFieldException;
@@ -60,7 +60,13 @@ public class DocumentApi extends BaseHandler {
 				case COMPANIES -> getCompanies(ex,user.get(),token.orElse(null));
 				case CONTACTS  -> getContacts(ex,user.get(),token.orElse(null));
 				case PATH_TYPES -> getDocTypes(ex);
-				case null, default -> super.doGet(path,ex);
+				case null -> super.doGet(path,ex);
+				default -> {
+					try {
+						yield getDocument(ex,Long.parseLong(head),user.get());
+					} catch (NumberFormatException ignored) {}
+					yield super.doGet(path,ex);
+				}
 			};
 		} catch (UmbrellaException e) {
 			return send(ex,e);
@@ -99,6 +105,21 @@ public class DocumentApi extends BaseHandler {
 		return sendContent(ex,map);
 	}
 
+	private boolean getDocument(HttpExchange ex, long docId, UmbrellaUser user) throws IOException, UmbrellaException {
+		var doc = db.loadDoc(docId);
+		var companyId = doc.companyId();
+		var company = companies.get(companyId);
+		var members = companies.getMembers(companyId);
+		var isMember = false;
+		for (var member : members) isMember |= user.equals(member);
+		if (!isMember) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+doc.companyId());
+		var sep = company.decimalSeparator();
+		if (sep != null) doc.setDecimalSeparator(sep);
+		doc.setCompanyName(company.name());
+
+		return sendContent(ex,doc.renderToMap());
+	}
+
 	private HashMap<Long, Map<String, Object>> getLegacyCompanies(HttpExchange ex, UmbrellaUser umbrellaUser, Token token) throws IOException, UmbrellaException {
 		var location = config.get("umbrella.modules.company.baseUrl").map(s -> s+"/json").orElseThrow(() -> new UmbrellaException(500,"umbrella.modules.company.baseUrl not configured!"));
 		var resp = request(location, token.asMap(),MIME_FORM_URL,null);
@@ -139,9 +160,9 @@ public class DocumentApi extends BaseHandler {
 
 		var company = companies.get(companyId.longValue());
 		var members = companies.getMembers(companyId.longValue());
-		var match = false;
+		var isMember = false;
-		for (var member : members) match |= user.equals(member);
+		for (var member : members) isMember |= user.equals(member);
-		if (!match) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+companyId);
+		if (!isMember) return sendContent(ex,HTTP_FORBIDDEN,"You are mot a member of company "+companyId);
 
 		if (!json.has(FIELD_CUSTOMER) || !(json.get(FIELD_CUSTOMER) instanceof JSONObject customerData)) throw missingFieldException(FIELD_CUSTOMER);
 		if (!json.has(FIELD_TYPE) || !(json.get(FIELD_TYPE) instanceof Number docTypeId)) throw missingFieldException(FIELD_TYPE);

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

@@ -5,7 +5,6 @@ import static de.srsoftware.umbrella.core.Constants.*;
 import static de.srsoftware.umbrella.core.Util.markdown;
 import static de.srsoftware.umbrella.documents.Constants.*;
 import static de.srsoftware.umbrella.documents.Constants.FIELD_CUSTOMER;
-import static java.text.MessageFormat.format;
 import static java.util.Optional.empty;
 
 import de.srsoftware.tools.Mappable;
@@ -209,7 +208,7 @@ public final class Document implements Mappable {
 		map.put(ID, id);
 		map.put(FIELD_COMPANY, Map.of(ID,companyId, NAME,companyName));
 		map.put(NUMBER, number);
-		map.put(FIELD_TYPE, format("<? {0} ?>", type.name()));
+		map.put(FIELD_TYPE, type.name());
 		map.put(DATE, date);
 		map.put(STATE, state.code);
 		map.put(FIELD_DELIVERY, delivery);

frontend/src/App.svelte

@@ -3,7 +3,7 @@
     import { loadTranslation } from './translations.svelte.js';
     import { user } from './user.svelte.js';
     import { Router, Route } from 'svelte-tiny-router';
-    import AddDocument from "./routes/document/AddDocument.svelte";
+    import AddDoc from "./routes/document/Add.svelte";
     import Callback from "./routes/user/OidcCallback.svelte";
     import DocList from "./routes/document/List.svelte";
     import EditService from "./routes/user/EditService.svelte";
@@ -15,6 +15,7 @@
     import ResetPw  from "./routes/user/ResetPw.svelte";
     import Search   from "./routes/search/Search.svelte";
     import User     from "./routes/user/User.svelte";
+    import ViewDoc  from "./routes/document/View.svelte";
 
     let translations_ready = $state(false);
     onMount(async () => {
@@ -38,7 +39,8 @@
             <Menu />
             <Route path="/"                            component={User} />
             <Route path="/document"                    component={DocList} />
-            <Route path="/document/add"                component={AddDocument} />
+            <Route path="/document/add"                component={AddDoc} />
+            <Route path="/document/:id/view"           component={ViewDoc} />
             <Route path="/message/settings"            component={Messages} />
             <Route path="/search"                      component={Search} />
             <Route path="/user"                        component={User} />

frontend/src/routes/document/List.svelte

@@ -40,6 +40,10 @@
         router.navigate(`/document/add?company_id=${selected_company.id}&document_type=${docType}`)
     }
 
+    function show(id){
+        router.navigate(`/document/${id}/view`);
+    }
+
     onMount(loadCompanies);
 </script>
 
@@ -73,7 +77,7 @@
         </thead>
         <tbody>
             {#each Object.entries(documents).reverse() as [id,document]}
-            <tr>
+            <tr onclick={() => show(id)}>
                 <td>{document.number}</td>
                 <td>{document.date}</td>
                 <td>{document.customer.name.split('\n')[0]}</td>

frontend/src/routes/document/View.svelte

@@ -0,0 +1,32 @@
+<script>
+    import { onMount } from 'svelte';
+    import { t } from '../../translations.svelte.js';
+    import { useTinyRouter } from 'svelte-tiny-router';
+
+    let { id } = $props();
+    let error = null;
+    let doc = $state(null);
+
+    async function loadDoc(){
+        const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/document/${id}`;
+        const resp = await fetch(url,{credentials:'include'});
+        if (resp.ok){
+            doc = await resp.json();
+        } else {
+            error = await resp.text();
+        }
+    }
+
+    onMount(loadDoc);
+</script>
+
+
+<fieldset>
+    {#if error}
+    <span class="error">{error}</span>
+    {/if}
+    {#if doc}
+    <legend>{t('document.type_'+doc.type)} {doc.number}</legend>
+
+    {/if}
+</fieldset>