From dbe7e51b7d69b1beacec0544682d354e2b6985b7 Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Tue, 2 Sep 2025 20:57:16 +0200
Subject: [PATCH] added links to documents to time track list

---
 .../srsoftware/umbrella/company/SqliteDb.java |  1 -
 .../umbrella/core/api/DocumentService.java    |  3 +++
 .../umbrella/documents/DocumentApi.java       |  4 +++
 .../umbrella/documents/DocumentDb.java        |  9 ++++---
 .../umbrella/documents/SqliteDb.java          | 23 +++++++++++++---
 frontend/src/routes/time/Index.svelte         | 27 ++++++++++++++++---
 .../srsoftware/umbrella/time/Constants.java   |  2 +-
 .../srsoftware/umbrella/time/TimeModule.java  |  2 ++
 web/src/main/resources/web/css/default.css    |  2 +-
 9 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/company/src/main/java/de/srsoftware/umbrella/company/SqliteDb.java b/company/src/main/java/de/srsoftware/umbrella/company/SqliteDb.java
index 217b69a..775d0bd 100644
--- a/company/src/main/java/de/srsoftware/umbrella/company/SqliteDb.java
+++ b/company/src/main/java/de/srsoftware/umbrella/company/SqliteDb.java
@@ -19,7 +19,6 @@ import de.srsoftware.umbrella.core.model.Company;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.*;
-
 import org.json.JSONObject;
 
 public class SqliteDb extends BaseDb implements CompanyDb {
diff --git a/core/src/main/java/de/srsoftware/umbrella/core/api/DocumentService.java b/core/src/main/java/de/srsoftware/umbrella/core/api/DocumentService.java
index 055c4d5..da1c914 100644
--- a/core/src/main/java/de/srsoftware/umbrella/core/api/DocumentService.java
+++ b/core/src/main/java/de/srsoftware/umbrella/core/api/DocumentService.java
@@ -4,7 +4,10 @@ package de.srsoftware.umbrella.core.api;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.Document;
 import java.util.Map;
+import java.util.Set;
 
 public interface DocumentService {
+	Map<Long, Map<Long, String>> docsReferencedByTimes(Set<Long> timeIds) throws UmbrellaException;
+
 	Map<Long, Document> list(long companyId) throws UmbrellaException;
 }
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 f4e2350..2c3531e 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
@@ -430,6 +430,10 @@ public class DocumentApi extends BaseHandler implements DocumentService {
 		}
 	}
 
