Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
@@ -872,6 +872,43 @@ class NutrientCalculator:
|
|
872 |
print(f"Ошибка при выводе отчёта: {str(e)}")
|
873 |
raise
|
874 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
875 |
if __name__ == "__main__":
|
876 |
try:
|
877 |
calculator = NutrientCalculator(volume_liters=VOLUME_LITERS)
|
|
|
872 |
print(f"Ошибка при выводе отчёта: {str(e)}")
|
873 |
raise
|
874 |
|
875 |
+
# ... (весь ваш существующий код без изменений)
|
876 |
+
|
877 |
+
def get_web_results(self):
|
878 |
+
"""Возвращает данные в формате для web-интерфейса"""
|
879 |
+
return {
|
880 |
+
'fertilizers': self._format_fertilizers(),
|
881 |
+
'profile': self._format_profile(),
|
882 |
+
'ec': self.calculate_ec(),
|
883 |
+
'deficits': self.calculate_deficits()
|
884 |
+
}
|
885 |
+
|
886 |
+
def _format_fertilizers(self):
|
887 |
+
formatted = []
|
888 |
+
for name, data in self.results.items():
|
889 |
+
fert = {
|
890 |
+
'name': name,
|
891 |
+
'grams': round(data['граммы'], 3),
|
892 |
+
'adds': {}
|
893 |
+
}
|
894 |
+
for k, v in data.items():
|
895 |
+
if k.startswith('внесет'):
|
896 |
+
fert['adds'][k.replace('внесет ', '')] = round(v, 1)
|
897 |
+
formatted.append(fert)
|
898 |
+
return formatted
|
899 |
+
|
900 |
+
def _format_profile(self):
|
901 |
+
return [{'element': k, 'ppm': round(v, 1)}
|
902 |
+
for k, v in self.actual_profile.items()]
|
903 |
+
|
904 |
+
|
905 |
+
|
906 |
+
|
907 |
+
|
908 |
+
|
909 |
+
|
910 |
+
|
911 |
+
|
912 |
if __name__ == "__main__":
|
913 |
try:
|
914 |
calculator = NutrientCalculator(volume_liters=VOLUME_LITERS)
|