Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions web/src/components/form/Form.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
let ph = "";
let logInactivation = "0.5";

let formulaResult = "";
let interpolatedResult = "";
let formulaResult: number | undefined = undefined;
let interpolatedResult: number | undefined = undefined;
let error = "";

async function onSubmit(event: Event) {
Expand Down Expand Up @@ -100,20 +100,22 @@
<option value="2.5">2.5</option>
<option value="3.0">3.0</option>
{:else}
<option value="1.0">2.0</option>
<option value="2.0">3.0</option>
<option value="3.0">4.0</option>
<option value="2.0">2.0</option>
<option value="3.0">3.0</option>
<option value="4.0">4.0</option>
{/if}
</select>

<br />
<button type="submit">Submit</button>

{#if formulaResult && interpolatedResult}
{#if interpolatedResult != null}
<div class={styles.divider} />

<p class={styles.result}>Formula result:</p>
<p data-cy="result">{formulaResult}</p>
{#if formulaResult != null}
<p class={styles.result}>Formula result:</p>
<p data-cy="result">{formulaResult}</p>
{/if}

<p class={styles.result}>Interpolated result:</p>
<p data-cy="result">{interpolatedResult}</p>
Expand Down
12 changes: 5 additions & 7 deletions web/src/utils/inactivation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,11 @@ export function getResults(validatedParams: any) {
const temperatureLow = Math.max(temperatureMin, Math.floor(t) * n);
const temperatureHigh = Number(Math.ceil(t) * n);

// Formula
const formulaResult = fcFormula(
inactivationLog,
temperature,
concentration,
ph
);
// Formula (only applicable for free chlorine + giardia)
const formulaResult =
isFreeChlorine && isGiardia
? fcFormula(inactivationLog, temperature, concentration, ph)
: undefined;

let interpolatedResult: number;
// TODO what to do about rounding?
Expand Down