add project linking.

svelte-ui/src/components/ProgressNumbers.svelte

@@ -50,7 +50,6 @@
       const boatTarget = Math.ceil(timeProgress * progressTarget);
       
       boat = progressAmount - boatTarget;
-      console.log(progressTarget, boatTarget);
     } else {
       boat = null;
     }
@@ -67,10 +66,6 @@
       }
     }
   }
-
-  $: {
-    console.log(boat);
-  }
 </script>
 
 <div class="progress">

svelte-ui/src/components/ProjectEntry.svelte

@@ -26,6 +26,7 @@ import stuffLogClient from "../clients/stufflog";
   let mdAddTask: ModalData;
   let mdProjectEdit: ModalData;
   let mdProjectDelete: ModalData;
+  let mdLinkTask: ModalData;
   let linkTarget: string = "";
   let activeTasks: TaskResult[] = [];
   let inactiveTasks: TaskResult[] = [];
@@ -73,6 +74,7 @@ import stuffLogClient from "../clients/stufflog";
   }
 
   $: mdAddTask = {name:"task.add", project};
+  $: mdLinkTask = {name:"tasklink.add", project};
   $: mdProjectEdit = {name:"project.edit", project};
   $: mdProjectDelete = {name:"project.delete", project};
 
@@ -114,6 +116,7 @@ import stuffLogClient from "../clients/stufflog";
     {#if showAllOptions}
       <OptionRow>
         <Option open={mdAddTask}>Add Task</Option>
+        <Option open={mdLinkTask}>Link Task</Option>
         <Option open={mdProjectEdit}>Edit</Option>
         <Option open={mdProjectDelete}>Delete</Option>
         {#if canComplete}

svelte-ui/src/components/ProjectSelect.svelte

@@ -14,12 +14,6 @@
   
   let optGroups: OptGroup[]
 
-  $: {
-    if ($projectStore.stale && !$projectStore.loading) {
-      projectStore.load({});
-    }
-  }
-
   $: {
     optGroups = [
       {
@@ -42,6 +36,14 @@
         status: "Completed",
         projects: $projectStore.projects.filter(p => !p.active && p.statusTag === "completed")
       },
+      {
+        status: "Background",
+        projects: $projectStore.projects.filter(p => !p.active && p.statusTag === "background")
+      },
+      {
+        status: "Progress",
+        projects: $projectStore.projects.filter(p => !p.active && p.statusTag === "progress")
+      },
       {
         status: "Failed",
         projects: $projectStore.projects.filter(p => !p.active && p.statusTag === "failed")

svelte-ui/src/components/TaskEntry.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { tick } from "svelte";
+  import { tick } from "svelte";
 
   import stuffLogClient from "../clients/stufflog";
   import type Project from "../models/project";
@@ -23,7 +23,9 @@ import { tick } from "svelte";
   let mdLogAdd: ModalData;
   let mdTaskEdit: ModalData;
   let mdTaskDelete: ModalData;
+  let mdTaskUnlink: ModalData;
   let isMoving = false;
+  let isLinked = false;
 
   function toggleShowLogs() {
     showLogs = !showLogs;
@@ -66,6 +68,8 @@ import { tick } from "svelte";
   $: mdLogAdd = {name: "log.add", task: {...task, project}};
   $: mdTaskEdit = {name: "task.edit", task: {...task, project}};
   $: mdTaskDelete = {name: "task.delete", task: {...task, project}};
+  $: mdTaskUnlink = {name: "tasklink.delete", task, project};
+  $: isLinked = task.projectId !== project.id;
 </script>
 
 <StatusColor affects="task" entry={task}>
@@ -81,25 +85,29 @@ import { tick } from "svelte";
       <Option open={mdLogAdd}>Add Log</Option>
       {#if showAllOptions}
         <Option open={mdTaskEdit}>Edit</Option>
-        <Option open={mdTaskDelete}>Delete</Option>
-        ·
-        {#if !isMoving && (!task.active) }
-          <Option on:click={moveToActive}>Active</Option>
-        {/if}
-        {#if !isMoving && (task.statusTag !== "to do") }
-        <Option color="yellow" on:click={moveToToDo}>To Do</Option>
-        {/if}
-        {#if !isMoving && (task.statusTag !== "on hold") }
-        <Option color="blue" on:click={moveToOnHold}>On Hold</Option>
-        {/if}
-        {#if !isMoving && (task.statusTag !== "declined") }
-        <Option color="purple" on:click={moveToDeclined}>Won't Do</Option>
-        {/if}
-        {#if !isMoving && task.active }
-          <Option color="green" on:click={moveToCompleted}>Completed</Option>
-        {/if}
-        {#if !isMoving && (task.statusTag !== "failed") }
-          <Option color="red" on:click={moveToFailed}>Failed</Option>
+        {#if isLinked}
+          <Option open={mdTaskUnlink}>Unlink</Option>
+        {:else}
+          <Option open={mdTaskDelete}>Delete</Option>
+          ·
+          {#if !isMoving && (!task.active) }
+            <Option on:click={moveToActive}>Active</Option>
+          {/if}
+          {#if !isMoving && (task.statusTag !== "to do") }
+            <Option color="yellow" on:click={moveToToDo}>To Do</Option>
+          {/if}
+          {#if !isMoving && (task.statusTag !== "on hold") }
+            <Option color="blue" on:click={moveToOnHold}>On Hold</Option>
+          {/if}
+          {#if !isMoving && (task.statusTag !== "declined") }
+            <Option color="purple" on:click={moveToDeclined}>Won't Do</Option>
+          {/if}
+          {#if !isMoving && task.active }
+            <Option color="green" on:click={moveToCompleted}>Completed</Option>
+          {/if}
+          {#if !isMoving && (task.statusTag !== "failed") }
+            <Option color="red" on:click={moveToFailed}>Failed</Option>
+          {/if}
         {/if}
       {/if}
     </OptionRow>

svelte-ui/src/components/TaskSelect.svelte

@@ -0,0 +1,36 @@
+<script lang="ts">
+  import projectStore from "../stores/project";
+
+  export let value = "";
+  export let name = "";
+  export let disabled = false;
+  export let optional = false;
+
+  $: {
+    if ($projectStore.stale && !$projectStore.loading) {
+      projectStore.load({});
+    }
+  }
+
+  $: {
+    if ($projectStore.projects.length > 0 && value === "" && !optional) {
+      const nonEmpty = $projectStore.projects.find(g => g.tasks.length > 0);
+      if (nonEmpty != null) {
+        value = nonEmpty.tasks[0].id;
+      }
+    }
+  }
+</script>
+
+<select name={name} bind:value={value} disabled={disabled || $projectStore.loading}>
+  {#if optional}
+    <option value={""} selected={"" === value}>None</option>
+  {/if}
+  {#each $projectStore.projects as project (project.id)}
+    <optgroup label={project.name}>
+      {#each project.tasks as task (task.id)}
+        <option value={task.id} selected={task.id === value}>{task.name}</option>
+      {/each}
+    </optgroup>
+  {/each}
+</select>