git.iko.soy/ilyakooo0.github.io
on master help sign in
Update diskra/sosalovo
commitaeee383690b14d10a96475044191ebfd61322af7 authorilyakooo0 <ilyakooo0@gmail.com> dateSat 22 Dec 2018, 16:13 (8 years ago) parentd276299
2 files changed+17−13
diskra/sosalovo.html+5−5 javascript/diskra.sosalovo.js+12−8
diskra/sosalovo.html+5−5
@@ -13,13 +13,13 @@ custom_js:
1313 <div class="sosalovoPair">
1414 <div class="field">
1515 <div class="diskraSosalovoTitle">
16− DZ3
16+ DZ1
1717 </div>
1818 <input autocomplete="off" id="DZ3" name="DZ3" type="number" value="9" min="0" max="10">
1919 </div>
2020 <div class="field">
2121 <div class="diskraSosalovoTitle">
22− KR3
22+ KR1
2323 </div>
2424 <input autocomplete="off" id="KR3" name="KR3" type="number" value="9" min="0" max="10">
2525 </div>
@@ -27,13 +27,13 @@ custom_js:
2727 <div class="sosalovoPair">
2828 <div class="field">
2929 <div class="diskraSosalovoTitle">
30− DZ4
30+ DZ2
3131 </div>
3232 <input autocomplete="off" id="DZ4" name="DZ4" type="number" value="5" min="0" max="10">
3333 </div>
3434 <div class="field">
3535 <div class="diskraSosalovoTitle">
36− KR4
36+ KR2
3737 </div>
3838 <input autocomplete="off" id="KR4" name="KR4" type="number" value="5" min="0" max="10">
3939 </div>
@@ -41,7 +41,7 @@ custom_js:
4141 <div class="sosalovoPair">
4242 <div class="field">
4343 <div class="diskraSosalovoTitle">
44− MIT
44+ Online
4545 </div>
4646 <input autocomplete="off" id="MIT" name="MIT" type="number" value="6" min="0" max="10">
4747 </div>
javascript/diskra.sosalovo.js+12−8
@@ -1,3 +1,7 @@
1+function round(value, decimals = 3) {
2+ return Number(Math.round(value+'e'+decimals)+'e-'+decimals);
3+}
4+
15function update() {
26 write()
37
@@ -7,20 +11,20 @@ function update() {
711 result.text("")
812 text.text("")
913
10− let kr3 = parseInt($("#KR3").val())
11− let dz3 = parseInt($("#DZ3").val())
12− let kr4 = parseInt($("#KR4").val())
13− let dz4 = parseInt($("#DZ4").val())
14− let mit = parseInt($("#MIT").val())
14+ let kr3 = round(parseFloat($("#KR3").val()))
15+ let dz3 = round(parseFloat($("#DZ3").val()))
16+ let kr4 = round(parseFloat($("#KR4").val()))
17+ let dz4 = round(parseFloat($("#DZ4").val()))
18+ let mit = round(parseFloat($("#MIT").val()))
1519
1620 if (isNaN(kr3) || isNaN(dz3) || isNaN(kr4) || isNaN(dz4) || isNaN(mit)) {
1721 return
1822 }
1923
20− let d = Math.round(0.62*Math.min(dz3, dz4) + 0.38*Math.max(dz3, dz4))
24+ let d = round((0.62*Math.min(dz3, dz4) + 0.38*Math.max(dz3, dz4)))
2125
22− let k = Math.round(0.62*Math.min(kr3, kr4) + 0.38*Math.max(kr3, kr4))
23− let o = 0.62*Math.min(d, k) + 0.38*Math.max(d, k)
26+ let k = round(0.62*Math.min(kr3, kr4) + 0.38*Math.max(kr3, kr4))
27+ let o = Math.round(0.62*Math.min(d, k) + 0.38*Math.max(d, k))
2428 let r = Math.round(0.8*Math.round(o) + 0.2*mit)
2529
2630 result.text(r)