preparing addition of tasks
This commit is contained in:
@@ -2,9 +2,7 @@
|
|||||||
package de.srsoftware.umbrella.core.api;
|
package de.srsoftware.umbrella.core.api;
|
||||||
|
|
||||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||||
import de.srsoftware.umbrella.core.model.Project;
|
|
||||||
import de.srsoftware.umbrella.core.model.Task;
|
import de.srsoftware.umbrella.core.model.Task;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
import { user } from './user.svelte.js';
|
import { user } from './user.svelte.js';
|
||||||
import { Router, Route } from 'svelte-tiny-router';
|
import { Router, Route } from 'svelte-tiny-router';
|
||||||
import AddDoc from "./routes/document/Add.svelte";
|
import AddDoc from "./routes/document/Add.svelte";
|
||||||
|
import AddTask from "./routes/task/Add.svelte";
|
||||||
import Callback from "./routes/user/OidcCallback.svelte";
|
import Callback from "./routes/user/OidcCallback.svelte";
|
||||||
import DocList from "./routes/document/List.svelte";
|
import DocList from "./routes/document/List.svelte";
|
||||||
import EditService from "./routes/user/EditService.svelte";
|
import EditService from "./routes/user/EditService.svelte";
|
||||||
@@ -50,6 +51,7 @@
|
|||||||
<Route path="/message/settings" component={Messages} />
|
<Route path="/message/settings" component={Messages} />
|
||||||
<Route path="/project" component={ProjectList} />
|
<Route path="/project" component={ProjectList} />
|
||||||
<Route path="/project/add" component={ProjectAdd} />
|
<Route path="/project/add" component={ProjectAdd} />
|
||||||
|
<Route path="/project/:project_id/add_task" component={AddTask} />
|
||||||
<Route path="/project/:id/view" component={ViewPrj} />
|
<Route path="/project/:id/view" component={ViewPrj} />
|
||||||
<Route path="/search" component={Search} />
|
<Route path="/search" component={Search} />
|
||||||
<Route path="/task/:id/view" component={ViewTask} />
|
<Route path="/task/:id/view" component={ViewTask} />
|
||||||
|
|||||||
@@ -2,8 +2,14 @@
|
|||||||
import { activeField } from './field_sync.svelte.js';
|
import { activeField } from './field_sync.svelte.js';
|
||||||
import { t } from '../translations.svelte.js';
|
import { t } from '../translations.svelte.js';
|
||||||
|
|
||||||
let { editable = false, value = $bindable(null), onSet = (newVal) => {} } = $props();
|
let {
|
||||||
let editing = $state(false);
|
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});
|
let editValue = $state({source:value.source,rendered:value.rendered});
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
<script>
|
<script>
|
||||||
import { t } from '../../translations.svelte.js';
|
import { t } from '../../translations.svelte.js';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
import { useTinyRouter } from 'svelte-tiny-router';
|
||||||
import TaskList from '../../Components/TaskList.svelte';
|
import TaskList from '../../Components/TaskList.svelte';
|
||||||
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
||||||
import LineEditor from '../../Components/LineEditor.svelte';
|
import LineEditor from '../../Components/LineEditor.svelte';
|
||||||
import StateSelector from '../../Components/StateSelector.svelte';
|
import StateSelector from '../../Components/StateSelector.svelte';
|
||||||
import MemberEditor from '../../Components/MemberEditor.svelte';
|
import MemberEditor from '../../Components/MemberEditor.svelte';
|
||||||
|
|
||||||
|
let router = useTinyRouter();
|
||||||
let { id } = $props();
|
let { id } = $props();
|
||||||
let project = $state(null);
|
let project = $state(null);
|
||||||
let error = $state(null);
|
let error = $state(null);
|
||||||
@@ -20,6 +22,10 @@
|
|||||||
if (ids) update({new_member:+ids.pop()});
|
if (ids) update({new_member:+ids.pop()});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addTask(){
|
||||||
|
router.navigate(`/project/${id}/add_task`);
|
||||||
|
}
|
||||||
|
|
||||||
function changeClosed(){
|
function changeClosed(){
|
||||||
update({show_closed:project.show_closed});
|
update({show_closed:project.show_closed});
|
||||||
loadTasks();
|
loadTasks();
|
||||||
@@ -133,7 +139,10 @@
|
|||||||
</tr>
|
</tr>
|
||||||
{/if}
|
{/if}
|
||||||
<tr>
|
<tr>
|
||||||
<th>{t('tasks')}</th>
|
<th>
|
||||||
|
{t('tasks')}
|
||||||
|
<button onclick={addTask}>{t('add_new',t('task'))}</button>
|
||||||
|
</th>
|
||||||
<td class="tasks">
|
<td class="tasks">
|
||||||
{#if tasks}
|
{#if tasks}
|
||||||
<TaskList {tasks} {estimated_time} show_closed={project.show_closed} />
|
<TaskList {tasks} {estimated_time} show_closed={project.show_closed} />
|
||||||
|
|||||||
68
frontend/src/routes/task/Add.svelte
Normal file
68
frontend/src/routes/task/Add.svelte
Normal file
@@ -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
Normal file
3
frontend/src/urls.svelte.js
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export function api(rel_path){
|
||||||
|
return `${location.protocol}//${location.host.replace('5173','8080')}/api/${rel_path}`;
|
||||||
|
}
|
||||||
@@ -14,7 +14,6 @@ import static java.net.HttpURLConnection.HTTP_OK;
|
|||||||
|
|
||||||
import com.sun.net.httpserver.HttpExchange;
|
import com.sun.net.httpserver.HttpExchange;
|
||||||
import de.srsoftware.configuration.Configuration;
|
import de.srsoftware.configuration.Configuration;
|
||||||
import de.srsoftware.tools.Mappable;
|
|
||||||
import de.srsoftware.tools.Path;
|
import de.srsoftware.tools.Path;
|
||||||
import de.srsoftware.tools.SessionToken;
|
import de.srsoftware.tools.SessionToken;
|
||||||
import de.srsoftware.umbrella.core.BaseHandler;
|
import de.srsoftware.umbrella.core.BaseHandler;
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import static java.lang.System.Logger.Level.WARNING;
|
|||||||
|
|
||||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||||
import de.srsoftware.umbrella.core.model.*;
|
import de.srsoftware.umbrella.core.model.*;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ package de.srsoftware.umbrella.task;
|
|||||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||||
import de.srsoftware.umbrella.core.model.Permission;
|
import de.srsoftware.umbrella.core.model.Permission;
|
||||||
import de.srsoftware.umbrella.core.model.Task;
|
import de.srsoftware.umbrella.core.model.Task;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public interface TaskDb {
|
public interface TaskDb {
|
||||||
|
|||||||
Reference in New Issue
Block a user