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

add Category Enumeration for Asphalts, Remove category from Limits of Asphalt, add two new classes

Browse Source
This commit is contained in:
Markus Clauß
2023-06-07 14:43:04 +02:00
parent f5e3a5e64e
commit 110400b7c1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/paveit/datamodels/enumeration.py
View File

@@ -39,6 +39,12 @@ class BitumenCategoryEnum(Enum):
class AsphaltCategoryEnum(Enum): class AsphaltCategoryEnum(Enum):
ATS = "Asphalttragschichtmischgut" ATS = "Asphalttragschichtmischgut"
ABS = "Asphaltbindermischgut"
ADS = "Asphaltdeckschichtmischgut"
SMA = "Splittmastixasphalt"
MA = "Gussasphalt"
PA = "Offenporiger Asphalt"
ACTD = 'Asphalttragdeckschichtmischgut'
class LabtestsEnum(Enum): class LabtestsEnum(Enum):

8
src/paveit/datamodels/norm_specification.py
View File

@@ -189,7 +189,6 @@ class AsphaltParameterLimitsBaseEnum(EnumerateBase):
class AsphaltParameterLimitsAsphalttragschicht(AsphaltParameterLimitsBaseEnum): class AsphaltParameterLimitsAsphalttragschicht(AsphaltParameterLimitsBaseEnum):
name = StringField() name = StringField()
category = EnumField(AsphaltCategoryEnum, required=True)
norm = LazyReferenceField(NormDocumentBitumen, required=True) norm = LazyReferenceField(NormDocumentBitumen, required=True)
@@ -202,4 +201,9 @@ class AsphaltParameterLimitsAsphalttragschicht(AsphaltParameterLimitsBaseEnum):
min_voids_content = FloatField(min=0, max=100) min_voids_content = FloatField(min=0, max=100)
max_voids_content = FloatField(min=0, max=100) max_voids_content = FloatField(min=0, max=100)
class AsphaltParameterLimitsAsphaltbinderschicht(AsphaltParameterLimitsAsphalttragschicht):
pass
class AsphaltParameterLimitsAsphaltdeckschicht(AsphaltParameterLimitsAsphalttragschicht):
pass