implemented various task features:

- saving on CTRL+S
- editing of
    - start date
    - due date
    - members

core/src/main/java/de/srsoftware/umbrella/core/model/Project.java

@@ -32,6 +32,16 @@ public class Project implements Mappable {
 		this.members = members;
 	}
 
+	public Project clean() {
+		dirtyFields.clear();
+		return this;
+	}
+
+	public Project clean(String field){
+		dirtyFields.remove(field);
+		return this;
+	}
+
 	public Optional<Long> companyId(){
 		return nullable(companyId);
 	}
@@ -40,8 +50,9 @@ public class Project implements Mappable {
 		return description;
 	}
 
-	public Set<String> dirtyFields(){
+	public Project dirty(String field){
-		return dirtyFields;
+		dirtyFields.add(field);
+		return this;
 	}
 
 	public boolean hasMember(UmbrellaUser user) {
@@ -52,6 +63,15 @@ public class Project implements Mappable {
 		return id;
 	}
 
+	public boolean isDirty() {
+		return !dirtyFields.isEmpty();
+	}
+
+	public boolean isDirty(String field){
+		return dirtyFields.contains(field);
+	}
+
+
 	public Map<Long,Member> members(){
 			return members;
 	}
@@ -103,12 +123,4 @@ public class Project implements Mappable {
 		map.put(MEMBERS,memberMap);
 		return map;
 	}
-
-	public boolean isDirty() {
-		return !dirtyFields.isEmpty();
-	}
-
-	public void clean() {
-		dirtyFields.clear();
-	}
 }

core/src/main/java/de/srsoftware/umbrella/core/model/Task.java

@@ -46,14 +46,25 @@ public class Task implements Mappable {
 		this.members = members;
 	}
 
-	public void clean() {
+	public Task clean() {
 		dirtyFields.clear();
+		return this;
+	}
+
+	public Task clean(String field){
+		dirtyFields.remove(field);
+		return this;
 	}
 
 	public String description(){
 		return description;
 	}
 
+	public Task dirty(String field){
+		dirtyFields.add(field);
+		return this;
+	}
+
 	public LocalDate dueDate(){
 		return dueDate;
 	}
@@ -70,6 +81,10 @@ public class Task implements Mappable {
 		return !dirtyFields.isEmpty();
 	}
 
+	public boolean isDirty(String field){
+		return dirtyFields.contains(field);
+	}
+
 	public Map<Long,Member> members(){
 		return members;
 	}
@@ -145,7 +160,7 @@ public class Task implements Mappable {
 				case STATUS:         status        = json.get(key) instanceof Number number ? Status.of(number.intValue()) : Status.valueOf(json.getString(key)); break;
 				default: {
 					key = null;
-					LOG.log(WARNING,"Tried to patch field ''{0}'' of task, which is not implemented!");
+					LOG.log(WARNING,"Tried to patch field ''{0}'' of task, which is not implemented!",key);
 				}
 			}
 			if (key != null) dirtyFields.add(key);

frontend/src/Components/MemberEditor.svelte

@@ -36,26 +36,24 @@
 {#if error}
 <span class="error">{error}</span>
 {/if}
-<fieldset>
+<table>
-    <legend>{t('members')}</legend>
+    <tbody>
-    <table>
+    {#each sortedMembers as member,i}
-        <tbody>
+    <tr>
-        {#each sortedMembers as member,i}
+        <td>{member.user.name}</td>
-        <tr>
+        <td>
-            <td>{member.user.name}</td>
+            <PermissionSelector {permissions} selected={member.permission.code} onchange={(perm) => updatePermission(member.user.id,perm)} />
-            <td>
+            {#if member.permission.name != 'OWNER'}
-                <PermissionSelector {permissions} selected={member.permission.code} onchange={(perm) => updatePermission(member.user.id,perm)} />
+            <button onclick={() => dropMember(member)}>x</button>
-                {#if member.permission.name != 'OWNER'}
+            {/if}
-                <button onclick={() => dropMember(member)}>x</button>
+        </td>
-                {/if}
+    </tr>
-            </td>
+    {/each}
-        </tr>
+    <tr>
-        {/each}
+        <td>{t('add_member')}</td>
-        <tr>
+        <td>
-            <td>{t('add_member')}</td>
+            <Autocomplete {getCandidates} {onSelect} />
-            <td>
+        </td>
-                <Autocomplete {getCandidates} {onSelect} />
+    </tr>
-            </td>
+    </tbody>
-        </tr>
+</table>
-        </tbody>
-    </table></fieldset>

frontend/src/routes/project/View.svelte

@@ -2,6 +2,8 @@
     import { t } from '../../translations.svelte.js';
     import { onMount } from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
+    import { api } from '../../urls.svelte.js';
+
     import TaskList from '../../Components/TaskList.svelte';
     import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
     import LineEditor from '../../Components/LineEditor.svelte';
@@ -18,7 +20,6 @@
 
     async function addMember(entry){
         const ids = Object.keys(entry);
-        console.log({entry:entry,ids:ids});
         if (ids) update({new_member:+ids.pop()});
     }
 
@@ -36,7 +37,7 @@
     }
 
     async function getCandidates(text){
-        const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/search`;
+        const url = api('user/search');
         var resp = await fetch(url,{
             credentials: 'include',
             method: 'POST',
@@ -51,7 +52,7 @@
     }
 
     async function loadProject(){
-        const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/project/${id}`;
+        const url = api(`project/${id}`);
         const resp = await fetch(url,{credentials:'include'});
         if (resp.ok){
             project = await resp.json();
@@ -63,7 +64,7 @@
     }
 
     async function loadTasks(){
-        const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/task/list`;
+        const url = api('task/list');
         const data = {
             project_id:+id,
             show_closed:project.show_closed
@@ -84,7 +85,7 @@
     }
 
     async function update(data){
-        const url = `${location.protocol}//${location.host.replace('5173','8080')}/api/project/${id}`;
+        const url = api(`project/${id}`);
         const resp = await fetch(url,{
             credentials:'include',
             method:'PATCH',
@@ -93,11 +94,18 @@
         if (resp.ok){
             error = null;
             project = await resp.json();
+            return true;
         } else {
             error = await resp.text();
+            return false;
         }
     }
 
+    function toggleSettings(){
+        showSettings = !showSettings;
+    }
+
+
     function updatePermission(user_id,permission){
         let members = {};
         members[user_id] = permission.code;
@@ -118,7 +126,7 @@
             <th>{t('project')}</th>
             <td class="name">
                 <LineEditor bind:value={project.name} editable={true} onSet={val => update({name:val})} />
-                <button class="symbol" onclick={() => showSettings = true}></button>
+                <button class="symbol" onclick={toggleSettings}></button>
             </td>
         </tr>
         <tr>
@@ -147,6 +155,27 @@
                 <MarkdownEditor bind:value={project.description} editable={true} onSet={val => update({description:val})} />
             </td>
         </tr>
+        {#if showSettings}
+        <tr>
+            <th>
+                {t('extended_settings')}
+            </th>
+            <td>
+                <label>
+                    <input type="checkbox" bind:checked={project.show_closed} onchange={changeClosed} />
+                    {t('display_closed_tasks')}
+                </label>
+            </td>
+        </tr>
+        <tr>
+            <th>
+                {t('members')}
+            </th>
+            <td>
+                <MemberEditor members={project.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
+            </td>
+        </tr>
+        {/if}
         {#if estimated_time.sum}
         <tr>
             <th>{t('estimated_time')}</th>
@@ -166,18 +195,4 @@
         </tr>
     </tbody>
 </table>
-{/if}
-{#if showSettings}
-<fieldset class="project settings">
-    <legend>{t('settings')}</legend>
-    <MemberEditor members={project.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
-    <fieldset>
-        <legend>{t('miscellaneous_settings')}</legend>
-        <label>
-            <input type="checkbox" bind:checked={project.show_closed} onchange={changeClosed} />
-            {t('display_closed_tasks')}
-        </label>
-    </fieldset>
-    <button onclick={() => showSettings = false}>{t('close_settings')}</button>
-</fieldset>
 {/if}

frontend/src/routes/task/Add.svelte

@@ -75,6 +75,14 @@
         return Object.fromEntries(candidates);
     }
 
+
+    function onkeydown(e){
+        if (e.ctrlKey && e.keyCode === 83) {
+            e.preventDefault();
+            saveTask();
+        }
+    }
+
     async function saveTask(){
         var url = api('task/add');
         const resp = await fetch(url,{
@@ -103,7 +111,7 @@
 
 <fieldset>
     <legend>{t('add_task')}</legend>
-    <table>
+    <table {onkeydown}>
         <tbody>
             <tr>
                 <th>

frontend/src/routes/task/View.svelte

@@ -8,6 +8,7 @@
     import TaskList from '../../Components/TaskList.svelte';
     import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
     import StateSelector from '../../Components/StateSelector.svelte';
+    import MemberEditor from '../../Components/MemberEditor.svelte';
 
     const router = useTinyRouter();
     let { id } = $props();
@@ -21,6 +22,24 @@
 
     $effect(() => updateOn(id));
 
+    async function addMember(entry){
+        const ids = Object.keys(entry);
+        if (ids) update({new_member:+ids.pop()});
+    }
+
+    async function dropMember(member){
+        update({drop_member:member.user.id});
+    }
+
+    async function getCandidates(text){
+        const origin = task.parent ? task.parent.members : project.members;
+        const candidates = Object.values(origin)
+            .filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
+            .map(member => [member.user.id,member.user.name]);
+        return Object.fromEntries(candidates);
+    }
+
+
     function updateOn(id){
         loadTask();
     }
@@ -108,6 +127,7 @@
         });
         if (resp.ok){
             error = null;
+            task = await resp.json();
             return true;
         } else {
             error = await resp.text();
@@ -118,6 +138,12 @@
     function updateClosed(){
         if (update({show_closed:task.show_closed})) setTimeout(loadTask,50);
     }
+
+    function updatePermission(user_id,permission){
+        let members = {};
+        members[user_id] = permission.code;
+        update({members:members});
+    }
 </script>
 
 {#if error}
@@ -200,6 +226,14 @@
                 </label>
             </td>
         </tr>
+        <tr>
+            <th>
+                {t('members')}
+            </th>
+            <td>
+                <MemberEditor members={task.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
+            </td>
+        </tr>
         <tr>
             <th>
                 {t('start_date')}

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

@@ -43,7 +43,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 		var user = users.loadUser(userId);
 		var member = new Member(user,READ_ONLY);
 		project.members().put(userId,member);
-		project.dirtyFields().add(MEMBERS);
+		project.dirty(MEMBERS);
 	}
 
 
@@ -190,7 +190,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 				}
 			}
 			members.put(userId,new Member(users.loadUser(userId),permission));
-			project.dirtyFields().add(MEMBERS);
+			project.dirty(MEMBERS);
 		}
 	}
 

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

@@ -218,11 +218,11 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
 				}
 			} else { // Update
 				try {
-					if (prj.dirtyFields().contains(MEMBERS)){
+					if (prj.isDirty(MEMBERS)){
 						var query = replaceInto(TABLE_PROJECT_USERS,PROJECT_ID,USER_ID,PERMISSIONS);
 						for (var member : prj.members().entrySet()) query.values(prj.id(),member.getKey(),member.getValue().permission().code());
 						query.execute(db).close();
-						prj.dirtyFields().remove(MEMBERS);
+						prj.clean(MEMBERS);
 					}
 					if (prj.isDirty()){
 						update(TABLE_PROJECTS).set(NAME,DESCRIPTION,STATUS,COMPANY_ID,SHOW_CLOSED).where(ID,equal(prj.id())).prepare(db)

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

@@ -112,6 +112,18 @@ CREATE TABLE IF NOT EXISTS {0} (
 		}
 	}
 
+	@Override
+	public void dropMember(long projectId, long userId) {
+		try {
+			delete().from(TABLE_TASKS_USERS)
+					.where(TASK_ID,equal(projectId))
+					.where(USER_ID,equal(userId))
+					.execute(db);
+		} catch (SQLException e) {
+			throw new UmbrellaException("Failed to delete member (userId = {0} from project {1}",userId,projectId);
+		}
+	}
+
 	@Override
 	public Map<Long, Permission> getMembers(Task task) {
 		try {
@@ -216,6 +228,12 @@ CREATE TABLE IF NOT EXISTS {0} (
 				if (taskId == null) throw new UmbrellaException("Failed to save task {0}",task.name());
 				return new Task(taskId,task.projectId(),task.parentTaskId(),task.name(),task.description(),task.status(),task.estimatedTime(),task.start(),task.dueDate(),task.showClosed(),task.noIndex(),task.members());
 			}
+			if (task.isDirty(MEMBERS)){
+				var query = replaceInto(TABLE_TASKS_USERS,TASK_ID,USER_ID,PERMISSIONS);
+				for (var member : task.members().entrySet()) query.values(task.id(),member.getKey(),member.getValue().permission().code());
+				query.execute(db).close();
+				task.clean(MEMBERS);
+			}
 			if (task.isDirty()) {
 				update(TABLE_TASKS).set(PROJECT_ID,PARENT_TASK_ID,NAME,DESCRIPTION,STATUS,EST_TIME,START_DATE,DUE_DATE,SHOW_CLOSED,NO_INDEX)
 						.where(ID,equal(task.id())).prepare(db)

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

@@ -9,6 +9,8 @@ import java.util.Map;
 
 public interface TaskDb {
 
+	void dropMember(long projectId, long userId);
+
 	Task load(long taskId) throws UmbrellaException;
 
 	Map<Long, Permission> getMembers(Task task);

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

@@ -9,7 +9,7 @@ import static de.srsoftware.umbrella.core.Paths.*;
 import static de.srsoftware.umbrella.core.ResponseCode.HTTP_NOT_IMPLEMENTED;
 import static de.srsoftware.umbrella.core.Util.mapValues;
 import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
-import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
+import static de.srsoftware.umbrella.core.model.Permission.*;
 import static de.srsoftware.umbrella.project.Constants.PERMISSIONS;
 import static de.srsoftware.umbrella.task.Constants.*;
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
@@ -49,6 +49,13 @@ public class TaskModule extends BaseHandler implements TaskService {
 		users      = companies.userService();
 	}
 
+	private void addMember(Task task, long userId) {
+		var user = users.loadUser(userId);
+		var member = new Member(user,READ_ONLY);
+		task.members().put(userId,member);
+		task.dirty(MEMBERS);
+	}
+
 	@Override
 	public CompanyService companyService() {
 		return companies;
@@ -123,6 +130,12 @@ public class TaskModule extends BaseHandler implements TaskService {
 		}
 	}
 
+	private void dropMember(Task task, long userId) {
+		if (task.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the task");
+		taskDb.dropMember(task.id(),userId);
+		task.members().remove(userId);
+	}
+
 	private boolean estimatedTimes(UmbrellaUser user, HttpExchange ex) throws IOException, UmbrellaException {
 		var json = json(ex);
 		if (!(json.has(COMPANY_ID) && json.get(COMPANY_ID) instanceof Number cid)) throw missingFieldException(COMPANY_ID);
@@ -202,11 +215,37 @@ public class TaskModule extends BaseHandler implements TaskService {
 		return mappedTask;
 	}
 
+	private void patchMembers(Task task, JSONObject json) {
+		var members = task.members();
+		for (var key : json.keySet()){
+			long userId;
+			try {
+				userId = Long.parseLong(key);
+			} catch (NumberFormatException e) {
+				throw invalidFieldException(USER_ID,"long");
+			}
+			if (!(json.get(key) instanceof Number number)) throw invalidFieldException(PERMISSION,"int");
+			var permission = Permission.of(number.intValue());
+			if (permission == OWNER) { // if a new person is about to become the task owner
+				for (var member : members.values()){ // alter the previous owners to editors
+					if (member.permission() == OWNER) members.put(member.user().id(),new Member(member.user(),EDIT));
+				}
+			}
+			members.put(userId,new Member(users.loadUser(userId),permission));
+			task.dirty(MEMBERS);
+		}
+	}
+
 	private boolean patchTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = loadMembers(taskDb.load(taskId));
 		var member = task.members().get(user.id());
 		if (member == null || member.permission() == READ_ONLY ) throw forbidden("You are not a allowed to edit {0}!",task.name());
-		taskDb.save(task.patch(json(ex)));
+		var json = json(ex);
+		if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(task,id.longValue());
+		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(task,memberJson);
+		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) addMember(task,num.longValue());
+
+		taskDb.save(task.patch(json));
 
 		return sendContent(ex,task);
 	}