extended documentation

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

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

@@ -3,13 +3,11 @@ package de.srsoftware.umbrella.core.api;
 
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.Task;
-import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 public interface TaskService {
-	void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest);
 	Map<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException;
 	Map<Long, Task> listProjectTasks(long projectId) throws UmbrellaException;
 	Map<Long, Task> load(Collection<Long> taskIds);

core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java

@@ -77,11 +77,10 @@ public class Field {
 	public static final String HEAD = "head";
 	public static final String HOURS = "hours";
 
-	public static final String ID           = "id";
+	public static final String ID        = "id";
-	public static final String INHERIT_FROM = "inherit_from";
+	public static final String INSTANTLY = "instantly";
-	public static final String INSTANTLY    = "instantly";
+	public static final String ITEM      = "item";
-	public static final String ITEM         = "item";
+	public static final String ITEM_CODE = "item_code";
-	public static final String ITEM_CODE    = "item_code";
 
 	public static final String KEY = "key";
 

core/src/main/java/de/srsoftware/umbrella/core/constants/Path.java

@@ -42,8 +42,8 @@ public class Path {
 	public static final String PROPERTY          = "property";
 	public static final String PURPOSES          = "purposes";
 
-	public static final String READ      = "read";
+	public static final String READ     = "read";
-	public static final String REDIRECT  = "redirect";
+	public static final String REDIRECT = "redirect";
 
 	public static final String SEARCH   = "search";
 	public static final String SELECT   = "select";

demodata/.gitignore

@@ -0,0 +1 @@
+*.db-journal

demodata/config.json

@@ -0,0 +1,74 @@
+{
+  "umbrella": {
+    "base_url": "http://127.0.0.1:5173",
+    "logging": {
+      "rootLevel": "INFO"
+    },
+    "http": {
+      "port": 8080
+    },
+    "threads": 16,
+    "modules": {
+      "accounting": {
+        "database": "demodata/accounting.db"
+      },
+      "bookmark": {
+        "database": "demodata/bookmark.db"
+      },
+      "company": {
+        "database": "demodata/company.db"
+      },
+      "contact": {
+        "database": "demodata/contacts.db"
+      },
+      "document": {
+        "database": "demodata/documents.db",
+        "templates": "demodata/templates"
+      },
+      "files": {
+        "database": "demodata/files.db",
+        "base_dir": "demodata/filestore"
+      },
+      "journal": {
+        "database": "demodata/journal.db"
+      },
+      "message": {
+        "database": "demodata/message.db",
+        "smtp": {
+          "from": "umbrella@example.com",
+          "host": "none",
+          "pass": "none",
+          "port": 587,
+          "user": "none"
+        }
+      },
+      "notes": {
+        "database": "demodata/notes.db"
+      },
+      "poll": {
+        "database": "demodata/poll.db"
+      },
+      "project": {
+        "database": "demodata/projects.db"
+      },
+      "stock": {
+        "database": "demodata/stock.db"
+      },
+      "tags": {
+        "database": "demodata/tags.db"
+      },
+      "task": {
+        "database": "demodata/tasks.db"
+      },
+      "time": {
+        "database": "demodata/times.db"
+      },
+      "user": {
+        "database": "demodata/users.db"
+      },
+      "wiki": {
+        "database": "demodata/wiki.db"
+      }
+    }
+  }
+}

frontend/src/Components/Autocomplete.svelte

@@ -4,7 +4,6 @@
 
 
     let {
-        enabled       = true,
         id            = null,
         autofocus     = false,
         getCandidates = dummyGetCandidates,
@@ -116,7 +115,7 @@
 
     function select(index){
         candidate = candidates[index];
-        disableDropdown();
+        <disableDropdown></disableDropdown>();
         onSelect(candidate);
     }
 
@@ -149,7 +148,7 @@
 </style>
 
 <span class="autocomplete">
-    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} disabled={!enabled} />
+    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} />
     {#if candidates && candidates.length > 0}
     <ul bind:this={list_elem} class="suggestions" tabindex="-1">
         {#each candidates as candidate,i}

frontend/src/Components/PermissionEditor.svelte

@@ -10,7 +10,6 @@
 
     let {
         addMember        = (entry)    => console.log(`no handler for addMember(${entry})`),
-        enabled          = true,
         dropMember       = (member)   => console.log(`no handler for dropMember(${member})`),
         getCandidates    = defaultGetCandidates,
         members,
@@ -62,7 +61,7 @@
     <tr>
         <td>{t('add_object',{object:t('member')})}</td>
         <td>
-            <Autocomplete {getCandidates} onSelect={addMember} {enabled} />
+            <Autocomplete {getCandidates} onSelect={addMember} />
         </td>
     </tr>
     </tbody>

frontend/src/Components/UserSelector.svelte

@@ -6,7 +6,6 @@
     import Autocomplete       from './Autocomplete.svelte';
 
     let {
-        enabled       = true,
         getCandidates = async text => {},
         heading       = t('add_object',{object:t('user')}),
         users         = $bindable({})
@@ -38,7 +37,7 @@
     <tr>
         <td>{heading}</td>
         <td>
-            <Autocomplete {getCandidates} {onSelect} {enabled} />
+            <Autocomplete {getCandidates} {onSelect} />
         </td>
     </tr>
     </tbody>

frontend/src/routes/project/View.svelte

@@ -25,13 +25,12 @@
     let tasks          = $state(null);
     let show_closed    = $state(false);
     let new_color      = $state({tag:null,color:'#00aa00'})
-    let inherit_from   = $state(0);
 
     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(user){
-        return await update({new_member:+user.id,inherit_from});
+        return await update({new_member:+user.id});
     }
 
     async function addState(){
@@ -240,16 +239,7 @@
     </label>
     <div class="em">{t('members')}</div>
     <div class="em">
-        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} enabled={inherit_from != 0}/>
+        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} />
-        <label>
-            └→ Inherit task permissions from:
-            <select bind:value={inherit_from}>
-                <option value={0}>{t('select user')}</option>
-                {#each Object.values(project.members) as member (member.user.id)}
-                <option value={member.user.id}>{member.user.name}</option>
-                {/each}
-            </select>
-        </label>
     </div>
     {#if project.allowed_states}
     {#each Object.keys(project.allowed_states) as key,idx}

frontend/src/routes/task/EasyList.svelte

@@ -130,10 +130,6 @@
     onMount(load);
 </script>
 
-<svelte:head>
-    <title>Umbrella – {t('Easylist')}: {tag}</title>
-</svelte:head>
-
 <h2>{t('tasks_for_tag',{tag:decodeURI(tag)})}</h2>
 
 <div class="easylist">

frontend/src/routes/task/View.svelte

@@ -81,10 +81,6 @@
         router.navigate(`/project/${project.id}/view`)
     }
 
-    function gotoTask(tid){
-        if (id) router.navigate(`/task/${tid}/view`)
-    }
-
 	function handleUpdateEvent(evt){
 		let json = JSON.parse(evt.data);
 		if (json.task) {
@@ -123,8 +119,7 @@
             if (task.show_closed) show_closed = true;
             loadChildren();
             if (task.project_id) loadProject();
-            if (task.parent_task_id) await loadParent();
+            if (task.parent_task_id) loadParent();
-            loadSiblings();
         } else error(resp);
     }
 
@@ -134,36 +129,13 @@
         if (resp.ok){
             project = await resp.json();
             yikes();
-        } else error(resp);
+        } else error(await resp.text());
-    }
-
-    async function loadSiblings(){
-        const url = api(`task/list`);
-        const select = task.parent_task_id ? {parent_task_id:task.parent_task_id} : {project_id: task.project_id};
-        select.show_closed = false;
-        const res = await post(url,select);
-        if (res.ok){
-            task.siblings = await res.json();
-            let last      = null;
-            let before    = undefined;
-            let after     = null;
-            for (let [sid, t] of Object.entries(task.siblings).toSorted((a,b) => a[1].name.localeCompare(b[1].name))){
-                if (before !== undefined) {
-                    after = +sid;
-                    break;
-                }
-                if (id == sid) before = last;
-                last = +sid;
-            }
-            task.before = before;
-            task.after  = after;
-        } else error(res)
     }
 
     function parentClick(ev){
         ev.preventDefault();
         if (!task.parent_task_id) return;
-        gotoTask(task.parent_task_id);
+        router.navigate(`/task/${task.parent_task_id}/view`);
         return false;
     }
 
@@ -260,17 +232,10 @@
         {/if}
         <button class="symbol" title={t('edit')} onclick={parentRightClick}></button>
         {/if}
-
     </div>
     <div>{t('task')}</div>
     <div class="name">
         <LineEditor bind:value={task.name} editable={true} onSet={val => update({name:val})} />
-        {#if task.before}
-        <button class="symbol" title={task.siblings[task.before].name} onclick={e => gotoTask(task.before)}></button>
-        {/if}
-        {#if task.after}
-        <button class="symbol" title={task.siblings[task.after].name} onclick={e => gotoTask(task.after)}></button>
-        {/if}
         <button class="symbol" title={t('settings')} onclick={toggleSettings}></button>
         <button class="symbol" title={t('timetracking')} onclick={addTime}></button>
     </div>

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

@@ -22,7 +22,6 @@ import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
 import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE;
 import static de.srsoftware.umbrella.project.Constants.CONFIG_DATABASE;
 import static java.lang.Boolean.TRUE;
-import static java.lang.System.Logger.Level.WARNING;
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -139,7 +138,6 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 	private void dropMember(Project project, long userId) {
 		if (project.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the project");
 		projectDb.dropMember(project.id(),userId);
-		LOG.log(WARNING,"Removing member from project tasks not implemented"); // TODO
 		project.members().remove(userId);
 	}
 
@@ -225,16 +223,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 		UmbrellaUser newMember = null;
 		if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(project,id.longValue());
 		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(project,memberJson);
-		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) {
+		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) newMember = addMember(project,num.longValue());
-			UmbrellaUser inheritFrom = null;
-			if (json.has(INHERIT_FROM)){
-				if (!(json.get(INHERIT_FROM) instanceof Number uid)) throw invalidField(INHERIT_FROM,Text.NUMBER);
-				inheritFrom = userService().loadUser(uid.longValue());
-				if (!project.hasMember(inheritFrom)) throw notAmember(inheritFrom);
-			}
-			newMember = addMember(project,num.longValue());
-			if (inheritFrom != null) taskService().clonePermissions(project.id(),inheritFrom,newMember);
-		}
 
 		project = projectDb.save(project.patch(json), user);
 		messageBus().dispatch(newMember != null ? new ProjectEvent(user,project,newMember) : new ProjectEvent(user,project, old));

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

@@ -260,7 +260,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 		try {
 			var query = select(ALL).from(TABLE_TASKS).leftJoin(ID,TABLE_TASKS_USERS,TASK_ID).where(USER_ID,equal(userId));
 			if (!showClosed) query.where(STATUS,lessThan(COMPLETE.code()));
-			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit == null ? -1 : limit).skip(offset).exec(db);
+			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit).skip(offset).exec(db);
 			var map = new ArrayList<Task>();
 			while (rs.next()) map.add(Task.of(rs));
 			rs.close();

task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java

@@ -66,28 +66,6 @@ public class TaskModule extends BaseHandler implements TaskService {
 		return user;
 	}
 
-	@Override
-	public void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest) {
-		var taskMap = taskDb.listProjectTasks(project_id,null,true);
-		loadMembers(taskMap.values());
-		for (var task : taskMap.values()) {
-			var memberShip = task.members().get(source.id());
-
-			Permission granted = memberShip == null ? EDIT : switch (memberShip.permission()) {
-				case ASSIGNEE,
-					 EDIT,
-					 OWNER ->
-						EDIT;
-				case READ_ONLY ->
-						READ_ONLY;
-			};
-			var newMember = new Member(dest, granted);
-			task.members().put(dest.id(), newMember);
-			task.dirty(MEMBERS);
-			taskDb.save(task);
-		}
-	}
-
 	private boolean deleteTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = loadMembers(taskDb.load(taskId));
 		var member = task.members().get(user.id());

translations/src/main/resources/de.json

@@ -335,7 +335,6 @@
   "select_customer": "Kunde auswählen",
   "select_property": "Eigenschaft auswählen",
   "select_state": "Status wählen",
-  "select user": "Nutzer auswählen",
   "send_document": "Dokument versenden",
   "sender": "Absender",
   "sender_bank_account": "Bankverbindung",

translations/src/main/resources/en.json

@@ -335,7 +335,6 @@
   "select_customer": "select customer",
   "select_property": "select property",
   "select_state": "select state",
-  "select user": "select user",
   "send_document": "send document",
   "sender": "sender",
   "sender_bank_account": "bank account",

web/src/main/resources/web/css/default-color.css

@@ -26,11 +26,6 @@ input{
     color: orange;
 }
 
-input:disabled{
-	border: 1px solid gray;
-	background: #444;
-}
-
 legend.date,
 legend.time{
     background-color: black;