implemented task creation using full form from kanban

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2026-02-03 10:54:37 +01:00
parent 0f902e3efa
commit f20fa69cf4
3 changed files with 25 additions and 19 deletions

View File

@@ -121,7 +121,9 @@
if (method != 'delete') processTask(json.task); if (method != 'delete') processTask(json.task);
// show notification // show notification
if (json.user.id != user.id) { if (json.user.id == user.id) {
if (method == 'create') task_form = false; // task has been created by current user
} else {
let term = "user_updated_entity"; let term = "user_updated_entity";
if (method == 'create') term = "user_created_entity"; if (method == 'create') term = "user_created_entity";
if (method == 'delete') term = "user_deleted_entity"; if (method == 'delete') term = "user_deleted_entity";
@@ -251,7 +253,6 @@
} }
function show_task_form(project_id,assignee,state_id){ function show_task_form(project_id,assignee,state_id){
console.log({project_id,assignee,state_id});
task_form = {project_id,assignee,state_id}; task_form = {project_id,assignee,state_id};
} }
@@ -274,7 +275,7 @@
{#if project} {#if project}
{#if task_form} {#if task_form}
<div class="overlay"> <div class="overlay">
<TaskForm project_id={task_form.project_id} user_id={task_form.user_id} state={task_form.state} /> <TaskForm project_id={task_form.project_id} assignee={task_form.assignee} state_id={task_form.state_id} />
</div> </div>
{/if} <!-- task form --> {/if} <!-- task form -->

View File

@@ -2,7 +2,7 @@
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router'; import { useTinyRouter } from 'svelte-tiny-router';
import { api } from '../../urls.svelte.js'; import { api, get } from '../../urls.svelte.js';
import { error, yikes } from '../../warn.svelte'; import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte.js'; import { t } from '../../translations.svelte.js';
import { user } from '../../user.svelte.js'; import { user } from '../../user.svelte.js';
@@ -20,6 +20,7 @@
description : { source : '', rendered : '' }, description : { source : '', rendered : '' },
due_date : null, due_date : null,
est_time : null, est_time : null,
members : {},
no_index : false, no_index : false,
show_closed : false, show_closed : false,
start_date : null, start_date : null,
@@ -29,6 +30,7 @@
function addMember(member){ function addMember(member){
for (let uid of Object.keys(member)) task.members[uid] = project.members[uid]; for (let uid of Object.keys(member)) task.members[uid] = project.members[uid];
console.log(task.members);
} }
function flat(json){ function flat(json){
@@ -44,31 +46,32 @@
async function load(){ async function load(){
if (parent_task_id) await loadParent(); if (parent_task_id) await loadParent();
if (project_id) loadProject(); if (project_id) loadProject();
if (assignee) task.assignee = +assignee; if (state_id) task.status = { code : +state_id };
if (state_id) task.state = +state_id;
loadTags(); loadTags();
} }
async function loadParent(){ async function loadParent(){
const url = api(`task/${parent_task_id}`); const url = api(`task/${parent_task_id}`);
const resp = await fetch(url,{credentials:'include'}); const resp = await get(url);
if (resp.ok){ if (resp.ok){
parent_task = await resp.json(); parent_task = await resp.json();
task.parent_task_id = +parent_task_id; task.parent_task_id = +parent_task_id;
project_id = +parent_task.project_id; project_id = +parent_task.project_id;
yikes(); yikes();
project = null; // TODO project = null; // TODO
} else { } else error(resp);
error(resp);
}
} }
async function loadProject(){ async function loadProject(){
const url = api(`project/${project_id}`); const url = api(`project/${project_id}`);
const resp = await fetch(url,{credentials:'include'}); const resp = await get(url);
if (resp.ok){ if (resp.ok){
project = await resp.json(); project = await resp.json();
task.project_id = +project_id; task.project_id = +project_id;
if (assignee && project.members[assignee]){
task.members[assignee] = project.members[assignee];
task.members[assignee].permission = { name : "ASSIGNEE", code : 3 }
}
yikes(); yikes();
} else { } else {
error(resp); error(resp);
@@ -80,7 +83,7 @@
if (project_id) url = api(`tags/project/${project_id}`); if (project_id) url = api(`tags/project/${project_id}`);
if (parent_task_id) url = api(`tags/task/${parent_task_id}`); if (parent_task_id) url = api(`tags/task/${parent_task_id}`);
if (url) { if (url) {
const resp = await fetch(url,{credentials:'include'}); const resp = await get(url);
if (resp.ok) task.tags = await resp.json(); if (resp.ok) task.tags = await resp.json();
} }
} }
@@ -109,10 +112,12 @@
body : JSON.stringify(task) body : JSON.stringify(task)
}); });
if (resp.ok) { if (resp.ok) {
task = await resp.json(); if (!assignee) { // if assignee is set, this form was opened within an external context. hence we don`t want to navigate somewhere else!
if (task.parent_task_id){ task = await resp.json();
router.navigate(`/task/${task.parent_task_id}/view`); if (task.parent_task_id){
} else router.navigate(`/task/${task.id}/view`); router.navigate(`/task/${task.parent_task_id}/view`);
} else router.navigate(`/task/${task.id}/view`);
}
yikes(); yikes();
} else { } else {
error(resp); error(resp);
@@ -185,7 +190,7 @@
{t('members')} {t('members')}
</th> </th>
<td> <td>
<PermissionEditor members={task.members} {addMember} {getCandidates} {dropMember} /> <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -247,4 +252,4 @@
</tbody> </tbody>
</table> </table>
<button onclick={saveTask}>{t('save_object',{object:t('task')})}</button> <button onclick={saveTask}>{t('save_object',{object:t('task')})}</button>
</fieldset> </fieldset>

View File

@@ -270,7 +270,7 @@
<div>{t('members')}</div> <div>{t('members')}</div>
<div> <div>
<PermissionEditor members={task.members} {updatePermission} {addMember} {dropMember} {getCandidates} /> <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
</div> </div>
<div>{t('start_date')}</div> <div>{t('start_date')}</div>
<div> <div>