diff --git a/README b/README index b55675c..339358f 100644 --- a/README +++ b/README @@ -13,6 +13,12 @@ sudo apt install python3-pip python3-psycopg2 libpq-dev # --user sticks python libs in ~/.local/[bin|lib|share] pip3 install --user flask sqlalchemy flask-sqlalchemy flask-marshmallow SQLAlchemy-serializer flask-wtf flask-bootstrap marshmallow-sqlalchemy + +### alter db that was saved by: +psql library + alter table genre_lst rename to genre; + alter table genre rename COLUMN genre to name; + # run the web server by: python3 main.py diff --git a/genre.py b/genre.py new file mode 100644 index 0000000..7f59796 --- /dev/null +++ b/genre.py @@ -0,0 +1,64 @@ +from wtforms import SubmitField, StringField, HiddenField, validators, Form +from flask import request, render_template +from __main__ import db, app, ma + +################################################################################ +# 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) + + def __repr__(self): + return "".format(self.id,self.name) + +################################################################################ +# Helper class that inherits a .dump() method to turn class Genre into json / useful in jinja2 +################################################################################ +class GenreSchema(ma.SQLAlchemyAutoSchema): + class Meta: model = Genre + +################################################################################ +# Helper class that defines a form for genre, used to make html
, with field validation (via wtforms) +################################################################################ +class GenreForm(Form): + id = HiddenField() + name = StringField('Name:', [validators.DataRequired()]) + submit = SubmitField('Save' ) + delete = SubmitField('Delete' ) + +################################################################################ +# Routes for genre data +# +# /genres -> GET only -> prints out list of all genres +################################################################################ +@app.route("/genres", methods=["GET"]) +def genres(): + genres = Genre.query.all() + return render_template("genres.html", genres=genres) + +################################################################################ +# /genre/ -> GET/POST(save or delete) -> shows/edits/delets a single genre +################################################################################ +@app.route("/genre/", 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'] + genre = Genre.query.get(id) + try: + request.form['submit'] + except: + message="Sorry, Deleting unsupported at present" + alert="Danger" + else: + genre.name = request.form['name'] + db.session.commit() + message="Successfully Updated Genre (id={})".format(id) + else: + genre = Genre.query.get(id) + genre_form = GenreForm(request.values, obj=genre) + message="" + return render_template("genre.html", genre=genre, alert=alert, message=message, genre_form=genre_form) diff --git a/main.py b/main.py index 50323de..30477ce 100644 --- a/main.py +++ b/main.py @@ -17,6 +17,7 @@ Bootstrap(app) from author import Author, AuthorForm, AuthorSchema from publisher import Publisher, PublisherForm, PublisherSchema +from genre import Genre, GenreForm, GenreSchema ####################################### CLASSES / DB model ####################################### book_author_link = db.Table('book_author_link', db.Model.metadata, @@ -31,7 +32,7 @@ book_publisher_link = db.Table('book_publisher_link', db.Model.metadata, book_genre_link = db.Table('book_genre_link', db.Model.metadata, db.Column('book_id', db.Integer, db.ForeignKey('book.id')), - db.Column('genre_id', db.Integer, db.ForeignKey('genre_lst.id')) + db.Column('genre_id', db.Integer, db.ForeignKey('genre.id')) ) class Book_Sub_Book_Link(db.Model): @@ -58,31 +59,20 @@ class Book(db.Model): author = db.relationship('Author', secondary=book_author_link) publisher = db.relationship('Publisher', secondary=book_publisher_link) - genre = db.relationship('Genre_Lst', secondary=book_genre_link ) + genre = db.relationship('Genre', secondary=book_genre_link ) parent_ref = db.relationship('Book_Sub_Book_Link', secondary=Book_Sub_Book_Link.__table__, primaryjoin="Book.id==Book_Sub_Book_Link.sub_book_id", secondaryjoin="Book.id==Book_Sub_Book_Link.book_id" ) child_ref = db.relationship('Book_Sub_Book_Link', secondary=Book_Sub_Book_Link.__table__, primaryjoin="Book.id==Book_Sub_Book_Link.book_id", secondaryjoin="Book.id==Book_Sub_Book_Link.sub_book_id" ) def __repr__(self): return "".format(self.id, self.author, self.title, self.year_published, self.rating, self.condition, self.owned, self.covertype, self.notes, self.blurb, self.created, self.modified, self.publisher ) -class Genre_Lst(db.Model): - __tablename__ = "genre_lst" - id = db.Column(db.Integer, unique=True, nullable=False, primary_key=True) - genre = db.Column(db.String(20), unique=False, nullable=False) - - def __repr__(self): - return "".format(self.id, self.genre) - -class Genre_LstSchema(ma.SQLAlchemyAutoSchema): - class Meta: model = Genre_Lst - class Book_Sub_Book_LinkSchema(ma.SQLAlchemyAutoSchema): class Meta: model = Book_Sub_Book_Link class BookSchema(ma.SQLAlchemyAutoSchema): author = ma.Nested(AuthorSchema, many=True) publisher = ma.Nested(PublisherSchema, many=True) - genre = ma.Nested(Genre_LstSchema, many=True) + genre = ma.Nested(GenreSchema, many=True) parent_ref = ma.Nested(Book_Sub_Book_LinkSchema, many=True) child_ref = ma.Nested(Book_Sub_Book_LinkSchema, many=True) class Meta: model = Book @@ -122,9 +112,9 @@ def book(id): for row in subs: # get genres for sub book and add by hand first tmp_g = [] - genres = db.engine.execute ( "select genre_lst.id, genre_lst.genre from genre_lst, book_genre_link bgl where genre_lst.id = bgl.genre_id and bgl.book_id = {}".format( row.sub_book_id ) ) + genres = db.engine.execute ( "select genre.id, genre.name from genre, book_genre_link bgl where genre.id = bgl.genre_id and bgl.book_id = {}".format( row.sub_book_id ) ) for genre in genres: - tmp_g.append( { 'id': genre.id, 'genre': genre.genre } ) + tmp_g.append( { 'id': genre.id, 'name': genre.name } ) sub_book.append( { 'sub_book_id': row.sub_book_id, 'sub_book_num': row.sub_book_num, 'title' : row.title, 'rating': row.rating, 'year_published' : row.year_published, 'notes' : row.notes, 'author_id' : row.author_id, 'author' : row.author, 'genres' : tmp_g } ) diff --git a/templates/book.html b/templates/book.html index a29b6ef..51d4660 100644 --- a/templates/book.html +++ b/templates/book.html @@ -9,12 +9,12 @@
+
{% if books[key] is iterable and books[key] is not string %} {% set cnt = namespace(idx=0, val=0) %} {% for objects in books[key] %} {% set cnt.val = 0 %} {% set str = namespace(val="") %} - {% for attr in objects %} {% if attr != "id" %} {% if cnt.val > 0 %} @@ -25,12 +25,12 @@ {% set cnt.val = cnt.val + 1 %} {% endif %} {% endfor %} - {% if key != "genre" %} - {{str.val}} - {% endif %} + + {{str.val}} {% set cnt.idx = cnt.idx+1 %} {% endfor %} +
{% else %} {% if key == "notes" or key == "blurb" %} diff --git a/templates/genre.html b/templates/genre.html new file mode 100644 index 0000000..6345ffc --- /dev/null +++ b/templates/genre.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} {% block main_content %} +

Genre

+
+ + {% if message|length %} +
+ {{message}} +
+ {% endif %} +
+ + {{ wtf.form_field( genre_form.id, form_type='inline' ) }} +
+ {{ wtf.form_field( genre_form.name, form_type='horizontal', horizontal_columns=('xl', 2, 10), style="width:100%" ) }} +
+
+

+
+ {{ wtf.form_field( genre_form.submit, horizontal_columns=('xl', 2, 2), class="btn btn-primary offset-xl-1 col-xl-2" )}} + {{ wtf.form_field( genre_form.delete, horizontal_columns=('xl', 2, 2), class="btn btn-danger offset-xl-1 col-xl-2" )}} + +
+
+{% endblock main_content %} diff --git a/templates/genres.html b/templates/genres.html new file mode 100644 index 0000000..89b73fd --- /dev/null +++ b/templates/genres.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block main_content %} +

Publishers

+ + + + + + {% for publisher in publishers %} + + {% endfor %} + +
SurnameFirstname(s)
{{publisher.name}}
+{% endblock main_content %}