now have a Person class & associated CReate/Update/Delete functions, and menu in base.html
This commit is contained in:
1
main.py
1
main.py
@@ -29,6 +29,7 @@ Bootstrap(app)
|
||||
################################# Now, import non-book classes ###################################
|
||||
from settings import Settings
|
||||
from files import Files
|
||||
from person import Person
|
||||
|
||||
####################################### GLOBALS #######################################
|
||||
# allow jinja2 to call these python functions directly
|
||||
|
||||
108
person.py
Normal file
108
person.py
Normal file
@@ -0,0 +1,108 @@
|
||||
from wtforms import SubmitField, StringField, HiddenField, validators, Form
|
||||
from flask_wtf import FlaskForm
|
||||
from flask import request, render_template, redirect
|
||||
from main import db, app, ma
|
||||
from sqlalchemy import Sequence
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from status import st, Status
|
||||
|
||||
################################################################################
|
||||
# Class describing Person in the database, and via sqlalchemy, connected to the DB as well
|
||||
################################################################################
|
||||
class Person(db.Model):
|
||||
id = db.Column(db.Integer, db.Sequence('person_id_seq'), primary_key=True )
|
||||
tag = db.Column(db.String(48), unique=False, nullable=False)
|
||||
surname = db.Column(db.String(48), unique=False, nullable=False)
|
||||
firstname = db.Column(db.String(48), unique=False, nullable=False)
|
||||
|
||||
def __repr__(self):
|
||||
return "<tag: {}, firstname: {}, surname: {}>".format(self.tag,self.firstname, self.surname)
|
||||
|
||||
################################################################################
|
||||
# Helper class that inherits a .dump() method to turn class Person into json / useful in jinja2
|
||||
################################################################################
|
||||
class PersonSchema(ma.SQLAlchemyAutoSchema):
|
||||
class Meta:
|
||||
model = Person
|
||||
ordered = True
|
||||
|
||||
################################################################################
|
||||
# Helper class that defines a form for person, used to make html <form>, with field validation (via wtforms)
|
||||
################################################################################
|
||||
class PersonForm(FlaskForm):
|
||||
id = HiddenField()
|
||||
tag = StringField('Tag (searchable name):', [validators.DataRequired()])
|
||||
firstname = StringField('FirstName(s):', [validators.DataRequired()])
|
||||
surname = StringField('Surname:', [validators.DataRequired()])
|
||||
submit = SubmitField('Save' )
|
||||
delete = SubmitField('Delete' )
|
||||
|
||||
################################################################################
|
||||
# Routes for person data
|
||||
#
|
||||
# /persons -> GET only -> prints out list of all persons
|
||||
################################################################################
|
||||
@app.route("/persons", methods=["GET"])
|
||||
def persons():
|
||||
persons = Person.query.all()
|
||||
return render_template("persons.html", persons=persons, alert=st.GetAlert(), message=st.GetMessage() )
|
||||
|
||||
|
||||
################################################################################
|
||||
# /person -> GET/POST -> creates a new person type and when created, takes you back to /persons
|
||||
################################################################################
|
||||
@app.route("/person", methods=["GET", "POST"])
|
||||
def new_person():
|
||||
form = PersonForm(request.form)
|
||||
page_title='Create new Person'
|
||||
if 'surname' not in request.form:
|
||||
return render_template("person.html", form=form, page_title=page_title )
|
||||
else:
|
||||
person = Person( tag=request.form["tag"], surname=request.form["surname"], firstname=request.form["firstname"] )
|
||||
try:
|
||||
db.session.add(person)
|
||||
db.session.commit()
|
||||
print(person)
|
||||
st.SetMessage( "Created new Person ({})".format(person.tag) )
|
||||
return redirect( '/persons' )
|
||||
except SQLAlchemyError as e:
|
||||
st.SetAlert( "danger" )
|
||||
st.SetMessage( "<b>Failed to add Person:</b> {}".format(e.orig) )
|
||||
return render_template("person.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
|
||||
|
||||
################################################################################
|
||||
# /person/<id> -> GET/POST(save or delete) -> shows/edits/delets a single
|
||||
# person
|
||||
################################################################################
|
||||
@app.route("/person/<id>", methods=["GET", "POST"])
|
||||
def person(id):
|
||||
form = PersonForm(request.form)
|
||||
page_title='Edit Person'
|
||||
if request.method == 'POST':
|
||||
try:
|
||||
person = Person.query.get(id)
|
||||
if 'delete' in request.form:
|
||||
st.SetMessage("Successfully deleted Person: ({})".format( person.tag ) )
|
||||
person = Person.query.filter(Person.id==id).delete()
|
||||
if 'submit' in request.form and form.validate():
|
||||
st.SetMessage("Successfully Updated Person: (From: {}, {}, {})".format(person.tag, person.firstname, person.surname) )
|
||||
person.tag = request.form['tag']
|
||||
person.surname = request.form['surname']
|
||||
person.firstname = request.form['firstname']
|
||||
st.AppendMessage(" To: ({}, {}, {})".format(person.tag, person.firstname, person.surname) )
|
||||
db.session.commit()
|
||||
return redirect( '/persons' )
|
||||
except SQLAlchemyError as e:
|
||||
st.SetAlert( "danger" )
|
||||
st.SetMessage( "<b>Failed to modify Person:</b> {}".format(e.orig) )
|
||||
return render_template("person.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
|
||||
else:
|
||||
person = Person.query.get(id)
|
||||
form = PersonForm(request.values, obj=person)
|
||||
return render_template("person.html", object=person, form=form, page_title = page_title, alert=st.GetAlert(), message=st.GetMessage() )
|
||||
|
||||
################################################################################
|
||||
# helper fund to GetPersons -> person_list -> jinja2 for person drop-down in book.html
|
||||
################################################################################
|
||||
def GetPersons():
|
||||
return Person.query.order_by('surname','firstname').all()
|
||||
@@ -49,6 +49,20 @@
|
||||
<a class="dropdown-item" href="{{url_for('file_list')}}">View Details</a>
|
||||
</div>
|
||||
</div class="nav-item dropdown">
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AIMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">AI</a>
|
||||
<div class="dropdown-menu" aria-labelledby="AIMenu">
|
||||
<a class="dropdown-item" href="{{url_for('settings')}}">Reference Images</a>
|
||||
<a class="dropdown-item" href="{{url_for('settings')}}">View Stats</a>
|
||||
</div>
|
||||
</div class="nav-item dropdown">
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="PersonMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Person</a>
|
||||
<div class="dropdown-menu" aria-labelledby="AIMenuPerson">
|
||||
<a class="dropdown-item" href="{{url_for('new_person')}}">Create Person</a>
|
||||
<a class="dropdown-item" href="{{url_for('persons')}}">Show People</a>
|
||||
</div>
|
||||
</div class="nav-item dropdown">
|
||||
<div class="nav-item dropdown">
|
||||
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="AdminMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Admin</a>
|
||||
<div class="dropdown-menu" aria-labelledby="AdminMenu">
|
||||
@@ -59,7 +73,7 @@
|
||||
</div class="nav-item dropdown">
|
||||
</div clas="navbar-nav">
|
||||
<form class="form-inline my-2 my-lg-0" method="POST" action="/search">
|
||||
<input class="form-control mr-sm-2" type="search" placeholder="Search by title" aria-label="Search" name="term">
|
||||
<input class="form-control mr-sm-2" type="search" placeholder="by file, date (YYYMMDD) or tag" aria-label="Search" name="term">
|
||||
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
|
||||
</form>
|
||||
</div class="collapse navbar-collapse">
|
||||
|
||||
28
templates/person.html
Normal file
28
templates/person.html
Normal file
@@ -0,0 +1,28 @@
|
||||
{% extends "base.html" %} {% block main_content %}
|
||||
<div class="container">
|
||||
<h3 class="offset-lg-2">{{page_title}}</h3>
|
||||
<div class="row">
|
||||
<form class="form form-inline col-xl-12" action="" method="POST">
|
||||
{% for field in form %}
|
||||
{% if field.type == 'HiddenField' or field.type == 'CSRFTokenField' %}
|
||||
{{field}}<br>
|
||||
{% elif field.type != 'SubmitField' %}
|
||||
<div class="form-row col-lg-12">
|
||||
{{ field.label( class="col-lg-4" ) }}
|
||||
{{ field( class="form-control col-lg-4" ) }}
|
||||
</div class="form-row col-lg-12">
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<div class="row col-lg-12">
|
||||
<br>
|
||||
</div class="row">
|
||||
<div class="form-row col-lg-12">
|
||||
{{ form.submit( class="btn btn-primary offset-lg-4 col-lg-2" )}}
|
||||
{% if 'Edit' in page_title %}
|
||||
{{ form.delete( class="btn btn-outline-danger col-lg-2" )}}
|
||||
{% endif %}
|
||||
</div class="form-row">
|
||||
</form>
|
||||
</div class="row">
|
||||
</div class="container">
|
||||
{% endblock main_content %}
|
||||
16
templates/persons.html
Normal file
16
templates/persons.html
Normal file
@@ -0,0 +1,16 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block main_content %}
|
||||
<h3>Show All People</h3>
|
||||
<table id="person_table" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
|
||||
<thead>
|
||||
<tr class="thead-light"><th>Tag</th><th>Firstname(s)</th><th>Surname</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for person in persons %}
|
||||
<tr><td><a href="{{url_for('person', id=person.id )}}">{{person.tag}}</td><td>{{person.firstname}}</td>
|
||||
<td>{{person.surname}}</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% endblock main_content %}
|
||||
Reference in New Issue
Block a user