git.iko.soy/ilyakooo0.github.io
on master help sign in
Fixed proga/sosalovo
commita8b359cacc69340c4a5c34ffb37647f29379f770 authorilyakooo0 <ilyakooo0@gmail.com> dateMon 18 Jun 2018, 20:48 (8 years ago) parent4069514
2 files changed+3−17
javascript/proga.sosalovo.js+1−7 proga/sosalovo.html+2−10
javascript/proga.sosalovo.js+1−7
@@ -8,7 +8,6 @@ function update() {
88 text.text("")
99
1010 let sr3 = parseFloat($("#SR3").val())
11− let kr3 = parseInt($("#KR3").val())
1211 let sr4 = parseFloat($("#SR4").val())
1312 let kr4 = parseInt($("#KR4").val())
1413 let kdz3 = parseInt($("#KDZ3").val())
@@ -16,7 +15,6 @@ function update() {
1615 let podbel = parseInt($("#Podbel").val())
1716
1817 if (isNaN(sr3) ||
19− isNaN(kr3) ||
2018 isNaN(sr4) ||
2119 isNaN(kr4) ||
2220 isNaN(kdz3)||
@@ -25,7 +23,7 @@ function update() {
2523 return
2624 }
2725
28− let no3 = 0.3*sr3 + 0.35*kdz3 + 0.35*kr3
26+ let no3 = 0.5*sr3 + 0.5*kdz3
2927 let no4 = 0.2*sr4 + 0.8*kr4
3028
3129 let no = Math.round(0.2*no3+0.8*no4)
@@ -41,14 +39,12 @@ function update() {
4139
4240window.onload = function() {
4341 $("#SR3").change(update)
44− $("#KR3").change(update)
4542 $("#SR4").change(update)
4643 $("#KR4").change(update)
4744 $("#KDZ3").change(update)
4845 $("#EKR").change(update)
4946 $("#Podbel").change(update)
5047 $("#SR3").keyup(update)
51− $("#KR3").keyup(update)
5248 $("#SR4").keyup(update)
5349 $("#KR4").keyup(update)
5450 $("#KDZ3").keyup(update)
@@ -64,7 +60,6 @@ function read() {
6460 let obj = Cookies.getJSON('proga.sosalovo')
6561 if (obj != undefined) {
6662 $("#SR3").val(obj.sr3)
67− $("#KR3").val(obj.kr3)
6863 $("#SR4").val(obj.sr4)
6964 $("#KR4").val(obj.kr4)
7065 $("#KDZ3").val(obj.kdz3)
@@ -76,7 +71,6 @@ function read() {
7671function write() {
7772 let obj = {
7873 "sr3": parseFloat($("#SR3").val()) || 0,
79− "kr3": parseInt($("#KR3").val()) || 0,
8074 "sr4": parseFloat($("#SR4").val()) || 0,
8175 "kr4": parseInt($("#KR4").val()) || 0,
8276 "kdz3": parseInt($("#KDZ3").val()) || 0,
proga/sosalovo.html+2−10
@@ -19,9 +19,9 @@ custom_js:
1919 </div>
2020 <div class="field">
2121 <div class="diskraSosalovoTitle">
22− KR3
22+ KDZ3
2323 </div>
24− <input autocomplete="off" id="KR3" name="KR3" type="number" value="10" min="0" max="10">
24+ <input autocomplete="off" id="KDZ3" name="KDZ3" type="number" value="5" min="0" max="10">
2525 </div>
2626 </div>
2727 <div class="sosalovoPair">
@@ -38,14 +38,6 @@ custom_js:
3838 <input autocomplete="off" id="KR4" name="KR4" type="number" value="10" min="0" max="10">
3939 </div>
4040 </div>
41− <div class="sosalovoPair">
42− <div class="field">
43− <div class="diskraSosalovoTitle">
44− KDZ3
45− </div>
46− <input autocomplete="off" id="KDZ3" name="KDZ3" type="number" value="5" min="0" max="10">
47− </div>
48− </div>
4941 <div class="sosalovoPair">
5042 <div class="field">
5143 <div class="diskraSosalovoTitle">