Merge branch 'bugfix/empty-markdown' 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,11 +5,14 @@ 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,6 +295,22 @@ 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)));
 	}
@@ -327,7 +343,9 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 	}
 
 	private boolean postToAccount(long accountId, Path path, UmbrellaUser user, HttpExchange ex) throws IOException {
-		return switch (path.pop()) {
+		var head = 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,6 +2,7 @@
 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;
@@ -130,6 +131,29 @@ 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 {

frontend/src/Components/Autocomplete.svelte

@@ -17,6 +17,7 @@
     let selected   = $state(null);
     let candidates = $state([]);
     let timer      = null;
+    let list_elem;
 
     async function dummyGetCandidates(text){
         console.warn(`getCandidates(${text}) not overridden!`);
@@ -58,9 +59,8 @@
     }
 
     async function fetchCandidates(){
-        candidates = await getCandidates(candidate.display);
+        candidates = candidate.display ? await getCandidates(candidate.display) : [];
         selected = null;
-        if (selected>candidates.length) selected = candidates.length;
     }
 
     async function onkeyup(ev){
@@ -69,12 +69,14 @@
             ev.preventDefault();
             selected = selected == null ? 0: selected +1;
             if (selected >= candidates.length) selected = 0;
+            scrollTo(selected);
             return false;
         }
         if (ev.key == 'ArrowUp'){
             ev.preventDefault();
             selected = selected == null ? candidates.length -1 : selected -1;
             if (selected < 0) selected = candidates.length -1;
+            scrollTo(selected);
             return false;
         }
         if (ev.key == 'Enter'|| ev.key == 'Tab'){
@@ -113,6 +115,11 @@
         onSelect(candidate);
 
     }
+
+    function scrollTo(index){
+        let list_elements = list_elem.children;
+        if (list_elements) list_elements[index].scrollIntoView({block:'center'});
+    }
 </script>
 
 <style>
@@ -129,17 +136,20 @@
         list-style: none;
         padding: 4px;
         margin: 0;
+        min-width: 400px;
+        max-height: 200px;
+        overflow: scroll;
     }
     .highlight { background: orange; color: black; }
 
 </style>
 
-<span>
+<span class="autocomplete">
     <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} />
     {#if candidates && candidates.length > 0}
-    <ul>
+    <ul bind:this={list_elem} class="suggestions">
         {#each candidates as candidate,i}
-        <li class="option {selected==i?'highlight':''}" onclick={e => selected = i} ondblclick={e => select(i)}>{candidate.display}</li>
+        <li class="option {selected==i?'highlight':''}" onclick={e => select(i)} ondblclick={e => select(i)}>{candidate.display}</li>
         {/each}
     </ul>
     {/if}

frontend/src/routes/accounting/account.svelte

@@ -77,6 +77,12 @@
 	.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,7 +42,10 @@
 	}
 
 	function focusOnEnter(ev,id){
-		if (ev.key == 'Enter') document.getElementById(id).focus();
+		if (ev.key == 'Enter') {
+			proposePurpose();
+			document.getElementById(id).focus();
+		}
 	}
 
 	async function getAccountTags(text){
@@ -93,6 +96,20 @@
 		}
 	}
 
+	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,
@@ -169,4 +186,4 @@
 	<span>
 		<button onclick={save}>{t('save')}</button>
 	</span>
-</fieldset>
+</fieldset>

frontend/src/routes/accounting/index.svelte

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

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

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