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

fix handling of zero-weight items. They're not counted in goals/compositon, but project progress count them as 1.

Browse Source
This commit is contained in:
gisle
2021-02-07 12:47:11 +01:00
parent fdeef21e59
commit 173158a514
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svelte-ui/src/components/Composition.svelte
+13 -8
View File
@@ -10,6 +10,7 @@
export let logs: LogResult[] = [];
export let mode: GoalCompositionMode = "item";
export let ignoreZeroWeight: boolean = false;
let list: CompositionItem[] = [];
@@ -20,19 +21,23 @@
for (const log of logs) {
if (log.itemCounted !== false) {
const item = log.item;
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.itemAmount, link: `/items#${item.id}`};
} else {
map[item.id].amount += log.itemAmount;
if (!ignoreZeroWeight || item.groupWeight > 0) {
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.itemAmount, link: `/items#${item.id}`};
} else {
map[item.id].amount += log.itemAmount;
}
}
}
if (log.secondaryItem && log.secondaryItemCounted !== false) {
const item = log.secondaryItem;
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.secondaryItemAmount, link: `/items#${item.id}`};
} else {
map[item.id].amount += log.secondaryItemAmount;
if (!ignoreZeroWeight || item.groupWeight > 0) {
if (!map[item.id]) {
map[item.id] = {name: item.name, amount: log.secondaryItemAmount, link: `/items#${item.id}`};
} else {
map[item.id].amount += log.secondaryItemAmount;
}
}
}
}