working on task members
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -2,7 +2,10 @@
|
|||||||
import { t } from '../translations.svelte.js'
|
import { t } from '../translations.svelte.js'
|
||||||
import { tick } from "svelte";
|
import { tick } from "svelte";
|
||||||
|
|
||||||
let { getOptionsFor = text => {}, onSelect = text => [] } = $props();
|
let {
|
||||||
|
getCandidates = text => {},
|
||||||
|
onSelect = text => []
|
||||||
|
} = $props();
|
||||||
|
|
||||||
let text = $state('')
|
let text = $state('')
|
||||||
let options = $state({});
|
let options = $state({});
|
||||||
@@ -35,7 +38,8 @@
|
|||||||
} else if (key.length<2){
|
} else if (key.length<2){
|
||||||
text += evt.key
|
text += evt.key
|
||||||
}
|
}
|
||||||
options = await getOptionsFor(text);
|
options = await getCandidates(text);
|
||||||
|
console.log({options:options})
|
||||||
await tick();
|
await tick();
|
||||||
for (let o of select.getElementsByTagName('option')) o.selected = false;
|
for (let o of select.getElementsByTagName('option')) o.selected = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,12 +4,12 @@
|
|||||||
|
|
||||||
let {
|
let {
|
||||||
editable = true,
|
editable = true,
|
||||||
editing = false,
|
start_open = false,
|
||||||
value = $bindable({source:null,rendered:null}),
|
value = $bindable({source:null,rendered:null}),
|
||||||
onSet = (newVal) => {}
|
onSet = (newVal) => {}
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
//let editing = $state(false);
|
let editing = $state(false);
|
||||||
|
|
||||||
let editValue = $state({source:value.source,rendered:value.rendered});
|
let editValue = $state({source:value.source,rendered:value.rendered});
|
||||||
|
|
||||||
@@ -49,10 +49,11 @@
|
|||||||
if (ev.keyCode == 27) resetEdit();
|
if (ev.keyCode == 27) resetEdit();
|
||||||
|
|
||||||
if (timer) clearTimeout(timer);
|
if (timer) clearTimeout(timer);
|
||||||
timer = setTimeout(render,1000);
|
timer = setTimeout(render,500);
|
||||||
}
|
}
|
||||||
|
|
||||||
activeField.subscribe((val) => resetEdit());
|
activeField.subscribe((val) => resetEdit());
|
||||||
|
if (start_open) startEdit();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
import PermissionSelector from './PermissionSelector.svelte';
|
import PermissionSelector from './PermissionSelector.svelte';
|
||||||
let {
|
let {
|
||||||
members,
|
members,
|
||||||
|
getCandidates = text => {},
|
||||||
updatePermission = (uid,perm) => console.log(`no handler for updatePermission(${uid}, ${perm})`),
|
updatePermission = (uid,perm) => console.log(`no handler for updatePermission(${uid}, ${perm})`),
|
||||||
dropMember = (member) => console.log(`no handler for dropMember(${member})`),
|
dropMember = (member) => console.log(`no handler for dropMember(${member})`),
|
||||||
addMember = (entry) => console.log(`no handler for addMember(${entry})`)
|
addMember = (entry) => console.log(`no handler for addMember(${entry})`)
|
||||||
@@ -24,21 +25,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getOptionsFor(text){
|
|
||||||
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/search`;
|
|
||||||
var resp = await fetch(url,{
|
|
||||||
credentials: 'include',
|
|
||||||
method: 'POST',
|
|
||||||
body: text
|
|
||||||
});
|
|
||||||
if (resp.ok){
|
|
||||||
var json = await resp.json();
|
|
||||||
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
|
||||||
} else {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onSelect(entry){
|
function onSelect(entry){
|
||||||
addMember(entry);
|
addMember(entry);
|
||||||
}
|
}
|
||||||
@@ -68,7 +54,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>{t('add_member')}</td>
|
<td>{t('add_member')}</td>
|
||||||
<td>
|
<td>
|
||||||
<Autocomplete {getOptionsFor} {onSelect} />
|
<Autocomplete {getCandidates} {onSelect} />
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -35,6 +35,21 @@
|
|||||||
update({drop_member:member.user.id});
|
update({drop_member:member.user.id});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getCandidates(text){
|
||||||
|
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/search`;
|
||||||
|
var resp = await fetch(url,{
|
||||||
|
credentials: 'include',
|
||||||
|
method: 'POST',
|
||||||
|
body: text
|
||||||
|
});
|
||||||
|
if (resp.ok){
|
||||||
|
var json = await resp.json();
|
||||||
|
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
||||||
|
} else {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadProject(){
|
async function loadProject(){
|
||||||
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/project/${id}`;
|
const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/project/${id}`;
|
||||||
const resp = await fetch(url,{credentials:'include'});
|
const resp = await fetch(url,{credentials:'include'});
|
||||||
@@ -155,7 +170,7 @@
|
|||||||
{#if showSettings}
|
{#if showSettings}
|
||||||
<fieldset class="project settings">
|
<fieldset class="project settings">
|
||||||
<legend>{t('settings')}</legend>
|
<legend>{t('settings')}</legend>
|
||||||
<MemberEditor members={project.members} {updatePermission} {addMember} {dropMember} />
|
<MemberEditor members={project.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>{t('miscellaneous_settings')}</legend>
|
<legend>{t('miscellaneous_settings')}</legend>
|
||||||
<label>
|
<label>
|
||||||
|
|||||||
@@ -1,34 +1,51 @@
|
|||||||
<script>
|
<script>
|
||||||
import { t } from '../../translations.svelte.js';
|
import { t } from '../../translations.svelte.js';
|
||||||
import { api } from '../../urls.svelte.js';
|
import { api } from '../../urls.svelte.js';
|
||||||
|
import { user } from '../../user.svelte.js';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
|
||||||
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
||||||
|
import MemberEditor from '../../Components/MemberEditor.svelte';
|
||||||
|
|
||||||
let { project_id = null } = $props();
|
let { project_id = null } = $props();
|
||||||
let error = $state(null);
|
let error = $state(null);
|
||||||
let project = $state(null)
|
let project = $state(null)
|
||||||
let task = $state({
|
let task = $state({
|
||||||
name : '',
|
name : '',
|
||||||
description : { source : 'new_task', rendered : '' }
|
description : { source : 'new_task', rendered : '' },
|
||||||
|
members : {}
|
||||||
});
|
});
|
||||||
|
|
||||||
function load(){
|
function load(){
|
||||||
if (project_id) loadProject();
|
if (project_id) loadProject();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addMember(member){
|
||||||
|
for (let uid of Object.keys(member)){
|
||||||
|
task.members[uid] = project.members[uid];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadProject(){
|
async function loadProject(){
|
||||||
var url = api(`project/${project_id}`);
|
var url = api(`project/${project_id}`);
|
||||||
const resp = await fetch(url,{credentials:'include'});
|
const resp = await fetch(url,{credentials:'include'});
|
||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
project = await resp.json();
|
project = await resp.json();
|
||||||
task.project_id = project_id;
|
task.project_id = project_id;
|
||||||
|
task.members = project.members;
|
||||||
error = null;
|
error = null;
|
||||||
} else {
|
} else {
|
||||||
error = await resp.text();
|
error = await resp.text();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function getCandidates(text){
|
||||||
|
const candidates = Object.values(project.members)
|
||||||
|
.filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
|
||||||
|
.map(member => [member.user.id,member.user.name]);
|
||||||
|
return Object.fromEntries(candidates);
|
||||||
|
}
|
||||||
|
|
||||||
onMount(load);
|
onMount(load);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -60,7 +77,15 @@
|
|||||||
{t('description')}
|
{t('description')}
|
||||||
</th>
|
</th>
|
||||||
<td>
|
<td>
|
||||||
<MarkdownEditor bind:value={task.description} editing={true}/>
|
<MarkdownEditor bind:value={task.description} start_open={true}/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th>
|
||||||
|
{t('members')}
|
||||||
|
</th>
|
||||||
|
<td>
|
||||||
|
<MemberEditor members={task.members} {addMember} {getCandidates}/>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ button{
|
|||||||
border-color: yellow red red yellow;
|
border-color: yellow red red yellow;
|
||||||
}
|
}
|
||||||
footer {
|
footer {
|
||||||
position: sticky;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user