SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'kanban'
Some checks failed
Build Docker Image / Docker-Build (push) Failing after 1m59s
Details
Build Docker Image / Clean-Registry (push) Successful in -6s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-03-11 22:28:33 +01:00
parent 880816450c e4a9463307
commit eede073cff
3 changed files with 33 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/de/srsoftware/umbrella/core/model/Task.java
View File

@@ -228,20 +228,19 @@ public class Task implements Mappable {
return tags;
}
@Override
public Map<String, Object> toMap() {
public Map<String,Object> toMap(boolean renderMarkdown){
var map = new HashMap<String,Object>();
var memberMap = new HashMap<Long,Map<String,Object>>();
if (members != null) for (var entry : members.entrySet()){
memberMap.put(entry.getKey(),entry.getValue().toMap());
}
map.put(ID, id);
map.put(PROJECT_ID, projectId);
map.put(PARENT_TASK_ID, parentTaskId);
map.put(PRIORITY,priority);
map.put(NAME, name);
map.put(DESCRIPTION, mapMarkdown(description));
map.put(STATUS, status);
map.put(PROJECT_ID, projectId);
map.put(PARENT_TASK_ID, parentTaskId);
map.put(PRIORITY,priority);
map.put(NAME, name);
map.put(DESCRIPTION, renderMarkdown ? mapMarkdown(description) : Map.of(SOURCE,description));
map.put(STATUS, status);
map.put(EST_TIME, estimatedTime);
map.put(START_DATE,start);
map.put(DUE_DATE,dueDate);
@@ -254,6 +253,11 @@ public class Task implements Mappable {
return map;
}
@Override
public Map<String, Object> toMap() {
return toMap(true);
}
private int totalPrio() {
if (status >= Status.COMPLETE.code()) return 0; // task is done, do no longer highlight
int total = priority;