Compare commits

..
28 Commits
Author SHA1 Message Date
StephanRichter 826718aa98 Merge branch 'markdown-norender' into dev
Build Docker Image / Docker-Build (push) Successful in 1m12s
Build Docker Image / Clean-Registry (push) Successful in 7s
2026-10-08 01:28:06 +02:00
StephanRichter d2d534cb14 fixed code so it works for task list in project view
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-08 01:28:00 +02:00
StephanRichter a28c8314f1 Merge branch 'markdown-norender' into dev
Build Docker Image / Docker-Build (push) Successful in 1m33s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-10-08 01:00:05 +02:00
StephanRichter e41932cb9f avoiding markdown rendering when loading project tasks
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-08 00:59:58 +02:00
StephanRichter ee4b2c2f23 Merge branch 'markdown-norender' into dev
Build Docker Image / Docker-Build (push) Successful in 1m24s
Build Docker Image / Clean-Registry (push) Successful in 8s
2026-10-07 22:10:49 +02:00
StephanRichter d95f4359f0 avoiding markdown rendering when reading task list
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-07 22:10:23 +02:00
StephanRichter 3ea457765f Merge branch 'tag-case' into dev
Build Docker Image / Docker-Build (push) Successful in 1m2s
Build Docker Image / Clean-Registry (push) Successful in 9s
2026-10-05 14:51:02 +02:00
StephanRichter 66514c60a5 reducing tag suggestions to distinct values
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-05 14:50:53 +02:00
StephanRichter 55b48b24c8 Merge branch 'tag-case' into dev
Build Docker Image / Docker-Build (push) Successful in 1m40s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-10-05 14:38:55 +02:00
StephanRichter 75814a86eb altered tag search in order to preserve case of input
re-set focus on inpt when selection option on autocomplete field

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-05 14:37:25 +02:00
StephanRichter b4f3077402 Merge branch 'task-sort' into dev
Build Docker Image / Docker-Build (push) Successful in 1m28s
Build Docker Image / Clean-Registry (push) Successful in 7s
2026-10-05 13:51:21 +02:00
StephanRichter 072ba5d4e5 implemented sorting for task list
Build Docker Image / Docker-Build (push) Successful in 1m30s
Build Docker Image / Clean-Registry (push) Successful in 7s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-10-05 13:50:56 +02:00
StephanRichter 6ac2d30419 Merge branch 'main' into dev
Build Docker Image / Docker-Build (push) Successful in 45s
Build Docker Image / Clean-Registry (push) Successful in 5s
2026-09-25 08:43:58 +02:00
StephanRichter 561b337b23 made convertDia blocking
Build Docker Image / Docker-Build (push) Successful in 39s
Build Docker Image / Clean-Registry (push) Successful in 5s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-09-25 08:43:48 +02:00
StephanRichter 4fb6833645 Merge branch 'dia-conversion' 2026-09-25 08:42:40 +02:00
StephanRichter 701cf8e463 Merge branch 'dia' into dev
Build Docker Image / Docker-Build (push) Successful in 1m17s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-24 09:03:16 +02:00
StephanRichter 9774a7c4ec simplified dia installation
Build Docker Image / Docker-Build (push) Successful in 1m9s
Build Docker Image / Clean-Registry (push) Successful in 6s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-09-24 09:02:59 +02:00
StephanRichter 67b06f7edd Merge branch 'dia' into dev
Build Docker Image / Docker-Build (push) Successful in 1m50s
Build Docker Image / Clean-Registry (push) Successful in 5s
2026-09-23 23:12:11 +02:00
StephanRichter 8b510de142 Merge branch 'dia-conversion' into dev
Build Docker Image / Docker-Build (push) Successful in 56s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-23 15:28:51 +02:00
StephanRichter 34b10921ce re-implemented dia-conversion
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-09-23 15:26:58 +02:00
StephanRichter 341c4def98 Merge branch 'search-on-search-page' into dev
Build Docker Image / Docker-Build (push) Successful in 1m23s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-21 16:52:13 +02:00
StephanRichter f2483ee8f5 Merge branch 'search-on-search-page' into dev
Build Docker Image / Docker-Build (push) Successful in 2m26s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-21 16:42:05 +02:00
StephanRichter 4044a333cf Merge branch 'search-on-search-page' into dev
Build Docker Image / Docker-Build (push) Successful in 1m45s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-16 08:46:40 +02:00
StephanRichter 37553ef6c2 Merge branch 'oidc-link' into dev
Build Docker Image / Docker-Build (push) Successful in 2m10s
Build Docker Image / Clean-Registry (push) Successful in 5s
2026-09-08 08:28:34 +02:00
StephanRichter 3009cd0a0c Merge branch 'timetrack-filter' into dev
Build Docker Image / Docker-Build (push) Successful in 2m14s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-07 22:08:22 +02:00
StephanRichter b4a480b3b4 Merge branch 'feature/fixed-kanban-filter' into dev
Build Docker Image / Docker-Build (push) Successful in 1h3m6s
Build Docker Image / Clean-Registry (push) Successful in 6s
2026-09-01 15:25:56 +02:00
StephanRichter 4af4bdbb85 fixed transaction order in CSV export
Build Docker Image / Docker-Build (push) Successful in 1m38s
Build Docker Image / Clean-Registry (push) Successful in 5s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-08-16 23:29:14 +02:00
StephanRichter 94f11ea38f implemented download of account data as CSV
Build Docker Image / Docker-Build (push) Successful in 2m4s
Build Docker Image / Clean-Registry (push) Successful in 6s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-08-16 23:08:51 +02:00
19 changed files with 204 additions and 57 deletions
+1 -2
View File
@@ -21,8 +21,7 @@ RUN gradle --no-daemon build
FROM alpine
RUN apk --no-cache add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint \
libxml2 cairo pango dbus-libs gmp nettle libxi tiff libjpeg-turbo xz-libs glib graphite2 gdk-pixbuf gtk+2.0 \
RUN apk --no-cache add bash fontconfig font-opensans graphviz gtk+2.0 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/
@@ -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),ex);
yield getAccount(user.get(),Long.parseLong(head), path.pop(), ex);
} catch (NumberFormatException ignored) {}
yield super.doGet(path,ex);
}
@@ -184,9 +184,17 @@ public class AccountingModule extends BaseHandler implements AccountingService {
return null;
}
private boolean getAccount(UmbrellaUser user, long accountId, HttpExchange ex) throws IOException {
private boolean getAccount(UmbrellaUser user, long accountId, String format, HttpExchange ex) throws IOException {
if (!accountDb.getMembers(accountId).contains(user)) throw forbidden("You are not allowed to access account {id}",Field.ID,accountId);
return sendContent(ex, loadAccount(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);
};
}
private boolean getAccounts(UmbrellaUser user, HttpExchange ex) throws IOException {
@@ -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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
public interface AccountingService {
public record AccountData(Account account, List<Transaction> transactions, HashMap<Long, UmbrellaUser> userMap) implements Mappable {
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,6 +26,16 @@ 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);
@@ -139,6 +139,7 @@ public class Field {
public static final String RECEIVERS = "receivers";
public static final String REDIRECT = "redirect";
public static final String RENDER = "render";
public static final String RENDERED = "rendered";
public static final String REQUIRED_TASKS_IDS = "required_tasks_ids";
@@ -118,8 +118,7 @@ public class Project extends UmbrellaObject {
return tagColors;
}
@Override
public Map<String, Object> toMap() {
public Map<String, Object> toMap(boolean renderMarkdown){
var memberMap = new HashMap<Long,Map<String,Object>>();
if (members != null) for (var entry : members.entrySet()){
memberMap.put(entry.getKey(),entry.getValue().toMap());
@@ -128,7 +127,7 @@ public class Project extends UmbrellaObject {
for (var state : allowedStates) stateMap.put(state.code(),state.name());
return super.map(
NAME,name,
DESCRIPTION,mapMarkdown(description),
DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description),
STATUS,status,
COMPANY_ID,companyId,
SHOW_CLOSED,showClosed,
@@ -137,6 +136,11 @@ public class Project extends UmbrellaObject {
TAG_COLORS,tagColors);
}
@Override
public Map<String, Object> toMap() {
return toMap(true);
}
@Override
public String toString() {
return name();
@@ -9,11 +9,10 @@ import java.sql.SQLException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
public class Transaction extends UmbrellaObject {
public class Transaction extends UmbrellaObject implements Comparable<Transaction>{
private final long accountId;
private LocalDateTime date;
private IdOrString source, destination;
@@ -25,11 +24,11 @@ public class Transaction extends UmbrellaObject {
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.date = date;
this.source = source;
this.destination = destination;
this.amount = amount;
this.date = date;
this.destination = destination;
this.purpose = purpose;
this.source = source;
this.tags = tags == null ? new HashSet<>() : tags;
}
@@ -52,6 +51,16 @@ public class Transaction extends UmbrellaObject {
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;
}
@@ -76,6 +85,19 @@ public class Transaction extends UmbrellaObject {
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();
}
@@ -102,6 +124,18 @@ public class Transaction extends UmbrellaObject {
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,6 +10,7 @@ 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;
@@ -54,6 +55,18 @@ 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).waitFor();
} catch (IOException | InterruptedException 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);
@@ -200,6 +213,7 @@ 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 {
+3 -2
View File
@@ -18,7 +18,7 @@
let selected = $state(null);
let candidates = $state([]);
let timer = null;
let list_elem;
let input, list_elem;
async function dummyGetCandidates(text){
console.warn(`getCandidates(${text}) not overridden!`);
@@ -117,6 +117,7 @@
function select(index){
candidate = candidates[index];
disableDropdown();
input.focus();
onSelect(candidate);
}
@@ -149,7 +150,7 @@
</style>
<span class="autocomplete">
<input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} disabled={!enabled} />
<input bind:this={input} type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} disabled={!enabled} />
{#if candidates && candidates.length > 0}
<ul bind:this={list_elem} class="suggestions" tabindex="-1">
{#each candidates as candidate,i}
+12 -6
View File
@@ -1,6 +1,6 @@
<script>
import { onMount } from 'svelte';
import { api, eventStream, get } from '../../urls.svelte';
import { api, download, eventStream, get } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte';
@@ -16,6 +16,10 @@
let users = {};
let sums = $derived.by(calcSums);
function addToFilter(tag){
filter.push(tag.toLowerCase());
}
function calcSums(){
let sums = {};
sums[ 0] = 0;
@@ -32,10 +36,6 @@
return sums;
}
function addToFilter(tag){
filter.push(tag.toLowerCase());
}
function checker(taglist, filter){
for (var f of filter){
var included = false;
@@ -47,6 +47,10 @@
return true;
}
function csvexport(ev){
download(api(`accounting/${id}/csv`),account.name+".csv");
}
function dropTag(tag){
filter = filter.filter(x => x != tag.toLowerCase());
}
@@ -167,7 +171,9 @@
{t('external expenses')}<br/>
{t('sum external')}
</td>
<td colspan="2"></td>
<td colspan="2">
<button onclick={csvexport}>{t('export as {format}',{format:'CSV'})}</button>
</td>
</tr>
</tbody>
</table>
+1 -1
View File
@@ -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();
+3 -6
View File
@@ -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;
+56 -7
View File
@@ -16,6 +16,7 @@
let loading = $state(true);
let map = $state({});
let hidden = $state({});
let sort = $state({key:'',asc:true});
async function changeState(idx,state){
const task = tasks[idx];
@@ -37,6 +38,11 @@
changeState(idx,'COMPLETE');
}
function cursor(key){
if (key != sort.key) return 'asc';
return sort.asc ? 'desc' : 'asc';
}
function edit(tid){
router.navigate(`/task/${tid}/edit`);
}
@@ -59,7 +65,7 @@
}
async function loadProject(pid){
const url = api(`project/${pid}`);
const url = api(`project/${pid}?render=false`);
const resp = await get(url);
if (resp.ok){
projects[pid] = await resp.json();
@@ -67,7 +73,7 @@
}
async function load(){
const url = api(`task?offset=${bounds.offset}&limit=${bounds.limit}`);
const url = api(`task?offset=${bounds.offset}&limit=${bounds.limit}&render=false`);
const resp = await get(url);
if (resp.ok){
let newTasks = await resp.json();
@@ -96,6 +102,40 @@
changeState(idx,'PENDING');
}
function compare(task1, task2, key){
if (key == 'project') {
let pj_id_A = task1['project_id'];
let pj_id_B = task2['project_id'];
if (pj_id_A == pj_id_B) {
let parentA = "";
if (task1['parent_task_id']){
let parent = map[task1['parent_task_id']];
if (parent) parentA = parent['name'];
}
let parentB = "";
if (task2['parent_task_id']){
let parent = map[task2['parent_task_id']];
if (parent) parentB = parent['name'];
}
return parentA.localeCompare(parentB);
}
return projects[pj_id_A]['name'].localeCompare(projects[pj_id_B]['name']);
}
if (key == 'state') return task1['status'] - task2['status'];
let valA = task1[key] || '';
let valB = task2[key] || '';
return valA.localeCompare(valB);
}
function resort(key){
if (loading) return;
if (sort.key != key) {
sort.asc = true;
sort.key = key;
} else sort.asc = !sort.asc;
tasks = tasks.toSorted((a,b) => sort.asc ? compare(a,b,key) : compare(b,a,key));
}
function start(idx){
changeState(idx,'STARTED');
}
@@ -103,6 +143,15 @@
onMount(load);
</script>
<style>
.asc{
cursor: s-resize;
}
.desc{
cursor: n-resize;
}
</style>
<svelte:head>
<title>Umbrella – {t('tasks')}</title>
</svelte:head>
@@ -124,11 +173,11 @@
<table>
<thead>
<tr>
<th>{t('name')}</th>
<th>{t('project')} ({t('parent_task')})</th>
<th>{t('state')}</th>
<th>{t('start_date')}</th>
<th>{t('due_date')}</th>
<th title={t('sort')} class={cursor('name')} onclick={e => resort('name')}>{t('name')}</th>
<th title={t('sort')} class={cursor('project')} onclick={e => resort('project')}>{t('project')} ({t('parent_task')})</th>
<th title={t('sort')} class={cursor('state')} onclick={e => resort('state')}>{t('state')}</th>
<th title={t('sort')} class={cursor('start_date')} onclick={e => resort('start_date')}>{t('start_date')}</th>
<th title={t('sort')} class={cursor('due_date')} onclick={e => resort('due_date')}>{t('due_date')}</th>
<th>{t('users')}</th>
<th>{t('actions')}</th>
</tr>
+2 -1
View File
@@ -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);
+7
View File
@@ -8,6 +8,13 @@ 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',
@@ -144,9 +144,11 @@ public class ProjectModule extends BaseHandler implements ProjectService {
}
private boolean getProject(HttpExchange ex, long projectId, UmbrellaUser user) throws IOException, UmbrellaException {
var params = queryParam(ex);
var render = !(params.get(RENDER) instanceof String r) || r.equals("true");
var project = loadMembers(projectDb.load(projectId));
if (!project.hasMember(user)) throw notAmember(t(PROJECT_WITH_ID,ID,project.name()));
var map = project.toMap();
var map = project.toMap(render);
project.companyId().map(companyService()::get).map(Company::toMap).ifPresent(data -> map.put(Field.COMPANY,data));
return sendContent(ex,map);
}
@@ -40,6 +40,11 @@ public class TagModule extends BaseHandler implements TagService {
tagDb.deleteEntity(module,entityId);
}
@Override
public void deleteEntity(String module, long entityId, long userId) {
tagDb.deleteEntity(module,entityId,userId);
}
@Override
public boolean doDelete(Path path, HttpExchange ex) throws IOException {
addCors(ex);
@@ -137,9 +142,11 @@ public class TagModule extends BaseHandler implements TagService {
return sendContent(ex,tuples.map(t -> Map.of(TAG,t.a,COUNT,t.b)));
}
@Override
public void deleteEntity(String module, long entityId, long userId) {
tagDb.deleteEntity(module,entityId,userId);
private String modifyCase(String entry, String key, String lKey) {
if (entry.toLowerCase().startsWith(lKey)) return key + entry.substring(key.length());
var pos = entry.toLowerCase().indexOf(" "+lKey);
if (pos >= 0) entry = entry.substring(0,pos+1)+key+entry.substring(pos+key.length()+1);
return entry;
}
@Override
@@ -158,8 +165,10 @@ public class TagModule extends BaseHandler implements TagService {
return tagDb.search(key, user);
}
private boolean searchTags(HttpExchange ex, String head, UmbrellaUser user) throws IOException {
return sendContent(ex, search(head, user));
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());
}
@Override
@@ -280,8 +280,9 @@ public class TaskModule extends BaseHandler implements TaskService {
} catch (NumberFormatException e) {
throw invalidField(LIMIT, t(Text.NUMBER));
}
var render = !(params.get(RENDER) instanceof String r) || r.equals("true");
var tasks = taskDb.listUserTasks(user.id(), limit, offset, false);
var mapped = loadMembers(tasks).stream().map(Task::toMap);
var mapped = loadMembers(tasks).stream().map(t -> t.toMap(render));
return sendContent(ex, mapped);
}
@@ -474,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) {
+1
View File
@@ -357,6 +357,7 @@
"show": "anzeigen",
"show_closed": "geschlossene anzeigen",
"show_kanban": "Kanban-Ansicht",
"sort": "sortieren",
"source": "Quelle",
"start": "Start",
"start_date": "Startdatum",
+1
View File
@@ -357,6 +357,7 @@
"show": "show",
"show_closed": "show closed",
"show_kanban": "Kanban",
"sort": "sort",
"source": "source",
"start": "start",
"start_date": "start date",