markus/lib-paveit-demo
1
0
Fork 0
Code Pull Requests Activity

change enumNorm to norm from db

Browse Source
This commit is contained in:
Markus Clauß
2023-05-23 16:58:24 +02:00
parent c012248aa9
commit b7d09737c7
3 changed files with 8 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/paveit/datamodels/material.py
View File

@@ -4,8 +4,10 @@ from re import T
from bson.json_util import loads
from mongoengine import *
from .enumeration import BitumenCategoryEnum, NormEnum
from .enumeration import BitumenCategoryEnum
from .norm_specification import DeliveryGrain, EnumerateBase
from .norm_documents import NormDocumentAggregate, NormDocumentBitumen, NormDocumentAsphalt
from .project import Project
from .usermanagement import Organisation, User
@@ -49,7 +51,7 @@ class Material(Document):
class Asphalt(Material):
norm = StringField(required=False, default='TP Asphalt Teil 24')
norm = LazyReferenceField(NormDocumentAsphalt, required=True)
name = StringField()
material = StringField()
@@ -59,25 +61,14 @@ class Asphalt(Material):
fatigue = DictField()
# Bitumen
class BitumenParameterStrassenbaubitumen(Material):
penetration = FloatField(min_value=0, max_value=1000)
softening_point = FloatField(min_value=0, max_value =500)
flash_point = FloatField(min_value=0, max_value=500)
solubility = FloatField(default=99.0, min_value=0, max_value=100)
fraass_breaking_point = FloatField(min_value=-100, max_value=100)
hardening_resistance_penetration = FloatField(min_value=0, max_value=100)
hardening_resistance_softening_point= FloatField(min_value=0, max_value=100)
hardening_resistance_masschange = FloatField(min_value=0, max_value=100)
class Bitumen(Material):
name = StringField()
producer = StringField()
batch_number = StringField()
category = EnumField(BitumenCategoryEnum, required=True)
norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019)
norm = LazyReferenceField(NormDocumentBitumen, required=True)
parameter = ReferenceField(Material)
limits = LazyReferenceField(EnumerateBase)
@@ -122,7 +113,8 @@ class Kompaktasphalt(Material):
class Aggregate(Material):
norm = EnumField(NormEnum, default=NormEnum.TLGestein2018)
norm = LazyReferenceField(NormDocumentAggregate, required=True)
name = StringField(required=True)
producer = StringField(required=True)
supply_source = StringField(required=True) #Bezugsquelle