re-implemented new transaction form

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

.gitea/workflows/docker.yaml

@@ -13,13 +13,6 @@ 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 .
 
@@ -35,12 +28,24 @@ 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/AccountDb.java

@@ -16,7 +16,7 @@ public interface AccountDb {
 
 	Collection<UmbrellaUser> getMembers(long accountId);
 
-	Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount);
+	Optional<Transaction> lastTransaction(long accountId, String source, String destination, Double amount);
 
 	Collection<Account> listAccounts(long userId);
 

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

@@ -311,12 +311,11 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 		var source = src.get(src.has(Field.ID) ? Field.ID : Field.DISPLAY).toString();
 		if (!json.has(Field.DESTINATION)) throw missingField(Field.DESTINATION);
 		if (!(json.get(Field.DESTINATION) instanceof JSONObject dst)) throw invalidField(Field.SOURCE,JSON);
-		var dest = dst.get(dst.has(Field.ID) ? Field.ID : Field.DISPLAY).toString();
+		String destination = dst.has(Field.ID) ? dst.get(Field.ID).toString() : dst.has(Field.DISPLAY) ? dst.get(Field.DISPLAY).toString() : null;
-		if (!json.has(Field.AMOUNT)) throw missingField(Field.AMOUNT);
+		Double amount = null;
-		if (!(json.get(Field.AMOUNT) instanceof Number amt)) throw invalidField(Field.AMOUNT,Text.NUMBER);
+		if (json.has(Field.AMOUNT) && json.get(Field.AMOUNT) instanceof Number amt) amount = amt.doubleValue();
-		var amount = amt.doubleValue();
 
-		var transaction = accountDb.lastTransaction(accountId, source, dest, amount);
+		var transaction = accountDb.lastTransaction(accountId, source, destination, amount);
 		return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex);
 	}
 

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

@@ -170,22 +170,42 @@ public class SqliteDb extends BaseDb implements AccountDb {
 	}
 
 	@Override
-	public Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount) {
+	public Optional<Transaction> lastTransaction(long accountId, String source, String destination, Double amount) {
 		try {
-			var rs = select(ALL).from(TABLE_TRANSACTIONS)
+			var query = select(ALL).from(TABLE_TRANSACTIONS).where(ACCOUNT,equal(accountId));
-					.where(ACCOUNT,equal(accountId)).where(SOURCE,equal(source)).where(DESTINATION,equal(dest)).where(AMOUNT,equal(amount))
+			if (source != null)      query = query.where(SOURCE,equal(source));
-					.sort(ID+" DESC")
+			if (destination != null) query = query.where(DESTINATION,equal(destination));
-					.limit(1)
+			if (amount != null)      query = query.where(AMOUNT,equal(amount));
-					.exec(db);
+			var rs = query.sort(ID+" DESC").limit(1).exec(db);
 			Transaction ta = null;
 			if (rs.next()) ta = Transaction.of(rs);
 			rs.close();
+
+			if (ta == null && amount != null) { // try to search by amount, ignore source and dest
+				rs = select(ALL).from(TABLE_TRANSACTIONS).where(ACCOUNT, equal(accountId)).where(AMOUNT, equal(amount))
+						.sort(ID + " DESC").limit(1).exec(db);
+				if (rs.next()) ta = Transaction.of(rs);
+				rs.close();
+			}
+
+			if (ta == null && source != null && destination != null) { // try to search by amount, ignore source and dest
+				rs = select(ALL).from(TABLE_TRANSACTIONS)
+						.where(SOURCE,equal(source))
+						.where(DESTINATION,equal(destination))
+						.where(ACCOUNT, equal(accountId))
+						.sort(ID + " DESC").limit(1).exec(db);
+				if (rs.next()) ta = Transaction.of(rs);
+				rs.close();
+			}
+
+
 			if (ta != null){
 				var tags = ta.tags();
 				rs = select(TAG).from(TABLE_TAGS_TRANSACTIONS).leftJoin(TAG_ID,TABLE_TAGS,ID).where(TRANSACTION_ID,equal(ta.id())).exec(db);
 				while (rs.next()) tags.add(rs.getString(1));
 				rs.close();
 			}
+
 			return nullable(ta);
 		} catch (SQLException e) {
 			throw failedToSearchDb(t(Text.ACCOUNTING));

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

@@ -26,8 +26,6 @@ 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;
@@ -188,19 +186,4 @@ 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();
-		}
-	}
 }

