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

implemented task/:id/view

Browse Source
This commit is contained in:
Stephan Richter
2025-07-22 23:51:37 +02:00
parent b03b0683bc
commit c2eae076f4
11 changed files with 213 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,10 @@ import java.util.Map;
public interface ProjectService {
CompanyService companyService();
public Map<Long,Project> listCompanyProjects(long companyId, boolean includeClosed) throws UmbrellaException;
public Map<Long,Project> listUserProjects(long userId, boolean includeClosed) throws UmbrellaException;
public Collection<Project> loadMembers(Collection<Project> projects);
public default Project loadMembers(Project project){
Map<Long,Project> listCompanyProjects(long companyId, boolean includeClosed) throws UmbrellaException;
Map<Long,Project> listUserProjects(long userId, boolean includeClosed) throws UmbrellaException;
Collection<Project> loadMembers(Collection<Project> projects);
default Project loadMembers(Project project){
loadMembers(List.of(project));
return project;
}

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

@@ -2,14 +2,22 @@
package de.srsoftware.umbrella.core.api;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Task;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
public interface TaskService {
CompanyService companyService();
HashMap<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException;
HashMap<Long, Task> listProjectTasks(long projectId) throws UmbrellaException;
Collection<Task> loadMembers(Collection<Task> tasks);
default Task loadMembers(Task task){
loadMembers(List.of(task));
return task;
}
ProjectService projectService();
UserService userService();

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

@@ -12,7 +12,7 @@ import java.time.LocalDate;
import java.util.HashMap;
import java.util.Map;
public record Task(long id, long projectId, Long parentTaskId, String name, String description, Status status, Double estimatedTime, LocalDate start, LocalDate dueDate, boolean showClosed, boolean noIndex) implements Mappable {
public record Task(long id, long projectId, Long parentTaskId, String name, String description, Status status, Double estimatedTime, LocalDate start, LocalDate dueDate, boolean showClosed, boolean noIndex, Map<Long,Member> members) implements Mappable {
public static Task of(ResultSet rs) throws SQLException {
var estTime = rs.getDouble(EST_TIME);
var parentTaskId = rs.getLong(PARENT_TASK_ID);
@@ -29,7 +29,8 @@ public record Task(long id, long projectId, Long parentTaskId, String name, Stri
startDate != null ? LocalDate.parse(startDate) : null,
dueDate != null ? LocalDate.parse(dueDate) : null,
rs.getBoolean(SHOW_CLOSED),
rs.getBoolean(NO_INDEX)
rs.getBoolean(NO_INDEX),
new HashMap<>()
);
}
@@ -49,4 +50,8 @@ public record Task(long id, long projectId, Long parentTaskId, String name, Stri
map.put(NO_INDEX,noIndex);
return map;
}
public boolean hasMember(UmbrellaUser user) {
return members.containsKey(user.id());
}
}

2
frontend/src/App.svelte
View File

@@ -20,6 +20,7 @@
import User from "./routes/user/User.svelte";
import ViewDoc from "./routes/document/View.svelte";
import ViewPrj from "./routes/project/View.svelte";
import ViewTask from "./routes/task/View.svelte";
let translations_ready = $state(false);
onMount(async () => {
@@ -51,6 +52,7 @@
<Route path="/project/add" component={ProjectAdd} />
<Route path="/project/:id/view" component={ViewPrj} />
<Route path="/search" component={Search} />
<Route path="/task/:id/view" component={ViewTask} />
<Route path="/user" component={User} />
<Route path="/user/create" component={EditUser} />
<Route path="/user/login" component={User} />

5
frontend/src/Components/ListTask.svelte
View File

@@ -32,8 +32,9 @@
function openTask(evt){
evt.preventDefault();
//router.navigate(`/task/${task.id}/view`);
location.href = `https://umbrella.srsoftware.de/task/${task.id}/view`;
console.log('openTask(…)',evt,task);
router.navigate(`/task/${task.id}/view`);
//location.href = `https://umbrella.srsoftware.de/task/${task.id}/view`;
}
if (task.estimated_time){

121
frontend/src/routes/task/View.svelte Normal file
View File

@@ -0,0 +1,121 @@
<script>
import { t } from '../../translations.svelte.js';
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import TaskList from '../../Components/TaskList.svelte';
const router = useTinyRouter();
let { id } = $props();
let task = $state(null);
let project = $state(null);
let error = $state(null);
let children = $state(null);
let estimated_time = $state({sum:0});
let dummy = $derived(updateOn(id));
$effect(() => updateOn(id));
function updateOn(id){
loadTask();
}
async function loadChildren(){
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/task/list`;
var data = {
parent_task_id:+task.id,
show_closed: task.show_closed
};
const resp = await fetch(url,{
credentials:'include',
method:'POST',
body:JSON.stringify(data)
});
if (resp.ok){
children = await resp.json();
error = null;
} else {
error = await resp.text();
}
}
async function loadProject(){
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/project/${task.project_id}`;
const resp = await fetch(url,{credentials:'include'});
if (resp.ok){
project = await resp.json();
error = null;
} else {
error = await resp.text();
}
}
async function loadTask(){
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/task/${id}`;
const resp = await fetch(url,{credentials:'include'});
if (resp.ok){
task = await resp.json();
error = null;
project = null;
children = null;
loadChildren();
if (task.project_id) loadProject();
} else {
error = await resp.text();
}
}
function gotoProject(){
if (!project) return;
router.navigate(`/project/${project.id}/view`)
}
onMount(loadTask);
</script>
{#if error}
<span class="error">{error}</span>
{/if}
{#if task}
<table>
<tbody>
{#if project}
<tr>
<th>{t('project')}</th>
<td class="project name" onclick={gotoProject}>{project.name}</td>
</tr>
{/if}
<tr>
<th>{t('task')}</th>
<td class="task name">{task.name}</td>
</tr>
{#if task.description.rendered}
<tr>
<th>{t('description')}</th>
<td class="task description">{@html task.description.rendered}</td>
</tr>
{/if}
{#if task.start_date}
<tr>
<th>{t('start_date')}</th>
<td class="task start date">{task.start_date}</td>
</tr>
{/if}
{#if task.due_date}
<tr>
<th>{t('due_date')}</th>
<td class="task due date">{task.due_date}</td>
</tr>
{/if}
{#if children}
<tr>
<th>{t('subtasks')}</th>
<td class="task children">
<TaskList tasks={children} {estimated_time} />
</td>
</tr>
{/if}
</tbody>
</table>
{/if}

2
project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java
View File

@@ -155,7 +155,7 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
if (result == null) throw UmbrellaException.notFound("No project found for id {0}",projectId);
return result;
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load items from database");
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load project from database");
}
}

34
task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
View File

@@ -7,17 +7,18 @@ import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
import static de.srsoftware.tools.jdbc.Query.select;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR;
import static de.srsoftware.umbrella.project.Constants.*;
import static de.srsoftware.umbrella.task.Constants.*;
import static java.lang.System.Logger.Level.WARNING;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Status;
import de.srsoftware.umbrella.core.model.Task;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import de.srsoftware.umbrella.core.model.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
public class SqliteDb implements TaskDb {
@@ -28,6 +29,19 @@ public class SqliteDb implements TaskDb {
db = connection;
}
@Override
public Map<Long, Permission> getMembers(Task task) {
try {
var result = new HashMap<Long,Permission>();
var rs = select(ALL).from(TABLE_TASKS_USERS).where(TASK_ID,equal(task.id())).exec(db);
while (rs.next()) result.put(rs.getLong(USER_ID),Permission.of(rs.getInt(PERMISSIONS)));
rs.close();
return result;
} catch (SQLException e){
throw new UmbrellaException(HTTP_SERVER_ERROR,"Faailed to load task members");
}
}
public HashMap<Long, Task> listTasks(Collection<Long> projectIds) throws UmbrellaException {
try {
var tasks = new HashMap<Long,Task>();
@@ -83,4 +97,18 @@ public class SqliteDb implements TaskDb {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load tasks for project id");
}
}
@Override
public Task load(long taskId) throws UmbrellaException {
try {
var rs = select(ALL).from(TABLE_TASKS).where(ID, equal(taskId)).exec(db);
Task result = null;
if (rs.next()) result = Task.of(rs);
rs.close();
if (result == null) throw UmbrellaException.notFound("No task found for id {0}",taskId);
return result;
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load task from database");
}
}
}

8
task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
View File

@@ -2,7 +2,15 @@
package de.srsoftware.umbrella.task;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.Task;
import java.util.Map;
public interface TaskDb {
Task load(long taskId) throws UmbrellaException;
Map<Long, Permission> getMembers(Task task);
}

27
task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
View File

@@ -62,7 +62,12 @@ public class TaskModule extends BaseHandler implements TaskService {
return switch (head) {
case PERMISSIONS -> getPermissionList(ex);
case STATES -> getStateList(ex);
default -> super.doGet(path,ex);
case null -> super.doGet(path,ex);
default -> {
var taskId = Long.parseLong(head);
head = path.pop();
yield head == null ? getTask(ex,taskId,user.get()) : super.doGet(path,ex);
}
};
} catch (UmbrellaException e){
return send(ex,e);
@@ -121,6 +126,12 @@ public class TaskModule extends BaseHandler implements TaskService {
return sendContent(ex,map);
}
private boolean getTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
var task = loadMembers(taskDb.load(taskId));
if (!task.hasMember(user)) throw forbidden("You are not a member of {0}",task.name());
return sendContent(ex,task);
}
@Override
public HashMap<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException {
var projectList = projects.listCompanyProjects(companyId,false);
@@ -132,6 +143,20 @@ public class TaskModule extends BaseHandler implements TaskService {
return taskDb.listTasks(List.of(projectId));
}
@Override
public Collection<Task> loadMembers(Collection<Task> taskList) {
var userMap = new HashMap<Long,UmbrellaUser>();
for (var task : taskList){
for (var entry : taskDb.getMembers(task).entrySet()){
var userId = entry.getKey();
var permission = entry.getValue();
var user = userMap.computeIfAbsent(userId,k -> users.loadUser(userId));
task.members().put(userId,new Member(user,permission));
}
}
return taskList;
}
private Map<String,Object> placeInTree(Task task, HashMap<Long, Map<String,Object>> taskTree, Map<Long, Task> taskMap) {
var mappedTask = task.toMap();
if (task.parentTaskId() != null){

1
translations/src/main/resources/de.json
View File

@@ -191,6 +191,7 @@
},
"stock": "Inventar",
"subject": "Betreff",
"subtasks": "Unteraufgaben",
"task": "Aufgabe",
"tasks": "Aufgaben",