neues Datenmodell5 hochgeladen

neofarm/lib.py

@@ -23,7 +23,7 @@ def init_api():
 				client_secret = client_secret
 			)
 			break
-		except ConnectionError:
+		except:
 			print("Fehler bei Verbindung mit Server (wahrscheinlich DuckDns) probiere erneut...")
 			
 	oauth = OAuth2(client_id=client_id, client=client, token=token)

neofarm/orm/asset.py

@@ -23,6 +23,19 @@ class Asset(jsonapi_requests.orm.ApiModel):
 					break;
 		return related
 
+	def get_inventory_logs_of_type(self, type):
+		if not issubclass(type, Log.Log):
+			raise ValueError("type specified is not a type of log use for example: get_logs_of_type(Log.Harvest)")
+		logs = type.get_list()
+		related = []
+		for log in logs:
+			for quantity in log.quantities:
+				if quantity.inventory_asset:
+					if quantity.inventory_asset.id == self.id:
+						related.append(log) 
+						break;
+		return related
+
 class Land(Asset):
 	class Meta(Asset.Meta):
 		name = 'land'
@@ -33,8 +46,8 @@ class Plant(Asset):
 	class Meta(Asset.Meta):
 		name = 'plant'
 		type, path = Asset.Meta.get_type_and_path(name)
-	crop = jsonapi_requests.orm.RelationField('plant_type')
-	season = jsonapi_requests.orm.RelationField('season')
+	crops = jsonapi_requests.orm.RelationField('plant_type')
+	seasons = jsonapi_requests.orm.RelationField('season')
 class Equipment(Asset):
 	class Meta(Asset.Meta):
 		name = 'equipment'

neofarm/orm/log.py

@@ -12,6 +12,11 @@ class Log(jsonapi_requests.orm.ApiModel):
 	location = jsonapi_requests.orm.RelationField('location')
 	equipment = jsonapi_requests.orm.RelationField('equipment')
 	quantities = jsonapi_requests.orm.RelationField('quantity')
+	json_notes = jsonapi_requests.orm.AttributeField('notes')
+	
+	@property
+	def notes(self):
+		return self.json_notes['value']
 
 	@property
 	def plant(self):

test.py

@@ -1,5 +1,7 @@
-import neofarm.lib as neo
-
-if __name__ == "__main__":
-    log = neo.Log.Purchase.get_list()[1]
-    print(log.quantities[1].material_types[0].name)
+liste = [1, 2, 3]
+m = 1
+print(liste[m])
+for element in liste:
+    print(element)
+for i in range(len(liste)):
+    print(liste[i])