frontend/src/App.svelte

@@ -90,7 +90,7 @@
         {#if messages.warning}
         <span class="warn">{@html messages.warning}</span>
         {/if}
-        <Route path="/"                            component={ProjectList} />
+        <Route path="/"                            component={User} />
         <Route path="/account/:id"                 component={Account} />
         <Route path="/accounting"                  component={Accounts} />
         <Route path="/accounting/new"              component={NewAccount} />

frontend/src/routes/accounting/account.svelte

@@ -4,7 +4,7 @@
 	import { error, yikes } from '../../warn.svelte';
 	import { t } from '../../translations.svelte';
 
-	import EntryForm from './add_entry.svelte';
+	import EntryForm from './add_entry_new.svelte';
 	import Transaction from './transaction.svelte';
 
 	let { id }       = $props();
@@ -19,7 +19,6 @@
 	function calcSums(){
 		let sums = {};
 		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)){
@@ -27,7 +26,7 @@
 				if (user.id == transaction.source.id) sums[user.id] -= transaction.amount;
 			}
 			if (!transaction.destination.id) sums[0] += transaction.amount;
-			if (!transaction.source.id)      sums[-1] += transaction.amount;
+			if (!transaction.source.id)      sums[0] -= transaction.amount;
 		}
 		return sums;
 	}
@@ -103,10 +102,7 @@
 </script>
 
 <style>
-	:global {
 	.amount{ text-align: right }
-		.nowrap{ whitespace: nowrap }
-	}
 </style>
 
 <svelte:head>
@@ -158,20 +154,14 @@
 				</th>
 				{/each}
 				<td class="amount">
-					{sums[-1].toFixed(2)}&nbsp;{account.currency} <br/>
+					<br/>
-					-{sums[0].toFixed(2)}&nbsp;{account.currency}<br/>
+					{sums[0].toFixed(2)}&nbsp;{account.currency}
-					{(sums[-1]-sums[0]).toFixed(2)}&nbsp;{account.currency}
 				</td>
-				<td class="nowrap">
+				<td colspan="3"></td>
-					{t('external gains')}<br/>
-					{t('external expenses')}<br/>
-					{t('sum external')}
-				</td>
-				<td colspan="2"></td>
 			</tr>
 		</tbody>
 	</table>
 </fieldset>
 
-<EntryForm {account} {onSave} />
+<EntryForm {account} {onSave} {users} />
 {/if}

frontend/src/routes/accounting/add_entry_new.svelte

