Merge branch 'accounting' into dev

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

.gitea/workflows/docker.yaml

@@ -53,8 +53,10 @@ jobs:
         run: |
           TAGS="$(curl -s -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASS }}" https://${{ secrets.REGISTRY_PATH }}/v2/umbrella/tags/list | jq -r ".tags[]")"
           COUNT=$(echo "$TAGS" | wc -l)
+          echo found $COUNT tags: $TAGS
           if [ $COUNT -gt 10 ]; then
             REMAIN=$((COUNT - 10))
+            echo $REMAIN tags will be kept!
             echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
           else
             echo less than 10 tags, skipping cleanup

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

@@ -5,14 +5,11 @@ import de.srsoftware.umbrella.core.model.Account;
 import de.srsoftware.umbrella.core.model.Transaction;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 public interface AccountDb {
 	void dropTransactionTag(long transactionId, String tag);
 
-	Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount);
-
 	Collection<Account> listAccounts(long userId);
 
 	Collection<String> listTags(long accountId, String source, String destination);

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

@@ -119,7 +119,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 			var head = path.pop();
 			return switch (head) {
 				case null -> postEntry(user.get(),ex);
- 				case DESTINATIONS -> postSearchDestinations(user.get(),ex);
+				case DESTINATIONS -> postSearchDestinations(user.get(),ex);
 				case PURPOSES -> postSearchPurposes(user.get(),ex);
 				case SOURCES -> postSearchSources(user.get(),ex);
 				default -> {
@@ -295,22 +295,6 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 		return sendContent(ex,newAccount != null ? newAccount : transaction);
 	}
 
-	public boolean postGetLastTransaction(long accountId, UmbrellaUser user, HttpExchange ex) throws IOException {
-		var json = json(ex);
-		if (!json.has(Field.SOURCE)) throw missingField(Field.SOURCE);
-		if (!(json.get(Field.SOURCE) instanceof JSONObject src)) throw invalidField(Field.SOURCE,JSON);
-		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();
-		if (!json.has(Field.AMOUNT)) throw missingField(Field.AMOUNT);
-		if (!(json.get(Field.AMOUNT) instanceof Number amt)) throw invalidField(Field.AMOUNT,Text.NUMBER);
-		var amount = amt.doubleValue();
-
-		var transaction = accountDb.lastTransaction(accountId, source, dest, amount);
-		return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex);
-	}
-
 	public boolean postSearchDestinations(UmbrellaUser user, HttpExchange ex) throws IOException {
 		return sendContent(ex,searchOptions(user, Field.DESTINATION, body(ex)));
 	}
