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

remove .format() and get all updates to have crrect content

Browse Source
This commit is contained in:
Damien De Paoli
2022-07-03 20:38:33 +10:00
parent 8834893df3
commit 021bf91e16
12 changed files with 81 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
series.py
View File

@@ -18,7 +18,7 @@ class Series(db.Model):
note = db.Column(db.Text)
def __repr__(self):
return "<id: {}, title: {}, num_books: {}, calcd_rating: {}, note: {}>".format(self.id, self.title, self.num_books, self.calcd_rating, self.note)
return f"<id: {self.id}, title: {self.title}, num_books: {self.num_books}, calcd_rating: {self.calcd_rating}, note: {self.note}>"
################################################################################
# Helper class that inherits a .dump() method to turn class Series into json / useful in jinja2
@@ -41,7 +41,7 @@ class SeriesForm(FlaskForm):
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))
res=db.engine.execute( f"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={sid} and s.id = bsl.series_id and bsl.book_id = b.id and b.rating = r.id and r.name ~ E'^\\\\d+$'" )
for row in res:
rating = row.rating
return rating
@@ -79,11 +79,11 @@ def new_series():
try:
db.session.add(series)
db.session.commit()
st.SetMessage( "Created new Series (id={})".format(series.id) )
st.SetMessage( f"Created new Series (id={series.id})" )
return redirect( '/seriess' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to add Series:</b>&nbsp;{}".format( e.orig) )
st.SetMessage( f"<b>Failed to add Series:</b>&nbsp;{e.orig}" )
return render_template("series.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
################################################################################
@@ -99,10 +99,10 @@ def series(id):
try:
series = Series.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, title={})".format( series.id, series.title ) )
st.SetMessage( f"Successfully deleted (id={series.id}, title={series.title})" )
series = Series.query.filter(Series.id==id).delete()
if 'submit' in request.form and form.validate():
st.SetMessage("Successfully Updated Series (id={})".format(id) )
st.SetMessage( f"Successfully Updated Series (id={id})" )
series.title = request.form['title']
series.num_books = request.form['num_books']
series.calcd_rating = CalcAvgRating(id)
@@ -110,7 +110,7 @@ def series(id):
else:
message="<b>Failed to update Series:</b>"
for field in form.errors:
message = "{}<br>{}={}".format( message, field, form.errors[field] )
message= f"{message}<br>{field}={form.errors[field]}"
st.SetAlert("danger")
st.SetMessage(message)
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
@@ -118,7 +118,7 @@ def series(id):
return redirect( '/seriess' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to modify Series:</b>&nbsp;{}".format(e.orig) )
st.SetMessage( f"<b>Failed to modify Series:</b>&nbsp;{e.orig}" )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
else:
series = Series.query.get(id)