From 121453937ca5edd6b599a51e124ff20a1a1a83bc Mon Sep 17 00:00:00 2001
From: Stephan Richter <s.richter@srsoftware.de>
Date: Mon, 29 Sep 2025 12:03:39 +0200
Subject: [PATCH] implemented user column in time tracking list

---
 frontend/src/routes/time/Index.svelte                    | 8 +++++++-
 .../java/de/srsoftware/umbrella/time/TimeModule.java     | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/time/Index.svelte b/frontend/src/routes/time/Index.svelte
index ec29bf1..89040c1 100644
--- a/frontend/src/routes/time/Index.svelte
+++ b/frontend/src/routes/time/Index.svelte
@@ -26,6 +26,7 @@
     let ranges = {};
     let timeMap = $derived.by(calcYearMap);
     let selectionSum = $derived(sortedTimes.filter(time => selected[time.id]).map(time => time.duration).reduce((acc, a) => acc + a, 0));
+    let users = null;
 
     async function addTime(task_id){
         const url  = api(`time/track_task/${task_id}`);
@@ -107,6 +108,7 @@
             tasks    = json.tasks;
             projects = json.projects;
             docLinks = json.documents;
+            users    = json.users;
         } else {
             error(resp);
         }
@@ -207,6 +209,7 @@
             <th>{t('month')}</th>
             <th>{t('start')}<wbr>…<wbr>{t('end')}</th>
             <th>{t('duration')}</th>
+            <th>{t('user')}</th>
             <th>{t('subject')}</th>
             <th>{t('projects')} / {t('tasks')}</th>
             <th>{t('state')}</th>
@@ -232,7 +235,7 @@
             {:else}
             <td class="start_end" onclick={e => toggleSelect(time.id)}>
                 {time.start}{#if time.end_time}<wbr>…<wbr>{time.start.startsWith(time.end_date)?time.end.substring(11):time.end}{/if}
-                {#if line>0 && Math.abs(sortedTimes[line-1].start_time - time.end_time)<100}
+                {#if line>0 && (sortedTimes[line-1].user_id == time.user_id) && (Math.abs(sortedTimes[line-1].start_time - time.end_time)<100)}
                 <button class="symbol join" title={t('join_objects',{objects:t('times')})} onclick={e => joinTimes(e, time.id, sortedTimes[line-1].id)} ></button>
                 {/if}
             </td>
@@ -241,6 +244,9 @@
                 {time.duration.toFixed(3)}&nbsp;h
                 {/if}
             </td>
+            <td class="user">
+                {users[time.user_id].name}
+            </td>
             <td class="subject" onclick={e => {detail = time.id}}>
                 {time.subject}
             </td>
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 71f20ea..a964216 100644
--- a/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java
+++ b/time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java
@@ -196,14 +196,21 @@ public class TimeModule extends BaseHandler implements TimeService {
 		boolean showClosed = false;
 		var times = timeDb.listTimes(taskIds, showClosed);
 		times.putAll(timeDb.listUserTimes(user.id(), showClosed));
-		taskIds = times.values().stream().map(Time::taskIds).flatMap(Collection::stream).collect(toSet());
+		taskIds.clear();
+		var userIds = new HashSet<Long>();
+		times.values().forEach(time -> {
+			taskIds.addAll(time.taskIds());
+			userIds.add(time.userId());
+		});
 		var tasks = taskService().load(taskIds);
+		var users = userService().list(null,null,userIds);
 		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));
+		result.put(USERS,mapValues(users));
 		return sendContent(ex,result);
 	}