Update calculate.html

calculate.html

@@ -92,48 +92,66 @@
                 return;
             }
 
-            // 1. KH₂PO₄ от P
-            let kh2po4 = p / pContent;
-            let kFromKH2PO4 = kh2po4 * kContentKH2PO4;
-
-            // 2. Ca(NO₃)₂·4H₂O от Ca
+            // 1. Ca(NO₃)₂·4H₂O от Ca
             let caNO3 = ca / caContentCa;
             let nFromCaNO3 = caNO3 * caContentN;
 
+            // 2. KH₂PO₄ от P
+            let kh2po4 = p / pContent;
+            let kFromKH2PO4 = kh2po4 * kContentKH2PO4;
+
             // 3. MgSO₄·7H₂O от Mg
             let mgso4 = mg / mgContent;
             let sFromMgSO4 = mgso4 * sContentMgSO4;
 
-            // 4. K₂SO₄ от остатка S
-            let sRemaining = s - sFromMgSO4;
-            let k2so4 = sRemaining > 0 ? sRemaining / sContentK2SO4 : 0;
-            let kFromK2SO4 = k2so4 * kContentK2SO4;
+            // 4. KNO₃ от остатка N (приоритет N)
+            let nRemaining = n - nFromCaNO3;
+            let kno3FromN = nRemaining > 0 ? nRemaining / nContentKNO3 : 0;
+            let kFromKNO3FromN = kno3FromN * kContentKNO3;
+
+            let kRemaining = k - kFromKH2PO4;
+            let kno3FromK = kRemaining > 0 ? kRemaining / kContentKNO3 : 0;
+            let nFromKNO3FromK = kno3FromK * nContentKNO3;
 
-            // 5. KNO₃ от остатка K
-            let kRemaining = k - kFromKH2PO4 - kFromK2SO4;
-            let kno3 = kRemaining > 0 ? kRemaining / kContentKNO3 : 0;
+            // Выбираем меньший KNO₃, чтобы не превысить N или K
+            let kno3 = Math.min(kno3FromN, kno3FromK);
             let nFromKNO3 = kno3 * nContentKNO3;
+            let kFromKNO3 = kno3 * kContentKNO3;
 
-            // 6. NH₄NO₃ от остатка N
-            let nRemaining = n - nFromCaNO3 - nFromKNO3;
+            // 5. NH₄NO₃ для остатка N
+            nRemaining = n - nFromCaNO3 - nFromKNO3;
             let nh4no3 = nRemaining > 0 ? nRemaining / nContentNH4NO3 : 0;
 
+            // 6. K₂SO₄ для остатка K и S
+            kRemaining = k - kFromKH2PO4 - kFromKNO3;
+            let k2so4FromK = kRemaining > 0 ? kRemaining / kContentK2SO4 : 0;
+            let sFromK2SO4FromK = k2so4FromK * sContentK2SO4;
+
+            let sRemaining = s - sFromMgSO4;
+            let k2so4FromS = sRemaining > 0 ? sRemaining / sContentK2SO4 : 0;
+            let kFromK2SO4FromS = k2so4FromS * kContentK2SO4;
+
+            // Выбираем меньший K₂SO₄, чтобы не превысить K
+            let k2so4 = Math.min(k2so4FromK, k2so4FromS);
+            let kFromK2SO4 = k2so4 * kContentK2SO4;
+            let sFromK2SO4 = k2so4 * sContentK2SO4;
+
             // Итоговые концентрации
             let totalN = (nFromCaNO3 + nFromKNO3 + nh4no3 * nContentNH4NO3).toFixed(2);
             let totalP = (kh2po4 * pContent).toFixed(2);
-            let totalK = (kFromKH2PO4 + kFromK2SO4 + kno3 * kContentKNO3).toFixed(2);
+            let totalK = (kFromKH2PO4 + kFromKNO3 + kFromK2SO4).toFixed(2);
             let totalCa = (caNO3 * caContentCa).toFixed(2);
             let totalMg = (mgso4 * mgContent).toFixed(2);
-            let totalS = (sFromMgSO4 + k2so4 * sContentK2SO4).toFixed(2);
+            let totalS = (sFromMgSO4 + sFromK2SO4).toFixed(2);
 
             // Результаты
             let resultText = `
                 <h3>Результаты расчёта (г/1000 л):</h3>
                 <p>Ca(NO₃)₂·4H₂O: ${caNO3.toFixed(2)} (Ca: ${totalCa}, N: ${nFromCaNO3.toFixed(2)})</p>
                 <p>KH₂PO₄: ${kh2po4.toFixed(2)} (P: ${totalP}, K: ${kFromKH2PO4.toFixed(2)})</p>
-                <p>KNO₃: ${kno3.toFixed(2)} (K: ${(kno3 * kContentKNO3).toFixed(2)}, N: ${nFromKNO3.toFixed(2)})</p>
+                <p>KNO₃: ${kno3.toFixed(2)} (K: ${kFromKNO3.toFixed(2)}, N: ${nFromKNO3.toFixed(2)})</p>
                 <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${totalMg}, S: ${sFromMgSO4.toFixed(2)})</p>
-                <p>K₂SO₄: ${k2so4.toFixed(2)} (S: ${(k2so4 * sContentK2SO4).toFixed(2)}, K: ${kFromK2SO4.toFixed(2)})</p>
+                <p>K₂SO₄: ${k2so4.toFixed(2)} (S: ${sFromK2SO4.toFixed(2)}, K: ${kFromK2SO4.toFixed(2)})</p>
                 <p>NH₄NO₃: ${nh4no3.toFixed(2)} (N: ${(nh4no3 * nContentNH4NO3).toFixed(2)})</p>
                 <h3>Итоговые концентрации (мг/л):</h3>
                 <p>N: ${totalN}, P: ${totalP}, K: ${totalK}, Ca: ${totalCa}, Mg: ${totalMg}, S: ${totalS}</p>