Update nutri_call.html

nutri_call.html

@@ -1756,25 +1756,26 @@ populateProfileSelector();
 
  <script>
 class NutrientCalculator {
-    constructor(fertilizerConstants, profileSettings, liters, roundingPrecision) {
-        this.fertilizers = fertilizerConstants;
-        this.profile = profileSettings;
-        this.volume = liters;
-        this.roundingPrecision = roundingPrecision;
+    constructor(inputData) {
+        this.fertilizers = inputData.fertilizerConstants;
+        this.profile = inputData.profileSettings;
+        this.volume = this.profile.liters;
+        this.roundingPrecision = this.profile.rounding_precision;
 
         const totalParts = this.profile.NO3_RAT + 1;
         this.target = {
             'P': this.profile.P,
             'K': this.profile.K,
             'Mg': this.profile.Mg,
-            'Ca': this.profile.Ca, // Общий кальций
+            'Ca': this.profile.Ca,
             'S': this.profile.S,
             'N (NO3-)': this.profile.TOTAL_NITROG * (this.profile.NO3_RAT / totalParts),
             'N (NH4+)': this.profile.TOTAL_NITROG * (1 / totalParts)
         };
 
-        this.actual = Object.fromEntries(Object.keys(this.target).map(k => [k, 0.0])); // CaCl не учитываем в фактическом балансе
-        this.results = Object.fromEntries(Object.keys(this.fertilizers).map(fert => [fert, { граммы: 0.0 }]));
+        this.actual = Object.fromEntries(Object.keys(this.target).map(k => [k, 0.0]));
+        this.results = Object.fromEntries(Object.keys(this.fertilizers).map(fert => [fert, {}]));
+        this.elementContributions = {};
     }
 
     calculate() {
@@ -1799,7 +1800,7 @@ class NutrientCalculator {
             this._applyFertilizer("Калий азотнокислый", "N (NO3-)", no3Needed);
         }
 
-        return this._verifyResults();
+        return this._generateOutput();
     }
 
     _applyFertilizer(name, element, targetPPM) {
@@ -1812,10 +1813,12 @@ class NutrientCalculator {
             return;
         }
         const grams = (targetPPM * this.volume) / (content * 1000);
-        this.results[name].граммы += parseFloat(grams.toFixed(this.roundingPrecision));
+        this.results[name].граммы = parseFloat(grams.toFixed(this.roundingPrecision));
 
+        this.elementContributions[name] = {};
         for (const [el, val] of Object.entries(this.fertilizers[name])) {
             const addedPPM = (grams * val * 1000) / this.volume;
+            this.elementContributions[name][el] = parseFloat(addedPPM.toFixed(this.roundingPrecision));
             if (el in this.actual) {
                 this.actual[el] = parseFloat((this.actual[el] + addedPPM).toFixed(this.roundingPrecision));
             }
@@ -1826,7 +1829,6 @@ class NutrientCalculator {
         let kNeeded = this.target.K - this.actual.K;
         let sNeeded = this.target.S - this.actual.S;
 
-        // Используем "Калий сернокислый" для баланса K и S
         if (kNeeded > 0 && sNeeded > 0) {
             const kFraction = this.fertilizers["Калий сернокислый"]["K"] || 0;
             const sFraction = this.fertilizers["Калий сернокислый"]["S"] || 0;
@@ -1838,7 +1840,6 @@ class NutrientCalculator {
             this._applyFertilizer("Калий сернокислый", "K", kFromK2SO4);
         }
 
-        // Оставшийся калий добавляем через "Калий азотнокислый"
         const remainingK = this.target.K - this.actual.K;
         if (remainingK > 0) {
             this._applyFertilizer("Калий азотнокислый", "K", remainingK);
@@ -1846,15 +1847,13 @@ class NutrientCalculator {
     }
 
     _distributeCalcium() {
-        const caTarget = this.target.Ca; // Общий кальций
-
-        // Весь кальций добавляется через "Кальциевую селитру"
+        const caTarget = this.target.Ca;
         if (caTarget > 0) {
             this._applyFertilizer("Кальциевая селитра", "Ca", caTarget);
         }
     }
 
-    _verifyResults() {
+    _generateOutput() {
         const deficits = {};
         for (const el in this.target) {
             const diff = this.target[el] - this.actual[el];
@@ -1862,20 +1861,28 @@ class NutrientCalculator {
                 deficits[el] = parseFloat(diff.toFixed(this.roundingPrecision));
             }
         }
+
+        const fertilizers = Object.fromEntries(
+            Object.entries(this.results).map(([name, data]) => [name, data.граммы])
+        );
+
         return {
-            fertilizers: Object.fromEntries(
-                Object.entries(this.results).map(([k, v]) => [k, parseFloat(v.граммы.toFixed(this.roundingPrecision))])
-            ),
-            actualProfile: Object.fromEntries(
-                Object.entries(this.actual).map(([k, v]) => [k, parseFloat(v.toFixed(this.roundingPrecision))])
-            ),
+            actual_profile: this.actual,
             deficits: deficits,
-            totalPPM: parseFloat(Object.values(this.actual).reduce((sum, val) => sum + val, 0).toFixed(this.roundingPrecision))
+            element_contributions: this.elementContributions,
+            fertilizers: fertilizers,
+            nitrogen_ratios: {
+                NH4_RATIO: this.profile.NO3_RAT,
+                NO3_RATIO: 1,
+                TOTAL_NITROGEN: this.profile.TOTAL_NITROG
+            },
+            total_ppm: parseFloat(Object.values(this.actual).reduce((sum, val) => sum + val, 0).toFixed(this.roundingPrecision))
         };
     }
 }
 
 
+
 const INPUT_DATA = {
     fertilizerConstants: {
         "Кальциевая селитра": { "N (NO3-)": 0.11863, "Ca": 0.16972 },
@@ -1887,21 +1894,17 @@ const INPUT_DATA = {
     },
     profileSettings: {
         P: 31, K: 210, Mg: 24, Ca: 82, S: 57.5,
-        NO3_RAT: 8.25, TOTAL_NITROG: 125, liters: 100
+        NO3_RAT: 8.25, TOTAL_NITROG: 125, liters: 100, rounding_precision: 3
     }
 };
 
 // Создаем экземпляр калькулятора
-const calculator = new NutrientCalculator(
-    INPUT_DATA.fertilizerConstants,
-    INPUT_DATA.profileSettings,
-    INPUT_DATA.profileSettings.liters,
-    3 // Точность округления
-);
+const calculator = new NutrientCalculator(INPUT_DATA);
 
 // Запускаем расчет
 const results = calculator.calculate();
-console.log(results);
+console.log(JSON.stringify(results, null, 2));
+