gisle/stufflog2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweak goal composition and fix label in goal form.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2021-01-19 20:56:54 +01:00
parent 5e1a6f7343
commit 99cc6fac3c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svelte-ui/src/components/Composition.svelte
+9 -9
View File
@@ -20,18 +20,18 @@ import type { TaskResult } from "../models/task";
if (mode === "item") {
for (const log of logs) {
const item = log.item;
if (!map[item.name]) {
map[item.name] = {name: item.name, amount: log.itemAmount, link: `/items#${item.id}`};
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.itemAmount, link: `/items#${item.id}`};
} else {
map[item.name].amount += log.itemAmount;
map[item.id].amount += log.itemAmount;
}
if (log.secondaryItem) {
const item = log.secondaryItem;
if (!map[item.name]) {
map[item.name] = {name: item.name, amount: log.secondaryItemAmount, link: `/items#${item.id}`};
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.secondaryItemAmount, link: `/items#${item.id}`};
} else {
map[item.name].amount += log.secondaryItemAmount;
map[item.id].amount += log.secondaryItemAmount;
}
}
}
@@ -41,10 +41,10 @@ import type { TaskResult } from "../models/task";
const amount = log.secondaryItem ? log.secondaryItemAmount + log.itemAmount : log.itemAmount;
if (!map[task.name]) {
map[task.name] = {name: task.name, amount, link: `/questlog#${task.projectId}`};
if (!map[task.id]) {
map[task.id] = {name: task.name, amount, link: `/questlog#${task.projectId}`};
} else {
map[task.name].amount += amount;
map[task.id].amount += amount;
}
}
}
svelte-ui/src/forms/GoalForm.svelte
+1 -1
View File
@@ -119,7 +119,7 @@ import type { GroupResult } from "../models/group";
<GroupItemSelect disabled={deletion} optional optionalLabel="Whole Group" group={selectedGroup} name="itemId" bind:value={itemId}/>
<label for="amount">Amount</label>
<input disabled={deletion} name="amount" type="number" bind:value={amount} />
<label for="compositionMode">Composition Mode (does nothing right now)</label>
<label for="compositionMode">Composition Mode</label>
<select name="compositionMode" bind:value={compositionMode} disabled={deletion}>
<option value="item" selected={"item" === compositionMode}>Item</option>
<option value="task" selected={"task" === compositionMode}>Task</option>