diff --git a/publisher.py b/publisher.py index 367dc74..068b6f9 100644 --- a/publisher.py +++ b/publisher.py @@ -1,14 +1,16 @@ -from wtforms import SubmitField, StringField, HiddenField, validators -from flask import request, render_template +from wtforms import SubmitField, StringField, HiddenField, SelectField, validators +from flask import request, render_template, redirect from flask_wtf import FlaskForm from __main__ import db, app, ma +from sqlalchemy import func, Sequence +from status import st, Status ################################################################################ # Class describing Publisher in the database, and via sqlalchemy, connected to the DB as well ################################################################################ class Publisher(db.Model): - id = db.Column(db.Integer, unique=True, nullable=False, primary_key=True) - name = db.Column(db.String(50), unique=False, nullable=False) + id = db.Column(db.Integer, db.Sequence('publisher_id_seq'), primary_key=True ) + name = db.Column(db.String(50), unique=True, nullable=False) def __repr__(self): return "".format(self.id,self.name) @@ -35,13 +37,24 @@ class PublisherForm(FlaskForm): ################################################################################ @app.route("/publishers", methods=["GET"]) def publishers(): - publishers = Publisher.query.all() - return render_template("show_id_name.html", objects=publishers, page_title='Show All Publishers', url_base='publisher') + objects = Publisher.query.order_by('id').all() + return render_template("show_id_name.html", objects=objects, page_title='Show All Publishers', url_base='publisher', alert=st.GetAlert(), message=st.GetMessage() ) -def GetPublishers(): - publishers = Publisher.query.order_by('name').all() - return publishers - +################################################################################ +# /publisher -> GET/POST -> creates a new publisher type and when created, takes you back to /publishers +################################################################################ +@app.route("/publisher", methods=["GET", "POST"]) +def new_publisher(): + form = PublisherForm(request.form) + if 'name' not in request.form: + return render_template("edit_id_name.html", form=form, page_title='Create new Publisher' ) + else: + publisher = Publisher( name=request.form["name"] ) + db.session.add(publisher) + db.session.commit() + st.SetMessage( "Created new Publisher (id={})".format(publisher.id) ) + publishers = Publisher.query.order_by('id').all() + return redirect( '/publishers' ) ################################################################################ # /publisher/ -> GET/POST(save or delete) -> shows/edits/delets a single publisher @@ -49,25 +62,31 @@ def GetPublishers(): @app.route("/publisher/", methods=["GET", "POST"]) def publisher(id): ### DDP: should this be request.form or request.values? - alert="Success" - publisher_form = PublisherForm(request.form) - if request.method == 'POST' and publisher_form.validate_on_submit(): - id = request.form['id'] + form = PublisherForm(request.form) + if request.method == 'POST' and form.validate(): publisher = Publisher.query.get(id) - try: - request.form['submit'] - except: - message="Sorry, Deleting unsupported at present" - alert="Danger" - else: + if 'delete' in request.form: + st.SetMessage("Successfully deleted (id={}, name={})".format( publisher.id, publisher.name ) ) + publisher = Publisher.query.filter(Publisher.id==id).delete() + if 'submit' in request.form: + st.SetMessage("Successfully Updated Publisher (id={})".format(id) ) publisher.name = request.form['name'] - db.session.commit() - message="Successfully Updated Publisher (id={})".format(id) + db.session.commit() + return redirect( '/publishers' ) else: publisher = Publisher.query.get(id) - publisher_form = PublisherForm(request.values, obj=publisher) - message="" - return render_template("edit_id_name.html", publisher=publisher, alert=alert, message=message, form=publisher_form, page_title='Edit Publisher') + form = PublisherForm(request.values, obj=publisher) + return render_template("edit_id_name.html", form=form, page_title='Edit Publisher' ) +################################################################################ +# Gets the Publisher matching id from DB, helper func in jinja2 code to show books +################################################################################ def GetPublisherById(id): return Publisher.query.get(id).name + +################################################################################ +# Gets the list of Publishers, populates publisher_list var in jinja2 code in book.html +################################################################################ +def GetPublishers(): + publishers = Publisher.query.order_by('name').all() + return publishers