@@ -0,0 +1,205 @@
+<script>
+	import { useTinyRouter } from 'svelte-tiny-router';
+
+	import { t } from '../../translations.svelte';
+	import { api, post } from '../../urls.svelte';
+	import { error, yikes } from '../../warn.svelte';
+	import { user }  from '../../user.svelte';
+	import Autocomplete from '../../Components/Autocomplete.svelte';
+    import Tags from '../tags/TagList.svelte';
+
+	let defaultAccount = {
+		id       : 0,
+		name     : '',
+		currency : ''
+	};
+	let { account = defaultAccount, new_account = false, onSave = () => {}, users } = $props();
+
+	let entry = $state({
+		account,
+		date : new Date().toISOString().substring(0, 10),
+		source : {
+			display: user.name,
+			id: user.id
+		},
+		destination : {},
+		amount : 0.0,
+		purpose : {},
+		tags    : []
+	});
+	let router = useTinyRouter();
+
+	async function dst_selected(destination){
+		destination = JSON.parse(JSON.stringify(destination));
+		let source  = JSON.parse(JSON.stringify(entry.source));
+		const url   = api(`accounting/${entry.account.id}/tags`)
+		const res   = await post(url,{source,destination});
+		if (res.ok) {
+			yikes();
+			const json = await res.json();
+			await proposePurpose();
+			entry.tags = json;
+		} else error(res);
+	}
+
+	function focusOnEnter(ev,id){
+		if (ev.key == 'Enter') {
+			proposePurpose();
+			document.getElementById(id).focus();
+		}
+	}
+
+	async function getAccountTags(text){
+		if (!text) return [];
+		const url = api(`accounting/${entry.account.id}/tags`)
+		return await getProposals(text,url);
+	}
+
+	async function getDestinations(text){
+		const url = api('accounting/destinations');
+		return await getProposals(text,url);
+	}
+
+	async function getProposals(text,url){
+		const res = await post(url,text);
+        if (res.ok){
+            yikes();
+            const input = await res.json();
+            return Object.values(input).map(mapDisplay);
+        } else {
+            error(res);
+            return {};
+        }
+	}
+
+
+	async function getPurposes(text) {
+		const url = api('accounting/purposes');
+		return await getProposals(text,url);
+	}
+
+	async function getSources(text){
+		const url = api('accounting/sources');
+		return await getProposals(text,url);
+	}
+
+	function gotoTags(purpose){
+		document.getElementById('new_tag_input');
+	}
+
+	function mapDisplay(object){
+		if (object.display){
+			return object;
+		} else if (object.name) {
+			return {...object, display: object.name};
+		} else {
+		    return { display : object }
+		}
+	}
+
+	async function proposePurpose(){
+		console.log('proposePurpose()');
+		const amount      = entry.amount;
+		const source      = entry.source;
+		const destination = entry.destination;
+		const url         = api(`accounting/${account.id}/purposes`);
+		const res         = await post(url,{source,destination,amount});
+		if (res.ok) {
+			yikes();
+			var lastTransaction = await res.json();
+			console.log({lastTransaction,users:JSON.parse(JSON.stringify(users))});
+			entry.purpose       = { display: lastTransaction.purpose};
+			entry.tags          = lastTransaction.tags;
+			if (lastTransaction.source.value){
+				if (users[lastTransaction.source.value]){
+					let user = users[lastTransaction.source.value];
+					entry.source = { id : +lastTransaction.source.value, display : user.name };
+				} else entry.source = { display: lastTransaction.source.value };
+			}
+			if (lastTransaction.destination.value){
+				if (users[lastTransaction.destination.value]){
+					let user = users[lastTransaction.destination.value];
+					entry.destination = { id : +lastTransaction.destination.value, display : user.name };
+				} else entry.destination = { display: lastTransaction.destination.value };
+			}
+		} else error(res);
+	}
+
+	async function save(){
+		let data = {
+			...entry,
+			purpose: entry.purpose.display
+		}
+		let url = api('accounting');
+		let res = await post(url, data);
+		if (res.ok) {
+			yikes();
+			if (new_account){
+				router.navigate('/accounting');
+				return;
+			}
+			//entry.tags = [];
+			onSave();
+			document.getElementById('date-input').focus();
+		} else error(res);
+	}
+</script>
+
+<style>
+	hr{
+		grid-column: 1 / -1;
+		margin: 0.5rem 0;
+        border: 0;
+        height: 1px;
+        align-self: center;
+        background: red;
+	}
+</style>
+
+<fieldset class="grid2 new_transaction">
+	{#if new_account}
+		<legend>{t('create_new_object',{object:t('account')})}</legend>
+		<span style="display:none"></span>
+		<span>{t('account name')}</span>
+		<span>
+			<input type="text" bind:value={entry.account.name} />
+		</span>
+		<span>{t('currency')}</span>
+		<span>
+			<input type="text" bind:value={entry.account.currency} />
+		</span>
+		<hr/>
+		<span style="grid-column-end: span 2">{t('first transaction')}</span>
+	{:else}
+		<legend>{t('add_object',{object:t('transaction')})}</legend>
+		<span style="display:none"></span>
+	{/if}
+
+	<span>{t('date')}</span>
+	<span>
+		<input type="date" bind:value={entry.date} id="date-input" />
+	</span>
+
+	<span>{t('amount')}</span>
+	<span>
+		<input type="number" bind:value={entry.amount} onkeyup={e => focusOnEnter(e,'source-input')} />&nbsp;{entry.account.currency}
+	</span>
+
+	<span>{t('source')}</span>
+	<Autocomplete bind:candidate={entry.source} getCandidates={getSources} id="source-input" />
+
+	<span>{t('destination')}</span>
+	<Autocomplete bind:candidate={entry.destination} getCandidates={getDestinations} onSelect={dst_selected} />
+
+
+	<span>{t('purpose')}</span>
+	<Autocomplete bind:candidate={entry.purpose} getCandidates={getPurposes} onCommit={gotoTags} id="purpose_input" />
+
+	<span>{t('tags')}</span>
+	<Tags getCandidates={getAccountTags} module={null} bind:tags={entry.tags} onEmptyCommit={save} />
+
+	<span></span>
+	<span>
+		<button onclick={save}>{t('save')}</button>
+	</span>
+</fieldset>

frontend/src/routes/accounting/index.svelte

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

frontend/src/routes/task/Add.svelte

@@ -63,13 +63,9 @@
         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;
+            project             = null; // TODO
         } else error(resp);
     }
 
