Update calculate.html

calculate.html

@@ -117,54 +117,44 @@ function calculate() {
     let nFromNH4NO3 = nitrogen * nRatio;
     let nh4no3 = nFromNH4NO3 / nh4no3ContentN;
 
-    let mgso4 = s / mgso4ContentS;
-    let mgFromMgSO4 = mgso4 * mgso4ContentMg;
+    let mgso4 = mg / mgso4ContentMg;
     let sFromMgSO4 = mgso4 * mgso4ContentS;
 
-    let sRemaining = s - sFromMgSO4;
-    let k2so4 = sRemaining > 0 ? sRemaining / k2so4ContentS : 0;
-    let kFromK2SO4 = k2so4 * k2so4ContentK;
-
-    let kRemaining = k - kFromKH2PO4 - kFromK2SO4;
+    let kRemaining = k - kFromKH2PO4;
     let kno3 = kRemaining > 0 ? kRemaining / kno3ContentK : 0;
     let nFromKNO3 = kno3 * kno3ContentN;
 
     let totalN = nFromCaNO3Min + nFromNH4NO3 + nFromKNO3;
     let nDelta = nitrogen - totalN;
-    let caNO3Extra = 0;
-    if (nDelta > 0) {
-        caNO3Extra = nDelta / caContentN;
-    } else if (nDelta < 0) {
-        let nExcess = -nDelta;
-        let kno3Reduction = nExcess / kno3ContentN;
-        kno3 = Math.max(0, kno3 - kno3Reduction);
-        nFromKNO3 = kno3 * kno3ContentN;
-        nExcess = nitrogen - (nFromNH4NO3 + nFromKNO3 + nFromCaNO3Min);
-        if (nExcess > 0) {
-            caNO3Extra = nExcess / caContentN;
-        }
-    }
+    let caNO3Extra = nDelta > 0 ? nDelta / caContentN : 0;
     let caNO3Total = caNO3FromCa + caNO3Extra;
 
-    let totalMg = mgso4 * mgso4ContentMg;
-    let mgDelta = mg - totalMg;
-    if (mgDelta > 0) {
-        mgso4 += mgDelta / mgso4ContentMg;
-        sFromMgSO4 = mgso4 * mgso4ContentS;
+    let totalS = sFromMgSO4;
+    let sRemaining = s - totalS;
+    let k2so4 = sRemaining > 0 ? sRemaining / k2so4ContentS : 0;
+    let kFromK2SO4 = k2so4 * k2so4ContentK;
+
+    // Проверка, не превышает ли K₂SO₄ допустимое количество калия
+    let totalK = kFromKH2PO4 + kFromK2SO4 + kno3 * kno3ContentK;
+    if (totalK > k) {
+        let excessK = totalK - k;
+        let k2so4Reduction = excessK / k2so4ContentK;
+        k2so4 = Math.max(0, k2so4 - k2so4Reduction);
+        totalK = kFromKH2PO4 + (k2so4 * k2so4ContentK) + kno3 * kno3ContentK;
     }
 
     totalN = (caNO3Total * caContentN + nh4no3 * nh4no3ContentN + kno3 * kno3ContentN).toFixed(2);
     let totalP = (kh2po4 * kh2po4ContentP).toFixed(2);
-    let totalK = (kh2po4 * kh2po4ContentK + kno3 * kno3ContentK + k2so4 * k2so4ContentK).toFixed(2);
+    totalK = totalK.toFixed(2);
     let totalCa = (caNO3Total * caContentCa).toFixed(2);
-    totalMg = (mgso4 * mgso4ContentMg).toFixed(2);
-    let totalS = (mgso4 * mgso4ContentS + k2so4 * k2so4ContentS).toFixed(2);
+    let totalMg = (mgso4 * mgso4ContentMg).toFixed(2);
+    totalS = ((mgso4 * mgso4ContentS) + (k2so4 * k2so4ContentS)).toFixed(2);
 
     // Отображение результатов
     const result = `
         <h3>Результат расчёта (г/1000 л):</h3>
         <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${totalMg}, S: ${sFromMgSO4.toFixed(2)})</p>
-        <p>K₂SO₄: ${k2so4.toFixed(2)} (K: ${kFromK2SO4.toFixed(2)}, S: ${(k2so4 * k2so4ContentS).toFixed(2)})</p>
+        <p>K₂SO₄: ${k2so4.toFixed(2)} (K: ${(k2so4 * k2so4ContentK).toFixed(2)}, S: ${(k2so4 * k2so4ContentS).toFixed(2)})</p>
         <p>KH₂PO₄: ${kh2po4.toFixed(2)} (P: ${totalP}, K: ${kFromKH2PO4.toFixed(2)})</p>
         <p>KNO₃: ${kno3.toFixed(2)} (N: ${nFromKNO3.toFixed(2)}, K: ${(kno3 * kno3ContentK).toFixed(2)})</p>
         <p>Ca(NO₃)₂·4H₂O: ${caNO3Total.toFixed(2)} (N: ${(caNO3Total * caContentN).toFixed(2)}, Ca: ${totalCa})</p>