ddp/books
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Damien De Paoli
2020-12-09 22:02:03 +11:00
parent 583bebccec
commit e3d21a9438
3 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
series.py
View File

@@ -1,14 +1,15 @@
from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaField, IntegerField from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaField, IntegerField
from flask_wtf import FlaskForm 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 wtforms.fields.html5 import DateField
from __main__ import db, app, ma 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 describing Series in the database, and via sqlalchemy, connected to the DB as well
################################################################################ ################################################################################
class Series(db.Model): 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) title = db.Column(db.String(100), unique=False, nullable=False)
num_books = db.Column(db.Integer, nullable=False) num_books = db.Column(db.Integer, nullable=False)
calcd_rating = db.Column(db.String(10), unique=False, nullable=False) calcd_rating = db.Column(db.String(10), unique=False, nullable=False)
@@ -37,6 +38,12 @@ class SeriesForm(FlaskForm):
submit = SubmitField('Save' ) submit = SubmitField('Save' )
delete = SubmitField('Delete' ) 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 # Routes for series data
# #
@@ -48,31 +55,47 @@ def seriess():
return render_template("seriess.html", seriess=seriess) return render_template("seriess.html", seriess=seriess)
################################################################################ ################################################################################
# /series/<id> -> GET/POST(save or delete) -> shows/edits/delets a single # /series -> GET/POST -> creates a new series type and when created, takes you back to /seriess
# series ################################################################################
@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"]) @app.route("/series/<id>", methods=["GET", "POST"])
def series(id): def series(id):
### DDP: should this be request.form or request.values? ### DDP: should this be request.form or request.values?
alert="Success" form = SeriesForm(request.form)
series_form = SeriesForm(request.form) if request.method == 'POST' and form.validate():
if request.method == 'POST' and series_form.validate_on_submit():
id = request.form['id']
series = Series.query.get(id) series = Series.query.get(id)
try: if 'delete' in request.form:
request.form['submit'] st.SetMessage("Successfully deleted (id={}, title={})".format( series.id, series.title ) )
except: series = Series.query.filter(Series.id==id).delete()
message="Sorry, Deleting unsupported at present" if 'submit' in request.form:
alert="Danger" st.SetMessage("Successfully Updated Series (id={})".format(id) )
else:
series.title = request.form['title'] series.title = request.form['title']
series.num_books = request.form['num_books'] series.num_books = request.form['num_books']
# series.calcd_rating = series.calcd_rating = CalcAvgRating(id)
series.note = request.form['note'] series.note = request.form['note']
db.session.commit() db.session.commit()
message="Successfully Updated Series (id={})".format(id) return redirect( '/seriess' )
else: else:
series = Series.query.get(id) series = Series.query.get(id)
series_form = SeriesForm(request.values, obj=series) form = SeriesForm(request.values, obj=series)
message="" return render_template("series.html", form=form, page_title='Edit Series' )
return render_template("series.html", series=series, alert=alert, message=message, series_form=series_form)
################################################################################
# Gets the Series matching id from DB, helper func in jinja2 code to show books
################################################################################
def GetSeriesById(id):
return Series.query.get(id).name

2
templates/base.html
View File

@@ -45,7 +45,7 @@
<div class="nav-item dropdown"> <div class="nav-item dropdown">
<a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="SeriesMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Series</a> <a class="nav-item dropdown nav-link dropdown-toggle" href="#" id="SeriesMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Series</a>
<div class="dropdown-menu" aria-labelledby="SeriesMenu"> <div class="dropdown-menu" aria-labelledby="SeriesMenu">
<a class="dropdown-item" href="{{url_for('seriess')}}">Create</a> <a class="dropdown-item" href="{{url_for('new_series')}}">Create</a>
<a class="dropdown-item" href="{{url_for('seriess')}}">Show All</a> <a class="dropdown-item" href="{{url_for('seriess')}}">Show All</a>
</div> </div>
</div class="nav-item dropdown"> </div class="nav-item dropdown">

