git.iko.soy/ilyakooo0.github.io
on master help sign in
Fixed proga/sosalovo
a8b359cilyakooo0
javascript/proga.sosalovo.js+1−7
compare with master
unifiedsplit
@@ -8,7 +8,6 @@ function update() {
8 text.text("")
8 text.text("")
9
9
10 let sr3 = parseFloat($("#SR3").val())
10 let sr3 = parseFloat($("#SR3").val())
11− let kr3 = parseInt($("#KR3").val())
12 let sr4 = parseFloat($("#SR4").val())
11 let sr4 = parseFloat($("#SR4").val())
13 let kr4 = parseInt($("#KR4").val())
12 let kr4 = parseInt($("#KR4").val())
14 let kdz3 = parseInt($("#KDZ3").val())
13 let kdz3 = parseInt($("#KDZ3").val())
@@ -16,7 +15,6 @@ function update() {
16 let podbel = parseInt($("#Podbel").val())
15 let podbel = parseInt($("#Podbel").val())
17
16
18 if (isNaN(sr3) ||
17 if (isNaN(sr3) ||
19− isNaN(kr3) ||
20 isNaN(sr4) ||
18 isNaN(sr4) ||
21 isNaN(kr4) ||
19 isNaN(kr4) ||
22 isNaN(kdz3)||
20 isNaN(kdz3)||
@@ -25,7 +23,7 @@ function update() {
25 return
23 return
26 }
24 }
27
25
28− let no3 = 0.3*sr3 + 0.35*kdz3 + 0.35*kr3
26+ let no3 = 0.5*sr3 + 0.5*kdz3
29 let no4 = 0.2*sr4 + 0.8*kr4
27 let no4 = 0.2*sr4 + 0.8*kr4
30
28
31 let no = Math.round(0.2*no3+0.8*no4)
29 let no = Math.round(0.2*no3+0.8*no4)
@@ -41,14 +39,12 @@ function update() {
41
39
42window.onload = function() {
40window.onload = function() {
43 $("#SR3").change(update)
41 $("#SR3").change(update)
44− $("#KR3").change(update)
45 $("#SR4").change(update)
42 $("#SR4").change(update)
46 $("#KR4").change(update)
43 $("#KR4").change(update)
47 $("#KDZ3").change(update)
44 $("#KDZ3").change(update)
48 $("#EKR").change(update)
45 $("#EKR").change(update)
49 $("#Podbel").change(update)
46 $("#Podbel").change(update)
50 $("#SR3").keyup(update)
47 $("#SR3").keyup(update)
51− $("#KR3").keyup(update)
52 $("#SR4").keyup(update)
48 $("#SR4").keyup(update)
53 $("#KR4").keyup(update)
49 $("#KR4").keyup(update)
54 $("#KDZ3").keyup(update)
50 $("#KDZ3").keyup(update)
@@ -64,7 +60,6 @@ function read() {
64 let obj = Cookies.getJSON('proga.sosalovo')
60 let obj = Cookies.getJSON('proga.sosalovo')
65 if (obj != undefined) {
61 if (obj != undefined) {
66 $("#SR3").val(obj.sr3)
62 $("#SR3").val(obj.sr3)
67− $("#KR3").val(obj.kr3)
68 $("#SR4").val(obj.sr4)
63 $("#SR4").val(obj.sr4)
69 $("#KR4").val(obj.kr4)
64 $("#KR4").val(obj.kr4)
70 $("#KDZ3").val(obj.kdz3)
65 $("#KDZ3").val(obj.kdz3)
@@ -76,7 +71,6 @@ function read() {
76function write() {
71function write() {
77 let obj = {
72 let obj = {
78 "sr3": parseFloat($("#SR3").val()) || 0,
73 "sr3": parseFloat($("#SR3").val()) || 0,
79− "kr3": parseInt($("#KR3").val()) || 0,
80 "sr4": parseFloat($("#SR4").val()) || 0,
74 "sr4": parseFloat($("#SR4").val()) || 0,
81 "kr4": parseInt($("#KR4").val()) || 0,
75 "kr4": parseInt($("#KR4").val()) || 0,
82 "kdz3": parseInt($("#KDZ3").val()) || 0,
76 "kdz3": parseInt($("#KDZ3").val()) || 0,
proga/sosalovo.html+2−10
@@ -19,9 +19,9 @@ custom_js:
19 </div>
19 </div>
20 <div class="field">
20 <div class="field">
21 <div class="diskraSosalovoTitle">
21 <div class="diskraSosalovoTitle">
22− KR3
22+ KDZ3
23 </div>
23 </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">
25 </div>
25 </div>
26 </div>
26 </div>
27 <div class="sosalovoPair">
27 <div class="sosalovoPair">
@@ -38,14 +38,6 @@ custom_js:
38 <input autocomplete="off" id="KR4" name="KR4" type="number" value="10" min="0" max="10">
38 <input autocomplete="off" id="KR4" name="KR4" type="number" value="10" min="0" max="10">
39 </div>
39 </div>
40 </div>
40 </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>
49 <div class="sosalovoPair">
41 <div class="sosalovoPair">
50 <div class="field">
42 <div class="field">
51 <div class="diskraSosalovoTitle">
43 <div class="diskraSosalovoTitle">