@@ -343,9 +327,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 	}
 
 	private boolean postToAccount(long accountId, Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
-		var head = path.pop();
+		return switch (path.pop()) {
-		return switch (head) {
-			case PURPOSES -> postGetLastTransaction(accountId,user,ex);
 			case TAGS -> postSearchTags(accountId,user,ex);
 			case null, default -> super.doPost(path,ex);
 		};

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

@@ -2,7 +2,6 @@
 package de.srsoftware.umbrella.accounting;
 
 import static de.srsoftware.tools.NotImplemented.notImplemented;
-import static de.srsoftware.tools.Optionals.nullable;
 import static de.srsoftware.tools.jdbc.Condition.*;
 import static de.srsoftware.tools.jdbc.Query.*;
 import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
@@ -131,29 +130,6 @@ public class SqliteDb extends BaseDb implements AccountDb {
 		}
 	}
 
-	@Override
-	public Optional<Transaction> lastTransaction(long accountId, String source, String dest, double amount) {
-		try {
-			var rs = select(ALL).from(TABLE_TRANSACTIONS)
-					.where(ACCOUNT,equal(accountId)).where(SOURCE,equal(source)).where(DESTINATION,equal(dest)).where(AMOUNT,equal(amount))
-					.sort(ID+" DESC")
-					.limit(1)
-					.exec(db);
-			Transaction ta = null;
-			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));
-		}
-	}
-
 	@Override
 	public HashSet<Account> listAccounts(long userId) {
 		try {
@@ -295,7 +271,7 @@ public class SqliteDb extends BaseDb implements AccountDb {
 			}
 		} else if (transaction.isDirty()) {
 			try {
-				if (transaction.amount() == 0 || transaction.source().isEmpty() || transaction.destination().isEmpty()) {
+				if (transaction.amount() == 0) {
 					delete().from(TABLE_TRANSACTIONS).where(Field.ID, equal(transaction.id())).where(ACCOUNT, equal(transaction.accountId())).execute(db);
 				} else {
 					replaceInto(TABLE_TRANSACTIONS, Field.ID, Field.ACCOUNT, Field.TIMESTAMP, Field.SOURCE, Field.DESTINATION, Field.AMOUNT, Field.DESCRIPTION)

core/src/main/java/de/srsoftware/umbrella/core/model/IdOrString.java

@@ -6,9 +6,6 @@ import de.srsoftware.umbrella.core.constants.Field;
 import java.util.HashMap;
 import java.util.Map;
 
-import static de.srsoftware.tools.Optionals.isSet;
-import static de.srsoftware.tools.Optionals.nullIfEmpty;
-
 public class IdOrString implements Mappable {
 		private final Long id;
 		private final String value;
@@ -55,10 +52,6 @@ public class IdOrString implements Mappable {
 			return map;
 		}
 
-	public boolean isEmpty() {
-			return id == null && !isSet(value);
-	}
-
 	@Override
 	public String toString() {
 		return value;
@@ -67,4 +60,4 @@ public class IdOrString implements Mappable {
 	public String value(){
 			return value;
 		}
-}
+	}

frontend/src/Components/Autocomplete.svelte

@@ -14,10 +14,9 @@
 
     const ignore   = ['ArrowLeft','ArrowRight'];
     //let candidate  = $state({ display : '' });
-    let selected   = $state(null);
+    let selected   = $state([]);
     let candidates = $state([]);
     let timer      = null;
-    let list_elem;
 
     async function dummyGetCandidates(text){
         console.warn(`getCandidates(${text}) not overridden!`);
@@ -54,43 +53,41 @@
         const idx    = select.value;
         candidate = candidates[idx];
         candidates = [];
-        selected = null;
+        selected = [];
         onSelect(candidate);
     }
 
     async function fetchCandidates(){
-        candidates = candidate.display ? await getCandidates(candidate.display) : [];
+        candidates = await getCandidates(candidate.display);
-        selected = null;
+        if (selected>candidates.length) selected = candidates.length;
     }
 
     async function onkeyup(ev){
         if (ignore.includes(ev.key)) return;
         if (ev.key == 'ArrowDown'){
             ev.preventDefault();
-            selected = selected == null ? 0: selected +1;
+            selected = selected.length < 1 ? [0] : [selected[0]+1]
-            if (selected >= candidates.length) selected = 0;
+            if (selected[0] >= candidates.length) selected = [0];
-            scrollTo(selected);
             return false;
         }
         if (ev.key == 'ArrowUp'){
             ev.preventDefault();
-            selected = selected == null ? candidates.length -1 : selected -1;
+            selected = selected.length < 1 ? [-1] : [selected[0]-1]
-            if (selected < 0) selected = candidates.length -1;
+            if (selected[0] < 0) selected = [candidates.length-1];
-            scrollTo(selected);
             return false;
         }
         if (ev.key == 'Enter'|| ev.key == 'Tab'){
             ev.preventDefault();
-            if (selected != null && selected < candidates.length) {
+            if (selected.length>0) {
-                candidate = candidates[selected];
+                candidate = candidates[selected[0]];
                 candidates = [];
-                selected = null;
+                selected = [];
                 onSelect(candidate);
                 return false;
             }
             if (ev.key == 'Enter') {
                 candidates = [];
-                selected = null;
+                selected = [];
                 if (onCommit(candidate)) candidate = { display : '' };
             }
             return false;
@@ -98,7 +95,7 @@
         if (ev.key == 'Escape'){
             ev.preventDefault();
             candidates = [];
-            selected = null;
+            selected = [];
             return false;
         }
 
@@ -107,50 +104,23 @@
         timer = setTimeout(fetchCandidates,400);
         return false;
     }
-
-    function select(index){
-        candidate = candidates[index];
-        selected = null;
-        candidates = [];
-        onSelect(candidate);
-
-    }
-
-    function scrollTo(index){
-        let list_elements = list_elem.children;
-        if (list_elements) list_elements[index].scrollIntoView({block:'center'});
-    }
 </script>
 
 <style>
     span { position : relative }
-    ul {
+    select { position : absolute; top: 30px; left: 3px; }
-        position : absolute;
-        top: 30px;
-        left: 3px;
-        background: black;
-        color: orange;
-        border: 1px solid orange;
-        border-radius: 5px;
-        z-index: 50;
-        list-style: none;
-        padding: 4px;
-        margin: 0;
-        min-width: 400px;
-        max-height: 200px;
-        overflow: scroll;
-    }
-    .highlight { background: orange; color: black; }
 
+    select { background: black; color: orange; border: 1px solid orange; border-radius: 5px; z-index: 50; }
+    option:checked { background: orange; color: black; }
 </style>
 
-<span class="autocomplete">
+<span>
-    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} />
+    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} />
     {#if candidates && candidates.length > 0}
-    <ul bind:this={list_elem} class="suggestions">
+    <select bind:value={selected} {ondblclick} multiple tabindex="-1" class="autocomplete" size={Math.min(candidates.length,10)}>
         {#each candidates as candidate,i}
-        <li class="option {selected==i?'highlight':''}" onclick={e => select(i)} ondblclick={e => select(i)}>{candidate.display}</li>
+        <option value={i}>{candidate.display}</option>
         {/each}
-    </ul>
+    </select>
     {/if}
-</span>
+</span>

frontend/src/Components/MarkdownEditor.svelte

@@ -155,8 +155,5 @@
     {/if}
 {:else}
     <Display classes={{editable}} markdown={value} {onclick} {oncontextmenu} title={t('right_click_to_edit')} wrapper={type} />
-    {#if !value.display}
-    <button onclick={oncontextmenu}>{t('add_object',{object:t('content')})}</button>
-    {/if}
 {/if}
 </div>

frontend/src/routes/accounting/account.svelte

@@ -27,7 +27,6 @@
 			if (!transaction.destination.id) sums[0] += transaction.amount;
 			if (!transaction.source.id)      sums[0] -= transaction.amount;
 		}
-		window.setTimeout(scrollToBottom,100);
 		return sums;
 	}
 
@@ -66,10 +65,6 @@
 		load();
 	}
 
-	function scrollToBottom(){
-		window.scrollTo(0, document.body.scrollHeight);
-	}
-
 	onMount(load);
 </script>
 
@@ -77,12 +72,6 @@
 	.amount{ text-align: right }
 </style>
 
-<svelte:head>
-	{#if account}
-	<title>Umbrella – {account.name}</title>
-	{/if}
-</svelte:head>
-
 {#if filter.length > 0}
 <fieldset>
 	<legend>{t('filter by tags')}</legend>

frontend/src/routes/accounting/add_entry.svelte

@@ -42,10 +42,7 @@
 	}
 
 	function focusOnEnter(ev,id){
-		if (ev.key == 'Enter') {
+		if (ev.key == 'Enter') document.getElementById(id).focus();
-			proposePurpose();
-			document.getElementById(id).focus();
-		}
 	}
 
 	async function getAccountTags(text){
@@ -96,20 +93,6 @@
 		}
 	}
 
-	async function proposePurpose(){
-		const source      = entry.source;
-		const destination = entry.destination;
-		const amount      = entry.amount;
-		const url         = api(`accounting/${account.id}/purposes`);
-		const res         = await post(url,{source,destination,amount});
-		if (res.ok) {
-			yikes();
-			var lastTransaction = await res.json();
-			entry.purpose       = { display: lastTransaction.purpose};
-			entry.tags          = lastTransaction.tags;
-		} else error(res);
-	}
-
 	async function save(){
 		let data = {
 			...entry,
@@ -123,7 +106,7 @@
 				router.navigate('/accounting');
 				return;
 			}
-			//entry.tags = [];
+			entry.tags = [];
 			onSave();
 			document.getElementById('date-input').focus();
 		} else error(res);
@@ -186,4 +169,4 @@
 	<span>
 		<button onclick={save}>{t('save')}</button>
 	</span>
-</fieldset>
+</fieldset>

frontend/src/routes/accounting/index.svelte

@@ -32,10 +32,6 @@
 	onMount(load);
 </script>
 
-<svelte:head>
-	<title>Umbrella – {t('accounts')}</title>
-</svelte:head>
-
 <fieldset>
 
 	<span></span>

frontend/src/routes/project/View.svelte

@@ -200,10 +200,9 @@
         <LineEditor bind:value={project.name} editable={true} onSet={val => update({name:val})} />
     </div>
     <div>
-        {t('options')}
+        <button onclick={kanban}>{t('show_kanban')}</button>
     </div>
     <div>
-        <button onclick={kanban}><span class="symbol"></span> {t('show_kanban')}</button>
         <button onclick={toggleSettings}><span class="symbol"></span> {t('settings')}</button>
     </div>
     <div>{t('state')}</div>

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());

translations/src/main/resources/de.json

@@ -192,8 +192,6 @@
   "items": "Artikel",
 
   "join_objects" : "{objects} zusammenführen",
-
-  "kanban": "Kanban",
   "key": "Suchbegriff",
 
   "language": "Sprache",
@@ -309,7 +307,6 @@
   "project ({id})": "Projekt ({id})",
   "Project '{project}' was edited": "Projekt '{project}' wurde bearbeitet",
   "projects": "Projekte",
-  "Projects": "Projekte",
   "properties": "Eigenschaften",
   "property": "Eigenschaft",
   "purpose": "Zweck",

translations/src/main/resources/en.json

@@ -192,8 +192,6 @@
   "items": "items",
 
   "join_objects" : "join {objects}",
-
-  "kanban": "Kanban",
   "key": "search term",
 
   "language": "language",
@@ -309,7 +307,6 @@
   "project ({id})": "project ({id})",
   "Project '{project}' was edited": "Project '{project}' was edited",
   "projects": "projects",
-  "Projects": "projects",
   "properties": "properties",
   "property": "property",
   "purpose": "purpose",

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

@@ -542,8 +542,7 @@ select.autocomplete{
 }
 
 @media screen and (max-width: 600px) {
-    .grid2,
+    .grid2{
-    .grid3{
         display: grid;
         grid-template-columns: auto;
     }
@@ -583,10 +582,6 @@ select.autocomplete{
     #app nav.expanded .timetracking{
     	grid-column-end: span 2;
     }
-
-    .autocomplete .suggestions > *{
-    	font-size: 1.5em;
-    }
 }
 
 fieldset.vcard{

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

@@ -711,10 +711,6 @@ select.autocomplete{
     #app nav.expanded .timetracking{
     	grid-column-end: span 2;
     }
-
-    .autocomplete .suggestions > *{
-    	font-size: 1.5em;
-    }
 }
 
 fieldset.vcard{

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

@@ -701,10 +701,6 @@ select.autocomplete{
     #app nav.expanded .timetracking{
     	grid-column-end: span 2;
     }
-
-    .autocomplete .suggestions > *{
-    	font-size: 1.5em;
-    }
 }
 
 fieldset.vcard{