add task and item filters to goals.
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-01-19 22:12:10 +01:00
parent 99cc6fac3c
commit a187e91c3c
8 changed files with 122 additions and 21 deletions
+13 -1
View File
@@ -49,7 +49,9 @@ import type { GroupResult } from "../models/group";
let compositionMode = goal.compositionMode;
let startTime = formatFormTime(goal.startTime);
let endTime = formatFormTime(goal.endTime);
let taskFilter = goal.taskFilter || "";
let itemFilter = goal.itemFilter || "";
let error = null;
let loading = false;
let selectedGroup: GroupResult = null;
@@ -62,6 +64,8 @@ import type { GroupResult } from "../models/group";
startTime: new Date(startTime),
endTime: new Date(endTime),
itemId: itemId || null,
taskFilter: taskFilter.toLowerCase() || null,
itemFilter: itemFilter.toLowerCase() || null,
groupId, name, description, amount, unweighted, compositionMode
}).then(() => {
markStale("goal");
@@ -86,6 +90,10 @@ import type { GroupResult } from "../models/group";
endTime: new Date(endTime),
itemId: itemId || null,
clearItemId: itemId === "",
taskFilter: taskFilter.toLowerCase() || null,
clearTaskFilter: taskFilter === "",
itemFilter: itemFilter.toLowerCase() || null,
clearItemFilter: itemFilter === "",
name, description, amount, compositionMode, unweighted,
}).then(() => {
markStale("goal");
@@ -128,6 +136,10 @@ import type { GroupResult } from "../models/group";
<input disabled={deletion} name="startTime" type="datetime-local" bind:value={startTime} />
<label for="endTime">End Time</label>
<input disabled={deletion} name="endTime" type="datetime-local" bind:value={endTime} />
<label for="taskFilter">Task Filter (Optional)</label>
<input disabled={deletion} name="taskFilter" type="text" bind:value={taskFilter} />
<label for="itemFilter">Item Filter (Optional)</label>
<input disabled={deletion} name="itemFilter" type="text" bind:value={itemFilter} />
<Checkbox bind:checked={unweighted} label="Unweighted (All items count as 1)" />
<hr />