diff --git a/config.py b/config.py index 5468ae4..db30b52 100644 --- a/config.py +++ b/config.py @@ -1,5 +1,5 @@ class Attribute: - def __init__(self, display_name, html_input_type="text", required=False, unique=False, primary=False, regex=None, min=None, max=None, options=None): + def __init__(self, display_name, html_input_type="text", required=False, unique=False, primary=False, regex=None, min=None, max=None, options=None, default_val=""): self.display_name = display_name self.html_input_type = html_input_type self.required = required @@ -9,8 +9,9 @@ class Attribute: self.min = min self.max = max self.options = options + self.default_val = default_val -tableitems = { +item_attributes = { "assettag": Attribute( display_name="Asset Tag", html_input_type="text", @@ -29,6 +30,7 @@ tableitems = { "warrantyfrom": Attribute( display_name="Warranty From", html_input_type="date", + default_val="2020-03-09", required=True ), "status": Attribute( diff --git a/routes/create.py b/routes/create.py index d8a004b..f9a0b06 100644 --- a/routes/create.py +++ b/routes/create.py @@ -1,12 +1,13 @@ from flask import Blueprint, request, render_template, redirect from models import Asset, db +from config import item_attributes addasset_bp = Blueprint('addasset', __name__) @addasset_bp.route('/create/', methods=['GET', 'POST']) def create(): if request.method == 'GET': - return render_template('create.html') + return render_template('create.html', item_attributes=item_attributes) if request.method == 'POST': assettag = request.form['assettag'] diff --git a/templates/create.html b/templates/create.html index f82e738..e1c8e0b 100644 --- a/templates/create.html +++ b/templates/create.html @@ -8,39 +8,45 @@
- {% if exc == 'integrity' %} + {%- if exc == 'integrity' -%} Item with the same assettag already exists - {% endif %} - {% if exc == 'status' %} - Data input error. Price must have a numeric value - {% endif %} - {% if exc == 'staffnum' %} + {%- endif -%} + {%- if exc == 'status' -%} + Data input error. Invalid status value + {%- endif -%} + {%- if exc == 'staffnum' -%} Data input error. Staff number must be an integer - {% endif %} + {%- endif -%}