Update app.py

app.py

@@ -767,9 +767,11 @@ class NutrientCalculator:
 
         # Веса компенсации для элементов (кроме азотов)
         self.element_compensation_weights = {
-            "POTASSIUM_SULFATE": {"weight": -0.18, "fert": "Калий сернокислый", "main_element": "K"},
-            "MAGNESIUM_SULFATE": {"weight": -0.1, "fert": "Сульфат магния", "main_element": "Mg"},
-            "MONOPOTASSIUM_PHOSPHATE": {"weight": -0.14, "fert": "Монофосфат калия", "main_element": "P"}
+          "POTASSIUM_SULFATE": {"weight": -0.18, "fert": "Калий сернокислый", "main_element": "K"},
+          "MAGNESIUM_SULFATE": {"weight": -0.1, "fert": "Сульфат магния", "main_element": "Mg"},
+          "MONOPOTASSIUM_PHOSPHATE": {"weight": -0.14, "fert": "Монофосфат калия", "main_element": "P"},
+          "CALCIUM_NITRATE": {"weight": 0.25, "fert": "Кальциевая селитра", "main_element": "Ca"},
+          "CALCIUM_NITRATE_NO3": {"weight": 0.15, "fert": "Кальциевая селитра", "main_element": "NO3"}
         }
 
         # Расчёт азота
@@ -851,11 +853,18 @@ class NutrientCalculator:
             raise
 
     def _compensate_element(self, element):
-        needed = self.target_profile[element] - self.actual_profile.get(element, 0)
-        if needed <= 0:
-            return
+    needed = self.target_profile[element] - self.actual_profile.get(element, 0)
+    if needed <= 0:
+        return
 
-        candidates = []
+    candidates = []
+    
+    # Для азотных соединений особый случай
+    if element in ['NH4', 'NO3']:
+        # Здесь ваша текущая логика для NH4 и NO3
+        pass
+    else:
+        # Стандартная компенсация для других элементов
         for weight_key, weight_data in self.element_compensation_weights.items():
             fert_name = weight_data["fert"]
             if element in self.fertilizers.get(fert_name, {}):
@@ -865,14 +874,14 @@ class NutrientCalculator:
                     'content': self.fertilizers[fert_name][element]
                 })
 
-        if not candidates:
-            raise ValueError(f"Нет удобрений для элемента {element}")
+    if not candidates:
+        raise ValueError(f"Нет удобрений для элемента {element}")
 
-        total_weight = sum(c['weight'] for c in candidates)
-        for candidate in candidates:
-            share = candidate['weight'] / total_weight
-            ppm_to_apply = needed * share
-            self._apply(candidate['name'], element, ppm_to_apply)
+    total_weight = sum(abs(c['weight']) for c in candidates)  # Берем модуль весов
+    for candidate in candidates:
+        share = abs(candidate['weight']) / total_weight  # Используем модуль веса
+        ppm_to_apply = needed * share
+        self._apply(candidate['name'], element, ppm_to_apply)
 
     def calculate_ec(self):
         return round(self.total_ec, 2)