Merge branch 'markdown-norender'

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

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

@@ -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 {

core/src/main/java/de/srsoftware/umbrella/core/api/AccountingService.java

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

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

@@ -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;
 	}

frontend/src/routes/accounting/account.svelte

@@ -1,6 +1,6 @@
 <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';
 
@@ -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());
 	}
@@ -171,9 +167,7 @@
 					{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>

frontend/src/routes/project/Kanban.svelte

@@ -190,7 +190,7 @@
         const url            = api('task/list');
         selector.show_closed = true;
         selector.no_index    = true;
-        selector.rendered    = false;
+        selector.render      = false;
         var resp = await post(url,selector);
         if (resp.ok){
             var json = await resp.json();

frontend/src/routes/project/View.svelte

@@ -108,13 +108,10 @@
         const url  = api('task/list');
         const data = {
             project_id:+id,
-            show_closed:project.show_closed
+            show_closed:project.show_closed,
+            render: false
         }
-        const resp = await fetch(url,{
-            credentials : 'include',
-            method      : 'POST',
-            body        : JSON.stringify(data)
-        });
+        const resp = await post(url,data);
         if (resp.ok){
             tasks              = {};
             est_time.sum = 0;

frontend/src/routes/task/ListTask.svelte

@@ -80,7 +80,8 @@
         const url  = api('task/list');
         const data = {
             parent_task_id : +task.id,
-            show_closed    : show_closed
+            show_closed    : show_closed,
+            render         : false
         };
         if (task.show_closed) data.show_closed = true;
         const resp = await post(url,data);

frontend/src/urls.svelte.js

@@ -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',

tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java

@@ -168,7 +168,7 @@ public class TagModule extends BaseHandler implements TagService {
 	private boolean searchTags(HttpExchange ex, String key, UmbrellaUser user) throws IOException {
 		var tags = search(key, user);
 		var lKey = key.toLowerCase();
-		return sendContent(ex, tags.stream().map(entry -> modifyCase(entry, key, lKey)).distinct());
+		return sendContent(ex, tags.stream().map(entry -> modifyCase(entry, key, lKey)));
 	}
 
 	@Override

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

@@ -475,24 +475,26 @@ public class TaskModule extends BaseHandler implements TaskService {
 		var noIndex      = json.has(NO_INDEX)       && json.get(NO_INDEX)       instanceof Boolean bool  ? bool : false;
 		var projectId    = json.has(PROJECT_ID)     && json.get(PROJECT_ID)     instanceof Number number ? number.longValue() : null;
 		var parentTaskId = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number number ? number.longValue() : null;
-		var markdown     = !json.has(RENDERED)    || !(json.get(RENDERED)       instanceof Boolean render) || render;
+		var render       = !json.has(RENDER)        || !(json.get(RENDER)       instanceof Boolean bool) || bool;
 		if (isSet(projectId)) {
 			if (parentTaskId == null) {
 				var list = taskDb.listRootTasks(projectId, user, showClosed);
-				return sendContent(ex, mapTasks(list,markdown));
+				return sendContent(ex, mapTasks(list,render));
 			}
 			var projectTasks = taskDb.listProjectTasks(projectId, parentTaskId, noIndex);
 			loadMembers(projectTasks.values());
 			var tags = tagService().getTags(TASK,projectTasks.keySet(),user);
 
 			projectTasks = addTags(projectTasks, tags);
-			return sendContent(ex, mapTasks(projectTasks, markdown));
+			return sendContent(ex, mapTasks(projectTasks, render));
 		}
-		if (isSet(parentTaskId)) return sendContent(ex, mapValues(taskDb.listChildrenOf(parentTaskId, user, showClosed)));
-		var taskIds = json.has(IDS) && json.get(IDS) instanceof JSONArray ids ? ids.toList().stream().map(Object::toString).map(Long::parseLong).toList() : null;
-		var tasks = taskDb.load(taskIds);
-		if (isSet(taskIds)) return sendContent(ex, mapTasks(tasks,markdown));
-		return sendEmptyResponse(HTTP_NOT_IMPLEMENTED, ex);
+		Map<Long, Task> tasks;
+		if (!isSet(parentTaskId)) {
+			var taskIds = json.has(IDS) && json.get(IDS) instanceof JSONArray ids ? ids.toList().stream().map(Object::toString).map(Long::parseLong).toList() : null;
+			if (!isSet(taskIds)) return sendEmptyResponse(HTTP_NOT_IMPLEMENTED,ex);
+			tasks = taskDb.load(taskIds);
+		} else tasks = taskDb.listChildrenOf(parentTaskId,user,showClosed);
+		return sendContent(ex, mapTasks(tasks,render));
 	}
 
 	private Map<Long, Task> addTags(Map<Long, Task> taskList, Map<Long, ? extends Collection<String>> tags) {