diff --git a/main.py b/main.py index da8dce2..9246893 100644 --- a/main.py +++ b/main.py @@ -23,6 +23,7 @@ from covertype import Covertype, CovertypeForm, CovertypeSchema, GetCovertypeByI from owned import Owned, OwnedForm, OwnedSchema, GetOwnedById from rating import Rating, RatingForm, RatingSchema from loan import Loan, LoanForm, LoanSchema +from series import Series, SeriesForm, SeriesSchema # allow jinja2 to call this python function app.jinja_env.globals['GetCovertypeById'] = GetCovertypeById @@ -50,6 +51,11 @@ class Book_Loan_Link(db.Model): book_id = db.Column(db.Integer, db.ForeignKey('book.id'), unique=True, nullable=False, primary_key=True) loan_id = db.Column(db.Integer, db.ForeignKey('loan.id'), unique=True, nullable=False, primary_key=True) +class Book_Series_Link(db.Model): + __tablename__ = "book_series_link" + book_id = db.Column(db.Integer, db.ForeignKey('book.id'), unique=True, nullable=False, primary_key=True) + series_id = db.Column(db.Integer, db.ForeignKey('series.id'), unique=True, nullable=False, primary_key=True) + class Book_Sub_Book_Link(db.Model): __tablename__ = "book_sub_book_link" book_id = db.Column(db.Integer, db.ForeignKey('book.id'), unique=True, nullable=False, primary_key=True) @@ -66,6 +72,7 @@ class Book(db.Model): publisher = db.relationship('Publisher', secondary=book_publisher_link) genre = db.relationship('Genre', secondary=book_genre_link ) loan = db.relationship('Loan', secondary=Book_Loan_Link.__table__); + series = db.relationship('Series', secondary=Book_Series_Link.__table__); year_published = db.Column(db.Integer) condition = db.Column(db.Integer, db.ForeignKey('condition.id')) covertype = db.Column(db.Integer, db.ForeignKey('covertype.id')) @@ -136,12 +143,14 @@ def books(): @app.route("/books_for_loan/", methods=["GET"]) def books_for_loan(id): -# books = db.engine.execute ( "select * from book_loan_link where loan_id = {}".format( id ) ) - print( id ) books = Book.query.join(Book_Loan_Link).filter(Book_Loan_Link.loan_id==id).order_by(Book.id).all() - print( books ) return render_template("books_for_loan.html", books=books) +@app.route("/books_for_series/", methods=["GET"]) +def books_for_series(id): + books = Book.query.join(Book_Series_Link).filter(Book_Series_Link.series_id==id).order_by(Book.id).all() + return render_template("books_for_series.html", books=books) + @app.route("/book/", methods=["GET"]) def book(id): book = Book.query.get(id) diff --git a/series.py b/series.py new file mode 100644 index 0000000..e87b7b0 --- /dev/null +++ b/series.py @@ -0,0 +1,78 @@ +from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaField, IntegerField +from flask_wtf import FlaskForm +from flask import request, render_template +from wtforms.fields.html5 import DateField +from __main__ import db, app, ma + +################################################################################ +# 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) + 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) + note = db.Column(db.Text) + + def __repr__(self): + return "".format(self.id, self.title, self.num_books, self.calcd_rating, self.note) + +################################################################################ +# Helper class that inherits a .dump() method to turn class Series into json / useful in jinja2 +################################################################################ +class SeriesSchema(ma.SQLAlchemyAutoSchema): + class Meta: + model = Series + ordered = True + +################################################################################ +# Helper class that defines a form for series, used to make html
, with field validation (via wtforms) +################################################################################ +class SeriesForm(FlaskForm): + id = HiddenField() + title = StringField('Title:', [validators.DataRequired()]) + num_books = IntegerField('Number of Books:', [validators.NumberRange(min=1)]) + calcd_rating = StringField('Avg Rating:' ) + note = TextAreaField('Notes:') + submit = SubmitField('Save' ) + delete = SubmitField('Delete' ) + +################################################################################ +# Routes for series data +# +# /seriess -> GET only -> prints out list of all seriess +################################################################################ +@app.route("/seriess", methods=["GET"]) +def seriess(): + seriess = Series.query.all() + return render_template("seriess.html", seriess=seriess) + +################################################################################ +# /series/ -> GET/POST(save or delete) -> shows/edits/delets a single +# series +################################################################################ +@app.route("/series/", 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'] + series = Series.query.get(id) + try: + request.form['submit'] + except: + message="Sorry, Deleting unsupported at present" + alert="Danger" + else: + series.title = request.form['title'] + series.num_books = request.form['num_books'] +# series.calcd_rating = + series.note = request.form['note'] + db.session.commit() + message="Successfully Updated Series (id={})".format(id) + 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) diff --git a/templates/base.html b/templates/base.html index cae83e2..6490a1d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -42,6 +42,13 @@ Show All +
+ +
+ Create + Show All +
+
diff --git a/templates/books_for_series.html b/templates/books_for_series.html new file mode 100644 index 0000000..8efcc56 --- /dev/null +++ b/templates/books_for_series.html @@ -0,0 +1,18 @@ +

Books in Series

+ + + + + + {% for book in books %} + + {% if book.sub_book_num is defined %} + + {% else %} + + {% endif %} + + + {% endfor %} + +
TitleBook Number
    {{book.title}}{{book.title}}not yet:
diff --git a/templates/series.html b/templates/series.html new file mode 100644 index 0000000..ea9f133 --- /dev/null +++ b/templates/series.html @@ -0,0 +1,53 @@ +{% extends "base.html" %} +{% block main_content %} +
+

Series

+ {% if message|length %} +
+ {{message}} +
+ {% endif %} +
+
+ + {{ series_form.csrf_token }} + {{ series_form.id }} +
+ {{ series_form.title.label( class="col-lg-3 justify-content-end" ) }} + {{ series_form.title( class="form-control col-lg-9" ) }} +
+
+ {{ series_form.num_books.label( class="col-lg-3 justify-content-end" ) }} + {{ series_form.num_books( class="form-control col-lg-9" ) }} +
+
+ {{ series_form.calcd_rating.label( class="col-lg-3 justify-content-end" ) }} + {{ series_form.calcd_rating( class="form-control col-lg-9", readonly="true" ) }} +
+
+ {{ series_form.note.label( class="col-lg-3 justify-content-end" ) }} + {{ series_form.note( class="form-control col-lg-9", rows="5" ) }} +
+
+
+
+
+ {{ series_form.delete( class="btn btn-outline-danger col-lg-2 offset-lg-1" )}} + {{ series_form.submit( class="btn btn-primary col-lg-2" )}} +
+ +
+
+
+
+
+
+
+{% endblock main_content %} +{% block script_content %} + +{% endblock script_content %} diff --git a/templates/seriess.html b/templates/seriess.html new file mode 100644 index 0000000..08dd631 --- /dev/null +++ b/templates/seriess.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block main_content %} +

Series

+ + + + + + {% for series in seriess %} + + + {% endfor %} + +
TitleNumber of BooksRating (average)Notes
{{series.title}}{{series.num_books}}{{series.calcd_rating}}{{series.note}}
+{% endblock main_content %}