Browse Source

preparing addition of tasks

kanban
Stephan Richter 3 months ago
parent
commit
ddeb2a8d88
  1. 2
      core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java
  2. 2
      frontend/src/App.svelte
  3. 10
      frontend/src/Components/MarkdownEditor.svelte
  4. 11
      frontend/src/routes/project/View.svelte
  5. 68
      frontend/src/routes/task/Add.svelte
  6. 3
      frontend/src/urls.svelte.js
  7. 1
      project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
  8. 1
      task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
  9. 1
      task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java

2
core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java

@ -2,9 +2,7 @@ @@ -2,9 +2,7 @@
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;

2
frontend/src/App.svelte

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
import { user } from './user.svelte.js';
import { Router, Route } from 'svelte-tiny-router';
import AddDoc from "./routes/document/Add.svelte";
import AddTask from "./routes/task/Add.svelte";
import Callback from "./routes/user/OidcCallback.svelte";
import DocList from "./routes/document/List.svelte";
import EditService from "./routes/user/EditService.svelte";
@ -50,6 +51,7 @@ @@ -50,6 +51,7 @@
<Route path="/message/settings" component={Messages} />
<Route path="/project" component={ProjectList} />
<Route path="/project/add" component={ProjectAdd} />
<Route path="/project/:project_id/add_task" component={AddTask} />
<Route path="/project/:id/view" component={ViewPrj} />
<Route path="/search" component={Search} />
<Route path="/task/:id/view" component={ViewTask} />

10
frontend/src/Components/MarkdownEditor.svelte

@ -2,8 +2,14 @@ @@ -2,8 +2,14 @@
import { activeField } from './field_sync.svelte.js';
import { t } from '../translations.svelte.js';
let { editable = false, value = $bindable(null), onSet = (newVal) => {} } = $props();
let editing = $state(false);
let {
editable = true,
editing = false,
value = $bindable({source:null,rendered:null}),
onSet = (newVal) => {}
} = $props();
//let editing = $state(false);
let editValue = $state({source:value.source,rendered:value.rendered});

11
frontend/src/routes/project/View.svelte

@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
<script>
import { t } from '../../translations.svelte.js';
import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import TaskList from '../../Components/TaskList.svelte';
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
import LineEditor from '../../Components/LineEditor.svelte';
import StateSelector from '../../Components/StateSelector.svelte';
import MemberEditor from '../../Components/MemberEditor.svelte';
let router = useTinyRouter();
let { id } = $props();
let project = $state(null);
let error = $state(null);
@ -20,6 +22,10 @@ @@ -20,6 +22,10 @@
if (ids) update({new_member:+ids.pop()});
}
function addTask(){
router.navigate(`/project/${id}/add_task`);
}
function changeClosed(){
update({show_closed:project.show_closed});
loadTasks();
@ -133,7 +139,10 @@ @@ -133,7 +139,10 @@
</tr>
{/if}
<tr>
<th>{t('tasks')}</th>
<th>
{t('tasks')}
<button onclick={addTask}>{t('add_new',t('task'))}</button>
</th>
<td class="tasks">
{#if tasks}
<TaskList {tasks} {estimated_time} show_closed={project.show_closed} />

68
frontend/src/routes/task/Add.svelte

@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
<script>
import { t } from '../../translations.svelte.js';
import { api } from '../../urls.svelte.js';
import { onMount } from 'svelte';
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
let { project_id = null } = $props();
let error = $state(null);
let project = $state(null)
let task = $state({
name : '',
description : { source : 'new_task', rendered : '' }
});
function load(){
if (project_id) loadProject();
}
async function loadProject(){
var url = api(`project/${project_id}`);
const resp = await fetch(url,{credentials:'include'});
if (resp.ok){
project = await resp.json();
task.project_id = project_id;
error = null;
} else {
error = await resp.text();
}
}
onMount(load);
</script>
<fieldset>
<legend>Add Task</legend>
<table>
<tbody>
<tr>
<th>
{t('name')}
</th>
<td>
<input bind:value={task.name}>
</td>
</tr>
{#if project}
<tr>
<th>
{t('project')}
</th>
<td>
{project.name}
</td>
</tr>
{/if}
<tr>
<th>
{t('description')}
</th>
<td>
<MarkdownEditor bind:value={task.description} editing={true}/>
</td>
</tr>
</tbody>
</table>
</fieldset>

3
frontend/src/urls.svelte.js

@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
export function api(rel_path){
return `${location.protocol}//${location.host.replace('5173','8080')}/api/${rel_path}`;
}

1
project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java

@ -14,7 +14,6 @@ import static java.net.HttpURLConnection.HTTP_OK; @@ -14,7 +14,6 @@ import static java.net.HttpURLConnection.HTTP_OK;
import com.sun.net.httpserver.HttpExchange;
import de.srsoftware.configuration.Configuration;
import de.srsoftware.tools.Mappable;
import de.srsoftware.tools.Path;
import de.srsoftware.tools.SessionToken;
import de.srsoftware.umbrella.core.BaseHandler;

1
task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java

@ -13,7 +13,6 @@ import static java.lang.System.Logger.Level.WARNING; @@ -13,7 +13,6 @@ import static java.lang.System.Logger.Level.WARNING;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collection;

1
task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java

@ -5,7 +5,6 @@ package de.srsoftware.umbrella.task; @@ -5,7 +5,6 @@ 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 {

Loading…
Cancel
Save