From b693aa5bf5b11816863d7f4a201b300e6ff4d7dc Mon Sep 17 00:00:00 2001 From: Matthias Puchstein Date: Sat, 27 Nov 2021 13:45:44 +0100 Subject: [PATCH] functionality should be complete, error checking is still needed --- aromacalc.js | 16 ++++++++++++++++ index.html | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/aromacalc.js b/aromacalc.js index 79127f7..6751894 100644 --- a/aromacalc.js +++ b/aromacalc.js @@ -1,3 +1,6 @@ +let buttoncalc = document.getElementById("calculate") +buttoncalc.addEventListener("click", calculate) + function calculate(){ let aromaamount = document.getElementById("aromaamount").value let aromaconc = document.getElementById("aromaconc").value @@ -9,5 +12,18 @@ function calculate(){ let nicshotnicppm = document.getElementById("nicshotnicppm").value let nicshotvg = document.getElementById("nicshotvg").value let nicshotpg = document.getElementById("nicshotpg").value + + document.getElementById("results").style.display="block" + let volume = aromaamount / aromaconc + let countnicshot = (volume * nicdose) / (nicshotamount * nicshotnicppm) + let amountothers = volume / 100 * other + let amountvg = volume / 100 * vg - countnicshot * nicshotamount * nicshotvg / 100 + let amountpg = volume / 100 * pg - countnicshot * nicshotamount * nicshotpg / 100 - aromaamount + + document.getElementById("volume").value = volume + document.getElementById("countnicshot").value = countnicshot + document.getElementById("amountothers").value = amountothers + document.getElementById("amountvg").value = amountvg + document.getElementById("amountpg").value = amountpg } diff --git a/index.html b/index.html index 85611c4..883ec27 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,7 @@ - +