@@ -79,17 +75,11 @@
         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.tags.length < 1) task.tags = project.tags;
+            if (task.taks.length < 1) task.tags = project.tags;
             yikes();
         } else {
             error(resp);
@@ -134,10 +124,6 @@
         extendedSettings = !extendedSettings;
     }
 
-    function updatePermission(uid,perm){
-        task.members[uid].permission = perm;
-    }
-
     onMount(load);
 </script>
 
@@ -175,7 +161,7 @@
         {#if extendedSettings}
         <div>{t('members')}</div>
         <div>
-            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
+            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
         </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 < 60 && task.status >= 20 && match(task)}
+            {#if 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,7 +7,6 @@
 
 	let { project, select = o => {}, task } = $props();
 	let tree = $state({});
-	let loading = $state(true);
 
 	async function loadParentCandidates(){
 		let url = api(`task/${task.id}/parent_candidates`);
@@ -15,7 +14,6 @@
 		if (res.ok){
 			yikes();
 			tree = await res.json();
-			loading = false;
 		} else error(res);
 	}
 
@@ -23,16 +21,7 @@
 </script>
 
 <div class="overlay parent_selector">
-	<h2>
+	<h2>{t('select a new parent for {entity}',{entity:task.name})}</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

@@ -193,7 +193,7 @@
 
     function update_parent(newVal){
         select_parent = false;
-        if (newVal) update({parent_task_id:newVal.id});
+        update({parent_task_id:newVal.id});
     }
 
     function updatePermission(user_id,permission){

frontend/src/routes/time/Index.svelte

@@ -1,7 +1,7 @@
 <script>
     import { onMount }                from 'svelte';
     import { useTinyRouter }          from 'svelte-tiny-router';
-    import { api, drop, get, patch, post } from '../../urls.svelte.js';
+    import { api, drop, 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,18 +41,10 @@
     });
 
     async function addTime(task_id){
-        let url  = api(`time/track_task/${task_id}`);
+        const url  = api(`time/track_task/${task_id}`);
-        let resp = await post(url,now()); // create new time or return time with assigned tasks
+        const 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);

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

@@ -13,8 +13,6 @@ import de.srsoftware.umbrella.core.BaseDb;
 import de.srsoftware.umbrella.messagebus.events.Event;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 
 public class SqliteDb extends BaseDb implements JournalDb{
 	public SqliteDb(Connection connection) {
@@ -35,14 +33,13 @@ public class SqliteDb extends BaseDb implements JournalDb{
 		var sql = """
 				CREATE TABLE IF NOT EXISTS {0} (
 					{1} INTEGER PRIMARY KEY,
-					{2} LONG NOT NULL,
+					{2} INTEGER,
-					{3} INTEGER,
+					{3} VARCHAR(255) NOT NULL,
-					{4} VARCHAR(255) NOT NULL,
+					{4} VARCHAR(16) NOT NULL,
-					{5} VARCHAR(16) NOT NULL,
+					{5} TEXT
-					{6} TEXT
 				);
 				""";
-		sql = format(sql,TABLE_JOURNAL,ID,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION);
+		sql = format(sql,TABLE_JOURNAL,ID,USER_ID,MODULE,ACTION,DESCRIPTION);
 		try {
 			db.prepareStatement(sql).execute();
 		} catch (SQLException e) {
@@ -53,9 +50,8 @@ public class SqliteDb extends BaseDb implements JournalDb{
 	@Override
 	public void logEvent(Event<?> event) {
 		try {
-			var timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+			insertInto(TABLE_JOURNAL,USER_ID,MODULE,ACTION,DESCRIPTION)
-			insertInto(TABLE_JOURNAL,TIMESTAMP,USER_ID,MODULE,ACTION,DESCRIPTION)
+					.values(event.initiator().id(), event.module(), event.eventType(), event.describe())
-					.values(timestamp,event.initiator().id(), event.module(), event.eventType(), event.describe())
 					.execute(db).close();
 		} catch (SQLException e) {
 			throw databaseException(ERROR_WRITE_EVENT,event.eventType(),event.initiator().name());

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

@@ -18,12 +18,10 @@ 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.*;
@@ -244,7 +242,6 @@ 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);
 			}

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

@@ -195,7 +195,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, true);
+		var projectTasks = taskDb.listProjectTasks(project.id(),null, false);
 		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,33 +386,40 @@ public class TaskModule extends BaseHandler implements TaskService {
 		long projectId = pid.longValue();
 		var project = projectService().load(projectId);
 		projectService().loadMembers(List.of(project));
-		var parentMembers = project.members();
+		var members = project.members();
-		var member = parentMembers.get(user.id());
+		var member = members.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);
-			parentMembers = parentTask.members();
+			members = parentTask.members();
-			member = parentMembers.get(user.id());
+			member = members.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>();
-		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject members) {
+		for (var mem : members.values()) { // Assign members from project or parent task
-			for (var key : members.keySet()){
+			var permission = mem.permission() == OWNER ? EDIT : mem.permission();
-				var code = members.getJSONObject(key).getJSONObject(PERMISSION).getInt(CODE);
+			newMembers.put(mem.user().id(), permission);
-				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);
-			}
 		}
 
+		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));
+				}
+			}
+		}
 		// 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/TimeModule.java

