From 110400b7c1fff3060d5656c4b6ee7a8485c0bf46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Clau=C3=9F?= Date: Wed, 7 Jun 2023 14:43:04 +0200 Subject: [PATCH] add Category Enumeration for Asphalts, Remove category from Limits of Asphalt, add two new classes --- src/paveit/datamodels/enumeration.py | 6 ++++++ src/paveit/datamodels/norm_specification.py | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/paveit/datamodels/enumeration.py b/src/paveit/datamodels/enumeration.py index 690cccf..38c2028 100755 --- a/src/paveit/datamodels/enumeration.py +++ b/src/paveit/datamodels/enumeration.py @@ -39,6 +39,12 @@ class BitumenCategoryEnum(Enum): class AsphaltCategoryEnum(Enum): ATS = "Asphalttragschichtmischgut" + ABS = "Asphaltbindermischgut" + ADS = "Asphaltdeckschichtmischgut" + SMA = "Splittmastixasphalt" + MA = "Gussasphalt" + PA = "Offenporiger Asphalt" + ACTD = 'Asphalttragdeckschichtmischgut' class LabtestsEnum(Enum): diff --git a/src/paveit/datamodels/norm_specification.py b/src/paveit/datamodels/norm_specification.py index c39e5c3..f85f3a1 100644 --- a/src/paveit/datamodels/norm_specification.py +++ b/src/paveit/datamodels/norm_specification.py @@ -189,7 +189,6 @@ class AsphaltParameterLimitsBaseEnum(EnumerateBase): class AsphaltParameterLimitsAsphalttragschicht(AsphaltParameterLimitsBaseEnum): name = StringField() - category = EnumField(AsphaltCategoryEnum, required=True) norm = LazyReferenceField(NormDocumentBitumen, required=True) @@ -202,4 +201,9 @@ class AsphaltParameterLimitsAsphalttragschicht(AsphaltParameterLimitsBaseEnum): min_voids_content = FloatField(min=0, max=100) max_voids_content = FloatField(min=0, max=100) - \ No newline at end of file + +class AsphaltParameterLimitsAsphaltbinderschicht(AsphaltParameterLimitsAsphalttragschicht): + pass + +class AsphaltParameterLimitsAsphaltdeckschicht(AsphaltParameterLimitsAsphalttragschicht): + pass \ No newline at end of file