add machine and calibration data

src/paveit/datamodels/material.py

@@ -18,6 +18,10 @@ from .usermanagement import Organisation, User
 
 
 class Material(Document):
+    
+    name = StringField(required=True)
+    producer = StringField(required=True)
+
 
     date = DateTimeField(default=datetime.datetime.now,
                          wtf_options={"render_kw": {
@@ -63,66 +67,48 @@ class Material(Document):
 
 class Asphalt(Material):
     
-    name = StringField()
-    producer = StringField()
-    batch_number = StringField()
-    
     norm =  LazyReferenceField(NormDocumentAsphalt, required=True)
-    
     limits = LazyReferenceField(EnumerateBase)
+    ce_marking = StringField(required=False) #CE Kennzeichen
 
 # Bitumen 
 class Bitumen(Material):
     
-    name = StringField()
-    producer = StringField()
-    batch_number = StringField()
-    
-    category = EnumField(BitumenCategoryEnum, required=True)
     norm =  LazyReferenceField(NormDocumentBitumen, required=True)
-    
-    parameter = ReferenceField(Material)
     limits = LazyReferenceField(EnumerateBase)
-    
+    ce_marking = StringField(required=False) #CE Kennzeichen
 
     
-
-
 class Bitumenemulsion(Material):
+
     norm = StringField(required=False, default='TP Asphalt Teil 24')
-
-    name = StringField()
-    material = StringField()
-
-    young_modulus = DictField()
+    limits = LazyReferenceField(EnumerateBase)
+    ce_marking = StringField(required=False) #CE Kennzeichen
 
 
 class Epoxy(Material):
-    norm = StringField(required=False, default='TP Asphalt Teil 24')
-    name = StringField()
-    
-    material = StringField()
 
-    young_modulus = DictField()
+    norm = StringField(required=False, default='TP Asphalt Teil 24')
+    limits = LazyReferenceField(EnumerateBase)
+    ce_marking = StringField(required=False) #CE Kennzeichen
+    
 
 
 class Kompaktasphalt(Material):
     norm = StringField(required=False, default='TP Asphalt Teil 24')
     name = StringField()
+    ce_marking = StringField(required=False) #CE Kennzeichen
+    
 
 class Aggregate(Material):
     
     norm =  LazyReferenceField(NormDocumentAggregate, required=True)
-    
-    name = StringField(required=True)
-    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,
+    limits = LazyReferenceField(DeliveryGrain,               required=True,
                                 reverse_delete_rule=CASCADE) #Lieferkörnung
+
+    ce_marking = StringField(required=False) #CE Kennzeichen
+    
+