working on translations

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-08-04 08:48:00 +02:00
30 changed files with 181 additions and 513 deletions
@@ -8,10 +8,6 @@ WORKDIR /home/svelte/Umbrella/frontend
 RUN npm install && npm run build


-FROM alpine:3.17 AS dia_source
-RUN apk add dia
-
-
 FROM alpine:3.22 AS java_build
 RUN apk add gradle
 ADD . /Umbrella
@@ -21,10 +17,8 @@ RUN gradle --no-daemon build


 FROM alpine
-RUN apk --no-cache add bash fontconfig font-opensans graphviz gtk+2.0 openjdk21-jre tzdata weasyprint \
+RUN apk --no-cache add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint \
 && adduser -D umbrella
-COPY --from=dia_source /usr/bin/dia /usr/bin/dia
-COPY --from=dia_source /usr/lib/dia/ /usr/lib/dia/
 WORKDIR /home/umbrella

 EXPOSE 80
@@ -37,4 +31,4 @@ RUN mkdir .config \
 && chmod a+rx plantuml.jar \
 && chown -R umbrella . \
 && ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-USER umbrella
+USER umbrella
@@ -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);

@@ -78,7 +78,7 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 				case null -> getAccounts(user.get(),ex);
 				default -> {
 					try {
-						yield getAccount(user.get(),Long.parseLong(head), path.pop(), ex);
+						yield getAccount(user.get(),Long.parseLong(head),ex);
 					} catch (NumberFormatException ignored) {}
 					yield super.doGet(path,ex);
 				}
@@ -184,17 +184,9 @@ public class AccountingModule extends BaseHandler implements AccountingService {
 		return null;
 	}

-	private boolean getAccount(UmbrellaUser user, long accountId, String format, HttpExchange ex) throws IOException {
+	private boolean getAccount(UmbrellaUser user, long accountId, HttpExchange ex) throws IOException {
 		if (!accountDb.getMembers(accountId).contains(user)) throw forbidden("You are not allowed to access account {id}",Field.ID,accountId);
-		var data = loadAccount(accountId);
-		return switch (format){
-			case "csv" -> {
-				ex.getResponseHeaders().add("Content-Type", "text/csv");
-				var users = userService().loader();
-				yield sendContent(ex,data.toCsv(users));
-			}
-			case null, default -> sendContent(ex,data);
-		};
+		return sendContent(ex, loadAccount(accountId));
 	}

 	private boolean getAccounts(UmbrellaUser user, HttpExchange ex) throws IOException {
@@ -319,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;
-		Double amount = null;
-		if (json.has(Field.AMOUNT) && json.get(Field.AMOUNT) instanceof Number amt) amount = amt.doubleValue();
+		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, destination, amount);
+		var transaction = accountDb.lastTransaction(accountId, source, dest, amount);
 		return transaction.isPresent() ? sendContent(ex,transaction.get()) : notFound(ex);
 	}

