add status tags to tasks and reorganize them to have more familiar names.
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-01-24 12:39:23 +01:00
parent f22b9b4947
commit 270694e49e
21 changed files with 347 additions and 166 deletions
+3 -7
View File
@@ -3,6 +3,7 @@
import Checkbox from "../components/Checkbox.svelte";
import IconSelect from "../components/IconSelect.svelte";
import Modal from "../components/Modal.svelte";
import StatusTagSelect from "../components/StatusTagSelect.svelte";
import { iconNames } from "../external/icons";
import type { ProjectResult } from "../models/project";
import markStale from "../stores/markStale";
@@ -103,13 +104,8 @@
<label for="endTime">Deadline (Optional)</label>
<input disabled={deletion} name="endTime" type="datetime-local" bind:value={endTime} />
<label for="statusTag">Status</label>
<select name="statusTag" bind:value={statusTag} disabled={deletion}>
<option value="" selected={"" === statusTag}>Active / In Progress</option>
<option value="completed" selected={"completed" === statusTag}>Completed</option>
<option value="failed" selected={"failed" === statusTag}>Failed</option>
<option value="postponed" selected={"postponed" === statusTag}>Postponed</option>
<option value="idea" selected={"idea" === statusTag}>Idea</option>
</select>
<StatusTagSelect disabled={deletion} bind:value={statusTag} />
<hr />
<button disabled={loading} type="submit">{verb} Project</button>
+11 -5
View File
@@ -1,8 +1,8 @@
<script lang="ts">
import stuffLogClient from "../clients/stufflog";
import Checkbox from "../components/Checkbox.svelte";
import ItemSelect from "../components/ItemSelect.svelte";
import Modal from "../components/Modal.svelte";
import StatusTagSelect from "../components/StatusTagSelect.svelte";
import { iconNames } from "../external/icons";
import type { TaskResult } from "../models/task";
import markStale from "../stores/markStale";
@@ -26,6 +26,7 @@
item: null,
logs: [],
completedAmount: 0,
statusTag: null,
}
let verb = "Add";
if (md.name === "task.edit" || md.name === "task.delete") {
@@ -47,7 +48,8 @@
let name = task.name;
let description = task.description;
let itemAmount = task.itemAmount;
let completed = !task.active;
let statusTag = task.statusTag || "";
let error = null;
let loading = false;
@@ -59,7 +61,8 @@
stuffLogClient.createTask({
projectId: task.projectId,
itemId: itemId,
active: !completed,
active: statusTag === "",
statusTag: statusTag || null,
endTime: (endTime == "") ? null : new Date(endTime),
name, description, itemAmount,
@@ -84,7 +87,9 @@
stuffLogClient.updateTask(task.id, {
endTime: (endTime == "") ? null : new Date(endTime),
clearEndTime: endTime == "",
active: !completed,
active: statusTag === "",
statusTag: statusTag || null,
clearStatusTag: statusTag === "",
itemId, name, description, itemAmount,
}).then(() => {
@@ -113,7 +118,8 @@
<input disabled={deletion} name="itemAmount" type="number" bind:value={itemAmount} />
<label for="endTime">Deadline (Optional)</label>
<input disabled={deletion} name="endTime" type="datetime-local" bind:value={endTime} />
<Checkbox disabled={deletion} bind:checked={completed} label="Task is completed." />
<label for="statusTag">Status</label>
<StatusTagSelect disabled={deletion} bind:value={statusTag} />
<hr />