Skip to content

Fix storage filling calculations #465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lilbit-prun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix storage filling calculations #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/features/planning/components/tools/PlanVisitationFrequency.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
(sum, e) => sum + (e.delta > 0 ? e.totalVolume : 0),
0
);
const dailyWeightTotal: number = dailyWeightImport + dailyWeightExport;
const dailyVolumeTotal: number = dailyVolumeImport + dailyVolumeExport;
const dailyWeightTotal: number = Math.max(dailyWeightImport, dailyWeightExport);
const dailyVolumeTotal: number = Math.max(dailyVolumeImport, dailyVolumeExport);

return {
storageFilled: Math.max(
Expand Down Expand Up @@ -252,12 +252,12 @@
</template>
</template>
</template>
<template #total_weight>{{

Check warning on line 255 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break after opening tag (`<template>`), but no line breaks found
formatAmount(totalWeight)
}}</template>

Check warning on line 257 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break before closing tag (`</template>`), but no line breaks found
<template #total_volume>{{

Check warning on line 258 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break after opening tag (`<template>`), but no line breaks found
formatAmount(totalVolume)
}}</template>

Check warning on line 260 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break before closing tag (`</template>`), but no line breaks found
</i18n-t>

<i18n-t
Expand All @@ -265,12 +265,12 @@
keypath="plan.tools.visitation_frequency.storage.info_no_storage"
tag="p"
class="pb-3">
<template #total_weight>{{

Check warning on line 268 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break after opening tag (`<template>`), but no line breaks found
formatAmount(totalWeight)
}}</template>

Check warning on line 270 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break before closing tag (`</template>`), but no line breaks found
<template #total_volume>{{

Check warning on line 271 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break after opening tag (`<template>`), but no line breaks found
formatAmount(totalVolume)
}}</template>

Check warning on line 273 in src/features/planning/components/tools/PlanVisitationFrequency.vue

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 22.x) 

Expected 1 line break before closing tag (`</template>`), but no line breaks found
</i18n-t>

<PTable striped>
Expand Down
4 changes: 2 additions & 2 deletions src/features/planning/usePlanCalculation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,8 @@ export async function usePlanCalculation(
(sum, e) => sum + (e.delta > 0 ? e.totalVolume : 0),
0
);
const dailyWeightTotal: number = dailyWeightImport + dailyWeightExport;
const dailyVolumeTotal: number = dailyVolumeImport + dailyVolumeExport;
const dailyWeightTotal: number = Math.max(dailyWeightImport, dailyWeightExport);
const dailyVolumeTotal: number = Math.max(dailyVolumeImport, dailyVolumeExport);

return {
storageFilled: Math.max(
Expand Down
2 changes: 1 addition & 1 deletion src/tests/features/planning/usePlanCalculation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe("usePlanCalculation", async () => {

const result = await calculate();

expect(visitationData.value.storageFilled).toBe(22.342256698594255);
expect(visitationData.value.storageFilled).toBe(26.462529131522697);
});

it("validate existing and saveable", async () => {
Expand Down
Loading