Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -861,8 +861,8 @@ def handle_calculation():
|
|
| 861 |
|
| 862 |
# 4. Формируем дополнительные данные: вклад каждого удобрения в каждый элемент
|
| 863 |
element_contributions = {}
|
| 864 |
-
for fert_name
|
| 865 |
-
grams =
|
| 866 |
element_contributions[fert_name] = {}
|
| 867 |
for element, percent in calculator.fertilizers[fert_name].items():
|
| 868 |
added_ppm = (grams * percent * 1000) / calculator.volume
|
|
@@ -870,8 +870,8 @@ def handle_calculation():
|
|
| 870 |
|
| 871 |
# 5. Формируем полный ответ
|
| 872 |
response = {
|
| 873 |
-
"fertilizers":
|
| 874 |
-
"actual_profile":
|
| 875 |
"deficits": results['deficits'],
|
| 876 |
"total_ppm": results['total_ppm'],
|
| 877 |
"element_contributions": element_contributions, # Новое поле
|
|
|
|
| 861 |
|
| 862 |
# 4. Формируем дополнительные данные: вклад каждого удобрения в каждый элемент
|
| 863 |
element_contributions = {}
|
| 864 |
+
for fert_name in calculator.fertilizers.keys(): # Для всех удобрений
|
| 865 |
+
grams = calculator.results[fert_name]['граммы']
|
| 866 |
element_contributions[fert_name] = {}
|
| 867 |
for element, percent in calculator.fertilizers[fert_name].items():
|
| 868 |
added_ppm = (grams * percent * 1000) / calculator.volume
|
|
|
|
| 870 |
|
| 871 |
# 5. Формируем полный ответ
|
| 872 |
response = {
|
| 873 |
+
"fertilizers": {k: round(v['граммы'], 3) for k, v in calculator.results.items()},
|
| 874 |
+
"actual_profile": {k: round(v, 3) for k, v in calculator.actual.items()},
|
| 875 |
"deficits": results['deficits'],
|
| 876 |
"total_ppm": results['total_ppm'],
|
| 877 |
"element_contributions": element_contributions, # Новое поле
|