From f20b7e171f47c71ba90fc3304a38ca5fff616afd Mon Sep 17 00:00:00 2001 From: Wir Date: Tue, 12 Nov 2024 12:55:45 +0100 Subject: [PATCH] Reports verbessert --- reporting.ipynb | 172 +++++------------------------------------------- 1 file changed, 15 insertions(+), 157 deletions(-) diff --git a/reporting.ipynb b/reporting.ipynb index 871c8a6..d00aaa8 100644 --- a/reporting.ipynb +++ b/reporting.ipynb @@ -141,11 +141,7 @@ "cell_type": "code", "execution_count": null, "id": "a993570d-dea2-4bd6-80c0-b36297ce6a3a", - "metadata": { - "jupyter": { - "source_hidden": true - } - }, + "metadata": {}, "outputs": [], "source": [ "#Beispiel\n", @@ -1122,159 +1118,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "id": "a7c72234-8838-461c-a4d7-b1c0170f789f", - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "\n", - "Activity:\n", - "name: Move 24/25 Nachtweide Raps Plant to Nachtweide\n", - "timestamp: 14.10.24 22:00 \n", - "\n", - "Activity:\n", - "name: Move W-Raps Helmacker Plant 24/25 to Helmacker\n", - "timestamp: 14.10.24 22:00 \n", - "\n", - "Activity:\n", - "name: Move W-Raps Helmacker Plant 24/25 to Helmacker\n", - "timestamp: 22.10.24 22:00 \n", - "\n", - "Maintenance:\n", - "name: Scheibeneggen Helmacker Maintenance 24/25\n", - "timestamp: 28.07.24 11:34 \n", - "equipment: Scheibenegge Catros\n", - "quant_type: quantity--price\n", - "quant_measure: time\n", - "quant_value: 2.0\n", - "quant_inventory_adjustment: None\n", - "quant_value: 2.0\n", - "unit_name: h\n", - "unit_price_1: = 20.0\n", - "unit_price_1: = 40.0\n", - "\n", - "Purchase:\n", - "name: Schneckenkorn Purchase 24/25\n", - "timestamp: 11.08.24 05:47 \n", - "quant0_type: quantity--price\n", - "quant0_measure: weight\n", - "quant0_value: 10.0\n", - "quant0_inventory_adjustment: increment\n", - "unit0_name: kg\n", - "unit0_price_1: = 30.0\n", - "unit0_price_1: = 300.0\n", - "inventory_asset1: = Schneckenkorn Material 08/24\n", - "\n", - "Purchase:\n", - "name: Innovert Raps Purchase 24/25\n", - "timestamp: 10.08.24 05:39 \n", - "quant0_type: quantity--price\n", - "quant0_measure: volume\n", - "quant0_value: 10.0\n", - "quant0_inventory_adjustment: increment\n", - "unit0_name: l\n", - "unit0_price_1: = 2.5\n", - "unit0_price_1: = 25.0\n", - "inventory_asset1: = Innovert Raps Material 08/24\n", - "quant1_type: quantity--material\n", - "quant1_measure: ratio\n", - "quant1_value: 69.0\n", - "quant2_type: quantity--material\n", - "quant2_measure: ratio\n", - "quant2_value: 138.0\n", - "\n", - "Purchase:\n", - "name: W-Raps Saatgut Otello KWS Saatgut Purchase 24/25\n", - "timestamp: 01.08.24 05:33 \n", - "quant0_type: quantity--price\n", - "quant0_measure: weight\n", - "quant0_value: 50.0\n", - "quant0_inventory_adjustment: increment\n", - "unit0_name: kg\n", - "unit0_price_1: = 2.0\n", - "unit0_price_1: = 100.0\n", - "inventory_asset1: = W-Raps Saatgut Otello KWS Seed 08/24\n", - "\n", - "Seeding:\n", - "name: W-Raps Otello KWS Helmacker Seeding 24/25\n", - "timestamp: 22.08.24 22:00 \n", - "equipment: Sähmaschine Cataya\n", - "plant loc: Helmacker\n", - "quant_type: quantity--standard\n", - "quant_measure: weight\n", - "quant_value: 50.0\n", - "quant_inventory_adjustment: decrement\n", - "quant_inventory_name: W-Raps Saatgut Otello KWS Seed 08/24\n", - "\n", - "Seeding:\n", - "name: W-Raps Otello KWS Nachtweide Seeding 24/25\n", - "timestamp: 28.08.24 22:00 \n", - "equipment: Sähmaschine Cataya\n", - "plant loc: Nachtweide\n", - "quant_type: quantity--standard\n", - "quant_measure: weight\n", - "quant_value: 66.0\n", - "quant_inventory_adjustment: decrement\n", - "quant_inventory_name: W-Raps Saatgut Otello KWS Seed 08/24\n", - "\n", - "Input:\n", - "name: Innovert Raps Input 24/25\n", - "timestamp: 12.10.24 13:18 \n", - "equipment: Spritze\n", - "quant_type: quantity--standard\n", - "quant_measure: volume\n", - "quant_value: 10.0\n", - "quant_inventory_adjustment: decrement\n", - "\n", - "Input:\n", - "name: Innovert Raps Input 24/25\n", - "timestamp: 03.11.24 23:00 \n", - "equipment: Spritze\n", - "quant_type: quantity--standard\n", - "quant_measure: volume\n", - "quant_value: 10.0\n", - "quant_inventory_adjustment: decrement\n", - "\n", - "Medical:\n", - "name: Schneckenkorn Medical 24/25\n", - "timestamp: 30.08.24 06:42 \n", - "equipment: Schneckenkornstreuer Leinfelder\n", - "quant_type: quantity--standard\n", - "quant_measure: weight\n", - "quant_value: 10.0\n", - "quant_inventory_adjustment: decrement\n", - "\n", - "Harvest:\n", - "name: W-Raps Helmacker Harvest 24/25\n", - "timestamp: 20.10.24 10:11 \n", - "equipment: Mähdrescher Leinfelder\n", - "quant_type: quantity--standard\n", - "quant_measure: weight\n", - "quant_value: 5.0\n", - "quant_inventory_adjustment: increment\n", - "\n", - "Harvest:\n", - "name: W-Raps Nachtweide Harvest 24/25\n", - "timestamp: 28.10.24 23:00 \n", - "equipment: Mähdrescher Leinfelder\n", - "quant_type: quantity--standard\n", - "quant_measure: weight\n", - "quant_value: 7.8\n", - "quant_inventory_adjustment: increment\n", - "\n", - "Sale:\n", - "name: W-Raps Sale 24/25\n", - "timestamp: 28.10.24 07:54 \n", - "quant_type: quantity--price\n", - "quant_measure: weight\n", - "quant_value: 5.0\n", - "quant_inventory_adjustment: decrement\n" - ] + "metadata": { + "jupyter": { + "source_hidden": true } - ], + }, + "outputs": [], "source": [ "#Alle Logs\n", "\n", @@ -1307,6 +1158,9 @@ " formatted_date = datetime.fromisoformat(log.timestamp).strftime(\"%d.%m.%y %H:%M \") # Konvertiere in das gewünschte Format\n", " print(f\"timestamp: {formatted_date}\") \n", " print(f\"equipment: {log.equipment[0].name}\")\n", + " print(f\"plant_name: {plant.name}\")\n", + " print(f\"plant_crop: {plant.crop}\")\n", + " print(f\"plant_season: {plant.season}\")\n", "#quantity\n", " input=neo.Log.Maintenance.from_id(log.id)\n", " print(f\"quant_type: {input.quantities[0].type}\")\n", @@ -1456,7 +1310,11 @@ "cell_type": "code", "execution_count": null, "id": "5d34dcc9-a4b9-423f-91d4-da1958ecc20e", - "metadata": {}, + "metadata": { + "jupyter": { + "source_hidden": true + } + }, "outputs": [], "source": [ "#log Purchase\n",