implemented patching of project tasks when new user is added to project

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

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 destination, Double amount);
+	Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount);
 
 	Collection<Account> listAccounts(long userId);
 

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

@@ -311,11 +311,12 @@ 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);
-		String destination = dst.has(Field.ID) ? dst.get(Field.ID).toString() : dst.has(Field.DISPLAY) ? dst.get(Field.DISPLAY).toString() : null;
+		var dest = dst.get(dst.has(Field.ID) ? Field.ID : Field.DISPLAY).toString();
-		Double amount = null;
+		if (!json.has(Field.AMOUNT)) throw missingField(Field.AMOUNT);
-		if (json.has(Field.AMOUNT) && json.get(Field.AMOUNT) instanceof Number amt) amount = amt.doubleValue();
+		if (!(json.get(Field.AMOUNT) instanceof Number amt)) throw invalidField(Field.AMOUNT,Text.NUMBER);
+		var amount = amt.doubleValue();
 
-		var transaction = accountDb.lastTransaction(accountId, source, destination, amount);
+		var transaction = accountDb.lastTransaction(accountId, source, dest, amount);
 		return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex);
 	}
 

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

@@ -124,16 +124,13 @@ 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){};
 		}
 	}
 
@@ -173,42 +170,22 @@ public class SqliteDb extends BaseDb implements AccountDb {
 	}
 
 	@Override
-	public Optional<Transaction> lastTransaction(long accountId, String source, String destination, Double amount) {
+	public Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount) {
 		try {
-			var query = select(ALL).from(TABLE_TRANSACTIONS).where(ACCOUNT,equal(accountId));
+			var rs = select(ALL).from(TABLE_TRANSACTIONS)
-			if (source != null)      query = query.where(SOURCE,equal(source));
+					.where(ACCOUNT,equal(accountId)).where(SOURCE,equal(source)).where(DESTINATION,equal(dest)).where(AMOUNT,equal(amount))
-			if (destination != null) query = query.where(DESTINATION,equal(destination));
+					.sort(ID+" DESC")
-			if (amount != null)      query = query.where(AMOUNT,equal(amount));
+					.limit(1)
-			var rs = query.sort(ID+" DESC").limit(1).exec(db);
+					.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));

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.8")
+        implementation("de.srsoftware:tools.jdbc:2.0.7")
         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,16 +67,9 @@ 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,15 +69,9 @@ 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){};
 		}
 	}
 }

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

@@ -198,17 +198,11 @@ 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){};
 		}
 	}
 
@@ -223,16 +217,10 @@ 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){};
 		}
 
 	}
@@ -594,15 +582,9 @@ 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

@@ -122,7 +122,6 @@
         <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/TimeRecorder.svelte

