From 91412f71694e55dcdb2df24183e723ba217362a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Clau=C3=9F?= Date: Thu, 25 May 2023 10:11:16 +0200 Subject: [PATCH] change definition of Asphalt as material --- src/paveit/datamodels/material.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/paveit/datamodels/material.py b/src/paveit/datamodels/material.py index 31ad356..839ca86 100755 --- a/src/paveit/datamodels/material.py +++ b/src/paveit/datamodels/material.py @@ -6,7 +6,7 @@ from mongoengine import * from paveit.helper import fetch_recursive, mongo_to_dict -from .enumeration import BitumenCategoryEnum +from .enumeration import AsphaltCategoryEnum, BitumenCategoryEnum from .norm_documents import ( NormDocumentAggregate, NormDocumentAsphalt, @@ -62,14 +62,14 @@ class Material(Document): class Asphalt(Material): - norm = LazyReferenceField(NormDocumentAsphalt, required=True) name = StringField() - material = StringField() - bitumen = StringField(required=False) - - young_modulus = DictField() - fatigue = DictField() + producer = StringField() + batch_number = StringField() + + norm = LazyReferenceField(NormDocumentAsphalt, required=True) + + limits = LazyReferenceField(EnumerateBase) # Bitumen class Bitumen(Material): @@ -125,8 +125,6 @@ class Aggregate(Material): reverse_delete_rule=CASCADE) #Lieferkörnung - - class Dummy(Material):