diff --git a/src/paveit/datamodels/citt.py b/src/paveit/datamodels/citt.py index 6991800..6db2ee3 100755 --- a/src/paveit/datamodels/citt.py +++ b/src/paveit/datamodels/citt.py @@ -26,7 +26,7 @@ class CyclicIndirectTensileTest(Document): filehash = StringField(required=True) - speciment_name = StringField() + speciment_name = StringField(required=True, default=None) meta = { 'allow_inheritance': True, diff --git a/src/paveit/labtest/citt.py b/src/paveit/labtest/citt.py index 55b8c38..68b1e92 100755 --- a/src/paveit/labtest/citt.py +++ b/src/paveit/labtest/citt.py @@ -278,6 +278,12 @@ class CITTBase(DataSineLoad): meta['filehash'] = self.filehash meta['task_id'] = task_id + + if not self.metadata['speciment_name'] == None: + meta['speciment_name'] = self.metadata['speciment_name'] + else: + meta['speciment_name'] = self.filename + #check if result in db #n = CITTSiffness.objects(**meta).count() @@ -340,6 +346,7 @@ class CITT_TUDresdenWille(CITTBase): 't': ['Zeit'], 'speciment_diameter': ['Probekörberdurchmesser', 'Probekörberbreite'], 'speciment_height': ['Probekörperhöhe'], + 'speciment_name': ['Probekörper-Nummer Bezeichnung'], } #list of names self.data_column_names = { @@ -380,6 +387,7 @@ class CITT_TUDresdenGeosysOne(CITTBase): 't': ['Zeit'], 'speciment_diameter': ['Probekörberdurchmesser', 'Probekörberbreite'], 'speciment_height': ['Probekörperhöhe'], + 'speciment_name': ['Probekörper-Nummer Bezeichnung'], } #list of names self.data_column_names = {