@@ -80,14 +80,7 @@ public class TimeModule extends BaseHandler implements TimeService {
 			var head = path.pop();
 			return switch (head) {
                 case STARTED -> getStartedTime(user.get(),ex);
-				case null -> super.doGet(path,ex);
+				case null, default -> 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,7 +17,6 @@
   "abort": "abbrechen",
   "account": "Konto",
   "accounting": "Konten",
-  "account name": "Konto-Name",
   "accounts": "Konten",
   "actions": "Aktionen",
   "add_login_service": "Login-Service anlegen",
@@ -76,7 +75,6 @@
   "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",
@@ -126,8 +124,6 @@
   "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}",
@@ -166,7 +162,6 @@
   "files": "Dateien",
   "filter": "Filter",
   "filter by tags": "Nach Tags filtern",
-  "first_transaction": "erste Transaktion",
   "footer": "Fuß-Text",
   "foreign_id": "externe Kennung",
   "forgot_pass"  : "Password vergessen?",
@@ -379,7 +374,6 @@
   "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,7 +17,6 @@
   "abort": "abort",
   "account": "account",
   "accounting": "accounting",
-  "account name": "Account name",
   "accounts": "accounts",
   "actions": "actions",
   "add_login_service": "add login service",
@@ -76,7 +75,6 @@
   "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",
@@ -126,8 +124,6 @@
   "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",
@@ -166,7 +162,6 @@
   "files": "files",
   "filter": "filter",
   "filter by tags": "filter by tags",
-  "first_transaction": "first transaction",
   "footer": "footer",
   "foreign_id": "external ID",
   "forgot_pass"  : "forgot password?",
@@ -379,7 +374,6 @@
   "subtask": "subtask",
   "subtasks": "subtasks",
   "succeeding_document": "succeeding document",
-  "sum external";"sum of external positions",
   "sum_of_records": "sum of records",
   "sums": "sums",
 
@@ -465,11 +459,11 @@
   "wiki_pages": "wiki pages",
 
   "year": "year",
-  "You can view/edit this transaction at {base_url}/account/{id}": "You can view/edit this transaction at {base_url}/account/{id}",
+  "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 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"