Update app.py

app.py

@@ -732,7 +732,7 @@ class NutrientCalculator:
         self.results = {}
         self.target_profile = BASE_PROFILE.copy()
         self.actual_profile = {k: 0.0 for k in BASE_PROFILE}
-        self.fertilizers = NUTRIENT_CONTENT_IN_FERTILIZERS 
+        self.fertilizers = NUTRIENT_CONTENT_IN_FERTILIZERS
         self.total_ec = 0.0
 
         # Расчёт азота
@@ -821,7 +821,7 @@ class NutrientCalculator:
             content = self.fertilizers[fert_name][main_element]
             max_allowed_ppm = self.target_profile[main_element] - self.actual_profile[main_element]
             grams = min((required_ppm * self.volume) / (content * 1000), (max_allowed_ppm * self.volume) / (content * 1000))
-            
+
             if fert_name not in self.results:
                 result = {
                     'граммы': 0.0,
@@ -831,17 +831,17 @@ class NutrientCalculator:
                 for element in self.fertilizers[fert_name]:
                     result[f'внесет {self._label(element)}'] = 0.0
                 self.results[fert_name] = result
-                
+
             self.results[fert_name]['граммы'] += grams
             self.results[fert_name]['миллиграммы'] += int(grams * 1000)
-            
+
             fert_ec = 0.0
             for element, percent in self.fertilizers[fert_name].items():
                 added_ppm = (grams * percent * 1000) / self.volume
                 self.results[fert_name][f'внесет {self._label(element)}'] += added_ppm
                 self.actual_profile[element] += added_ppm
                 fert_ec += added_ppm * EC_COEFFICIENTS.get(element, 0.0015)
-                
+
             self.results[fert_name]['вклад в EC'] += fert_ec
             self.total_ec += fert_ec
         except KeyError as e:
@@ -853,8 +853,22 @@ class NutrientCalculator:
         for element in self.actual_profile:
             if self.actual_profile[element] > self.target_profile[element]:
                 overage = self.actual_profile[element] - self.target_profile[element]
-                self.actual_profile[element] -= overage
                 print(f"Корректировка перебора: {element} уменьшен на {overage:.2f} ppm")
+                
+                # Уменьшаем фактическое значение
+                self.actual_profile[element] -= overage
+                
+                # Обновляем результаты удобрений
+                for fert_name, fert_data in self.results.items():
+                    if f'внесет {self._label(element)}' in fert_data:
+                        fert_data[f'внесет {self._label(element)}'] -= overage
+                        
+                        # Пересчитываем граммы удобрения
+                        if element in self.fertilizers[fert_name]:
+                            content = self.fertilizers[fert_name][element]
+                            grams_to_remove = (overage * self.volume) / (content * 1000)
+                            fert_data['граммы'] -= grams_to_remove
+                            fert_data['миллиграммы'] -= int(grams_to_remove * 1000)
 
     def calculate_ec(self):
         return round(self.total_ec, 2)