create/update/delete of condition, covertype, genre, owned, rating objects all works, and can be accessed from Admin menu

genre.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 Genre in the database, and via sqlalchemy, connected to the DB as well
 ################################################################################
 class Genre(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('genre_id_seq'), primary_key=True )
+    name = db.Column(db.String(50), unique=True, nullable=False)
 
     def __repr__(self):
         return "<id: {}, name: {}>".format(self.id,self.name)
@@ -35,13 +37,24 @@ class GenreForm(FlaskForm):
 ################################################################################
 @app.route("/genres", methods=["GET"])
 def genres():
-    genres = Genre.query.all()
-    return render_template("show_id_name.html", objects=genres, page_title='Show All Genres', url_base='genre')
+    objects = Genre.query.order_by('id').all()
+    return render_template("show_id_name.html", objects=objects, page_title='Show All Genres', url_base='genre', alert=st.GetAlert(), message=st.GetMessage() )
 
-
-def GetGenres():
-    genres = Genre.query.order_by('name').all()
-    return genres
+################################################################################
+# /genre -> GET/POST -> creates a new genre type and when created, takes you back to /genres
+################################################################################
+@app.route("/genre", methods=["GET", "POST"])
+def new_genre():
+    form = GenreForm(request.form)
+    if 'name' not in request.form:
+        return render_template("edit_id_name.html", form=form, page_title='Create new Genre' )
+    else:
+        genre = Genre( name=request.form["name"] )
+        db.session.add(genre)
+        db.session.commit()
+        st.SetMessage( "Created new Genre (id={})".format(genre.id) )
+        genres = Genre.query.order_by('id').all()
+        return redirect( '/genres' )
 
 ################################################################################
 # /genre/<id> -> GET/POST(save or delete) -> shows/edits/delets a single genre
@@ -49,22 +62,31 @@ def GetGenres():
 @app.route("/genre/<id>", methods=["GET", "POST"])
 def genre(id):
     ### DDP: should this be request.form or request.values?
-    alert="Success"
-    genre_form = GenreForm(request.form)
-    if request.method == 'POST' and genre_form.validate():
-        id = request.form['id']
+    form = GenreForm(request.form)
+    if request.method == 'POST' and form.validate():
         genre = Genre.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( genre.id, genre.name ) )
+            genre = Genre.query.filter(Genre.id==id).delete()
+        if 'submit' in request.form:
+            st.SetMessage("Successfully Updated Genre (id={})".format(id) )
             genre.name = request.form['name']
-            db.session.commit()
-            message="Successfully Updated Genre (id={})".format(id)
+        db.session.commit()
+        return redirect( '/genres' )
     else:
         genre = Genre.query.get(id)
-        genre_form = GenreForm(request.values, obj=genre)
-        message=""
-    return render_template("edit_id_name.html", genre=genre, alert=alert, message=message, form=genre_form, page_title='Edit Genre')
+        form = GenreForm(request.values, obj=genre)
+    return render_template("edit_id_name.html", form=form, page_title='Edit Genre' )
+
+################################################################################
+# Gets the Genre matching id from DB, helper func in jinja2 code to show books
+################################################################################
+def GetGenreById(id):
+    return Genre.query.get(id).name
+
+################################################################################
+# Gets the list of Genres, populates genre_list var in jinja2 code in book.html
+################################################################################
+def GetGenres():
+    genres = Genre.query.order_by('name').all()
+    return genres