41
templates/series.html
View File

@@ -2,7 +2,10 @@
{% block main_content %} {% block main_content %}
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<h3 class="col-lg-6"><center>Series</center></h3><h3 class="col-lg-6"><center>Books in Series</center></h3> <h3 class="col-lg-6"><center>{{page_title}}</center></h3>
{% if 'Create' not in page_title %}
<h3 class="col-lg-6"><center>Books in Series</center></h3>
{% endif %}
</div class="row"> </div class="row">
{% if message|length %} {% if message|length %}
<div class="row alert alert-{{alert}}"> <div class="row alert alert-{{alert}}">
@@ -12,36 +15,42 @@
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<form class="form form-inline col-lg-12" action="" method="POST"> <form class="form form-inline col-lg-12" action="" method="POST">
{{ series_form.csrf_token }} {{ form.csrf_token }}
{{ series_form.id }} {{ form.id }}
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
{{ series_form.title.label( class="col-lg-3 justify-content-end" ) }} {{ form.title.label( class="col-lg-3 justify-content-end" ) }}
{{ series_form.title( class="form-control col-lg-9" ) }} {{ form.title( class="form-control col-lg-9" ) }}
</div class="form-row"> </div class="form-row">
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
{{ series_form.num_books.label( class="col-lg-3 justify-content-end" ) }} {{ form.num_books.label( class="col-lg-3 justify-content-end" ) }}
{{ series_form.num_books( class="form-control col-lg-9" ) }} {{ form.num_books( class="form-control col-lg-9" ) }}
</div class="form-row"> </div class="form-row">
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
{{ series_form.calcd_rating.label( class="col-lg-3 justify-content-end" ) }} {{ form.calcd_rating.label( class="col-lg-3 justify-content-end" ) }}
{{ series_form.calcd_rating( class="form-control col-lg-9", readonly="true" ) }} {{ form.calcd_rating( class="form-control col-lg-9", readonly="true" ) }}
</div class="form-row"> </div class="form-row">
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
{{ series_form.note.label( class="col-lg-3 justify-content-end" ) }} {{ form.note.label( class="col-lg-3 justify-content-end" ) }}
{{ series_form.note( class="form-control col-lg-9", rows="5" ) }} {{ form.note( class="form-control col-lg-9", rows="5" ) }}
</div class="form-row"> </div class="form-row">
<div class="row col-lg-12"> <div class="row col-lg-12">
<br> <br>
</div class="row"> </div class="row">
<div class="form-row col-lg-12"> <div class="form-row col-lg-12">
{{ series_form.delete( class="btn btn-outline-danger col-lg-2 offset-lg-1" )}} {% if 'Create' in page_title %}
{{ series_form.submit( class="btn btn-primary col-lg-2" )}} {{ form.submit( class="btn btn-primary offset-lg-3 col-lg-2" )}}
{% else %}
{{ form.delete( class="btn btn-outline-danger offset-lg-3 col-lg-2" )}}
{{ form.submit( class="btn btn-primary col-lg-2" )}}
{% endif %}
</div class="form-row"> </div class="form-row">
</form> </form>
</div class="col-lg-6"> </div class="col-lg-6">
<div class="col-lg-6"> <div class="col-lg-6">
<div id="books_for_series_bit"> {% if 'Create' not in page_title %}
</div id="books_for_series_bit"> <div id="books_for_series_bit">
</div id="books_for_series_bit">
{% endif %}
</div class="col-lg-6"> </div class="col-lg-6">
</div class="row"> </div class="row">
</div class="container"> </div class="container">
@@ -49,7 +58,7 @@
{% block script_content %} {% block script_content %}
<script> <script>
$(document).ready( function() { $(document).ready( function() {
$("#books_for_series_bit").load("/books_for_series/" + {{series_form.data.id}}) $("#books_for_series_bit").load("/books_for_series/" + {{form.data.id}})
} ) } )
</script> </script>
{% endblock script_content %} {% endblock script_content %}