gui improvements

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

.gitea/workflows/docker.yaml

@@ -13,6 +13,13 @@ jobs:
       - name: Clone Repository
         uses: actions/checkout@v4
 
+      - name: Login to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.REGISTRY_PATH }}
+          username: ${{ secrets.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASS }}
+
       - name: Build docker image
         run: docker build -t umbrella .
 
@@ -28,24 +35,12 @@ jobs:
           docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker tag umbrella ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
-      - name: Login to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ secrets.REGISTRY_PATH }}
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_PASS }}
-
       - name: Push to registry
         run: |
           TAG=$(cat /tmp/tag)
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
           docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
 
-      - name: Restart umbrella.srsoftware.de
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
-
   Clean-Registry:
     runs-on: ubuntu-latest
     steps:

accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java

@@ -124,13 +124,16 @@ public class SqliteDb extends BaseDb implements AccountDb {
 			db.setAutoCommit(false);
 			Query.delete().from(TABLE_TAGS_TRANSACTIONS).where(TRANSACTION_ID,equal(transaction.id())).execute(db);
 			Query.delete().from(TABLE_TRANSACTIONS).where(ID,equal(transaction.id())).execute(db);
-			db.setAutoCommit(true);
 			return transaction;
 		} catch (SQLException e){
 			try {
 				db.rollback();
 			} catch (SQLException ignored){};
 			throw failedToDropObject(transaction);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 

backend/src/main/java/de/srsoftware/umbrella/backend/Application.java

@@ -14,7 +14,6 @@ import de.srsoftware.umbrella.bookmarks.BookmarkApi;
 import de.srsoftware.umbrella.company.CompanyModule;
 import de.srsoftware.umbrella.contact.ContactModule;
 import de.srsoftware.umbrella.core.SettingsService;
-import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.documents.DocumentApi;
 import de.srsoftware.umbrella.files.FileModule;
@@ -34,7 +33,6 @@ import de.srsoftware.umbrella.translations.Translations;
 import de.srsoftware.umbrella.user.UserModule;
 import de.srsoftware.umbrella.web.WebHandler;
 import de.srsoftware.umbrella.wiki.WikiModule;
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;

build.gradle.kts

@@ -41,7 +41,7 @@ subprojects {
         testImplementation(platform("org.junit:junit-bom:5.10.0"))
         testImplementation("org.junit.jupiter:junit-jupiter")
         implementation("de.srsoftware:configuration.api:1.0.2")
-        implementation("de.srsoftware:tools.jdbc:2.0.7")
+        implementation("de.srsoftware:tools.jdbc:2.0.8")
         implementation("de.srsoftware:tools.http:6.0.5")
         implementation("de.srsoftware:tools.mime:1.1.4")
         implementation("de.srsoftware:tools.logging:1.3.2")

contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java

@@ -67,9 +67,16 @@ public class SqliteDb extends BaseDb implements ContactDb{
 			db.setAutoCommit(false);
 			Query.delete().from(TABLE_CONTACTS).where(ID,equal(contact.id())).execute(db);
 			Query.delete().from(TABLE_CONTACTS_USERS).where(CONTACT_ID,equal(contact.id())).execute(db);
-			db.setAutoCommit(true);
 		} catch (SQLException e){
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw failedToDropObject(t(CONTACT_WITH_ID, ID,contact.id())).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
+
 		}
 	}
 

core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java

@@ -69,9 +69,15 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 			update(table).set(STATUS).where(STATUS,equal(20)).prepare(db).apply(40).execute();
 			update(table).set(STATUS).where(STATUS,equal(10)).prepare(db).apply(20).execute();
 			update(table).set(STATUS).where(STATUS,equal(0)).prepare(db).apply(10).execute();
-			db.setAutoCommit(true);
 		} catch (SQLException e) {
+			try {
+				db.rollback();
+			} catch (SQLException ignored) {}
 			throw new RuntimeException(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 }

core/src/main/java/de/srsoftware/umbrella/core/Util.java

@@ -15,7 +15,6 @@ import static java.lang.System.Logger.Level.*;
 import static java.lang.System.Logger.Level.WARNING;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.xrbpowered.jparsedown.JParsedown;
 import de.srsoftware.tools.Mappable;
 import de.srsoftware.tools.Query;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
@@ -27,12 +26,13 @@ import java.net.URI;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Pattern;
 import org.json.JSONObject;
 
 public class Util {
@@ -188,4 +188,19 @@ jspreadsheet(document.getElementById('spreadsheet'), {
 	public static String dateTimeOf(long epochMilis){
 		return LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMilis), ZoneId.systemDefault()).format(TIME_FORMATTER);
 	}
+
+	public static String toJson(ResultSet rs) {
+		try {
+			Map<String,Object> map = new HashMap<>();
+			var meta = rs.getMetaData();
+			for (int col = 1; col <= meta.getColumnCount(); col++) {
+				var key = meta.getColumnName(col);
+				var val = rs.getObject(col);
+				map.put(key, val);
+			}
+			return new JSONObject(map).toString();
+		} catch (SQLException e){
+			return e.getMessage();
+		}
+	}
 }

core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java

@@ -3,11 +3,13 @@ package de.srsoftware.umbrella.core.api;
 
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.Task;
+import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 public interface TaskService {
+	void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest);
 	Map<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException;
 	Map<Long, Task> listProjectTasks(long projectId) throws UmbrellaException;
 	Map<Long, Task> load(Collection<Long> taskIds);

core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java

@@ -77,10 +77,11 @@ public class Field {
 	public static final String HEAD = "head";
 	public static final String HOURS = "hours";
 
-	public static final String ID        = "id";
-	public static final String INSTANTLY = "instantly";
-	public static final String ITEM      = "item";
-	public static final String ITEM_CODE = "item_code";
+	public static final String ID           = "id";
+	public static final String INHERIT_FROM = "inherit_from";
+	public static final String INSTANTLY    = "instantly";
+	public static final String ITEM         = "item";
+	public static final String ITEM_CODE    = "item_code";
 
 	public static final String KEY = "key";
 

core/src/main/java/de/srsoftware/umbrella/core/constants/Path.java

@@ -42,8 +42,8 @@ public class Path {
 	public static final String PROPERTY          = "property";
 	public static final String PURPOSES          = "purposes";
 
-	public static final String READ     = "read";
-	public static final String REDIRECT = "redirect";
+	public static final String READ      = "read";
+	public static final String REDIRECT  = "redirect";
 
 	public static final String SEARCH   = "search";
 	public static final String SELECT   = "select";

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

@@ -198,11 +198,17 @@ CREATE TABLE IF NOT EXISTS {0} (
 			rs.close();
 			delete().from(TABLE_POSITIONS).where(DOCUMENT_ID,equal(docId)).execute(db);
 			delete().from(TABLE_DOCUMENTS).where(ID,equal(docId)).execute(db);
-			db.setAutoCommit(true);
 			if (number != null) return number;
 			throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId));
 		} catch (SQLException e){
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId)).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 
@@ -217,10 +223,16 @@ CREATE TABLE IF NOT EXISTS {0} (
 			stmt.setLong(2,pos);
 			stmt.execute();
 			stmt.close();
-			db.setAutoCommit(true);
 			return pos;
 		} catch (SQLException e) {
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw failedToDropObjectFromObject(POSITION,pos,t(Text.DOCUMENT),docId).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 
 	}