+	@Override
+	public Map<Long, Map<Long, String>> docsReferencedByTimes(Set<Long> timeIds) throws UmbrellaException {
+		return db.docReferencedByTimes(timeIds);
+	}
 
 	private boolean patchDocument(long docId, UmbrellaUser user, HttpExchange ex) throws UmbrellaException, IOException {
 		var doc = getDocument(docId,user).a;
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentDb.java b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentDb.java
index 32fd86e..47f0867 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentDb.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentDb.java
@@ -10,6 +10,7 @@ import de.srsoftware.umbrella.documents.model.*;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 public interface DocumentDb {
 	Long dropPosition(long documentId, long pos) throws UmbrellaException;
@@ -27,9 +28,13 @@ public interface DocumentDb {
 
 	CompanySettings getCompanySettings(long companyId, Type docType) throws UmbrellaException;
 
+	Collection<Template> getCompanyTemplates(long l) throws UmbrellaException;
+
 	Type getType(int typeId) throws UmbrellaException;
 
-	Map<Long, Document> listDocs(long companyId) throws UmbrellaException;
+	public Map<Long, Map<Long, String>> docReferencedByTimes(Set<Long> timeIds) throws UmbrellaException;
+
+		Map<Long, Document> listDocs(long companyId) throws UmbrellaException;
 
 	HashMap<Integer, Type> listTypes() throws UmbrellaException;
 
@@ -55,6 +60,4 @@ public interface DocumentDb {
 	void step(CompanySettings settings);
 
 	Pair<Integer> switchPositions(long docId, Pair<Integer> longPair) throws UmbrellaException;
-
-	Collection<Template> getCompanyTemplates(long l) throws UmbrellaException;
 }
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
index a41c8f4..d15db74 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
@@ -25,10 +25,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.Instant;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
+import java.util.*;
 
 public class SqliteDb implements DocumentDb{
 	private static final System.Logger LOG = System.getLogger(SqliteDb.class.getSimpleName());
@@ -319,6 +316,24 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 		var version = createTables();
 	}
 
+	@Override
+	public Map<Long, Map<Long, String>> docReferencedByTimes(Set<Long> timeIds) throws UmbrellaException {
+		try {
+			var map = new HashMap<Long, Map<Long, String>>(); // Map ( timeId → Map ( docId → name ))
+			var rs = select(FIELD_TIME_ID,FIELD_DOCUMENT_ID,NUMBER).from(TABLE_POSITIONS).leftJoin(FIELD_DOCUMENT_ID,TABLE_DOCUMENTS,ID).where(FIELD_TIME_ID,in(timeIds.toArray())).exec(db);
+			while (rs.next()) {
+				var timeId = rs.getLong(FIELD_TIME_ID);
+				var docId  = rs.getLong(FIELD_DOCUMENT_ID);
+				var number = rs.getString(NUMBER);
+				map.computeIfAbsent(timeId,k -> new HashMap<>()).put(docId,number);
+			}
+			rs.close();
+			return map;
+		} catch (SQLException e) {
+			throw databaseException("Failed to list Documents for list of times");
+		}
+	}
+
 	@Override
 	public Map<Long, Document> listDocs(long companyId) throws UmbrellaException {
 		try {
diff --git a/frontend/src/routes/time/Index.svelte b/frontend/src/routes/time/Index.svelte
index 313615b..ce94c31 100644
--- a/frontend/src/routes/time/Index.svelte
+++ b/frontend/src/routes/time/Index.svelte
@@ -7,6 +7,7 @@
 
     import TimeEditor from '../../Components/TimeRecordEditor.svelte';
 
+    let docLinks = $state(null);
     let error = $state(null);
     let router = useTinyRouter();
     let times = $state(null);
@@ -85,9 +86,10 @@
         const resp = await fetch(url,{credentials:'include'});
         if (resp.ok){
             var json = await resp.json();
-            times = json.times;
-            tasks = json.tasks;
+            times    = json.times;
+            tasks    = json.tasks;
             projects = json.projects;
+            docLinks = json.documents;
         } else {
             error = await resp.text();
         }
@@ -97,6 +99,14 @@
         detail = null;
     }
 
+    function onclick(e){
+        e.preventDefault();
+        let href = e.target.getAttribute('href');
+        if (href) router.navigate(href);
+        return false;
+    }
+
+
     async function onDrop(time_id){
         const url = api(`time/${time_id}`);
         const res = await fetch(url,{
@@ -226,9 +236,9 @@
                 {#if tasks[tid]}
                 <li>
                     {#if tasks[tid] && projects[tasks[tid].project_id]}
-                    <a href="#" onclick={e => openProject(tasks[tid].project_id)}>{projects[tasks[tid].project_id].name}</a> /
+                    <a href="/project/{tasks[tid].project_id}/view" {onclick}>{projects[tasks[tid].project_id].name}</a> /
                     {/if}
-                    <a href="#" onclick={e => openTask(tid)}>{tasks[tid].name}</a>
+                    <a href="/task/{tid}/view" {onclick}>{tasks[tid].name}</a>
                 </li>
                 {/if}
                 {/each}
@@ -236,6 +246,15 @@
             </td>
             <td class="state" onclick={e => {detail = time.id}}>
                 {t("state_"+time.state.name.toLowerCase())}
+                {#if time.state.name.toLowerCase() == 'pending' && docLinks[time.id]}
+                <ul>
+                    {#each Object.entries(docLinks[time.id]) as [a,b]}
+                    <li>
+                        <a href="/document/{a}/view" {onclick}>{b}</a>
+                    </li>
+                    {/each}
+                </ul>
+                {/if}
             </td>
             {/if}
         </tr>
diff --git a/time/src/main/java/de/srsoftware/umbrella/time/Constants.java b/time/src/main/java/de/srsoftware/umbrella/time/Constants.java
index f0324b1..ca7ad49 100644
--- a/time/src/main/java/de/srsoftware/umbrella/time/Constants.java
+++ b/time/src/main/java/de/srsoftware/umbrella/time/Constants.java
@@ -4,9 +4,9 @@ package de.srsoftware.umbrella.time;
 public class Constants {
 	private Constants(){}
 
-
 	public static final String CHILDREN = "children";
 	public static final String CONFIG_DATABASE = "umbrella.modules.time.database";
+	public static final String DOCUMENTS = "documents";
 	public static final String JOIN = "join";
 	public static final String PROJECTS = "projects";
 	public static final String TABLE_TASK_TIMES = "task_times";
diff --git a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java
index 910151a..6dd77d6 100644
--- a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java
+++ b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java
@@ -238,6 +238,8 @@ public class TimeModule extends BaseHandler implements TimeService {
 		taskIds = times.values().stream().map(Time::taskIds).flatMap(Collection::stream).collect(toSet());
 		var tasks = taskService().load(taskIds);
 		var result = new HashMap<String,Object>();
+		var docList = documentService().docsReferencedByTimes(times.keySet());
+		result.put(DOCUMENTS,docList);
 		result.put(TIMES,mapValues(times));
 		result.put(TASKS,mapValues(tasks));
 		result.put(PROJECTS,mapValues(projects));
diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css
index 3338008..b7b2b4e 100644
--- a/web/src/main/resources/web/css/default.css
+++ b/web/src/main/resources/web/css/default.css
@@ -346,7 +346,7 @@ li > a > p:nth-child(1){
     top: 0;
 }
 table{
-    width: 100vw;
+    min-width: 30vw;
 }
 
 .start_end{