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

working on project list: introducing task list

Browse Source
This commit is contained in:
Stephan Richter
2025-07-19 21:05:17 +02:00
parent 8e3fa266a8
commit a14b541c91
16 changed files with 128 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/srsoftware/umbrella/core/Util.java
View File

@@ -9,6 +9,7 @@ import static java.lang.System.Logger.Level.WARNING;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.xrbpowered.jparsedown.JParsedown;
import de.srsoftware.tools.Mappable;
import de.srsoftware.tools.Query;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import java.io.*;
@@ -18,6 +19,7 @@ import java.net.URL;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import org.json.JSONObject;
@@ -40,6 +42,12 @@ public class Util {
};
}
public static Map<Long,Map<String,Object>> mapValues(Map<Long, ? extends Mappable> map){
var result = new HashMap<Long,Map<String,Object>>();
for (var entry : map.entrySet()) result.put(entry.getKey(),entry.getValue().toMap());
return result;
}
public static String markdown(String source){
try {
if (plantumlJar.exists()) {

6
core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java
View File

@@ -3,12 +3,12 @@ package de.srsoftware.umbrella.core.api;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Task;
import java.util.Collection;
import java.util.HashMap;
public interface TaskService {
CompanyService companyService();
Collection<Task> listCompanyTasks(long companyId) throws UmbrellaException;
Collection<Task> listProjectTasks(long projectId) throws UmbrellaException;
HashMap<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException;
HashMap<Long, Task> listProjectTasks(long projectId) throws UmbrellaException;
ProjectService projectService();

1
core/src/main/java/de/srsoftware/umbrella/core/model/Project.java
View File

@@ -1,7 +1,6 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.core.model;
import static de.srsoftware.tools.Optionals.nullIfEmpty;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Util.markdown;