From 591fced274f8912f6b08492dd816205fd4d6fca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Clau=C3=9F?= Date: Fri, 26 May 2023 11:20:38 +0200 Subject: [PATCH] add date of manufacture to machines, small fixes --- src/paveit/datamodels/components.py | 1 + src/paveit/datamodels/enumeration.py | 9 +++++++-- src/paveit/datamodels/machines.py | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/paveit/datamodels/components.py b/src/paveit/datamodels/components.py index 7b704c7..fef97f2 100755 --- a/src/paveit/datamodels/components.py +++ b/src/paveit/datamodels/components.py @@ -19,6 +19,7 @@ class Components(Document): internalnumber = StringField(required=False) # Interne Bezeichnung extrainfo = StringField(required=False) + year_manufacture = IntField(min=1900, max=2100, required=False) date = DateTimeField(default=datetime.datetime.now, wtf_options={"render_kw": { diff --git a/src/paveit/datamodels/enumeration.py b/src/paveit/datamodels/enumeration.py index da7c438..dd46ebf 100755 --- a/src/paveit/datamodels/enumeration.py +++ b/src/paveit/datamodels/enumeration.py @@ -2,6 +2,8 @@ import datetime from enum import Enum from mongoengine import * +from paveit.helper import fetch_recursive, mongo_to_dict + from .usermanagement import Organisation @@ -53,11 +55,14 @@ class Config(Document): tags = ListField(StringField()) - def to_dict(self): + def to_dict(self, enabled=True): # convert data to dict data = fetch_recursive(self) data = mongo_to_dict(data) - + + if enabled: + data = list(filter(lambda item: item["enabled"], data)) + return data meta = { diff --git a/src/paveit/datamodels/machines.py b/src/paveit/datamodels/machines.py index 7eaaf4a..0e5464e 100755 --- a/src/paveit/datamodels/machines.py +++ b/src/paveit/datamodels/machines.py @@ -30,6 +30,8 @@ class Machine(Document): serialnumber = StringField(required=True) extrainfo = StringField(required=False) + + year_manufacture = IntField(min=1900, max=2100, required=False) tests = ListField(EmbeddedDocumentField(Experiment), required=True)