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

restructure materials, add additives

Browse Source
This commit is contained in:
Markus Clauß
2023-09-06 14:50:40 +02:00
parent dd56a016c4
commit 4b263f461a
6 changed files with 211 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,6 @@ 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": {
"step": "60"
@@ -32,17 +28,15 @@ class Material(Document):
required=True,
reverse_delete_rule=CASCADE)
project_id = ListField(LazyReferenceField(Project,
required=False,
reverse_delete_rule=CASCADE),
required=False)
user_id = LazyReferenceField(User,
required=False,
required=True,
reverse_delete_rule=DO_NOTHING)
tags = ListField(StringField())
project_ids = ListField(LazyReferenceField(Project,
reverse_delete_rule=CASCADE),
required=False)
def to_dict(self):
# convert data to dict
data = fetch_recursive(self)
@@ -67,16 +61,17 @@ class Material(Document):
class Asphalt(Material):
norm = LazyReferenceField(NormDocumentAsphalt, required=True)
limits = LazyReferenceField(EnumerateBase)
ce_marking = StringField(required=False) #CE Kennzeichen
pass
#limits = LazyReferenceField(EnumerateBase)
# Bitumen
class Bitumen(Material):
norm = LazyReferenceField(NormDocumentBitumen, required=True)
limits = LazyReferenceField(EnumerateBase)
ce_marking = StringField(required=False) #CE Kennzeichen
pass
#norm = LazyReferenceField(NormDocumentBitumen, required=True)
#limits = LazyReferenceField(EnumerateBase)
#ce_marking = StringField(required=False) #CE Kennzeichen
class Bitumenemulsion(Material):
@@ -102,13 +97,12 @@ class Kompaktasphalt(Material):
class Aggregate(Material):
norm = LazyReferenceField(NormDocumentAggregate, required=True)
limits = LazyReferenceField(DeliveryGrain, required=True,
reverse_delete_rule=CASCADE) #Lieferkörnung
pass
ce_marking = StringField(required=False) #CE Kennzeichen
class Additive(Material):
typ = StringField(required=True)