add date of manufacture to machines, small fixes
This commit is contained in:
@@ -19,6 +19,7 @@ class Components(Document):
|
|||||||
internalnumber = StringField(required=False) # Interne Bezeichnung
|
internalnumber = StringField(required=False) # Interne Bezeichnung
|
||||||
|
|
||||||
extrainfo = StringField(required=False)
|
extrainfo = StringField(required=False)
|
||||||
|
year_manufacture = IntField(min=1900, max=2100, required=False)
|
||||||
|
|
||||||
date = DateTimeField(default=datetime.datetime.now,
|
date = DateTimeField(default=datetime.datetime.now,
|
||||||
wtf_options={"render_kw": {
|
wtf_options={"render_kw": {
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ import datetime
|
|||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
from mongoengine import *
|
from mongoengine import *
|
||||||
|
from paveit.helper import fetch_recursive, mongo_to_dict
|
||||||
|
|
||||||
|
|
||||||
from .usermanagement import Organisation
|
from .usermanagement import Organisation
|
||||||
|
|
||||||
@@ -53,11 +55,14 @@ class Config(Document):
|
|||||||
|
|
||||||
tags = ListField(StringField())
|
tags = ListField(StringField())
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self, enabled=True):
|
||||||
# convert data to dict
|
# convert data to dict
|
||||||
data = fetch_recursive(self)
|
data = fetch_recursive(self)
|
||||||
data = mongo_to_dict(data)
|
data = mongo_to_dict(data)
|
||||||
|
|
||||||
|
if enabled:
|
||||||
|
data = list(filter(lambda item: item["enabled"], data))
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ class Machine(Document):
|
|||||||
serialnumber = StringField(required=True)
|
serialnumber = StringField(required=True)
|
||||||
|
|
||||||
extrainfo = StringField(required=False)
|
extrainfo = StringField(required=False)
|
||||||
|
|
||||||
|
year_manufacture = IntField(min=1900, max=2100, required=False)
|
||||||
|
|
||||||
tests = ListField(EmbeddedDocumentField(Experiment), required=True)
|
tests = ListField(EmbeddedDocumentField(Experiment), required=True)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user