now create an owned on /owned, rather than /owned/-1 kludge. Also using sequence for creation. All good - made sequences for all relevant tables too. Last question is how to do redirect to /owneds and still show messsage

This commit is contained in:
2020-12-04 18:59:34 +11:00
parent ed07d1f9cb
commit d61e830525
4 changed files with 27 additions and 22 deletions

View File

@@ -2,13 +2,14 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validato
from flask import request, render_template
from flask_wtf import FlaskForm
from __main__ import db, app, ma
from sqlalchemy import func
from sqlalchemy import func, Sequence
################################################################################
# Class describing Owned in the database, and via sqlalchemy, connected to the DB as well
################################################################################
class Owned(db.Model):
id = db.Column(db.Integer, primary_key=True )
id = db.Column(db.Integer, db.Sequence('owned_id_seq'), primary_key=True )
name = db.Column(db.String(50), unique=True, nullable=False)
def __repr__(self):
@@ -20,7 +21,6 @@ class Owned(db.Model):
class OwnedSchema(ma.SQLAlchemyAutoSchema):
class Meta: model = Owned
################################################################################
# Helper class that defines a form for owned, used to make html <form>, with field validation (via wtforms)
################################################################################
@@ -40,6 +40,25 @@ def owneds():
owneds = Owned.query.order_by('id').all()
return render_template("show_id_name.html", objects=owneds, page_title='Show All Ownership types', url_base='owned')
################################################################################
# /owned -> GET/POST -> creates a new owned type and when created, takes you back to /owneds
################################################################################
@app.route("/owned", methods=["GET", "POST"])
def new_owned():
alert="success"
owned_form = OwnedForm(request.form)
if 'name' not in request.form:
owned=None
message=""
return render_template("edit_id_name.html", owned=owned, alert=alert, message=message, form=owned_form, page_title='Create new Owned Type' )
else:
owned = Owned( name=request.form["name"] )
db.session.add(owned)
db.session.commit()
message="Created new Owned Type (id={})".format(owned.id)
owneds = Owned.query.order_by('id').all()
return render_template("show_id_name.html", objects=owneds, page_title='Show All Ownership types', url_base='owned', alert=alert, message=message)
################################################################################
# /owned/<id> -> GET/POST(save or delete) -> shows/edits/delets a single
# owned
@@ -47,24 +66,8 @@ def owneds():
@app.route("/owned/<id>", methods=["GET", "POST"])
def owned(id):
alert="success"
owned_form = OwnedForm(request.form)
if id == "-1":
if 'name' not in request.form:
owned=None
message=""
return render_template("edit_id_name.html", owned=owned, alert=alert, message=message, form=owned_form, page_title='Create new Owned Type' )
else:
res=db.session.query(func.max(Owned.id)).all()
new_id=res[0][0]
new_id=new_id+1
owned = Owned( id=new_id, name=request.form["name"] )
db.session.add(owned)
db.session.commit()
message="Created new Owned Type (id={})".format(new_id)
owneds = Owned.query.order_by('id').all()
return render_template("show_id_name.html", objects=owneds, page_title='Show All Ownership types', url_base='owned', alert=alert, message=message)
### DDP: should this be request.form or request.values?
owned_form = OwnedForm(request.form)
if request.method == 'POST' and owned_form.validate():
owned = Owned.query.get(id)
if 'delete' in request.form: