Update app.py

app.py

@@ -818,12 +818,23 @@ class NutrientCalculator:
             self._add_to_total('N (NH4+)', profile['N (NH4+)'])
             self._add_to_total('N (NO3-)', no3_from_nh4)
 
-    def _calculate_ec(self):
-        """Расчет электропроводимости на основе накопленных ppm"""
+    def calculate_ec(self):
+        ppm = self.calculate_ppm()
         ec = 0.0
-        for elem, ppm in self.total_ppm.items():
-            ec += EC_CONTRIBUTION.get(elem, 0) * (ppm / 1000)
-        return round(ec, 2)
+        EC_COEFFICIENTS = {
+            'N (NO3-)': 0.6,
+            'N (NH4+)': 0.4,
+            'K': 0.7,
+            'Ca': 0.75,
+            'Mg': 0.6,
+            'S': 0.3,
+            'P': 0.1,
+        }
+        for element, value in ppm.items():
+            if element in EC_COEFFICIENTS:
+                ec += value * EC_COEFFICIENTS[element]
+        return ec / 100
+        
 
     def print_report(self, profile):
         """Красивый вывод результатов"""