[Script][System] Added date as export format and added birthday as user attribute

This commit is contained in:
Ferdinand Thiessen 2020-11-15 15:49:18 +01:00
parent 04753e9a41
commit 1d36aa4033
3 changed files with 11 additions and 6 deletions

View File

@ -1,7 +1,7 @@
import pkg_resources import pkg_resources
from flask import Flask, current_app from flask import Flask, current_app
from flask_cors import CORS from flask_cors import CORS
from datetime import datetime from datetime import datetime, date
from flask.json import JSONEncoder, jsonify from flask.json import JSONEncoder, jsonify
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
@ -19,7 +19,7 @@ class CustomJSONEncoder(JSONEncoder):
except AttributeError: except AttributeError:
pass pass
if isinstance(o, datetime): if isinstance(o, datetime) or isinstance(o, date):
return o.isoformat() return o.isoformat()
# Check if iterable # Check if iterable

View File

@ -1,3 +1,6 @@
from datetime import date
from typing import Optional
from sqlalchemy.orm.collections import attribute_mapped_collection from sqlalchemy.orm.collections import attribute_mapped_collection
from . import ModelSerializeMixin from . import ModelSerializeMixin
@ -42,14 +45,16 @@ class User(db.Model, ModelSerializeMixin):
firstname: Firstname of the User firstname: Firstname of the User
lastname: Lastname of the User lastname: Lastname of the User
mail: mail address of the User mail: mail address of the User
birthday: Birthday of the user
""" """
__tablename__ = "user" __tablename__ = "user"
userid: str = db.Column(db.String(30), nullable=False) userid: str = db.Column(db.String(30), nullable=False)
display_name: str = db.Column(db.String(30)) display_name: str = db.Column(db.String(30))
firstname: str = db.Column(db.String(50)) firstname: str = db.Column(db.String(50), nullable=False)
lastname: str = db.Column(db.String(50)) lastname: str = db.Column(db.String(50), nullable=False)
mail: str = db.Column(db.String(60)) mail: str = db.Column(db.String(60), nullable=False)
birthday: Optional[date] = db.Column(db.Date)
roles: [str] = [] roles: [str] = []
roles_: [Role] = db.relationship("Role", secondary=association_table, cascade="save-update, merge") roles_: [Role] = db.relationship("Role", secondary=association_table, cascade="save-update, merge")

View File

@ -9,7 +9,7 @@ import pkg_resources
class InterfaceGenerator: class InterfaceGenerator:
known = [] known = []
classes = {} classes = {}
mapper = {"str": "string", "int": "number", "float": "number", "datetime": "Date", "NoneType": "null"} mapper = {"str": "string", "int": "number", "float": "number", "date": "Date", "datetime": "Date", "NoneType": "null"}
def __init__(self, namespace, filename): def __init__(self, namespace, filename):
self.basename = "" self.basename = ""