Update calculate.html

calculate.html

@@ -72,18 +72,6 @@
 
     <div class="result" id="result"></div>
 
-    <script>
-        document.getElementById('n_ratio').addEventListener('input', function() {
-            const ratio = (this.value / 10).toFixed(1);
-            document.getElementById('n_ratio_value').textContent = ratio;
-        });
-
-    <script>
-        document.getElementById('n_ratio').addEventListener('input', function() {
-            const ratio = (this.value / 10).toFixed(1);
-            document.getElementById('n_ratio_value').textContent = ratio;
-        });
-
     <script>
         document.getElementById('n_ratio').addEventListener('input', function() {
             const ratio = (this.value / 10).toFixed(1);
@@ -119,67 +107,93 @@
                 return;
             }
 
-            // Расчёт
-            // 1. KH₂PO₄ от P
+            // Первый проход: базовый расчёт
             let kh2po4 = p / kh2po4ContentP;
             let kFromKH2PO4 = kh2po4 * kh2po4ContentK;
 
-            // 2. Ca(NO₃)₂ от Ca
+            let mgso4 = mg / mgso4ContentMg;
+            let sFromMgSO4 = mgso4 * mgso4ContentS;
+
             let caNO3FromCa = ca / caContentCa;
             let nFromCaNO3Min = caNO3FromCa * caContentN;
 
-            // 3. NH₄NO₃ от nRatio
             let nFromNH4NO3 = nitrogen * nRatio;
             let nh4no3 = nFromNH4NO3 / nh4no3ContentN;
 
-            // 4. MgSO₄ от S (приоритет S, так как Mg проще скорректировать)
-            let mgso4 = s / mgso4ContentS;
-            let mgFromMgSO4 = mgso4 * mgso4ContentMg;
-            let sFromMgSO4 = mgso4 * mgso4ContentS;
+            let kRemaining = k - kFromKH2PO4;
+            let kno3 = kRemaining > 0 ? kRemaining / kno3ContentK : 0;
+            let nFromKNO3 = kno3 * kno3ContentN;
+
+            let nRemaining = nitrogen - nFromNH4NO3 - nFromCaNO3Min - nFromKNO3;
+            let caNO3Extra = nRemaining > 0 ? nRemaining / caContentN : 0;
+            let caNO3Total = caNO3FromCa + caNO3Extra;
 
-            // 5. K₂SO₄ от остатка S (если нужно)
             let sRemaining = s - sFromMgSO4;
             let k2so4 = sRemaining > 0 ? sRemaining / k2so4ContentS : 0;
             let kFromK2SO4 = k2so4 * k2so4ContentK;
 
-            // 6. KNO₃ от остатка K
-            let kRemaining = k - kFromKH2PO4 - kFromK2SO4;
-            let kno3 = kRemaining > 0 ? kRemaining / kno3ContentK : 0;
-            let nFromKNO3 = kno3 * kno3ContentN;
-
-            // 7. Корректировка N
-            let totalN = nFromCaNO3Min + nFromNH4NO3 + nFromKNO3;
+            // Второй проход: корректировка N и K
+            let totalN = caNO3Total * caContentN + nh4no3 * nh4no3ContentN + kno3 * kno3ContentN;
+            let totalK = kh2po4 * kh2po4ContentK + kno3 * kno3ContentK + k2so4 * k2so4ContentK;
             let nDelta = nitrogen - totalN;
-            let caNO3Extra = 0;
-            if (nDelta > 0) {
-                caNO3Extra = nDelta / caContentN;
-            } else if (nDelta < 0) {
+            let kDelta = k - totalK;
+
+            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;
+                nExcess = nitrogen - (nFromNH4NO3 + nFromKNO3 + caNO3FromCa * caContentN);
+                if (nExcess < 0) {
+                    caNO3Extra = Math.max(0, caNO3Extra + (nExcess / caContentN));
+                    caNO3Total = caNO3FromCa + caNO3Extra;
                 }
             }
-            let caNO3Total = caNO3FromCa + caNO3Extra;
+            if (nDelta > 0) {
+                caNO3Extra += nDelta / caContentN;
+                caNO3Total = caNO3FromCa + caNO3Extra;
+            }
+
+            totalK = kh2po4 * kh2po4ContentK + kno3 * kno3ContentK + k2so4 * k2so4ContentK;
+            kDelta = k - totalK;
+            if (kDelta > 0) {
+                let kno3Add = kDelta / kno3ContentK;
+                kno3 += kno3Add;
+                nFromKNO3 = kno3 * kno3ContentN;
+            }
 
-            // 8. Корректировка Mg
+            // Третий проход: корректировка Mg и S
             let totalMg = mgso4 * mgso4ContentMg;
+            let totalS = mgso4 * mgso4ContentS + k2so4 * k2so4ContentS;
             let mgDelta = mg - totalMg;
+            let sDelta = s - totalS;
+
             if (mgDelta > 0) {
                 mgso4 += mgDelta / mgso4ContentMg;
                 sFromMgSO4 = mgso4 * mgso4ContentS;
             }
+            totalS = mgso4 * mgso4ContentS + k2so4 * k2so4ContentS;
+            sDelta = s - totalS;
+            if (sDelta < 0) {
+                let sExcess = -sDelta;
+                let mgso4Reduction = sExcess / mgso4ContentS;
+                mgso4 = Math.max(0, mgso4 - mgso4Reduction);
+                sFromMgSO4 = mgso4 * mgso4ContentS;
+                totalMg = mgso4 * mgso4ContentMg;
+                sDelta = s - sFromMgSO4;
+                if (sDelta > 0) {
+                    k2so4 = sDelta / k2so4ContentS;
+                    kFromK2SO4 = k2so4 * k2so4ContentK;
+                }
+            }
 
-            // Пересчёт итоговых концентраций
+            // Итоговые концентрации после всех проходов
             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);
-            let totalCa = (caNO3Total * caContentCa).toFixed(2);
+            totalP = (kh2po4 * kh2po4ContentP).toFixed(2);
+            totalK = (kh2po4 * kh2po4ContentK + kno3 * kno3ContentK + k2so4 * k2so4ContentK).toFixed(2);
+            totalCa = (caNO3Total * caContentCa).toFixed(2);
             totalMg = (mgso4 * mgso4ContentMg).toFixed(2);
-            let totalS = (mgso4 * mgso4ContentS + k2so4 * k2so4ContentS).toFixed(2);
+            totalS = (mgso4 * mgso4ContentS + k2so4 * k2so4ContentS).toFixed(2);
 
             // Отображение результатов
             const result = `