series now has create/update/delete working, and put back series.html rather than edit-id.html (what was I thinking, serious case of the dumbs)

series.py

@@ -1,14 +1,15 @@
 from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaField, IntegerField
 from flask_wtf import FlaskForm
-from flask import request, render_template
+from flask import request, render_template, redirect
 from wtforms.fields.html5 import DateField
 from __main__ import db, app, ma
+from status import st, Status
 
 ################################################################################
 # Class describing Series in the database, and via sqlalchemy, connected to the DB as well
 ################################################################################
 class Series(db.Model):
-    id = db.Column(db.Integer, unique=True, nullable=False, primary_key=True)
+    id = db.Column(db.Integer, db.Sequence('series_id_seq'), primary_key=True)
     title = db.Column(db.String(100), unique=False, nullable=False)
     num_books = db.Column(db.Integer, nullable=False)
     calcd_rating = db.Column(db.String(10), unique=False, nullable=False)
@@ -37,6 +38,12 @@ class SeriesForm(FlaskForm):
     submit = SubmitField('Save' )
     delete = SubmitField('Delete' )
 
+def CalcAvgRating(sid):
+    res=db.engine.execute("select round(avg(to_number(r.name, '99')),1) as rating from book b, rating r, series s, book_series_link bsl where s.id={} and s.id = bsl.series_id and bsl.book_id = b.id and b.rating = r.id and r.name ~ E'^\\\\d+$'".format(sid))
+    for row in res:
+        print( row )
+    return row.rating
+
 ################################################################################
 # Routes for series data
 #
@@ -48,31 +55,47 @@ def seriess():
     return render_template("seriess.html", seriess=seriess)
 
 ################################################################################
-# /series/<id> -> GET/POST(save or delete) -> shows/edits/delets a single
-# series
+# /series -> GET/POST -> creates a new series type and when created, takes you back to /seriess
+################################################################################
+@app.route("/series", methods=["GET", "POST"])
+def new_series():
+    form = SeriesForm(request.form)
+    if 'title' not in request.form:
+        return render_template("series.html", form=form, page_title='Create new Series' )
+    else:
+        series = Series( title=request.form["title"], num_books=request.form["num_books"], note=request.form["note"], calcd_rating=0 )
+        db.session.add(series)
+        db.session.commit()
+        st.SetMessage( "Created new Series (id={})".format(series.id) )
+        return redirect( '/seriess' )
+
+################################################################################
+# /series/<id> -> GET/POST(save or delete) -> shows/edits/delets a single series
 ################################################################################
 @app.route("/series/<id>", methods=["GET", "POST"])
 def series(id):
     ### DDP: should this be request.form or request.values?
-    alert="Success"
-    series_form = SeriesForm(request.form)
-    if request.method == 'POST' and series_form.validate_on_submit():
-        id = request.form['id']
+    form = SeriesForm(request.form)
+    if request.method == 'POST' and form.validate():
         series = Series.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={}, title={})".format( series.id, series.title ) )
+            series = Series.query.filter(Series.id==id).delete()
+        if 'submit' in request.form:
+            st.SetMessage("Successfully Updated Series (id={})".format(id) )
             series.title = request.form['title']
             series.num_books = request.form['num_books']
-#            series.calcd_rating = 
+            series.calcd_rating = CalcAvgRating(id)
             series.note = request.form['note']
-            db.session.commit()
-            message="Successfully Updated Series (id={})".format(id)
+        db.session.commit()
+        return redirect( '/seriess' )
     else:
         series = Series.query.get(id)
-        series_form = SeriesForm(request.values, obj=series)
-        message=""
-    return render_template("series.html", series=series, alert=alert, message=message, series_form=series_form)
+        form = SeriesForm(request.values, obj=series)
+    return render_template("series.html", form=form, page_title='Edit Series' )
+
+################################################################################
+# Gets the Series matching id from DB, helper func in jinja2 code to show books
+################################################################################
+def GetSeriesById(id):
+    return Series.query.get(id).name