Update calculate.html

calculate.html

@@ -31,11 +31,16 @@
         <label for="n_content_kno3">N в KNO₃:</label>
         <input type="number" id="n_content_kno3" value="13.5" step="0.1"><br>
 
-        <label for="mg_content">Mg в MgSO₄·7H₂O:</label>
-        <input type="number" id="mg_content" value="16" step="0.1"><br>
+        <label for="mg_content_mgso4">Mg в MgSO₄·7H₂O:</label>
+        <input type="number" id="mg_content_mgso4" value="16" step="0.1"><br>
         <label for="s_content_mgso4">S в MgSO₄·7H₂O:</label>
         <input type="number" id="s_content_mgso4" value="13.5" step="0.1"><br>
 
+        <label for="mg_content_mgno3">Mg в Mg(NO₃)₂:</label>
+        <input type="number" id="mg_content_mgno3" value="9.8" step="0.1"><br>
+        <label for="n_content_mgno3">N в Mg(NO₃)₂:</label>
+        <input type="number" id="n_content_mgno3" value="11" step="0.1"><br>
+
         <label for="k_content_k2so4">K в K₂SO₄:</label>
         <input type="number" id="k_content_k2so4" value="41.5" step="0.1"><br>
         <label for="s_content_k2so4">S в K₂SO₄:</label>
@@ -72,8 +77,10 @@
             const kContentKH2PO4 = parseFloat(document.getElementById("k_content_kh2po4").value) / 100;
             const kContentKNO3 = parseFloat(document.getElementById("k_content_kno3").value) / 100;
             const nContentKNO3 = parseFloat(document.getElementById("n_content_kno3").value) / 100;
-            const mgContent = parseFloat(document.getElementById("mg_content").value) / 100;
+            const mgContentMgSO4 = parseFloat(document.getElementById("mg_content_mgso4").value) / 100;
             const sContentMgSO4 = parseFloat(document.getElementById("s_content_mgso4").value) / 100;
+            const mgContentMgNO3 = parseFloat(document.getElementById("mg_content_mgno3").value) / 100;
+            const nContentMgNO3 = parseFloat(document.getElementById("n_content_mgno3").value) / 100;
             const kContentK2SO4 = parseFloat(document.getElementById("k_content_k2so4").value) / 100;
             const sContentK2SO4 = parseFloat(document.getElementById("s_content_k2so4").value) / 100;
             const nContentNH4NO3 = parseFloat(document.getElementById("n_content_nh4no3").value) / 100;
@@ -100,12 +107,24 @@
             let kh2po4 = p / pContent;
             let kFromKH2PO4 = kh2po4 * kContentKH2PO4;
 
-            // 3. MgSO₄·7H₂O от Mg
-            let mgso4 = mg / mgContent;
+            // 3. MgSO₄·7H₂O и Mg(NO₃)₂ для Mg и S
+            let mgso4 = s / sContentMgSO4; // Сначала максимум S
+            let mgFromMgSO4 = mgso4 * mgContentMgSO4;
             let sFromMgSO4 = mgso4 * sContentMgSO4;
 
-            // 4. KNO₃ от остатка N (приоритет N)
-            let nRemaining = n - nFromCaNO3;
+            let mgRemaining = mg - mgFromMgSO4;
+            let mgno3 = mgRemaining > 0 ? mgRemaining / mgContentMgNO3 : 0;
+            let nFromMgNO3 = mgno3 * nContentMgNO3;
+
+            if (mgFromMgSO4 > mg) {
+                mgso4 = mg / mgContentMgSO4;
+                sFromMgSO4 = mgso4 * sContentMgSO4;
+                mgno3 = 0;
+                nFromMgNO3 = 0;
+            }
+
+            // 4. KNO₃ для остатка N
+            let nRemaining = n - nFromCaNO3 - nFromMgNO3;
             let kno3FromN = nRemaining > 0 ? nRemaining / nContentKNO3 : 0;
             let kFromKNO3FromN = kno3FromN * kContentKNO3;
 
@@ -113,35 +132,32 @@
             let kno3FromK = kRemaining > 0 ? kRemaining / kContentKNO3 : 0;
             let nFromKNO3FromK = kno3FromK * nContentKNO3;
 
-            // Выбираем меньший KNO₃, чтобы не превысить N или K
             let kno3 = Math.min(kno3FromN, kno3FromK);
             let nFromKNO3 = kno3 * nContentKNO3;
             let kFromKNO3 = kno3 * kContentKNO3;
 
             // 5. NH₄NO₃ для остатка N
-            nRemaining = n - nFromCaNO3 - nFromKNO3;
+            nRemaining = n - nFromCaNO3 - nFromMgNO3 - 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;
-
+            // 6. K₂SO₄ для остатка S и K
             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;
+            kRemaining = k - kFromKH2PO4 - kFromKNO3;
+            let k2so4FromK = kRemaining > 0 ? kRemaining / kContentK2SO4 : 0;
+
+            let k2so4 = Math.min(k2so4FromS, k2so4FromK);
             let sFromK2SO4 = k2so4 * sContentK2SO4;
+            let kFromK2SO4 = k2so4 * kContentK2SO4;
 
             // Итоговые концентрации
-            let totalN = (nFromCaNO3 + nFromKNO3 + nh4no3 * nContentNH4NO3).toFixed(2);
+            let totalN = (nFromCaNO3 + nFromKNO3 + nFromMgNO3 + nh4no3 * nContentNH4NO3).toFixed(2);
             let totalP = (kh2po4 * pContent).toFixed(2);
             let totalK = (kFromKH2PO4 + kFromKNO3 + kFromK2SO4).toFixed(2);
             let totalCa = (caNO3 * caContentCa).toFixed(2);
-            let totalMg = (mgso4 * mgContent).toFixed(2);
+            let totalMg = (mgso4 * mgContentMgSO4 + mgno3 * mgContentMgNO3).toFixed(2);
             let totalS = (sFromMgSO4 + sFromK2SO4).toFixed(2);
 
             // Результаты
@@ -150,7 +166,8 @@
                 <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: ${kFromKNO3.toFixed(2)}, N: ${nFromKNO3.toFixed(2)})</p>
-                <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${totalMg}, S: ${sFromMgSO4.toFixed(2)})</p>
+                <p>MgSO₄·7H₂O: ${mgso4.toFixed(2)} (Mg: ${(mgso4 * mgContentMgSO4).toFixed(2)}, S: ${sFromMgSO4.toFixed(2)})</p>
+                <p>Mg(NO₃)₂: ${mgno3.toFixed(2)} (Mg: ${(mgno3 * mgContentMgNO3).toFixed(2)}, N: ${nFromMgNO3.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>