Compare commits
9 Commits
feature/bo
...
feature/ta
| Author | SHA1 | Date | |
|---|---|---|---|
| 22094e7ccc | |||
| 3927898c9b | |||
| 2fcf024410 | |||
| 5c0efe5730 | |||
| 72f897c40c | |||
| d3e5897cd5 | |||
| ef71cf3b20 | |||
| e14e37fc9d | |||
| 3e6ee91041 |
@@ -1,7 +1,6 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.bookmarks;
|
||||
|
||||
import static de.srsoftware.umbrella.messagebus.events.Event.EventType;
|
||||
import static de.srsoftware.umbrella.bookmarks.Constants.*;
|
||||
import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
|
||||
import static de.srsoftware.umbrella.core.ModuleRegistry.tagService;
|
||||
@@ -29,14 +28,9 @@ import de.srsoftware.umbrella.core.constants.Text;
|
||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||
import de.srsoftware.umbrella.core.model.Token;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.awt.print.Book;
|
||||
import de.srsoftware.umbrella.messagebus.events.BookmarkEvent;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
import de.srsoftware.umbrella.messagebus.events.BookmarkEvent;
|
||||
import de.srsoftware.umbrella.messagebus.events.Event;
|
||||
import de.srsoftware.umbrella.messagebus.events.TaskEvent;
|
||||
import org.json.JSONArray;
|
||||
|
||||
public class BookmarkApi extends BaseHandler implements BookmarkService {
|
||||
|
||||
@@ -3,7 +3,6 @@ package de.srsoftware.umbrella.bookmarks;
|
||||
|
||||
import de.srsoftware.umbrella.core.model.Bookmark;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -12,8 +12,6 @@ import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Text.BOOKMARK;
|
||||
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
|
||||
import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
|
||||
import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE;
|
||||
import static de.srsoftware.umbrella.messagebus.events.Event.EventType.UPDATE;
|
||||
import static java.text.MessageFormat.format;
|
||||
import static java.time.ZoneOffset.UTC;
|
||||
|
||||
@@ -24,7 +22,6 @@ import de.srsoftware.umbrella.core.model.Translatable;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import de.srsoftware.umbrella.messagebus.events.BookmarkEvent;
|
||||
import de.srsoftware.umbrella.messagebus.events.Event;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.messagebus.events;
|
||||
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.model.Bookmark;
|
||||
import de.srsoftware.umbrella.core.model.Task;
|
||||
import de.srsoftware.umbrella.core.model.Translatable;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import static de.srsoftware.umbrella.core.constants.Module.BOOKMARK;
|
||||
import static de.srsoftware.umbrella.core.model.Translatable.t;
|
||||
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.model.Bookmark;
|
||||
import de.srsoftware.umbrella.core.model.Translatable;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public class BookmarkEvent extends Event<Bookmark> {
|
||||
|
||||
public BookmarkEvent(UmbrellaUser initiator, Bookmark bookmark, EventType type){
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.messagebus.events;
|
||||
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.api.Owner;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.model.*;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.model.Translatable.t;
|
||||
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.api.Owner;
|
||||
import de.srsoftware.umbrella.core.model.*;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemEvent extends Event<Item>{
|
||||
public ItemEvent(UmbrellaUser initiator, String module, Item item, EventType type) {
|
||||
super(initiator, module, item, type);
|
||||
|
||||
@@ -150,6 +150,7 @@ public class Field {
|
||||
public static final String SUBJECT = "subject";
|
||||
|
||||
public static final String TABLE = "table";
|
||||
public static final String TAG = "tag";
|
||||
public static final String TAGS = "tags";
|
||||
public static final String TAG_COLORS = "tag_colors";
|
||||
public static final String TASK = "task";
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
/* © SRSoftware 2025 */
|
||||
package de.srsoftware.umbrella.core.model;
|
||||
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static java.text.MessageFormat.format;
|
||||
|
||||
import de.srsoftware.tools.Mappable;
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.Util;
|
||||
import de.srsoftware.umbrella.core.api.Owner;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static java.text.MessageFormat.format;
|
||||
|
||||
public class Poll implements Mappable {
|
||||
public static class Option implements Mappable{
|
||||
|
||||
|
||||
@@ -2,59 +2,118 @@
|
||||
import { t } from '../translations.svelte.js'
|
||||
import { tick } from "svelte";
|
||||
|
||||
|
||||
let {
|
||||
getCandidates = async text => { conole.log('no handler for getCandidates('+text+')'); return {};},
|
||||
onSelect = text => []
|
||||
autofocus = false,
|
||||
getCandidates = dummyGetCandidates,
|
||||
onCommit = dummyOnCommit,
|
||||
onSelect = dummyOnSelect,
|
||||
candidate = $bindable({ display : '' })
|
||||
} = $props();
|
||||
|
||||
const ignore = ['Escape','Tab','ArrowUp','ArrowLeft','ArrowRight']
|
||||
let options = $state({});
|
||||
let text = $state('')
|
||||
const ignore = ['ArrowLeft','ArrowRight'];
|
||||
//let candidate = $state({ display : '' });
|
||||
let selected = $state([]);
|
||||
let candidates = $derived(getCandidates(candidate.display));
|
||||
|
||||
async function dummyGetCandidates(text){
|
||||
console.warn(`getCandidates(${text}) not overridden!`);
|
||||
if (!text) return [];
|
||||
return [
|
||||
{
|
||||
display : 'candidate 1',
|
||||
explanation : 'candidates need to have a display field'
|
||||
},
|
||||
{
|
||||
display : 'candidate 2',
|
||||
additional : 'other fields are optional',
|
||||
more : 'and may be domain specific'
|
||||
},
|
||||
{ display : text }
|
||||
];
|
||||
}
|
||||
|
||||
function dummyOnCommit(candidate){
|
||||
// if Enter is pressed on the input field, this method gets called with
|
||||
// either the selected candidate or
|
||||
// an anonymous object with the entered text in the display field
|
||||
console.warn(`onCommit(${JSON.stringify(candidate)}) not overridden!`);
|
||||
// if the method returns true, the field will be cleared after committing
|
||||
return true;
|
||||
}
|
||||
|
||||
function dummyOnSelect(candidate){
|
||||
console.warn(`${candidate.display} selected, but onSelect not overridden!`)
|
||||
}
|
||||
|
||||
async function ondblclick(evt){
|
||||
const select = evt.target;
|
||||
const key = select.value;
|
||||
text = options[key];
|
||||
let result = {};
|
||||
result[key] = text;
|
||||
options = {};
|
||||
text = '';
|
||||
onSelect(result);
|
||||
const idx = select.value;
|
||||
candidate = candidates[idx];
|
||||
candidates = [];
|
||||
selected = [];
|
||||
console.log(candidate);
|
||||
onSelect(candidate);
|
||||
}
|
||||
|
||||
async function onkeyup(evt){
|
||||
const select = evt.target;
|
||||
const key = evt.key;
|
||||
if (ignore.includes(key)) return;
|
||||
if (key == 'ArrowDown'){
|
||||
if (select.selectedIndex == 0) select.selectedIndex=1;
|
||||
return;
|
||||
async function onkeyup(ev){
|
||||
if (ignore.includes(ev.key)) return;
|
||||
if (ev.key == 'ArrowDown'){
|
||||
ev.preventDefault();
|
||||
selected = selected.length < 1 ? [0] : [selected[0]+1]
|
||||
if (selected[0] >= candidates.length) selected = [0];
|
||||
return false;
|
||||
}
|
||||
if (key == 'Enter'){
|
||||
ondblclick(evt);
|
||||
return;
|
||||
if (ev.key == 'ArrowUp'){
|
||||
ev.preventDefault();
|
||||
selected = selected.length < 1 ? [-1] : [selected[0]-1]
|
||||
if (selected[0] < 0) selected = [candidates.length-1];
|
||||
return false;
|
||||
}
|
||||
if (key == 'Backspace'){
|
||||
text = text.substring(0,text.length-1)
|
||||
} else if (key.length<2){
|
||||
text += evt.key
|
||||
if (ev.key == 'Enter'|| ev.key == 'Tab'){
|
||||
ev.preventDefault();
|
||||
if (selected.length>0) {
|
||||
candidate = candidates[selected[0]];
|
||||
candidates = [];
|
||||
selected = [];
|
||||
onSelect(candidate);
|
||||
return false;
|
||||
}
|
||||
if (ev.key == 'Enter') {
|
||||
candidates = [];
|
||||
selected = [];
|
||||
if (onCommit(candidate)) candidate = { display : '' };
|
||||
}
|
||||
return false;
|
||||
}
|
||||
options = await getCandidates(text);
|
||||
await tick();
|
||||
for (let o of select.getElementsByTagName('option')) o.selected = false;
|
||||
if (ev.key == 'Escape'){
|
||||
ev.preventDefault();
|
||||
candidates = [];
|
||||
selected = [];
|
||||
return false;
|
||||
}
|
||||
|
||||
candidates = await getCandidates(candidate.display);
|
||||
if (selected>candidates.length) selected = candidates.length;
|
||||
return false;
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
select{
|
||||
min-width: 200px;
|
||||
}
|
||||
span { position : relative }
|
||||
select { position : absolute; top: 30px; left: 3px; }
|
||||
|
||||
select { background: black; color: orange; border: 1px solid orange; border-radius: 5px; }
|
||||
option:checked { background: orange; color: black; }
|
||||
</style>
|
||||
{#if options}
|
||||
<select size={Object.keys(options).length<2?2:Object.keys(options).length+1} {onkeyup} {ondblclick} width="40">
|
||||
<option>{text}</option>
|
||||
{#each Object.entries(options) as [val,caption]}
|
||||
<option value={val}>{caption}</option>
|
||||
{/each}
|
||||
</select>
|
||||
{/if}
|
||||
|
||||
<span>
|
||||
<input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} />
|
||||
{#if candidates && candidates.length > 0}
|
||||
<select bind:value={selected} {ondblclick} multiple tabindex="-1">
|
||||
{#each candidates as candidate,i}
|
||||
<option value={i}>{candidate.display}</option>
|
||||
{/each}
|
||||
</select>
|
||||
{/if}
|
||||
</span>
|
||||
@@ -1,8 +1,9 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
|
||||
import { api } from '../urls.svelte';
|
||||
import { api, get, post } from '../urls.svelte';
|
||||
import { t } from '../translations.svelte';
|
||||
import { error, yikes } from '../warn.svelte';
|
||||
|
||||
import Autocomplete from './Autocomplete.svelte';
|
||||
import PermissionSelector from './PermissionSelector.svelte';
|
||||
@@ -27,7 +28,7 @@
|
||||
});
|
||||
if (resp.ok){
|
||||
var json = await resp.json();
|
||||
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
||||
return Object.values(json).map(user => { return {...user,display:user.name}; });
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
@@ -35,16 +36,10 @@
|
||||
|
||||
async function loadPermissions(){
|
||||
const url = api('task/permissions');
|
||||
const resp = await fetch(url,{credentials: 'include'});
|
||||
const resp = await get(url);
|
||||
if (resp.ok){
|
||||
permissions = await resp.json();
|
||||
} else {
|
||||
message = await resp.text();
|
||||
}
|
||||
}
|
||||
|
||||
function onSelect(entry){
|
||||
addMember(entry);
|
||||
} else error(resp);
|
||||
}
|
||||
|
||||
onMount(loadPermissions);
|
||||
@@ -66,7 +61,7 @@
|
||||
<tr>
|
||||
<td>{t('add_object',{object:t('member')})}</td>
|
||||
<td>
|
||||
<Autocomplete {getCandidates} {onSelect} />
|
||||
<Autocomplete {getCandidates} onSelect={addMember} />
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -16,9 +16,7 @@
|
||||
}
|
||||
|
||||
function onSelect(entry){
|
||||
for (let [k,v] of Object.entries(entry)){
|
||||
users[k] = {name:v,id:k};
|
||||
}
|
||||
users[entry.id] = entry;
|
||||
}
|
||||
|
||||
let sortedUsers = $derived.by(() => Object.values(users).sort((a, b) => a.name.localeCompare(b.name)));
|
||||
|
||||
@@ -37,9 +37,7 @@
|
||||
if (resp.ok){
|
||||
yikes();
|
||||
const input = await resp.json();
|
||||
return Object.fromEntries(
|
||||
Object.entries(input).map(([key, value]) => [key, value.name])
|
||||
);
|
||||
return Object.values(input).map(user => {return {...user,display:user.name}});
|
||||
} else {
|
||||
error(resp);
|
||||
return {};
|
||||
|
||||
@@ -22,9 +22,7 @@
|
||||
if (resp.ok){
|
||||
yikes();
|
||||
const input = await resp.json();
|
||||
return Object.fromEntries(
|
||||
Object.entries(input).map(([key, value]) => [key, value.name])
|
||||
);
|
||||
return Object.values(input).map(user => { return {...user, display: user.name}});
|
||||
} else {
|
||||
error(resp);
|
||||
return {};
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
let members = $state([]);
|
||||
|
||||
function addMember(member){
|
||||
for (let [id,name] of Object.entries(member)) update_permissions({user_id:+id,permission:4});
|
||||
update_permissions({user_id:+member.id,permission:4});
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
import { onDestroy, onMount } from 'svelte';
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
import { api, patch, post, eventStream, target } from '../../urls.svelte.js';
|
||||
import { api, get, patch, post, eventStream, target } from '../../urls.svelte.js';
|
||||
import { error, messages, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte.js';
|
||||
import { user } from '../../user.svelte.js';
|
||||
|
||||
import Autocomplete from '../../Components/Autocomplete.svelte';
|
||||
import Card from './KanbanCard.svelte';
|
||||
import LineEditor from '../../Components/LineEditor.svelte';
|
||||
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
||||
@@ -16,12 +17,12 @@
|
||||
let connectionStatus = 'disconnected';
|
||||
let { id } = $props();
|
||||
let descr = $state(false);
|
||||
let filter_input = $state('');
|
||||
let filter_input = $state({display:''});
|
||||
let router = useTinyRouter();
|
||||
if (router.hasQueryParam('filter')) filter_input = router.getQueryParam('filter');
|
||||
if (router.hasQueryParam('filter')) filter_input = {display:router.getQueryParam('filter')};
|
||||
let dragged = null;
|
||||
let highlight = $state({});
|
||||
let filter = $derived(filter_input.toLowerCase());
|
||||
let filter = $derived(filter_input.display.toLowerCase());
|
||||
let project = $state(null);
|
||||
let tasks = $state({});
|
||||
let users = [];
|
||||
@@ -29,7 +30,7 @@
|
||||
let info = $state(null);
|
||||
let task_form = $state(false);
|
||||
let stateList = {};
|
||||
$effect(() => updateUrl(filter_input));
|
||||
$effect(() => updateUrl(filter_input.display));
|
||||
|
||||
function byName(a,b) {
|
||||
return a.name.localeCompare(b.name);
|
||||
@@ -92,6 +93,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function getCandidates(input){
|
||||
if (!input || input.length <3) return [];
|
||||
const url = api(`tags/search/${encodeURI(input)}`);
|
||||
const res = await get(url);
|
||||
if (res.ok){
|
||||
yikes();
|
||||
const list = await res.json();
|
||||
return list.map(elem => {return {display:elem}});
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
function handleCreateEvent(evt){
|
||||
handleEvent(evt,'create');
|
||||
}
|
||||
@@ -191,6 +203,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
function onCommit(){
|
||||
return false;
|
||||
}
|
||||
|
||||
function openTask(task_id){
|
||||
window.open(`/task/${task_id}/view`, '_blank').focus();
|
||||
}
|
||||
@@ -219,8 +235,8 @@
|
||||
const user_ids = Object.values(project.members).map(member => member.user.id);
|
||||
const data = {
|
||||
url : location.href,
|
||||
tags : ['Kanban', project.name, filter_input],
|
||||
comment : `${project.name}: ${filter_input}`,
|
||||
tags : ['Kanban', project.name, filter_input.display],
|
||||
comment : `${project.name}: ${filter_input.display}`,
|
||||
share : user_ids
|
||||
}
|
||||
const url = api('bookmark');
|
||||
@@ -239,7 +255,7 @@
|
||||
|
||||
function updateUrl(){
|
||||
let url = window.location.origin + window.location.pathname;
|
||||
if (filter_input) url += '?filter=' + encodeURI(filter_input);
|
||||
if (filter_input.display) url += '?filter=' + encodeURI(filter_input.display);
|
||||
window.history.replaceState(window.history.state, '', url);
|
||||
}
|
||||
|
||||
@@ -272,7 +288,7 @@
|
||||
</fieldset>
|
||||
<div class="kanban" style="display: grid; grid-template-columns: {`repeat(${columns}, auto)`}">
|
||||
<span class="filter">
|
||||
<input type="text" bind:value={filter_input} autofocus />
|
||||
<Autocomplete {getCandidates} bind:candidate={filter_input} {onCommit} autofocus={true} />
|
||||
{t('filter')}
|
||||
<button style="visibility:{filter_input ? 'visible' : 'hidden'}" onclick={save_bookmark}>
|
||||
<span class="symbol"></span> {t('save_object',{object:t('bookmark')})}
|
||||
|
||||
@@ -28,9 +28,8 @@
|
||||
let new_state = $state({code:null,name:null})
|
||||
let state_available=$derived(new_state.name && new_state.code && !project.allowed_states[new_state.code]);
|
||||
|
||||
async function addMember(entry){
|
||||
const ids = Object.keys(entry);
|
||||
if (ids) update({new_member:+ids.pop()});
|
||||
async function addMember(user){
|
||||
return await update({new_member:+user.id});
|
||||
}
|
||||
|
||||
async function addState(){
|
||||
@@ -67,21 +66,6 @@
|
||||
update({drop_member:member.user.id});
|
||||
}
|
||||
|
||||
async function getCandidates(text){
|
||||
const url = api('user/search');
|
||||
const 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 handleCreate(evt){
|
||||
let json = JSON.parse(evt.data);
|
||||
json.event = 'create';
|
||||
@@ -242,7 +226,7 @@
|
||||
</label>
|
||||
<div class="em">{t('members')}</div>
|
||||
<div class="em">
|
||||
<PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
|
||||
<PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} />
|
||||
</div>
|
||||
{#if project.allowed_states}
|
||||
{#each Object.keys(project.allowed_states) as key,idx}
|
||||
|
||||
37
frontend/src/routes/stock/display.svelte
Normal file
37
frontend/src/routes/stock/display.svelte
Normal file
@@ -0,0 +1,37 @@
|
||||
<script>
|
||||
import { onMount } from 'svelte';
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
import { api, get } from '../../urls.svelte';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte';
|
||||
|
||||
let {module, id} = $props();
|
||||
let item = $state(null);
|
||||
let router = useTinyRouter();
|
||||
|
||||
function onclick(e){
|
||||
e.preventDefault();
|
||||
var target = e.target;
|
||||
while (target && !target.href) target=target.parentNode;
|
||||
let href = target.getAttribute('href');
|
||||
if (href) router.navigate(href);
|
||||
return false;
|
||||
}
|
||||
|
||||
async function loadItem(){
|
||||
let url = api(`stock/item/${id}`);
|
||||
let res = await get(url);
|
||||
if (res.ok) {
|
||||
yikes();
|
||||
item = await res.json();
|
||||
} else error();
|
||||
}
|
||||
|
||||
|
||||
onMount(loadItem);
|
||||
</script>
|
||||
|
||||
{#if item}
|
||||
<a href="/stock/{id}/view" {onclick} >({item.code}) {item.name}</a>
|
||||
{/if}
|
||||
@@ -6,6 +6,8 @@
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte.js';
|
||||
|
||||
import ItemDisplay from '../stock/display.svelte';
|
||||
|
||||
let { module, id } = $props();
|
||||
let object = $state(null);
|
||||
let router = useTinyRouter();
|
||||
@@ -44,7 +46,9 @@
|
||||
{:else if module=='wiki'}
|
||||
<span onclick={go}>{object.title}</span>
|
||||
{:else if module=='document'}
|
||||
<span onclick={go}>{t(object.type)} ${object.number} (${object.customer.name.split('\n')[0]})</span>
|
||||
<span onclick={go}>{t('type_'+object.type)} {object.number} ({object.customer.name.split('\n')[0]})</span>
|
||||
{:else if module=='stock'}
|
||||
<ItemDisplay {module} {id} />
|
||||
{:else}
|
||||
<span class="error">No display defined in Reference.svelte for entities of type {module}.</span>
|
||||
{/if}
|
||||
|
||||
@@ -2,7 +2,9 @@
|
||||
import {onMount} from 'svelte';
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
import { api } from '../../urls.svelte.js';
|
||||
import Autocomplete from '../../Components/Autocomplete.svelte';
|
||||
|
||||
import { api, get, post } from '../../urls.svelte.js';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte.js';
|
||||
import { user } from '../../user.svelte.js'
|
||||
@@ -13,10 +15,9 @@
|
||||
tags = $bindable([]),
|
||||
user_list = [],
|
||||
} = $props();
|
||||
let newTag = $state('');
|
||||
let router = useTinyRouter();
|
||||
|
||||
async function addTag(){
|
||||
async function addTag(newTag){
|
||||
if (!newTag) return;
|
||||
if (!id) {
|
||||
// when creating elements, they don`t have an id, yet
|
||||
@@ -63,10 +64,21 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
async function getCandidates(input){
|
||||
if (!input || input.length <3) return [];
|
||||
const url = api(`tags/search/${encodeURI(input)}`);
|
||||
const res = await get(url);
|
||||
if (res.ok){
|
||||
yikes();
|
||||
const list = await res.json();
|
||||
return list.map(elem => {return {display:elem}});
|
||||
} else error(res);
|
||||
}
|
||||
|
||||
async function loadTags(entityId){
|
||||
if (!entityId) return; // when crating elements, they dont`t have an id, yet.
|
||||
const url = api(`tags/${module}/${entityId}`);
|
||||
const resp = await fetch(url,{credentials:'include'});
|
||||
const resp = await get(url);
|
||||
if (resp.ok) {
|
||||
tags = await resp.json();
|
||||
tags = tags.sort();
|
||||
@@ -75,13 +87,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function onCommit(wrapped){
|
||||
addTag(wrapped.display);
|
||||
}
|
||||
|
||||
function onSelect(dummy){}
|
||||
|
||||
function show(tag){
|
||||
router.navigate(`/tags/use/${tag}`);
|
||||
}
|
||||
|
||||
function typed(ev){
|
||||
if (ev.keyCode == 13) addTag();
|
||||
}
|
||||
|
||||
$effect(() => loadTags(id));
|
||||
</script>
|
||||
@@ -93,6 +108,6 @@
|
||||
</span>
|
||||
{/each}
|
||||
<span class="tag editor">
|
||||
<input type="text" bind:value={newTag} onkeyup={typed} />
|
||||
<Autocomplete {getCandidates} {onCommit} {onSelect} />
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -12,6 +12,12 @@
|
||||
let router = useTinyRouter();
|
||||
let uses = $state(null);
|
||||
|
||||
function headline(module){
|
||||
if (module == 'stock') return t(module);
|
||||
if (module.endsWith('s')) return t(`${module}s`);
|
||||
return t(module);
|
||||
}
|
||||
|
||||
async function loadUses(){
|
||||
const url = api(`tags/uses/${tag}`);
|
||||
const resp = await fetch(url,{credentials:'include'});
|
||||
@@ -36,7 +42,7 @@
|
||||
</legend>
|
||||
{#if uses}
|
||||
{#each Object.entries(uses) as [module,ids]}
|
||||
<h2>{t(module.endsWith('s') ? module : `${module}s`)}</h2>
|
||||
<h2>{headline(module)}</h2>
|
||||
<ul>
|
||||
{#each ids as id}
|
||||
<li><Reference {module} {id} /></li>
|
||||
|
||||
@@ -29,7 +29,8 @@
|
||||
let router = useTinyRouter();
|
||||
|
||||
function addMember(member){
|
||||
for (let uid of Object.keys(member)) task.members[uid] = project.members[uid];
|
||||
let uid = member.id;
|
||||
task.members[uid] = project.members[uid];
|
||||
}
|
||||
|
||||
function flat(json){
|
||||
@@ -44,10 +45,9 @@
|
||||
|
||||
async function getCandidates(text){
|
||||
const origin = parent_task ? parent_task.members : project.members;
|
||||
const candidates = Object.values(origin)
|
||||
return Object.values(origin)
|
||||
.filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
|
||||
.map(member => [member.user.id,member.user.name]);
|
||||
return Object.fromEntries(candidates);
|
||||
.map(member => {return { ...member.user,display:member.user.name}});
|
||||
}
|
||||
|
||||
async function load(){
|
||||
|
||||
@@ -37,9 +37,8 @@
|
||||
router.navigate(`/task/${id}/add_subtask`);
|
||||
}
|
||||
|
||||
async function addMember(entry){
|
||||
const ids = Object.keys(entry);
|
||||
if (ids) update({new_member:+ids.pop()});
|
||||
async function addMember(newMember){
|
||||
return await update({new_member:+newMember.id});
|
||||
}
|
||||
|
||||
async function addTime(){
|
||||
@@ -64,10 +63,10 @@
|
||||
|
||||
async function getCandidates(text){
|
||||
const origin = task.parent ? task.parent.members : project.members;
|
||||
const candidates = Object.values(origin)
|
||||
return Object.values(origin)
|
||||
.filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
|
||||
.map(member => [member.user.id,member.user.name]);
|
||||
return Object.fromEntries(candidates);
|
||||
.map(member => { return {...member.user,display:member.user.name}});
|
||||
|
||||
}
|
||||
|
||||
function gotoKanban(){
|
||||
@@ -177,6 +176,8 @@
|
||||
});
|
||||
if (resp.ok){
|
||||
yikes();
|
||||
let json = await resp.json();
|
||||
if (json.members) task.members = json.members;
|
||||
return true;
|
||||
} else {
|
||||
error(resp);
|
||||
|
||||
@@ -22,9 +22,8 @@
|
||||
|
||||
async function addMember(entry){
|
||||
let newMembers = JSON.parse(JSON.stringify(page.members));
|
||||
for (var id of Object.keys(entry)){
|
||||
if (!newMembers[id]) newMembers[id] = { permission : {name:'READ_ONLY'} };
|
||||
}
|
||||
let id = entry.id;
|
||||
if (!newMembers[id]) newMembers[id] = { permission : {name:'READ_ONLY'} };
|
||||
return patch({members:newMembers});
|
||||
}
|
||||
|
||||
@@ -74,7 +73,7 @@
|
||||
});
|
||||
if (resp.ok){
|
||||
var json = await resp.json();
|
||||
return Object.fromEntries(Object.values(json).filter(nonMember).map(user => [user.id,user.name]));
|
||||
return Object.values(json).filter(nonMember).map(user => { return {...user,display:user.name}});
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.poll;
|
||||
import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ import static de.srsoftware.umbrella.poll.Constants.CONFIG_DATABASE;
|
||||
import static java.lang.System.Logger.Level.WARNING;
|
||||
import static java.net.HttpURLConnection.HTTP_OK;
|
||||
import static java.text.MessageFormat.format;
|
||||
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
|
||||
|
||||
import com.sun.net.httpserver.HttpExchange;
|
||||
import de.srsoftware.configuration.Configuration;
|
||||
import de.srsoftware.tools.Path;
|
||||
@@ -26,10 +26,9 @@ import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.Token;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
import org.json.JSONObject;
|
||||
|
||||
public class PollModule extends BaseHandler implements PollService {
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||
import de.srsoftware.umbrella.core.model.Permission;
|
||||
import de.srsoftware.umbrella.core.model.Poll;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.util.*;
|
||||
|
||||
@@ -10,6 +10,7 @@ import static de.srsoftware.tools.jdbc.Query.SelectQuery.ALL;
|
||||
import static de.srsoftware.umbrella.bookmarks.Constants.*;
|
||||
import static de.srsoftware.umbrella.core.Errors.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.*;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.TAG;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.TAGS;
|
||||
import static de.srsoftware.umbrella.core.constants.Module.BOOKMARK;
|
||||
import static de.srsoftware.umbrella.core.constants.Text.TABLE_WITH_NAME;
|
||||
@@ -25,8 +26,10 @@ import de.srsoftware.tools.Tuple;
|
||||
import de.srsoftware.tools.jdbc.Query;
|
||||
import de.srsoftware.umbrella.bookmarks.BookmarkDb;
|
||||
import de.srsoftware.umbrella.core.BaseDb;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.constants.Text;
|
||||
import de.srsoftware.umbrella.core.model.Translatable;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import java.sql.Connection;
|
||||
import java.sql.SQLException;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -333,6 +336,19 @@ CREATE TABLE IF NOT EXISTS {0} (
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<String> search(String key, UmbrellaUser user) {
|
||||
try {
|
||||
var tags = new HashSet<String>();
|
||||
var rs = select("DISTINCT tag").from(TABLE_TAGS).where(USER_ID,equal(user.id())).where(Field.TAG,like("%"+key+"%")).exec(db);
|
||||
while (rs.next()) tags.add(rs.getString(1));
|
||||
rs.close();
|
||||
return tags;
|
||||
} catch (SQLException s){
|
||||
throw failedToLoadObject(Text.TAGS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateId(String module, Object oldId, Object newId) {
|
||||
try {
|
||||
|
||||
@@ -3,6 +3,7 @@ package de.srsoftware.umbrella.tags;
|
||||
|
||||
|
||||
import de.srsoftware.tools.Tuple;
|
||||
import de.srsoftware.umbrella.core.model.UmbrellaUser;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -32,5 +33,7 @@ public interface TagDB {
|
||||
|
||||
void save(Collection<Long> userIds, String module, long entityId, Collection<String> tags);
|
||||
|
||||
Collection<String> search(String key, UmbrellaUser user);
|
||||
|
||||
void updateId(String module, Object oldId, Object newId);
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
|
||||
import static de.srsoftware.umbrella.core.ModuleRegistry.userService;
|
||||
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_UNPROCESSABLE;
|
||||
import static de.srsoftware.umbrella.core.constants.Field.USER_LIST;
|
||||
import static de.srsoftware.umbrella.core.constants.Path.SEARCH;
|
||||
import static de.srsoftware.umbrella.core.constants.Path.USES;
|
||||
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
|
||||
import static de.srsoftware.umbrella.tags.Constants.*;
|
||||
@@ -66,11 +67,13 @@ public class TagModule extends BaseHandler implements TagService {
|
||||
var user = userService().refreshSession(ex);
|
||||
if (user.isEmpty()) return unauthorized(ex);
|
||||
var module = path.pop();
|
||||
if (module == null) return getUserTags(ex, user.get());
|
||||
var head = path.pop();
|
||||
if (USES.equals(module)) return getTagUses(ex,head,user.get());
|
||||
long entityId = Long.parseLong(head);
|
||||
return sendContent(ex, getTags(module,entityId,user.get()));
|
||||
return switch (module){
|
||||
case SEARCH -> searchTags(ex,path.pop(),user.get());
|
||||
case USES -> getTagUses(ex,path.pop(),user.get());
|
||||
case null -> getUserTags(ex, user.get());
|
||||
default -> sendContent(ex, getTags(module,Long.parseLong(path.pop()),user.get()));
|
||||
};
|
||||
|
||||
} catch (NumberFormatException e){
|
||||
return sendContent(ex,HTTP_UNPROCESSABLE,"Entity id missing in path.");
|
||||
} catch (UmbrellaException e){
|
||||
@@ -150,6 +153,10 @@ public class TagModule extends BaseHandler implements TagService {
|
||||
return tag;
|
||||
}
|
||||
|
||||
private boolean searchTags(HttpExchange ex, String head, UmbrellaUser user) throws IOException {
|
||||
return sendContent(ex, tagDb.search(head, user));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateId(String module, Object oldId, Object newId) {
|
||||
tagDb.updateId(module,oldId,newId);
|
||||
|
||||
@@ -32,7 +32,6 @@ import de.srsoftware.tools.SessionToken;
|
||||
import de.srsoftware.umbrella.core.BaseHandler;
|
||||
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||
import de.srsoftware.umbrella.core.api.*;
|
||||
import de.srsoftware.umbrella.core.constants.Field;
|
||||
import de.srsoftware.umbrella.core.constants.Text;
|
||||
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
|
||||
import de.srsoftware.umbrella.core.model.*;
|
||||
|
||||
Reference in New Issue
Block a user