From 2bf4d1b6eacfcc80d01d7dc2e715e9a944d33d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Clau=C3=9F?= <markus@linsenbruch.de>
Date: Tue, 23 May 2023 13:58:03 +0200
Subject: [PATCH] define supply_source as required, restructure

---
 src/paveit/datamodels/material.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/paveit/datamodels/material.py b/src/paveit/datamodels/material.py
index 1ec0199..b262d20 100755
--- a/src/paveit/datamodels/material.py
+++ b/src/paveit/datamodels/material.py
@@ -110,16 +110,15 @@ class Aggregate(Material):
     
     norm = EnumField(NormEnum, default=NormEnum.TLGestein2018)
     name = StringField(required=True)
-    producer = StringField()
-    location = StringField()
+    producer = StringField(required=True)
+    supply_source = StringField(required=True) #Bezugsquelle
     batch_number = StringField()
+    ce_marking = StringField(required=True) #CE Kennzeichen
     
     delivery_grain = LazyReferenceField(DeliveryGrain,
                                 required=True,
                                 reverse_delete_rule=CASCADE) #Lieferkörnung
     
-    supply_source = StringField(required=True) #Bezugsquelle
-    ce_marking = StringField(required=True) #CE Kennzeichen
 
 class Dummy(Material):