diff --git a/.gitignore b/.gitignore index 7ede580..c4b9d06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ # by me: resources/ +.vscode/ + # ---> Python # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/Filter.ipynb b/Filter.ipynb index d301f48..34bc764 100755 --- a/Filter.ipynb +++ b/Filter.ipynb @@ -101,9 +101,9 @@ " response = farm_client.resource.get('log', type)\n", " ret = []\n", " for log in response['data']:\n", - " assets = log['relationships']['asset']['data']\n", - " for asset in assets:\n", - " if asset['id'] == id:\n", + " log_assets = log['relationships']['asset']['data']\n", + " for log_asset in log_assets:\n", + " if log_asset['id'] == asset['id']:\n", " ret.append(log)\n", " return ret\n", "\n", @@ -129,7 +129,7 @@ " for asset in assets:\n", " if asset['type'] == 'asset--plant': \n", " plant_id = asset['id']\n", - " seedings = get_related_logs_of_type(plant_id, 'seeding')\n", + " seedings = get_related_logs_of_type(asset, 'seeding')\n", " for seeding in seedings:\n", " area_quants = get_related_quantities_of_measure(seeding, 'area')\n", " for area_quant in area_quants:\n", @@ -158,7 +158,7 @@ "print(df)\n", "\n", "# Speichere die Tabelle in einer CSV-Datei\n", - "csv_file_path = 'harvest_logs.csv'\n", + "csv_file_path = 'resources/harvest_logs.csv'\n", "df.to_csv(csv_file_path, index=False)\n", "\n", "print(f\"Die Tabelle wurde erfolgreich in der Datei '{csv_file_path}' gespeichert.\")" diff --git a/testbed.py b/testbed.py index c929e9b..e4d5973 100644 --- a/testbed.py +++ b/testbed.py @@ -21,9 +21,9 @@ def get_related_logs_of_type(asset, type): response = farm_client.resource.get('log', type) ret = [] for log in response['data']: - assets = log['relationships']['asset']['data'] - for asset in assets: - if asset['id'] == id: + log_assets = log['relationships']['asset']['data'] + for log_asset in log_assets: + if log_asset['id'] == asset['id']: ret.append(log) return ret @@ -49,7 +49,7 @@ for item in response['data']: for asset in assets: if asset['type'] == 'asset--plant': plant_id = asset['id'] - seedings = get_related_logs_of_type(plant_id, 'seeding') + seedings = get_related_logs_of_type(asset, 'seeding') for seeding in seedings: area_quants = get_related_quantities_of_measure(seeding, 'area') for area_quant in area_quants: