From 99cc6fac3cfd34d09e7b3421b51f4d07e4ac59f7 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Tue, 19 Jan 2021 20:56:54 +0100
Subject: [PATCH] tweak goal composition and fix label in goal form.

---
 svelte-ui/src/components/Composition.svelte | 18 +++++++++---------
 svelte-ui/src/forms/GoalForm.svelte         |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/svelte-ui/src/components/Composition.svelte b/svelte-ui/src/components/Composition.svelte
index 3a58b90..0c38e9d 100644
--- a/svelte-ui/src/components/Composition.svelte
+++ b/svelte-ui/src/components/Composition.svelte
@@ -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;
         }
       }
     }
diff --git a/svelte-ui/src/forms/GoalForm.svelte b/svelte-ui/src/forms/GoalForm.svelte
index 0bf3f27..d21ce56 100644
--- a/svelte-ui/src/forms/GoalForm.svelte
+++ b/svelte-ui/src/forms/GoalForm.svelte
@@ -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>