@@ -4,47 +4,12 @@
 
     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`);
@@ -63,6 +28,9 @@
         }
     }
 
+    function go(){
+        router.navigate('/time');
+    }
 
     function updateElapsed(){
         timetrack.elapsed = msToTime(Date.now() - timetrack.start);
@@ -86,7 +54,7 @@
 
 
 {#if timetrack.running}
-<span class="timetracking" {ondrop} {ondragover} {ondragleave} >
+<span class="timetracking">
     <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/routes/accounting/account.svelte

@@ -4,7 +4,7 @@
 	import { error, yikes } from '../../warn.svelte';
 	import { t } from '../../translations.svelte';
 
-	import EntryForm from './add_entry_new.svelte';
+	import EntryForm from './add_entry.svelte';
 	import Transaction from './transaction.svelte';
 
 	let { id }       = $props();
@@ -173,5 +173,5 @@
 	</table>
 </fieldset>
 
-<EntryForm {account} {onSave} {users} />
+<EntryForm {account} {onSave} />
 {/if}

frontend/src/routes/accounting/add_entry_new.svelte

@@ -1,205 +0,0 @@
-<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/document/Position.svelte

@@ -1,7 +1,6 @@
 <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';
@@ -24,17 +23,13 @@
     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;
     }
@@ -71,7 +66,6 @@
             <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,11 +207,6 @@
         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();
     }
@@ -311,7 +306,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 => ondragstart(ev,task)} {task} tag_colors={project.tag_colors} />
+                    <Card onclick={e => openTask(task.id)} ondragstart={ev => dragged=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

@@ -249,6 +249,11 @@
                 <option value={member.user.id}>{member.user.name}</option>
                 {/each}
             </select>
+            <pre>
+                <code>
+                    {JSON.stringify(project.members,null,2)}
+                </code>
+            </pre>
         </label>
     </div>
     {#if project.allowed_states}

frontend/src/routes/search/Search.svelte

@@ -265,10 +265,8 @@
     <legend>
         {t('stock')}
     </legend>
-    {#if Object.keys(stock.items).length }
-    {t('items')}
     <ul>
-        {#each Object.values(stock.items) as item}
+        {#each Object.values(stock) 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>]
@@ -277,18 +275,6 @@
         </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/task/EasyList.svelte

@@ -130,10 +130,6 @@
     onMount(load);
 </script>
 
-<svelte:head>
-    <title>Umbrella – {t('Easylist')}: {tag}</title>
-</svelte:head>
-
 <h2>{t('tasks_for_tag',{tag:decodeURI(tag)})}</h2>
 
 <div class="easylist">

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

@@ -63,16 +63,10 @@ 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){};
 		}
 	}
 
@@ -132,7 +126,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);
@@ -142,7 +136,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);
@@ -152,7 +146,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);
@@ -162,7 +156,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);
@@ -207,18 +201,18 @@ public class SqliteDb extends BaseDb implements StockDb {
 	}
 
 	@Override
-	public Map<Long, Item> findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext) {
+	public Map<Long, Item> find(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);
@@ -230,33 +224,10 @@ 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();
@@ -269,7 +240,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();
@@ -630,16 +601,13 @@ 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,8 +10,7 @@ import java.util.Map;
 public interface StockDb {
 	Property                addNewProperty(long itemId, String name, Object value, String unit);
 	Location                delete(DbLocation location);
-	Map<Long, Item>         findItems(Collection<Owner> owners, Collection<String> keys, boolean fulltext);
+	Map<Long, Item>         find(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,13 +459,12 @@ 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 keys = Arrays.asList(key.split(" "));
-		var fulltext      = json.has(FULLTEXT) && json.get(FULLTEXT) instanceof Boolean val && val;
+		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.findItems(owners,keys,fulltext);
+		var items = stockDb.find(owners,keys,fulltext);
-		var locations = stockDb.findLocations(owners,keys,fulltext);
+		return sendContent(ex,mapValues(items));
-		return sendContent(ex,Map.of("items",mapValues(items),"locations",mapValues(locations)));
 	}
 
 	@Override

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

@@ -340,6 +340,7 @@ 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);
@@ -353,14 +354,7 @@ 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){};
 		}
 	}
 

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

@@ -84,16 +84,10 @@ 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){};
 		}
 	}
 

translations/src/main/resources/de.json

@@ -167,7 +167,6 @@
   "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?",
@@ -279,9 +278,7 @@
 
   "oidc_Login"       : "Anmeldung mit OIDC",
   "old_password": "altes Passwort",
-  "offer": "Angebot",
   "option": "Option",
-  "optional position": "optionaler Posten",
   "options": "Optionen",
   "organization": "Organisation",
   "other party": "Gegenseite",

translations/src/main/resources/en.json

@@ -167,7 +167,6 @@
   "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?",
@@ -279,9 +278,7 @@
 
   "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",
@@ -332,7 +329,7 @@
   "saved": "saved",
   "save_object": "save {object}",
   "search": "search",
-  "searching…": "searching…",
+  "searching…": "searhcing…",
   "select a new parent for {entity}": "select a new parent for '{entity}'",
   "select_company" : "select on of you companies:",
   "select_customer": "select customer",
@@ -383,7 +380,7 @@
   "subtask": "subtask",
   "subtasks": "subtasks",
   "succeeding_document": "succeeding document",
-  "sum external":"sum of external positions",
+  "sum external";"sum of external positions",
   "sum_of_records": "sum of records",
   "sums": "sums",
 

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

@@ -341,14 +341,6 @@ 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;
-}
-
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: black;

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

@@ -356,10 +356,6 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
-.markdown svg{
-	display: block;
-}
-
 .editable:hover{
     border: 1px dotted;
 }
@@ -390,7 +386,6 @@ span.timetracking {
 
 table{
     min-width: 30vw;
-    border-collapse: collapse;
 }
 
 .start_end{
@@ -486,14 +481,6 @@ 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

@@ -337,14 +337,6 @@ code,
 	color: black;
 }
 
-.positions tr:nth-child(2n){
-	border-bottom-color: gold;
-}
-
-.positions tbody tr:last-child{
-	border-top-color: gold;
-}
-
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: black;

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

@@ -450,10 +450,6 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
-.markdown svg{
-	display: block;
-}
-
 .editable:hover{
     border: 1px dotted;
 }
@@ -484,7 +480,6 @@ span.timetracking {
 
 table{
     min-width: 30vw;
-    border-collapse: collapse;
 }
 
 .start_end{
@@ -590,14 +585,6 @@ 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,15 +288,6 @@ 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;
-}
-
-
 @media screen and (max-width: 900px) {
 	#app nav a{
 		background: white;

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

@@ -449,10 +449,6 @@ span.timetracking {
     grid-column-end: span 2;
 }
 
-.markdown svg{
-	display: block;
-}
-
 .editable:hover{
     border: 1px dotted;
 }
@@ -483,7 +479,6 @@ span.timetracking {
 
 table{
     min-width: 30vw;
-    border-collapse: collapse;
 }
 
 .start_end{
@@ -579,14 +574,6 @@ 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;