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

12
condition.py
View File

@@ -15,7 +15,7 @@ class Condition(db.Model):
name = db.Column(db.String(50), unique=True, nullable=False)
def __repr__(self):
return "<id: {}, name: {}>".format(self.id,self.name)
return f"<id: {self.id}, name: {self.name}>"
################################################################################
# Helper class that inherits a .dump() method to turn class Condition into json / useful in jinja2
@@ -58,11 +58,11 @@ def new_condition():
try:
db.session.add(condition)
db.session.commit()
st.SetMessage( "Created new Condition (id={})".format(condition.id) )
st.SetMessage( f"Created new Condition (id={condition.id})" )
return redirect( '/conditions' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to add condition:</b>&nbsp;{}".format( e.orig) )
st.SetMessage( f"<b>Failed to add condition:</b>&nbsp;{e.orig}" )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
################################################################################
@@ -78,16 +78,16 @@ def condition(id):
try:
condition = Condition.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, name={})".format( condition.id, condition.name ) )
st.SetMessage(f"Successfully deleted (id={condition.id}, name={condition.name})" )
condition = Condition.query.filter(Condition.id==id).delete()
if 'submit' in request.form:
st.SetMessage("Successfully Updated Condition (id={})".format(id) )
st.SetMessage( f"Successfully Updated Condition (id={id})" )
condition.name = request.form['name']
db.session.commit()
return redirect( '/conditions' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to modify Condition:</b>&nbsp;{}".format(e.orig) )
st.SetMessage( f"<b>Failed to modify Condition:</b>&nbsp;{e.orig}" )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
else:
condition = Condition.query.get(id)