@@ -173,42 +173,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));
-			if (source != null)      query = query.where(SOURCE,equal(source));
-			if (destination != null) query = query.where(DESTINATION,equal(destination));
-			if (amount != null)      query = query.where(AMOUNT,equal(amount));
-			var rs = query.sort(ID+" DESC").limit(1).exec(db);
+			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 && 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));
@@ -42,9 +42,6 @@ public class MessageApi extends BaseHandler{
 		ex.sendResponseHeaders(HTTP_OK,0);
 		try (var os = ex.getResponseBody(); var stream = new PrintWriter(os); var eventQueue = new EventQueue(addr)){
 			LOG.log(INFO,"{0} opened event stream.",addr);
-			stream.print("retry: 3000\n\n");
-			stream.flush();
-
 			var counter = 0;
 			while (!stream.checkError()){
 				sleep(100);
@@ -5,6 +5,7 @@ import static de.srsoftware.umbrella.core.constants.Module.BOOKMARK;
 import static de.srsoftware.umbrella.core.model.Translatable.t;

 import de.srsoftware.umbrella.core.constants.Field;
+import de.srsoftware.umbrella.core.constants.Text;
 import de.srsoftware.umbrella.core.model.Bookmark;
 import de.srsoftware.umbrella.core.model.Translatable;
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
@@ -22,19 +23,42 @@ public class BookmarkEvent extends Event<Bookmark> {
 	}

 	@Override
-	public Translatable describe(boolean verbose) {
-		return switch (eventType()){
-			case CREATE -> t("New bookmark created");
-			case DELETE -> t("The bookmark '{url}' has been deleted", Field.URL, payload().url());
-			case UPDATE -> t("Bookmark updated");
-			default -> null;
-		};
+	public Translatable describeCreate(boolean verbose) {
+		return t(Text.CREATE_BOOKMARK_DESCRIPTION,Field.URL,payload().url(),Field.DESCRIPTION,payload().comment());
 	}

 	@Override
-	public Translatable subject() {
-		return describe(false);
+	public Translatable describeDelete(boolean verbose) {
+		return t(Text.DELETE_BOOKMARK_DESCRIPTION, Field.DESCRIPTION, payload().comment());
 	}

+	@Override
+	public Translatable describeMemberAdded(boolean verbose) {
+		return t(Text.MEMBER_ADDED_TO_BM_DESC,Field.DESCRIPTION,payload().comment());
+	}

+	@Override
+	public Translatable describeUpdate(boolean verbose) {
+		return t(Text.UPDATE_BM_DESCRIPTION, Field.USER, initiator().name());
+	}
+
+	@Override
+	public Translatable subjectCreate() {
+		return t(Text.CREATE_BOOKMARK_SUBJECT,Field.USER,initiator().name());
+	}
+
+	@Override
+	public Translatable subjectDelete() {
+		return t(Text.DELETE_BOOKMARK_SUBJECT, Field.USER, initiator().name(), Field.URL, payload().url());
+	}
+
+	@Override
+	public Translatable subjectMemberAdded() {
+		return t(Text.MEMBER_ADDED_TO_BM_SUBJ,Field.USER, initiator().name(), Field.URL, payload().url());
+	}
+
+	@Override
+	public Translatable subjectUpdate() {
+		return t(Text.UPDATE_BM_SUBJECT,Field.URL, payload().url(), Field.DESCRIPTION, diff().orElse(""));
+	}
 }
@@ -2,9 +2,11 @@
 package de.srsoftware.umbrella.messagebus.events;

 import static de.srsoftware.umbrella.core.constants.Field.*;
+import static de.srsoftware.umbrella.core.model.Translatable.t;
 import static java.util.Optional.*;

 import de.srsoftware.tools.Diff;
+import de.srsoftware.umbrella.core.constants.Field;
 import de.srsoftware.umbrella.core.model.Translatable;
 import de.srsoftware.umbrella.core.model.UmbrellaObject;
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
@@ -47,7 +49,19 @@ public abstract class Event<Payload extends UmbrellaObject> {

 	public abstract Collection<UmbrellaUser> audience();

-	public abstract Translatable describe(boolean verbose);
+	public Translatable describe(boolean verbose) {
+		return switch (eventType()){
+			case CREATE       -> describeCreate(verbose);
+			case DELETE       -> describeDelete(verbose);
+			case MEMBER_ADDED -> describeMemberAdded(verbose);
+			case UPDATE       -> describeUpdate(verbose);
+		};
+	}
+
+	public abstract Translatable describeCreate(boolean verbose);
+	public abstract Translatable describeDelete(boolean verbose);
+	public abstract Translatable describeMemberAdded(boolean verbose);
+	public abstract Translatable describeUpdate(boolean verbose);

 	private Map<String, Object> dropMarkdown(Map<String, Object> map) {
 		var result = new HashMap<String, Object>();
@@ -85,7 +99,7 @@ public abstract class Event<Payload extends UmbrellaObject> {
 		{ // get the highest superclass that is not object
 			Class<?> parent = clazz.getSuperclass();

-			while (parent != null && parent != Object.class && parent != UmbrellaObject.class) {
+			while (parent != null && parent != Object.class) {
 				clazz = parent;
 				parent = clazz.getSuperclass();
 			}
@@ -110,5 +124,18 @@ public abstract class Event<Payload extends UmbrellaObject> {
 		return payload;
 	}

-	public abstract Translatable subject();
+	public Translatable subject() {
+		return switch (eventType()){
+			case CREATE       -> subjectCreate();
+			case DELETE       -> subjectDelete();
+			case MEMBER_ADDED -> subjectMemberAdded();
+			case UPDATE       -> subjectUpdate();
+		};
+	}
+
+	public abstract Translatable subjectCreate();
+	public abstract Translatable subjectDelete();
+	public abstract Translatable subjectMemberAdded();
+	public abstract Translatable subjectUpdate();
+
 }
@@ -23,30 +23,9 @@ public class ItemEvent extends Event<Item>{
 		return List.of();
 	}

-	@Override
-	public Translatable describe(boolean verbose) {
-		return switch (eventType()){
-			case CREATE -> describeCreate();
-			case null, default -> null;
-		};
-	}
-
-	private Translatable describeCreate() {
-		var loc  = payload().location().resolve().name();
-		return t("{user} added \"{item}\" to \"{location}\"", USER,initiator().name(), ITEM, payload().name(), LOCATION, loc);
-	}
-
 	@Override
 	public long objectId() {
 		return payload().id();
 	}

-	@Override
-	public Translatable subject() {
-		var loc  = payload().location().resolve().name();
-		return switch (eventType()){
-			case CREATE -> t("A new item has been added to \"{location}\":",LOCATION,loc);
-			case null, default -> null;
-		};
-	}
 }
@@ -2,18 +2,18 @@
 package de.srsoftware.umbrella.core.api;

 import static de.srsoftware.umbrella.core.Util.mapValues;
-import static java.nio.charset.StandardCharsets.UTF_8;

 import de.srsoftware.tools.Mappable;
 import de.srsoftware.umbrella.core.constants.Field;
 import de.srsoftware.umbrella.core.model.Account;
 import de.srsoftware.umbrella.core.model.Transaction;
-import de.srsoftware.umbrella.core.model.Translatable;
 import de.srsoftware.umbrella.core.model.UmbrellaUser;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 public interface AccountingService {
-	record AccountData(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) implements Mappable {
+	public record AccountData(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) implements Mappable {
 		public static AccountData of(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) {
 			return new AccountData(account, transactions, userMap);
 		}
@@ -26,16 +26,6 @@ public interface AccountingService {
 				Field.USER_LIST,mapValues(userMap)
 			);
 		}
-
-		public byte[] toCsv(Map<Long, UmbrellaUser> users) {
-			var keys = List.of(Field.DATE, Field.SOURCE, Field.AMOUNT, Field.DESTINATION, Field.PURPOSE,Field.TAGS);
-			var sb = new StringBuilder();
-			keys.stream().map(Translatable::t).forEach(field -> sb.append(field).append(";"));
-			transactions.stream().sorted()
-					.map(transaction -> transaction.csvLine(users, keys,";"))
-					.forEach(line -> sb.append("\n").append(line));
-			return sb.toString().getBytes(UTF_8);
-		}
 	}

 	AccountData loadAccount(long accountId);
@@ -19,10 +19,14 @@ public class Text {
 	public static final String CONTACT           = "Contact";
 	public static final String CONTACTS          = "contacts";
 	public static final String CONTACT_WITH_ID   = "contact ({id})";
+	public static final String CREATE_BOOKMARK_SUBJECT = "create_bookmark_subject";
+	public static final String CREATE_BOOKMARK_DESCRIPTION = "create_bookmark_description";
 	public static final String CUSTOMER          = "customer";
 	public static final String CUSTOMER_SETTINGS = "customer settings";

 	public static final String DESTINATION      = "destination";
+	public static final String DELETE_BOOKMARK_DESCRIPTION = "The deleted bookmark was described as:\n{description}";
+	public static final String DELETE_BOOKMARK_SUBJECT = "{user} deleted {url}";
 	public static final String DOCUMENT         = "document";
 	public static final String DOCUMENTS        = "documents";
 	public static final String DOCUMENT_TYPE_ID = "document type id";
@@ -43,6 +47,8 @@ public class Text {
 	public static final String LOGIN_SERVICE = "login service";
 	public static final String LONG          = "Long";

+	public static final String MEMBER_ADDED_TO_BM_DESC = "Description:\n{description}";
+	public static final String MEMBER_ADDED_TO_BM_SUBJ = "{user} shared {url}";
 	public static final String MESSAGE = "message";
 	public static final String MESSAGES = "messages";

@@ -96,6 +102,8 @@ public class Text {

 	public static final String UNIT_PRICE    = "unit price";
 	public static final String UNKNOWN_FIELD = "unknown field: {id}";
+	public static final String UPDATE_BM_DESCRIPTION = "{user} updated bookmark";
+	public static final String UPDATE_BM_SUBJECT = "{url} was changed:\n{description}";
 	public static final String USER          = "user";
 	public static final String USERS         = "users";

@@ -9,10 +9,11 @@ import java.sql.SQLException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;

-public class Transaction extends UmbrellaObject implements Comparable<Transaction>{
+public class Transaction extends UmbrellaObject {
 	private final long accountId;
 	private LocalDateTime date;
 	private IdOrString source, destination;
@@ -24,11 +25,11 @@ public class Transaction extends UmbrellaObject implements Comparable<Transactio
 	public Transaction(long id, long accountId, LocalDateTime date, IdOrString source, IdOrString destination, double amount, String purpose, Set<String> tags){
 		super(id);
 		this.accountId   = accountId;
-		this.amount      = amount;
 		this.date        = date;
-		this.destination = destination;
-		this.purpose     = purpose;
 		this.source      = source;
+		this.destination = destination;
+		this.amount      = amount;
+		this.purpose     = purpose;
 		this.tags        = tags == null ? new HashSet<>() : tags;
 	}

@@ -51,16 +52,6 @@ public class Transaction extends UmbrellaObject implements Comparable<Transactio
 		return this;
 	}

-	@Override
-	public int compareTo(Transaction other) {
-		var order = date.compareTo(other.date);
-		return order == 0 ? Long.compare(id(), other.id()) : order;
-	}
-
-	public String csvLine(Map<Long, UmbrellaUser> users, List<String> keys, String delimiter) {
-		return keys.stream().map(this::get).map(o -> resolveUsers(users,o)).map(o -> quote(o, delimiter)).collect(Collectors.joining(delimiter));
-	}
-
 	public LocalDateTime date(){
 		return date;
 	}
@@ -85,19 +76,6 @@ public class Transaction extends UmbrellaObject implements Comparable<Transactio
 		return this;
 	}

-	public Object get(String property){
-		return switch (property){
-			case Field.AMOUNT -> amount;
-			case Field.DATE -> date.toLocalDate();
-			case Field.DESTINATION -> destination;
-			case Field.ID -> id();
-			case Field.PURPOSE -> purpose;
-			case Field.SOURCE -> source;
-			case Field.TAGS -> tags.stream().sorted().collect(Collectors.joining(", "));
-			case null, default -> null;
-		};
-	}
-
 	public boolean isDirty(){
 		return !dirtyFields.isEmpty();
 	}
@@ -124,18 +102,6 @@ public class Transaction extends UmbrellaObject implements Comparable<Transactio
 		return this;
 	}

-	private static String quote(Object o, String delimiter){
-		var str = o == null ? "" : o instanceof Map<?,?> m ? m.get("value").toString() : o.toString();
-		if (str.contains(delimiter)) return '"'+str.replace("\"","\"\"")+'"';
-		return str;
-	}
-
-	private Object resolveUsers(Map<Long, UmbrellaUser> users, Object o) {
-		if (!(o instanceof IdOrString ios)) return o;
-		if (ios.isId()) return users.get(ios.id()) instanceof UmbrellaUser user ? user.name() : "unknown";
-		return ios;
-	}
-
 	public IdOrString source(){
 		return source;
 	}
@@ -10,7 +10,6 @@ import static de.srsoftware.umbrella.core.constants.Text.LONG;
 import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
 import static de.srsoftware.umbrella.core.model.Translatable.t;
 import static de.srsoftware.umbrella.files.Constants.*;
-import static java.lang.System.Logger.Level.WARNING;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.text.MessageFormat.format;
@@ -55,18 +54,6 @@ public class FileModule extends BaseHandler implements FileService {
 		ModuleRegistry.add(this);
 	}

-	private void convertDia(File source) {
-		if (!new File("/usr/bin/dia").exists()) return;
-		var dest = source+".svg";
-		String[] command = {"dia","-e",dest,source.toString()};
-		try {
-			Runtime.getRuntime().exec(command);
-		} catch (IOException e) {
-			LOG.log(WARNING,"Failed to convert {} to SVG file",source,e);
-		}
-
-	}
-
 	@Override
 	public boolean doDelete(de.srsoftware.tools.Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
@@ -213,7 +200,6 @@ public class FileModule extends BaseHandler implements FileService {
 			body.transferTo(out);
 			body.close();
 			out.close();
-			if (filename.toLowerCase().endsWith(".dia")) convertDia(file);
 		} else {
 			if (file.exists()) throw unprocessable("{file} already exists!",FILE, filename);
 			try {
@@ -59,7 +59,7 @@
        router.navigate('/user/reset/pw');
    }

-    if (router.query.service) {
+    if (router.fullPath.endsWith('/openid_login') && router.query.service) {
        redirectTo(null,router.query.service);
    } else {
        onMount(load);
@@ -2,13 +2,14 @@
 import { onMount }       from 'svelte';
 import { useTinyRouter } from 'svelte-tiny-router';

-import { api, get, search }      from '../urls.svelte';
+import { api, get }      from '../urls.svelte';
 import { error }         from '../warn.svelte';
 import { logout, user }  from '../user.svelte';
 import { t }             from '../translations.svelte';

 import TimeRecorder from './TimeRecorder.svelte';

+let key = $state(null);
 const router  = useTinyRouter();
 let modules = $state(null);
 let expand = $state(false);
@@ -35,10 +36,10 @@ function onclick(e){
    return false;
 }

-async function doSearch(e){
+async function search(e){
    e.preventDefault();
    expand = false;
-    router.navigate(`/search?key=${search.key}`);
+    router.navigate(`/search?key=${key}`);
    return false;
 }

@@ -52,8 +53,8 @@ onMount(fetchModules);
 </style>

 <nav class={expand?"expanded":"collapsed"}>
-    <form onsubmit={doSearch}>
-        <input type="text" bind:value={search.key} />
+    <form onsubmit={search}>
+        <input type="text" bind:value={key} />
        <button type="submit">{t('search')}</button>
    </form>
    <button class="symbol" onclick={e => expand = !expand}> </button>
@@ -1,10 +1,10 @@
 <script>
 	import { onMount } from 'svelte';
-	import { api, download, eventStream, get } from '../../urls.svelte';
+	import { api, eventStream, get } from '../../urls.svelte';
 	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();
@@ -16,10 +16,6 @@
 	let users        = {};
 	let sums         = $derived.by(calcSums);

-	function addToFilter(tag){
-		filter.push(tag.toLowerCase());
-	}
-
 	function calcSums(){
 		let sums = {};
 		sums[ 0] = 0;
@@ -36,6 +32,10 @@
 		return sums;
 	}

+	function addToFilter(tag){
+		filter.push(tag.toLowerCase());
+	}
+
 	function checker(taglist, filter){
 	    for (var f of filter){
 	        var included = false;
@@ -47,10 +47,6 @@
 		return true;
 	}

-	function csvexport(ev){
-		download(api(`accounting/${id}/csv`),account.name+".csv");
-	}
-
 	function dropTag(tag){
 		filter = filter.filter(x => x != tag.toLowerCase());
 	}
@@ -109,7 +105,7 @@
 <style>
 	:global {
 		.amount{ text-align: right }
-		.nowrap{ white-space: nowrap }
+		.nowrap{ whitespace: nowrap }
 	}
 </style>

@@ -171,13 +167,11 @@
 					{t('external expenses')}<br/>
 					{t('sum external')}
 				</td>
-				<td colspan="2">
-					<button onclick={csvexport}>{t('export as {format}',{format:'CSV'})}</button>
-				</td>
+				<td colspan="2"></td>
 			</tr>
 		</tbody>
 	</table>
 </fieldset>

-<EntryForm {account} {onSave} {users} />
+<EntryForm {account} {onSave} />
 {/if}
@@ -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>
@@ -4,22 +4,19 @@
 	import { t }  from '../../translations.svelte';
 	let { module, entityId } = $props();

-	let data = $state(null);
-	let loading = $state(false);
+	let data = $state({journal:[]});

-	async function onclick(ev){
-		loading = true;
+	async function loadJournal(){
 		const url = api(`journal/${module}/${entityId}`);
 		const res = await get(url);
 		if (res.ok) {
 			data = await res.json();
 		} else error(res);
-		loading = false;
 	}

+	$effect(loadJournal);
 </script>

-{#if data}
 <ul>
 	{#each data.journal as entry (entry.id)}
 	<li>
@@ -30,10 +27,3 @@
 	</li>
 	{/each}
 </ul>
-{:else}
-{#if loading}
-{t('loading…')}
-{:else}
-<button {onclick}>{t('load {object}',{object:t('journal')})}</button>
-{/if}
-{/if}
@@ -1,7 +1,7 @@
 <script>
    import { onMount }       from 'svelte';
    import { useTinyRouter } from 'svelte-tiny-router';
-    import { api, get, post, search, target }   from '../../urls.svelte.js';
+    import { api, get, post, target }   from '../../urls.svelte.js';
    import { error, warn, yikes }  from '../../warn.svelte';
    import { t }             from '../../translations.svelte.js';
    import { display }       from '../../time.svelte';
@@ -14,6 +14,8 @@
    let companies = $state(null);
    let documents = $state(null);
    let fulltext  = false;
+    let key       = $state(router.getQueryParam('key'));
+    let input     = $state(router.getQueryParam('key'));
    let notes     = $state(null);
    let pages     = $state(null);
    let projects  = $state(null);
@@ -21,10 +23,22 @@
    let tasks     = $state(null);
    let times     = $state(null);

+    async function setKey(ev){
+        if (ev) ev.preventDefault();
+        key = input;
+        doSearch(null);
+    }

+    onMount(() => {
+        let params = new URLSearchParams(location.search);
+        key        = params.get('key');
+    });

-    function doSearch(key){
+    function doSearch(ignored){
        warn(t('searching…'));
+        let url = window.location.origin + window.location.pathname;
+        if (key) url += '?key=' + encodeURI(key);
+        window.history.replaceState(history.state, '', url);

        const data = { key : key, fulltext : fulltext };
        post(api('bookmark/search'),data).then(handleBookmarks);
@@ -42,6 +56,27 @@
        get(api(module+'/'+entity_id)).then(res => setTitle(res,key,module))
    }

+    async function setTitle(resp,key,module){
+        if (resp.ok){
+            const json = await resp.json();
+            if (json.name) notes[key].title = t(module)+": "+json.name;
+            if (json.title) notes[key].title = t(module)+": "+json.title;
+            if (module == 'document'){
+                notes[key].title = t(json.type)+" "+json.number;
+            }
+        }
+
+    }
+
+    function onclick(e){
+        e.preventDefault();
+        var target = e.target;
+        while (target && !target.href) target=target.parentNode;
+        let href = target.getAttribute('href');
+        if (href) router.navigate(href);
+        return false;
+    }
+
    async function handleBookmarks(resp){
        quitOne();
        if (resp.ok){
@@ -140,63 +175,27 @@
        }
    }

-    function onclick(e){
-        e.preventDefault();
-        var target = e.target;
-        while (target && !target.href) target=target.parentNode;
-        let href = target.getAttribute('href');
-        if (href) router.navigate(href);
-        return false;
-    }
-
-    async function setKey(ev){
-        if (ev) ev.preventDefault();
-        doSearch(search.key);
-    }
-
-    async function setTitle(resp,key,module){
-        if (resp.ok){
-            const json = await resp.json();
-            if (json.name) notes[key].title = t(module)+": "+json.name;
-            if (json.title) notes[key].title = t(module)+": "+json.title;
-            if (module == 'document'){
-                notes[key].title = t(json.type)+" "+json.number;
-            }
-        }
-    }
-
    function quitOne(){
        counter--;
        if (counter > 0) {
            warn(t('searching…')+" "+counter);
        } else yikes();
    }
-
-    function updateUrl(ev){
-        ev.preventDefault();
-        let url = window.location.origin + window.location.pathname;
-        if (search.key) {
-            url += '?key=' + encodeURI(search.key);
-            window.history.replaceState(history.state, '', url);
-            doSearch(search.key);
-        }
-    }
-
-    $effect(() => {
-        doSearch(router.getQueryParam('key'));
-    });
+    
+    $effect(() => doSearch(key))
 </script>

 <svelte:head>
-    <title>Umbrella – {t('search')}{search.key?': '+search.key:''}</title>
+    <title>Umbrella – {t('search')}: {key}</title>
 </svelte:head>

+
 <fieldset class="search">
    <legend>{t('search')}</legend>
-    <form onsubmit={updateUrl}>
+    <form onsubmit={setKey}>
    <label>
        {t('key')}
-        <input type="text" bind:value={search.key} />
+        <input type="text" bind:value={input} />
    </label>
    <label>
        <input type="checkbox" bind:checked={fulltext} />
@@ -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">
@@ -15,14 +15,12 @@
    let router = useTinyRouter();

    let times = $state(null);
-    let filter = $state("");
-    let lc_filter = $derived(filter.toLowerCase());
    let closed = $state(false);
    let tasks = {};
    let projects = {};
    let project_filter = $state(null);
    if (router.hasQueryParam('project')) project_filter = router.getQueryParam('project');
-    let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).filter(key_filter).map(time => ({
+    let sortedTimes = $derived.by(() => Object.values(times).filter(match_prj_filter).map(time => ({
      ...time,
      start: display(time.start_time),
      end: display(time.end_time),
@@ -62,6 +60,7 @@
    }

    function calcYearMap(){
+        console.log('calcYearMap called');
        let result = {
            months : {},
            years  : {}
@@ -113,17 +112,7 @@
        return false;
    }

-    function key_filter(time){
-        if (!filter) return true;
-        if (users[time.user_id].name.toLowerCase().includes(lc_filter)) return true;
-        if (time.subject.toLowerCase().includes(lc_filter)) return true;
-        for (var tid of time.task_ids){
-            var task = tasks[tid];
-            if (tasks[tid].name.toLowerCase().includes(lc_filter)) return true;
-            if (projects[tasks[tid].project_id].name.toLowerCase().includes(lc_filter)) return true;
-        }
-        return false;
-    }
+

    async function loadTimes(){
        const url  = api('time');
@@ -246,11 +235,6 @@
    <title>Umbrella – {t('timetracking')}</title>
 </svelte:head>

-<style>
-    .filter{
-        margin: 0 0 0 30%;
-    }
-</style>

 <h1>{t('timetracking')}</h1>
 {#if times}
@@ -267,10 +251,6 @@
        <input type="checkbox" bind:checked={closed} onchange={reload} />
        {t('show_closed')}
    </label>
-    <label class="filter">
-        <input type="text" bind:value={filter} />
-        {t('filter')}
-    </label>
 </div>
 <table class="timetracks">
    <thead>
@@ -10,13 +10,12 @@ export async function loadTranslation(lang){
 export function t(key,args = {}){
    if (key === undefined) return "";
    if (key instanceof Response) key = 'status.'+key.status;
-    let set  = translations.values;
+    let set = translations.values;
    let keys = key.split('.');
    for (let token of keys){
        if (!set[token]){
            console.warn('Missing translation for '+key);
-            set = keys[keys.length-1].replaceAll('_',' ');
-            break;
+            return keys[keys.length-1].replaceAll('_',' ');
        }
        set = set[token];
    }
@@ -8,13 +8,6 @@ export function get(url){
    return fetch(url,{ credentials:'include' });
 }

-export function download(url,name = null){
-    var link=document.createElement('a');
-    link.href = url;
-    link.download = name ? name : url.substr(url.lastIndexOf('/') + 1);
-    link.click();
-}
-
 export function drop(url, payload){
 	let data = {
 		credentials:'include',
@@ -29,9 +22,6 @@ export function eventStream(createHandler,updateHandler,deleteHandler){
 	if (createHandler) es.addEventListener('CREATE', createHandler);
 	if (updateHandler) es.addEventListener('UPDATE', updateHandler);
 	if (deleteHandler) es.addEventListener('DELETE', deleteHandler);
-	es.onerror = (err) => {
-		console.log("SSE error (reconnecting automatically):", err);
-  	};
 	return es;
 }

@@ -51,8 +41,6 @@ export function post(url,data){
    });
 }

-export const search = $state({"key":""});
-
 export function target(code){
    if (!code) return null;
    let altered = code;
@@ -72,7 +72,10 @@
  "CUSTOMER-NUMBER": "Kundennummer",
  "customer_number_prefix": "Präfix für Kundennummer",
  "create": "anlegen",
+  "create_bookmark_description": "{url} was annotated with:\n{description}",
+  "create_bookmark_subject": "{user} created new bookmark",
  "create_new_object": "{object} neu anlegen",
+  "created_wiki_page":
  "CREATE_USERS": "Nutzer anlegen",
  "create_pdf": "PDF erzeugen",
  "created_with": "erzeugt mit {tool} von {producer}",
@@ -87,12 +90,14 @@
  "data_sent": "Daten übermittelt",
  "date": "Datum",
  "delete": "löschen",
+  "delete_bookmark_subject": "{user} deleted {url}",
  "delete_object": "{object} löschen",
  "DELETE_USERS": "Nutzer löschen",
  "deletes_nested": "Das wird auch alle enthaltenen Dateien löschen!",
  "delivery_date": "Lieferdatum",
  "depends_on": "hängt ab von",
  "description": "Beschreibung",
+  "Description:\n{description}": "Beschreibung:\n{description}",
  "destination": "Ziel",
  "detail": "Details",
  "directory": "Verzeichnis",
@@ -198,7 +203,6 @@
  "items": "Artikel",

  "join_objects" : "{objects} zusammenführen",
-  "journal": "Journal",

  "kanban": "Kanban",
  "key": "Suchbegriff",
@@ -209,7 +213,6 @@
  "loading": "lade…",
  "loading_data": "Daten werden geladen…",
  "loading_object": "lade {object}…",
-  "load {object}": "{object} laden",
  "local_court": "Amtsgericht",
  "locality": "Ort",
  "location": "Ort",
@@ -440,9 +443,11 @@
  "update": "aktualisieren",
  "UPDATE_USERS" : "Nutzer aktualisieren",
  "upload_file": "Datei hochladen",
+  "{url} was changed:\n{description}": "{url} wurde geändert:\n{description}",
  "user": "Benutzer",
  "user ({id})": "Benutzer ({id})",
  "{user} added a new transaction: {entity}": "{user} hat einen neuen Umsatz hinzugefügt: {entity}",
+  "{user} shared {url}": "{user} teilte {url}",
  "{user} updated the transaction '{entity}'": "{user} hat den Umsatz „{entity}“ aktualisiert",
  "user_list": "Benutzer-Liste",
  "user_module" : "Umbrella User-Verwaltung",
@@ -198,7 +198,6 @@
  "items": "items",

  "join_objects" : "join {objects}",
-  "journal": "Journal",

  "kanban": "Kanban",
  "key": "search term",
@@ -209,7 +208,6 @@
  "loading": "loading…",
  "loading_data": "loading data…",
  "loading_object": "loading {object}…",
-  "load {object}": "load {object}",
  "local_court": "local court",
  "locality": "locality",
  "location": "location",
@@ -130,10 +130,6 @@ tr:hover .taglist .tag button {
    background-color: #d3ff00;
 }

-.kanban .filter{
-    background: rgba(0,0,0,0.7);
- }
-
 .position_selector{
    background-color: rgba(0,0,0,0.7);
    backdrop-filter: blur(3px);
@@ -15,10 +15,9 @@ body {
    background-position: 98% 70px;
    background-attachment: fixed;
 }
-.code,
+
 code {
    font-size: 16px;
-    font-family: monospace;
 }

 fieldset {
@@ -229,11 +228,9 @@ textarea{
 }

 .kanban .filter{
-    position: fixed;
-    top: 84px;
+    position: absolute;
+    top: 60px;
    right: 20px;
-    padding: 5px;
-    z-index: 100;
 }

 .kanban.description{
@@ -141,10 +141,6 @@ code,
    background-color: #d3ff00;
 }

-.kanban .filter{
-    background: rgba(0,0,0,0.7);
- }
-
 .position_selector{
    background-color: rgba(0,0,0,0.7);
    backdrop-filter: blur(3px);
@@ -322,11 +322,9 @@ textarea{
 }

 .kanban .filter{
-    position: fixed;
-    top: 84px;
+    position: absolute;
+    top: 60px;
    right: 20px;
-    padding: 5px;
-    z-index: 100;
 }

 .kanban.description{
@@ -68,7 +68,6 @@ tr:hover .taglist .tag button {
    color: black;
 }

-code,
 .code{
 	color: black;
 }
@@ -120,10 +119,6 @@ code,
    background-color: #d3ff00;
 }

-.kanban .filter{
-    background: rgba(255,255,255,0.7);
- }
-
 .position_selector{
    background-color: rgba(0,0,0,0.7);
    backdrop-filter: blur(3px);
@@ -15,10 +15,9 @@ body {
    background-position: 98% 70px;
    background-attachment: fixed;
 }
-.code,
+
 code {
    font-size: 16px;
-    font-family: monospace;
 }

 fieldset {
@@ -322,11 +321,9 @@ textarea{
 }

 .kanban .filter{
-    position: fixed;
-    top: 84px;
+    position: absolute;
+    top: 60px;
    right: 20px;
-    padding: 5px;
-    z-index: 100;
 }

 .kanban.description{