@@ -582,9 +594,15 @@ CREATE TABLE IF NOT EXISTS {0} (
 			update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.left())).prepare(db).apply(-pair.right()).close();
 			update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.right())).prepare(db).apply(pair.left()).close();
 			update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(-pair.right())).prepare(db).apply(pair.right()).close();
-			db.setAutoCommit(true);
 		} catch (SQLException e) {
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw databaseException(FAILED_TO_SWITCH_POSITIONS,"a",pair.left(),"b",pair.right(),docId).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 		return pair;
 	}

frontend/src/App.svelte

@@ -90,7 +90,7 @@
         {#if messages.warning}
         <span class="warn">{@html messages.warning}</span>
         {/if}
-        <Route path="/"                            component={User} />
+        <Route path="/"                            component={ProjectList} />
         <Route path="/account/:id"                 component={Account} />
         <Route path="/accounting"                  component={Accounts} />
         <Route path="/accounting/new"              component={NewAccount} />
@@ -122,6 +122,7 @@
         <Route path="/stock/location/:location_id" component={Stock} />
         <Route path="/stock/:item_id/view"         component={Stock} />
         <Route path="/stock/:owner/:owner_id/item/:owner_number" component={Stock} />
+        <Route path="/stock/:owner/:owner_id/item/:owner_number/view" component={Stock} />
         <Route path="/tags"                        component={TagList} />
         <Route path="/tags/use/:tag"               component={TagUses} />
         <Route path="/task"                        component={TaskList} />

frontend/src/Components/Autocomplete.svelte

@@ -4,6 +4,7 @@
 
 
     let {
+        enabled       = true,
         id            = null,
         autofocus     = false,
         getCandidates = dummyGetCandidates,
@@ -148,7 +149,7 @@
 </style>
 
 <span class="autocomplete">
-    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} />
+    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} disabled={!enabled} />
     {#if candidates && candidates.length > 0}
     <ul bind:this={list_elem} class="suggestions" tabindex="-1">
         {#each candidates as candidate,i}

frontend/src/Components/PermissionEditor.svelte

@@ -10,6 +10,7 @@
 
     let {
         addMember        = (entry)    => console.log(`no handler for addMember(${entry})`),
+        enabled          = true,
         dropMember       = (member)   => console.log(`no handler for dropMember(${member})`),
         getCandidates    = defaultGetCandidates,
         members,
@@ -61,7 +62,7 @@
     <tr>
         <td>{t('add_object',{object:t('member')})}</td>
         <td>
-            <Autocomplete {getCandidates} onSelect={addMember} />
+            <Autocomplete {getCandidates} onSelect={addMember} {enabled} />
         </td>
     </tr>
     </tbody>

frontend/src/Components/TimeRecorder.svelte

@@ -4,12 +4,47 @@
 
     import { api }           from '../urls.svelte';
     import { t }             from '../translations.svelte';
+    import { error, yikes }  from '../warn.svelte';
     import { msToTime, now } from '../time.svelte';
     import { timetrack }     from '../user.svelte';
 
     let interval = null;
     const router  = useTinyRouter();
 
+    async function addTime(task_id){
+        const url  = api(`time/track_task/${task_id}`);
+        const resp = await fetch(url,{
+            credentials : 'include',
+            method      : 'POST',
+            body        : now()
+        }); // create new time or return time with assigned tasks
+        if (resp.ok) {
+            const track = await resp.json();
+            timetrack.running = track;
+            yikes();
+        } else {
+            error(resp);
+        }
+    }
+
+
+    function go(){
+        router.navigate('/time');
+    }
+
+    function ondragover(ev){
+        ev.preventDefault();
+    }
+
+    function ondragleave(ev){
+        ev.preventDefault();
+    }
+
+    function ondrop(ev){
+        let task_id = ev.dataTransfer.getData('task');
+        if (task_id) addTime(task_id);
+    }
+
     async function stopTrack(){
         if (timetrack.running.id){
             const url = api(`time/${timetrack.running.id}/stop`);
@@ -28,9 +63,6 @@
         }
     }
 
-    function go(){
-        router.navigate('/time');
-    }
 
     function updateElapsed(){
         timetrack.elapsed = msToTime(Date.now() - timetrack.start);
@@ -54,7 +86,7 @@
 
 
 {#if timetrack.running}
-<span class="timetracking">
+<span class="timetracking" {ondrop} {ondragover} {ondragleave} >
     <span onclick={go} >{timetrack.running.subject} {#if timetrack.elapsed}({timetrack.elapsed}){/if}</span>
     <button onclick={stopTrack} title={t('stop')} class="symbol"></button>
 </span>

frontend/src/Components/UserSelector.svelte

@@ -6,6 +6,7 @@
     import Autocomplete       from './Autocomplete.svelte';
 
     let {
+        enabled       = true,
         getCandidates = async text => {},
         heading       = t('add_object',{object:t('user')}),
         users         = $bindable({})
@@ -37,7 +38,7 @@
     <tr>
         <td>{heading}</td>
         <td>
-            <Autocomplete {getCandidates} {onSelect} />
+            <Autocomplete {getCandidates} {onSelect} {enabled} />
         </td>
     </tr>
     </tbody>

frontend/src/routes/accounting/account.svelte

@@ -18,15 +18,16 @@
 
 	function calcSums(){
 		let sums = {};
-		sums[0]      = 0;
+		sums[ 0] = 0;
+		sums[-1] = 0;
 		for (let user of Object.values(users)) sums[user.id] = 0;
 		for (let transaction of filtered) {
 			for (let user of Object.values(users)){
 				if (user.id == transaction.destination.id) sums[user.id] += transaction.amount;
 				if (user.id == transaction.source.id) sums[user.id] -= transaction.amount;
 			}
-			if (!transaction.destination.id) sums[0] += transaction.amount;
-			if (!transaction.source.id)      sums[0] -= transaction.amount;
+			if (!transaction.destination.id) sums[ 0] += transaction.amount;
+			if (!transaction.source.id)      sums[-1] += transaction.amount;
 		}
 		return sums;
 	}
@@ -102,7 +103,10 @@
 </script>
 
 <style>
-	.amount{ text-align: right }
+	:global {
+		.amount{ text-align: right }
+		.nowrap{ whitespace: nowrap }
+	}
 </style>
 
 <svelte:head>
@@ -154,10 +158,16 @@
 				</th>
 				{/each}
 				<td class="amount">
-					<br/>
-					{sums[0].toFixed(2)}&nbsp;{account.currency}
+					{sums[-1].toFixed(2)}&nbsp;{account.currency} <br/>
+					-{sums[0].toFixed(2)}&nbsp;{account.currency}<br/>
+					{(sums[-1]-sums[0]).toFixed(2)}&nbsp;{account.currency}
 				</td>
-				<td colspan="3"></td>
+				<td class="nowrap">
+					{t('external gains')}<br/>
+					{t('external expenses')}<br/>
+					{t('sum external')}
+				</td>
+				<td colspan="2"></td>
 			</tr>
 		</tbody>
 	</table>

frontend/src/routes/accounting/index.svelte

@@ -44,9 +44,9 @@
 	</span>
 
 	<ul>
-	{#each accounts as account (account.id)}
+	{#each accounts.toSorted((a,b) => a.name.localeCompare(b.name)) as account (account.id)}
 		<li>
-			<a {onclick} href="/account/{account.id}">{account.name} ({account.id})</a>
+			<a {onclick} href="/account/{account.id}">{account.name}</a>
 		</li>
 	{/each}
 	</ul>

frontend/src/routes/document/Position.svelte

@@ -1,6 +1,7 @@
 <script>
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
+    import { t }             from '../../translations.svelte';
 
     import LineEditor        from '../../Components/LineEditor.svelte';
     import MarkdownEditor    from '../../Components/MarkdownEditor.svelte';
@@ -23,13 +24,17 @@
     function movedown(){
         movePos(pos.number,1);
     }
+
+    async function toggleOptional(ev){
+        const ok = await submit(`${prefix}.optional`,!pos.optional);
+        if (ok) pos.optional = !pos.optional;
+    }
 </script>
 
 <style>
     .move{
         vertical-align: middle;
     }
-
     tr > *:nth-child(1){
         text-align: right;
     }
@@ -66,6 +71,7 @@
             <span onclick={moveup}>⏫</span>
             {/if}
             <span onclick={() => drop(pos.number)}>❌</span>
+            <span class="symbol" onclick={toggleOptional} title={t(pos.optional?'optional position':'fixed position')}>{pos.optional?'':''}</span>
             <span onclick={movedown}>⏬</span>
             {/if}
         </td>

frontend/src/routes/project/Kanban.svelte

@@ -207,6 +207,11 @@
         return false;
     }
 
+    function ondragstart(ev, task){
+        dragged = task;
+        ev.dataTransfer.setData("task",task.id);
+    }
+
     function openTask(task_id){
         window.open(`/task/${task_id}/view`, '_blank').focus();
     }
@@ -306,7 +311,7 @@
             <div class={['state_'+state, is_custom(state) ? '':'state_custom' ,highlight.user == u.id && highlight.state == state ? 'highlight':'']} ondragover={ev => hover(ev,u.id,state)} ondragleave={e => delete highlight.user} ondrop={ev => drop(u.id,state)} >
                 {#each Object.values(tasks[u.id][state]).sort(byName) as task}
                     {#if !filter || task.name.toLowerCase().includes(filter) || (task.tags && task.tags.filter(tag => tag.toLowerCase().includes(filter)).length)}
-                    <Card onclick={e => openTask(task.id)} ondragstart={ev => dragged=task} {task} tag_colors={project.tag_colors} />
+                    <Card onclick={e => openTask(task.id)} ondragstart={ev => ondragstart(ev,task)} {task} tag_colors={project.tag_colors} />
                     {/if}
                 {/each}
                 <div class="add_task" onclick={ev => show_task_form(project.id,u.id,+state)}>

frontend/src/routes/project/View.svelte

@@ -25,12 +25,13 @@
     let tasks          = $state(null);
     let show_closed    = $state(false);
     let new_color      = $state({tag:null,color:'#00aa00'})
+    let inherit_from   = $state(0);
 
     let new_state = $state({code:null,name:null})
     let state_available=$derived(new_state.name && new_state.code && !project.allowed_states[new_state.code]);
 
     async function addMember(user){
-        return await update({new_member:+user.id});
+        return await update({new_member:+user.id,inherit_from});
     }
 
     async function addState(){
@@ -239,7 +240,16 @@
     </label>
     <div class="em">{t('members')}</div>
     <div class="em">
-        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} />
+        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} enabled={inherit_from != 0}/>
+        <label>
+            └→ Inherit task permissions from:
+            <select bind:value={inherit_from}>
+                <option value={0}>{t('select user')}</option>
+                {#each Object.values(project.members) as member (member.user.id)}
+                <option value={member.user.id}>{member.user.name}</option>
+                {/each}
+            </select>
+        </label>
     </div>
     {#if project.allowed_states}
     {#each Object.keys(project.allowed_states) as key,idx}

frontend/src/routes/search/Search.svelte

@@ -265,8 +265,10 @@
     <legend>
         {t('stock')}
     </legend>
+    {#if Object.keys(stock.items).length }
+    {t('items')}
     <ul>
-        {#each Object.values(stock) as item}
+        {#each Object.values(stock.items) as item}
         <li>
             <a href="/stock/{item.owner.type}/{item.owner.id}/item/{item.owner_number}" {onclick} >
             {item.name} [{t('code')}: <span class="code">{item.code}</span>]
@@ -275,6 +277,18 @@
         </li>
         {/each}
     </ul>
+    {/if}
+    {#if Object.keys(stock.locations).length}
+    {t('locations')}
+    <ul>
+        {#each Object.values(stock.locations) as loc (loc.id)}
+        <li>
+            <a href="/stock/location/{loc.id}">{loc.name}</a>
+            <br/> {@html loc.description.rendered}
+        </li>
+        {/each}
+    </ul>
+    {/if}
 </fieldset>
 {/if}
 {#if times}

frontend/src/routes/stock/Locations.svelte

@@ -102,7 +102,7 @@
 <ul>
     {#each locations as location}
     <li onclick={e => toggleChildren(e, location)}
-        class="{location.locations?'expanded':'collapsed'} {location.highlight?'highlight':null}"
+        class="{location.locations?'expanded':'collapsed'} {location.highlight?'highlight':null} {selected && selected.id == location.id?'selected':null}"
         draggable={true}
         ondragover={e => drag_over(e,location)}
         ondrop={e => onDrop(e,location)}

frontend/src/routes/task/Add.svelte

@@ -63,9 +63,13 @@
         if (resp.ok){
             parent_task         = await resp.json();
             task.parent_task_id = +parent_task_id;
+            for (let [uid, member] of Object.entries(parent_task.members)){
+                if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                task.members[uid] = member;
+            }
             project_id          = +parent_task.project_id;
             yikes();
-            project             = null; // TODO
+            project             = null;
         } else error(resp);
     }
 
@@ -75,11 +79,17 @@
         if (resp.ok){
             project           = await resp.json();
             task.project_id   = +project_id;
+            if (Object.keys(task.members).length < 1) {
+                for (let [uid, member] of Object.entries(project.members)){
+                    if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                    task.members[uid] = member;
+                }
+            }
             if (assignee && project.members[assignee]){
                 task.members[assignee] = project.members[assignee];
                 task.members[assignee].permission = { name : "ASSIGNEE", code : 3 }
             }
-            if (task.taks.length < 1) task.tags = project.tags;
+            if (task.tags.length < 1) task.tags = project.tags;
             yikes();
         } else {
             error(resp);
@@ -124,6 +134,10 @@
         extendedSettings = !extendedSettings;
     }
 
+    function updatePermission(uid,perm){
+        task.members[uid].permission = perm;
+    }
+
     onMount(load);
 </script>
 
@@ -161,7 +175,7 @@
         {#if extendedSettings}
         <div>{t('members')}</div>
         <div>
-            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
+            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
         </div>
 
         <div>{t('estimated_time')}</div>

frontend/src/routes/task/EasyList.svelte

@@ -137,7 +137,7 @@
         <legend>{t('state_open')}</legend>
         {#if sorted}
         {#each sorted as task}
-            {#if task.status == 20 && match(task)}
+            {#if task.status < 60 && task.status >= 20 && match(task)}
             <div href={`/task/${task.id}/view`} title={task.description.source} task_id={task.id} {onclick} {oncontextmenu} {ontouchstart} {ontouchend} onmousedown={ontouchstart} onmouseup={ontouchend} >
                 {task.name}
             </div>

frontend/src/routes/task/ParentSelector.svelte

@@ -7,6 +7,7 @@
 
 	let { project, select = o => {}, task } = $props();
 	let tree = $state({});
+	let loading = $state(true);
 
 	async function loadParentCandidates(){
 		let url = api(`task/${task.id}/parent_candidates`);
@@ -14,6 +15,7 @@
 		if (res.ok){
 			yikes();
 			tree = await res.json();
+			loading = false;
 		} else error(res);
 	}
 
@@ -21,7 +23,16 @@
 </script>
 
 <div class="overlay parent_selector">
-	<h2>{t('select a new parent for {entity}',{entity:task.name})}</h2>
+	<h2>
+		{t('select a new parent for {entity}',{entity:task.name})}
+		<button onclick={ev => select(null)}>{t('abort')}</button>
+	</h2>
 	{t('project')}: {project.name}
+	{#if loading}
+	<p>
+		{t('loading')}
+	</p>
+	{:else}
 	<TaskTree {tree} {select} />
+	{/if}
 </div>

frontend/src/routes/task/View.svelte

@@ -81,6 +81,10 @@
         router.navigate(`/project/${project.id}/view`)
     }
 
+    function gotoTask(tid){
+        if (id) router.navigate(`/task/${tid}/view`)
+    }
+
 	function handleUpdateEvent(evt){
 		let json = JSON.parse(evt.data);
 		if (json.task) {
@@ -119,7 +123,8 @@
             if (task.show_closed) show_closed = true;
             loadChildren();
             if (task.project_id) loadProject();
-            if (task.parent_task_id) loadParent();
+            if (task.parent_task_id) await loadParent();
+            loadSiblings();
         } else error(resp);
     }
 
@@ -129,13 +134,36 @@
         if (resp.ok){
             project = await resp.json();
             yikes();
-        } else error(await resp.text());
+        } else error(resp);
+    }
+
+    async function loadSiblings(){
+        const url = api(`task/list`);
+        const select = task.parent_task_id ? {parent_task_id:task.parent_task_id} : {project_id: task.project_id};
+        select.show_closed = false;
+        const res = await post(url,select);
+        if (res.ok){
+            task.siblings = await res.json();
+            let last      = null;
+            let before    = undefined;
+            let after     = null;
+            for (let [sid, t] of Object.entries(task.siblings).toSorted((a,b) => a[1].name.localeCompare(b[1].name))){
+                if (before !== undefined) {
+                    after = +sid;
+                    break;
+                }
+                if (id == sid) before = last;
+                last = +sid;
+            }
+            task.before = before;
+            task.after  = after;
+        } else error(res)
     }
 
     function parentClick(ev){
         ev.preventDefault();
         if (!task.parent_task_id) return;
-        router.navigate(`/task/${task.parent_task_id}/view`);
+        gotoTask(task.parent_task_id);
         return false;
     }
 
@@ -193,7 +221,7 @@
 
     function update_parent(newVal){
         select_parent = false;
-        update({parent_task_id:newVal.id});
+        if (newVal) update({parent_task_id:newVal.id});
     }
 
     function updatePermission(user_id,permission){
@@ -232,10 +260,17 @@
         {/if}
         <button class="symbol" title={t('edit')} onclick={parentRightClick}></button>
         {/if}
+
     </div>
     <div>{t('task')}</div>
     <div class="name">
         <LineEditor bind:value={task.name} editable={true} onSet={val => update({name:val})} />
+        {#if task.before}
+        <button class="symbol" title={task.siblings[task.before].name} onclick={e => gotoTask(task.before)}></button>
+        {/if}
+        {#if task.after}
+        <button class="symbol" title={task.siblings[task.after].name} onclick={e => gotoTask(task.after)}></button>
+        {/if}
         <button class="symbol" title={t('settings')} onclick={toggleSettings}></button>
         <button class="symbol" title={t('timetracking')} onclick={addTime}></button>
     </div>

frontend/src/routes/time/Index.svelte

@@ -1,7 +1,7 @@
 <script>
     import { onMount }                from 'svelte';
     import { useTinyRouter }          from 'svelte-tiny-router';
-    import { api, drop, patch, post } from '../../urls.svelte.js';
+    import { api, drop, get, patch, post } from '../../urls.svelte.js';
     import { error, yikes }           from '../../warn.svelte';
     import { t }         from '../../translations.svelte.js';
     import { timetrack } from '../../user.svelte.js';
@@ -41,10 +41,18 @@
     });
 
     async function addTime(task_id){
-        const url  = api(`time/track_task/${task_id}`);
-        const resp = await post(url,now()); // create new time or return time with assigned tasks
+        let url  = api(`time/track_task/${task_id}`);
+        let resp = await post(url,now()); // create new time or return time with assigned tasks
         if (resp.ok) {
             const track = await resp.json();
+            if (timetrack.running){
+                url  = api(`time/${timetrack.running.id}`);
+                resp = await get(url);
+                if (resp.ok){
+                    let previous = await resp.json();
+                    times[previous.id] = previous;
+                }
+            }
             timetrack.running = track;
         } else {
             error(resp);

frontend/src/translations.svelte.js

@@ -21,4 +21,4 @@ export function t(key,args = {}){
     }
     for (var key of Object.keys(args)) set = set.replace(`{${key}}`,args[key]);
     return set;
-}
+}

markdown/src/main/java/de/srsoftware/umbrella/markdown/MarkdownApi.java

@@ -14,11 +14,8 @@ import de.srsoftware.configuration.Configuration;
 import de.srsoftware.tools.Path;
 import de.srsoftware.umbrella.core.BaseHandler;
 import de.srsoftware.umbrella.core.ModuleRegistry;
-import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.api.MarkdownService;
-import de.srsoftware.umbrella.core.constants.Field;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java

@@ -22,6 +22,7 @@ import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
 import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE;
 import static de.srsoftware.umbrella.project.Constants.CONFIG_DATABASE;
 import static java.lang.Boolean.TRUE;
+import static java.lang.System.Logger.Level.WARNING;
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -138,6 +139,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 	private void dropMember(Project project, long userId) {
 		if (project.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the project");
 		projectDb.dropMember(project.id(),userId);
+		LOG.log(WARNING,"Removing member from project tasks not implemented"); // TODO
 		project.members().remove(userId);
 	}
 
@@ -223,7 +225,16 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 		UmbrellaUser newMember = null;
 		if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(project,id.longValue());
 		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(project,memberJson);
-		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) newMember = addMember(project,num.longValue());
+		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) {
+			UmbrellaUser inheritFrom = null;
+			if (json.has(INHERIT_FROM)){
+				if (!(json.get(INHERIT_FROM) instanceof Number uid)) throw invalidField(INHERIT_FROM,Text.NUMBER);
+				inheritFrom = userService().loadUser(uid.longValue());
+				if (!project.hasMember(inheritFrom)) throw notAmember(inheritFrom);
+			}
+			newMember = addMember(project,num.longValue());
+			if (inheritFrom != null) taskService().clonePermissions(project.id(),inheritFrom,newMember);
+		}
 
 		project = projectDb.save(project.patch(json), user);
 		messageBus().dispatch(newMember != null ? new ProjectEvent(user,project,newMember) : new ProjectEvent(user,project, old));

stock/src/main/java/de/srsoftware/umbrella/stock/SqliteDb.java

@@ -63,10 +63,16 @@ public class SqliteDb extends BaseDb implements StockDb {
 			rs.close();
 			if (propertyId == null || propertyId == 0) throw failedToStoreObject(t(PROPERTY));
 			insertInto(TABLE_ITEM_PROPERTIES,ITEM_ID,PROPERTY_ID,VALUE).values(itemId,propertyId,value).execute(db).close();
-			db.setAutoCommit(true);
 			return new Property(propertyId,name,value,unit);
 		} catch (SQLException e) {
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw failedToStoreObject(t(PROPERTY)).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 
@@ -126,7 +132,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createItemsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} TEXT, {4} VARCHAR(255))";
-			sql = format(sql, TABLE_ITEMS, ID, Field.CODE, NAME, LOCATION_ID);
+			sql     = format(sql, TABLE_ITEMS, ID, Field.CODE, NAME, LOCATION_ID);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_ITEMS).causedBy(e);
@@ -136,7 +142,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createItemPropsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INT NOT NULL, {2} INT NOT NULL, {3} VARCHAR(255) NOT NULL, PRIMARY KEY({1}, {2}))";
-			sql = format(sql, TABLE_ITEM_PROPERTIES, ITEM_ID, PROPERTY_ID,VALUE);
+			sql     = format(sql, TABLE_ITEM_PROPERTIES, ITEM_ID, PROPERTY_ID,VALUE);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_ITEM_PROPERTIES).causedBy(e);
@@ -146,7 +152,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createLocationsTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255) DEFAULT NULL, {3} VARCHAR(255) NOT NULL, {4} TEXT)";
-			sql = format(sql, TABLE_LOCATIONS, ID, LOCATION_ID, NAME, DESCRIPTION);
+			sql     = format(sql, TABLE_LOCATIONS, ID, LOCATION_ID, NAME, DESCRIPTION);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_LOCATIONS).causedBy(e);
@@ -156,7 +162,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	private void createPropertiesTable() {
 		try {
 			var sql = "CREATE TABLE IF NOT EXISTS {0} ( {1} INTEGER PRIMARY KEY, {2} VARCHAR(255) NOT NULL, {3} INT NOT NULL, {4} VARCHAR(255))";
-			sql = format(sql, TABLE_PROPERTIES, ID, NAME, TYPE, UNIT);
+			sql     = format(sql, TABLE_PROPERTIES, ID, NAME, TYPE, UNIT);
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
 			throw failedToCreateTable(TABLE_PROPERTIES).causedBy(e);
@@ -201,18 +207,18 @@ public class SqliteDb extends BaseDb implements StockDb {
 	}
 
 	@Override
-	public Map<Long, Item> find(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
+	public Map<Long, Item> findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
 		try {
-			var items = new HashMap<Long,Item>();
 			var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
-			var query = select(ALL).from(TABLE_ITEMS).where(OWNER, in(ownerCodes));
+			var query      = select(ALL).from(TABLE_ITEMS).where(OWNER, in(ownerCodes));
 			if (fulltext) {
 				query.leftJoin(ID,TABLE_ITEM_PROPERTIES,ITEM_ID);
 				for (var key : keys) query.where(format("CONCAT({0},\" \",{1},\" \",{2})", NAME, DESCRIPTION,VALUE),like("%"+key+"%"));
 			} else {
 				for (var key : keys) query.where(NAME,like("%"+key+"%"));
 			}
-			var rs = query.exec(db);
+			var rs    = query.exec(db);
+			var items = new HashMap<Long,Item>();
 			while (rs.next()){
 				var item = Item.of(rs);
 				items.put(item.id(),item);
@@ -224,10 +230,33 @@ public class SqliteDb extends BaseDb implements StockDb {
 		}
 	}
 
+	@Override
+	public Map<Long, Location> findLocations(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
+		try {
+			var ownerCodes = owners.stream().map(Owner::dbCode).toArray();
+			var query      = select(ALL).from(TABLE_LOCATIONS).where(OWNER, in(ownerCodes));
+			if (fulltext) {
+				for (var key : keys) query.where(format("CONCAT({0},\" \",{1})", NAME, DESCRIPTION), like("%" + key + "%"));
+			} else {
+				for (var key : keys) query.where(NAME, like("%" + key + "%"));
+			}
+			var rs        = query.exec(db);
+			var locations = new HashMap<Long, Location>();
+			while (rs.next()) {
+				var location = DbLocation.of(rs);
+				locations.put(location.id(), location);
+			}
+			rs.close();
+			return locations;
+		} catch (SQLException e){
+			throw databaseException(FAILED_TO_LIST_ENTITIES, TYPE,t(LOCATIONS)).causedBy(e);
+		}
+	}
+
 	@Override
 	public Collection<DbLocation> listChildLocations(long parentId) {
 		try {
-			var rs = select(ALL).from(TABLE_LOCATIONS).where(PARENT_LOCATION_ID,equal(parentId)).exec(db);
+			var rs   = select(ALL).from(TABLE_LOCATIONS).where(PARENT_LOCATION_ID,equal(parentId)).exec(db);
 			var list = new ArrayList<DbLocation>();
 			while (rs.next()) list.add(DbLocation.of(rs));
 			rs.close();
@@ -240,7 +269,7 @@ public class SqliteDb extends BaseDb implements StockDb {
 	@Override
 	public Collection<DbLocation> listCompanyLocations(Company company) {
 		try {
-			var rs = select(ALL).from(TABLE_LOCATIONS).where(OWNER,equal(company.dbCode())).where(PARENT_LOCATION_ID,isNull()).exec(db);
+			var rs   = select(ALL).from(TABLE_LOCATIONS).where(OWNER,equal(company.dbCode())).where(PARENT_LOCATION_ID,isNull()).exec(db);
 			var list = new ArrayList<DbLocation>();
 			while (rs.next()) list.add(DbLocation.of(rs));
 			rs.close();
@@ -601,13 +630,16 @@ public class SqliteDb extends BaseDb implements StockDb {
 			replaceLocationsTable();
 			replaceItemsTable();
 			replaceItemPropsTable();
-			db.setAutoCommit(true);
 		} catch (Exception e) {
 			try {
 				db.rollback();
 			} catch (SQLException ignored) {
 			}
 			throw databaseException(FAILED_TO_UPDATE_OBJECT, OBJECT, t(TABLE_WITH_NAME,NAME,TABLE_LOCATIONS)).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 

stock/src/main/java/de/srsoftware/umbrella/stock/StockDb.java

@@ -10,7 +10,8 @@ import java.util.Map;
 public interface StockDb {
 	Property                addNewProperty(long itemId, String name, Object value, String unit);
 	Location                delete(DbLocation location);
-	Map<Long, Item>         find(Collection<Owner> owners, Collection<String> keys, boolean fulltext);
+	Map<Long, Item>         findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext);
+	Map<Long, Location>     findLocations(Collection<Owner> owners, Collection<String> keys, boolean fulltext);
 	Collection<DbLocation>  listChildLocations(long parentId);
 	Collection<DbLocation>  listCompanyLocations(Company company);
 	Collection<Item>        listItemsAt(Location location);

stock/src/main/java/de/srsoftware/umbrella/stock/StockModule.java

@@ -459,12 +459,13 @@ public class StockModule extends BaseHandler implements StockService {
 	private boolean postSearch(UmbrellaUser user, HttpExchange ex) throws IOException {
 		var json = json(ex);
 		if (!(json.has(KEY) && json.get(KEY) instanceof String key)) throw missingField(KEY);
-		var keys = Arrays.asList(key.split(" "));
-		var fulltext = json.has(FULLTEXT) && json.get(FULLTEXT) instanceof Boolean val && val;
+		var keys          = Arrays.asList(key.split(" "));
+		var fulltext      = json.has(FULLTEXT) && json.get(FULLTEXT) instanceof Boolean val && val;
 		Set<Owner> owners = new HashSet<>(companyService().listCompaniesOf(user).values());
 		owners.add(user);
-		var items = stockDb.find(owners,keys,fulltext);
-		return sendContent(ex,mapValues(items));
+		var items     = stockDb.findItems(owners,keys,fulltext);
+		var locations = stockDb.findLocations(owners,keys,fulltext);
+		return sendContent(ex,Map.of("items",mapValues(items),"locations",mapValues(locations)));
 	}
 
 	@Override

task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java

@@ -18,10 +18,12 @@ import static de.srsoftware.umbrella.core.model.Status.*;
 import static de.srsoftware.umbrella.core.model.Translatable.t;
 import static de.srsoftware.umbrella.project.Constants.*;
 import static de.srsoftware.umbrella.task.Constants.*;
+import static java.lang.System.Logger.Level.TRACE;
 import static java.text.MessageFormat.format;
 
 import de.srsoftware.tools.jdbc.Query;
 import de.srsoftware.umbrella.core.BaseDb;
+import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.constants.Text;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.*;
@@ -242,6 +244,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 			var tasks = new HashMap<Long,Task>();
 			var rs = query.exec(db);
 			while (rs.next()){
+				LOG.log(TRACE,() -> Util.toJson(rs));
 				var task = Task.of(rs);
 				tasks.put(task.id(),task);
 			}
@@ -257,7 +260,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 		try {
 			var query = select(ALL).from(TABLE_TASKS).leftJoin(ID,TABLE_TASKS_USERS,TASK_ID).where(USER_ID,equal(userId));
 			if (!showClosed) query.where(STATUS,lessThan(COMPLETE.code()));
-			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit).skip(offset).exec(db);
+			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit == null ? -1 : limit).skip(offset).exec(db);
 			var map = new ArrayList<Task>();
 			while (rs.next()) map.add(Task.of(rs));
 			rs.close();
@@ -337,7 +340,6 @@ CREATE TABLE IF NOT EXISTS {0} (
 					var addQuery = replaceInto(TABLE_TASK_DEPENDENCIES, TASK_ID, REQUIRED_TASK_ID);
 					for (var reqId : task.requiredTasksIds()) addQuery.values(task.id(), reqId);
 					addQuery.execute(db).close();
-					db.setAutoCommit(true);
 				}
 
 				task.clean(REQUIRED_TASKS_IDS);
@@ -351,7 +353,14 @@ CREATE TABLE IF NOT EXISTS {0} (
 			}
 			return task;
 		} catch (SQLException e){
+			try {
+				db.rollback();
+			} catch (SQLException ignored){};
 			throw failedToStoreObject(task.name()).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 

task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java

@@ -66,6 +66,28 @@ public class TaskModule extends BaseHandler implements TaskService {
 		return user;
 	}
 
+	@Override
+	public void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest) {
+		var taskMap = taskDb.listProjectTasks(project_id,null,true);
+		loadMembers(taskMap.values());
+		for (var task : taskMap.values()) {
+			var memberShip = task.members().get(source.id());
+
+			Permission granted = memberShip == null ? EDIT : switch (memberShip.permission()) {
+				case ASSIGNEE,
+					 EDIT,
+					 OWNER ->
+						EDIT;
+				case READ_ONLY ->
+						READ_ONLY;
+			};
+			var newMember = new Member(dest, granted);
+			task.members().put(dest.id(), newMember);
+			task.dirty(MEMBERS);
+			taskDb.save(task);
+		}
+	}
+
 	private boolean deleteTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = loadMembers(taskDb.load(taskId));
 		var member = task.members().get(user.id());
@@ -195,7 +217,7 @@ public class TaskModule extends BaseHandler implements TaskService {
 	private boolean getParentCandidates(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = taskDb.load(taskId);
 		var project = projectService().load(task.projectId());
-		var projectTasks = taskDb.listProjectTasks(project.id(),null, false);
+		var projectTasks = taskDb.listProjectTasks(project.id(),null, true);
 		var mapped = projectTasks.values().stream().collect(Collectors.toMap(Task::id,Task::toMap));
 		var roots = new HashMap<Long,Map<String,Object>>();
 		for (var map : mapped.values()){
@@ -386,40 +408,33 @@ public class TaskModule extends BaseHandler implements TaskService {
 		long projectId = pid.longValue();
 		var project = projectService().load(projectId);
 		projectService().loadMembers(List.of(project));
-		var members = project.members();
-		var member = members.get(user.id());
+		var parentMembers = project.members();
+		var member = parentMembers.get(user.id());
 		if (member == null || member.permission() == READ_ONLY) throw forbidden("You are not allowed to create new tasks in this project");
 
 		var parentTask = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number par ? taskService().load(Set.of(par.longValue())).get(par.longValue()) : null;
 		if (parentTask != null) {
 			taskService().loadMembers(parentTask);
-			members = parentTask.members();
-			member = members.get(user.id());
+			parentMembers = parentTask.members();
+			member = parentMembers.get(user.id());
 			if (member == null || member.permission() == READ_ONLY) throw forbidden("You are not allowed to add sub-stasks to {object}", OBJECT, parentTask.name());
 		}
 
 		var newMembers = new HashMap<Long, Permission>();
-		for (var mem : members.values()) { // Assign members from project or parent task
-			var permission = mem.permission() == OWNER ? EDIT : mem.permission();
-			newMembers.put(mem.user().id(), permission);
-		}
-
-		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject mems) {
-			// check of assignee has been set by client
-			for (var k : mems.keySet()) {
-				try {
-					var userId = Long.parseLong(k);
-					var permName = mems.getJSONObject(k).getJSONObject(PERMISSION).getString(NAME);
-					if (Permission.valueOf(permName) == ASSIGNEE) newMembers.put(userId, ASSIGNEE);
-				} catch (Exception ignored) {
-					LOG.log(WARNING, "Failed to parse {0}", mems.get(k));
-				}
+		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject members) {
+			for (var key : members.keySet()){
+				var code = members.getJSONObject(key).getJSONObject(PERMISSION).getInt(CODE);
+				var perm = Permission.of(code);
+				if (perm == OWNER) perm = EDIT;
+				var userId = Long.parseLong(key);
+				if (!parentMembers.containsKey(userId)) throw forbidden("{user} is not a member of {path}",Field.USER,userService().loadUser(userId).name(),Field.PATH, parentTask == null ? project.name() : parentTask.name());
+				newMembers.put(userId,perm);
 			}
 		}
+
 		// set ownership to current user
 		newMembers.put(user.id(), OWNER);
 
-
 		json.put(MEMBERS, Map.of()); // reset member map for task-to-be-created
 		Task task = Task.of(json);
 		if (parentTask != null && parentTask.dueDate() != null && task.dueDate() == null) task.dueDate(parentTask.dueDate());

time/src/main/java/de/srsoftware/umbrella/time/SqliteDb.java

@@ -84,10 +84,16 @@ CREATE TABLE IF NOT EXISTS {0} (
 			db.setAutoCommit(false);
 			Query.delete().from(TABLE_TASK_TIMES).where(TIME_ID,equal(timeId)).execute(db);
 			Query.delete().from(TABLE_TIMES).where(ID,equal(timeId)).execute(db);
-			db.setAutoCommit(false);
 			return timeId;
 		} catch (SQLException e) {
+			try {
+				db.rollback();
+			} catch (SQLException ignored) {}
 			throw failedToDropObject(t(TIME_WITH_ID, ID,timeId)).causedBy(e);
+		} finally {
+			try {
+				db.setAutoCommit(true);
+			} catch (SQLException ignored){};
 		}
 	}
 

time/src/main/java/de/srsoftware/umbrella/time/TimeModule.java

@@ -79,8 +79,15 @@ public class TimeModule extends BaseHandler implements TimeService {
 			if (user.isEmpty()) return unauthorized(ex);
 			var head = path.pop();
 			return switch (head) {
-                case STARTED -> getStartedTime(user.get(),ex);
-				case null, default -> super.doGet(path,ex);
+				case STARTED -> getStartedTime(user.get(),ex);
+				case null -> super.doGet(path,ex);
+				default -> {
+					try {
+						yield sendContent(ex,timeDb.load(Long.parseLong(head)));
+					} catch (NumberFormatException ignored) {
+						yield super.doGet(path,ex);
+					}
+				}
 			};
 		} catch (UmbrellaException e){
 			return send(ex,e);

translations/src/main/resources/de.json

@@ -17,6 +17,7 @@
   "abort": "abbrechen",
   "account": "Konto",
   "accounting": "Konten",
+  "account name": "Konto-Name",
   "accounts": "Konten",
   "actions": "Aktionen",
   "add_login_service": "Login-Service anlegen",
@@ -75,6 +76,7 @@
   "CREATE_USERS": "Nutzer anlegen",
   "create_pdf": "PDF erzeugen",
   "created_with": "erzeugt mit {tool} von {producer}",
+  "currency": "Währung",
   "customer": "Kunde",
   "customer_address": "Adresse",
   "customer_email": "Emailadresse des Kunden",
@@ -124,6 +126,8 @@
   "evaluate": "auswerten",
   "expand_on_click": "Anklicken zum Anzeigen",
   "extended_settings": "erweiterte Einstellungen",
+  "external expenses": "externe Ausgaben",
+  "external gains": "externe Einnahmen",
 
   "failed": "fehlgeschlagen",
   "failed_login_attempts" : "Account nach {attempts} fehlgeschlagenen Logins gesperrt bis {release_time}",
@@ -162,6 +166,8 @@
   "files": "Dateien",
   "filter": "Filter",
   "filter by tags": "Nach Tags filtern",
+  "first_transaction": "erste Transaktion",
+  "fixed position": "fester Posten",
   "footer": "Fuß-Text",
   "foreign_id": "externe Kennung",
   "forgot_pass"  : "Password vergessen?",
@@ -273,7 +279,9 @@
 
   "oidc_Login"       : "Anmeldung mit OIDC",
   "old_password": "altes Passwort",
+  "offer": "Angebot",
   "option": "Option",
+  "optional position": "optionaler Posten",
   "options": "Optionen",
   "organization": "Organisation",
   "other party": "Gegenseite",
@@ -330,6 +338,7 @@
   "select_customer": "Kunde auswählen",
   "select_property": "Eigenschaft auswählen",
   "select_state": "Status wählen",
+  "select user": "Nutzer auswählen",
   "send_document": "Dokument versenden",
   "sender": "Absender",
   "sender_bank_account": "Bankverbindung",
@@ -374,6 +383,7 @@
   "subtask": "Unteraufgabe",
   "subtasks": "Unteraufgaben",
   "succeeding_document": "Nachfolge-Dokument",
+  "sum external": "Summe externe Umsätze",
   "sum_of_records": "Summe der ausgewählten Einträge",
   "sums": "Summen",
 

translations/src/main/resources/en.json

@@ -17,6 +17,7 @@
   "abort": "abort",
   "account": "account",
   "accounting": "accounting",
+  "account name": "Account name",
   "accounts": "accounts",
   "actions": "actions",
   "add_login_service": "add login service",
@@ -75,6 +76,7 @@
   "CREATE_USERS": "create users",
   "create_pdf": "create PDF",
   "created_with": "created with {tool} by {producer}",
+  "currency": "Currency",
   "customer": "customer",
   "customer_address": "address",
   "customer_email": "customer email address",
@@ -124,6 +126,8 @@
   "evaluate": "evaluate",
   "expand_on_click": "click to expand",
   "extended_settings": "extended settings",
+  "external expenses": "external expenses",
+  "external gains": "external gains",
 
   "failed": "failed",
   "failed_login_attempts" : "account locked until {release_time} after {attempts} failed login attempts",
@@ -162,6 +166,8 @@
   "files": "files",
   "filter": "filter",
   "filter by tags": "filter by tags",
+  "first_transaction": "first transaction",
+  "fixed position": "fixed position",
   "footer": "footer",
   "foreign_id": "external ID",
   "forgot_pass"  : "forgot password?",
@@ -273,7 +279,9 @@
 
   "oidc_Login"       : "Login via OIDC",
   "old_password": "old password",
+  "offer": "offer",
   "option": "option",
+  "optional position": "optional position",
   "options": "options",
   "organization": "organization",
   "other party": "other party",
@@ -324,12 +332,13 @@
   "saved": "saved",
   "save_object": "save {object}",
   "search": "search",
-  "searching…": "searhcing…",
+  "searching…": "searching…",
   "select a new parent for {entity}": "select a new parent for '{entity}'",
   "select_company" : "select on of you companies:",
   "select_customer": "select customer",
   "select_property": "select property",
   "select_state": "select state",
+  "select user": "select user",
   "send_document": "send document",
   "sender": "sender",
   "sender_bank_account": "bank account",
@@ -374,6 +383,7 @@
   "subtask": "subtask",
   "subtasks": "subtasks",
   "succeeding_document": "succeeding document",
+  "sum external":"sum of external positions",
   "sum_of_records": "sum of records",
   "sums": "sums",
 
@@ -459,11 +469,11 @@
   "wiki_pages": "wiki pages",
 
   "year": "year",
-  "You have been added to the new project '{project}', created by {user}:\n\n{body}": "You have been added to the new project '{project}', created by {user}:\n\n{body}",
-  "You can view/edit this transaction at {base_url}/account/{id}": "Du kannst diese transaktion unter {base_url}/account/{id} ansehen",
+  "You can view/edit this transaction at {base_url}/account/{id}": "You can view/edit this transaction at {base_url}/account/{id}",
   "You can view/edit this project at {base_url}/project/{id}/view": "You can view/edit this project at {base_url}/project/{id}/view",
   "You can view/edit this task at {base_url}/task/{id}/view": "You can view/edit this task at {base_url}/task/{id}/view",
   "You can view/edit this wiki page at {base_url}/wiki/{id}/view": "You can view/edit this wiki page at {base_url}/wiki/{id}/view",
+  "You have been added to the new project '{project}', created by {user}:\n\n{body}": "You have been added to the new project '{project}', created by {user}:\n\n{body}",
   "You may change your notification settings at {base_url}/message/settings": "You may change your notification settings at {base_url}/message/settings .",
   "Your token to create a new password" : "Your token to create a new password",
   "your_profile": "your profile"

web/src/main/resources/web/css/bloodshed-color.css

@@ -341,6 +341,18 @@ tr:hover .taglist .tag button {
 	color: yellow;
 }
 
+.positions tr:nth-child(2n){
+	border-bottom-color: red;
+}
+
+.positions tbody tr:last-child{
+	border-top-color: red;
+}
+
+.locations .selected span{
+	background: brown;
+	color: yellow;
+}
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: black;

web/src/main/resources/web/css/bloodshed.css

@@ -356,6 +356,10 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
+.markdown svg{
+	display: block;
+}
+
 .editable:hover{
     border: 1px dotted;
 }
@@ -386,6 +390,7 @@ span.timetracking {
 
 table{
     min-width: 30vw;
+    border-collapse: collapse;
 }
 
 .start_end{
@@ -481,6 +486,14 @@ select.autocomplete{
 	width: calc(100% - 50px);
 }
 
+.positions tr:nth-child(2n){
+	border-bottom: 1px solid;
+}
+
+.positions tbody tr:last-child{
+	border-top: 3px solid;
+}
+
 @media screen and (min-width: 900px) {
 	#app nav > button.symbol{
 		display: none;

web/src/main/resources/web/css/default-color.css

@@ -26,6 +26,11 @@ input{
     color: orange;
 }
 
+input:disabled{
+	border: 1px solid gray;
+	background: #444;
+}
+
 legend.date,
 legend.time{
     background-color: black;
@@ -332,6 +337,18 @@ code,
 	color: black;
 }
 
+.positions tr:nth-child(2n){
+	border-bottom-color: gold;
+}
+
+.positions tbody tr:last-child{
+	border-top-color: gold;
+}
+
+.locations .selected span{
+	background: gold;
+	color: black;
+}
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: black;

web/src/main/resources/web/css/default.css

@@ -450,6 +450,10 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
+.markdown svg{
+	display: block;
+}
+
 .editable:hover{
     border: 1px dotted;
 }
@@ -480,6 +484,7 @@ span.timetracking {
 
 table{
     min-width: 30vw;
+    border-collapse: collapse;
 }
 
 .start_end{
@@ -585,6 +590,14 @@ select.autocomplete{
 	width: calc(100% - 50px);
 }
 
+.positions tr:nth-child(2n){
+	border-bottom: 1px solid;
+}
+
+.positions tbody tr:last-child{
+	border-top: 3px solid;
+}
+
 @media screen and (min-width: 900px) {
 	#app nav > button.symbol{
 		display: none;

web/src/main/resources/web/css/winter-color.css

@@ -288,6 +288,18 @@ tr:hover .taglist .tag button {
 	background: cyan;
 }
 
+.positions tr:nth-child(2n){
+	border-bottom-color: blue;
+}
+
+.positions tbody tr:last-child{
+	border-top-color: blue;
+}
+
+.locations .selected span{
+	background: #afffff;
+	color: black;
+}
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: white;

web/src/main/resources/web/css/winter.css

@@ -449,6 +449,10 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
+.markdown svg{
+	display: block;
+}
+
 .editable:hover{
     border: 1px dotted;
 }
@@ -479,6 +483,7 @@ span.timetracking {
 
 table{
     min-width: 30vw;
+    border-collapse: collapse;
 }
 
 .start_end{
@@ -574,6 +579,14 @@ select.autocomplete{
 	width: calc(100% - 50px);
 }
 
+.positions tr:nth-child(2n){
+	border-bottom: 1px solid;
+}
+
+.positions tbody tr:last-child{
+	border-top: 3px solid;
+}
+
 @media screen and (min-width: 900px) {
 	#app nav > button.symbol{
 		display: none;