From 7bd81d31196772dd230ae073f55714e93e8c9c24 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Mon, 21 Dec 2020 22:06:35 +1100
Subject: [PATCH] loan now has working create/update/delete, still no add/rem
 books though

---
 loan.py              | 51 +++++++++++++++++++++++++++-----------------
 templates/loan.html  | 33 ++++++++++++----------------
 templates/loans.html |  6 ++++++
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/loan.py b/loan.py
index 9ce2f73..666d477 100644
--- a/loan.py
+++ b/loan.py
@@ -1,14 +1,16 @@
 from wtforms import SubmitField, StringField, HiddenField, validators, TextAreaField
 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 __main__ import db, app, ma
+from datetime import date
+from status import st, Status
 
 ################################################################################
 # Class describing Loan in the database, and via sqlalchemy, connected to the DB as well
 ################################################################################
 class Loan(db.Model):
-    id = db.Column(db.Integer, unique=True, nullable=False, primary_key=True)
+    id = db.Column(db.Integer, db.Sequence('loan_id_seq'), primary_key=True )
     surname = db.Column(db.String(30), unique=False, nullable=False)
     firstnames = db.Column(db.String(50), unique=False, nullable=False)
     contact_details = db.Column(db.String(256), unique=False, nullable=False)
@@ -34,7 +36,7 @@ class LoanForm(FlaskForm):
     surname = StringField('Surname:', [validators.DataRequired()])
     contact_details = TextAreaField('Contact Details:', [validators.DataRequired()])
     surname = StringField('Surname:', [validators.DataRequired()])
-    date_lent = DateField('Date Lent:', format='%Y-%m-%d' )
+    date_lent = DateField('Date Lent:', format='%Y-%m-%d', default=date.today(), validators=[validators.DataRequired()] )
     submit = SubmitField('Save' )
     delete = SubmitField('Delete' )
 
@@ -46,7 +48,22 @@ class LoanForm(FlaskForm):
 @app.route("/loans", methods=["GET"])
 def loans():
     loans = Loan.query.all()
-    return render_template("loans.html", loans=loans)
+    return render_template("loans.html", loans=loans, alert=st.GetAlert(), message=st.GetMessage())
+
+################################################################################
+# /loan -> GET/POST -> creates a new loan type and when created, takes you back to /loans
+################################################################################
+@app.route("/loan", methods=["GET", "POST"])
+def new_loan():
+    form = LoanForm(request.form)
+    if 'firstnames' not in request.form:
+        return render_template("loan.html", form=form, page_title='Create new Loan' )
+    else:
+        loan = Loan( firstnames=request.form["firstnames"], surname=request.form["surname"], date_lent=request.form["date_lent"], contact_details=request.form["contact_details"] )
+        db.session.add(loan)
+        db.session.commit()
+        st.SetMessage( "Created new Loan (id={})".format(loan.id) )
+        return redirect( '/loans' )
 
 ################################################################################
 # /loan/<id> -> GET/POST(save or delete) -> shows/edits/delets a single loan
@@ -54,26 +71,22 @@ def loans():
 @app.route("/loan/<id>", methods=["GET", "POST"])
 def loan(id):
     ### DDP: should this be request.form or request.values?
-    alert="Success"
-    loan_form = LoanForm(request.form)
-    if request.method == 'POST' and loan_form.validate_on_submit():
-        id = request.form['id']
+    form = LoanForm(request.form)
+    if request.method == 'POST' and form.validate():
         loan = Loan.query.get(id)
-        try:
-            request.form['submit']
-        except:
-            message="Sorry, Deleting unsupported at present"
-            alert="Danger"
-        else:
+        if 'delete' in request.form:
+            st.SetMessage("Successfully deleted (id={}, who={} {})".format( loan.id, loan.firstnames, loan.surname ) )
+            loan = Loan.query.filter(Loan.id==id).delete()
+        if 'submit' in request.form:
+            st.SetMessage("Successfully Updated Loan (id={})".format(id) )
             loan.firstnames = request.form['firstnames']
             loan.surname = request.form['surname']
             loan.surname = request.form['surname']
             loan.contact_details = request.form['contact_details']
             loan.date_lent = request.form['date_lent']
-            db.session.commit()
-            message="Successfully Updated Loan (id={})".format(id)
+        db.session.commit()
+        return redirect( '/loans' )
     else:
         loan = Loan.query.get(id)
-        loan_form = LoanForm(request.values, obj=loan)
-        message=""
-    return render_template("loan.html", loan=loan, alert=alert, message=message, loan_form=loan_form)
+        form = LoanForm(request.values, obj=loan)
+    return render_template("loan.html", loan=loan, form=form, page_title='Edit Loan' )
diff --git a/templates/loan.html b/templates/loan.html
index e831ee1..5da8efe 100644
--- a/templates/loan.html
+++ b/templates/loan.html
@@ -1,39 +1,34 @@
 {% extends "base.html" %}
 {% block main_content %}
 	<div class="container">
-		<h3 class="col-lg-12"><center>Loan</center></h3>
-		{% if message|length %}
-			<div class="row alert alert-{{alert}}">
-			{{message}}
-			</div>
-		{% endif %}
+		<h3 class="col-lg-12"><center>{{page_title}}</center></h3>
 		<div class="row">
 			<div class="col-lg-8">
 			<form class="form form-inline col-lg-12" action="" method="POST">
-				{{ loan_form.csrf_token }}
-				{{ loan_form.id }}
+				{{ form.csrf_token }}
+				{{ form.id }}
 				<div class="form-row col-lg-12">
-				{{ loan_form.firstnames.label( class="col-lg-2" ) }}
-				{{ loan_form.firstnames( class="form-control col-lg-10" ) }}
+				{{ form.firstnames.label( class="col-lg-2" ) }}
+				{{ form.firstnames( class="form-control col-lg-10" ) }}
 				</div class="form-row">
 				<div class="form-row col-lg-12">
-				{{ loan_form.surname.label( class="col-lg-2" ) }}
-				{{ loan_form.surname( class="form-control col-lg-10" ) }}
+				{{ form.surname.label( class="col-lg-2" ) }}
+				{{ form.surname( class="form-control col-lg-10" ) }}
 				</div class="form-row">
 				<div class="form-row col-lg-12">
-				{{ loan_form.date_lent.label( class="col-lg-2" ) }}
-				{{ loan_form.date_lent( class="form-control col-lg-10" ) }}
+				{{ form.date_lent.label( class="col-lg-2" ) }}
+				{{ form.date_lent( class="form-control col-lg-10" ) }}
 				</div class="form-row">
 				<div class="form-row col-lg-12">
-				{{ loan_form.contact_details.label( class="col-lg-2" ) }}
-				{{ loan_form.contact_details( class="form-control col-lg-10", rows="5" ) }}
+				{{ form.contact_details.label( class="col-lg-2" ) }}
+				{{ form.contact_details( class="form-control col-lg-10", rows="5" ) }}
 				</div class="form-row">
 				<div class="row col-lg-12">
 				<br>
 				</div class="row">
 				<div class="form-row col-lg-12">
-					{{ loan_form.delete( class="btn btn-outline-danger col-lg-2" )}}
-					{{ loan_form.submit( class="btn btn-primary col-lg-2" )}}
+					{{ form.delete( class="btn btn-outline-danger col-lg-2" )}}
+					{{ form.submit( class="btn btn-primary col-lg-2" )}}
 				</div class="form-row">
 			</form>
 			</div class="col-lg-8">
@@ -47,7 +42,7 @@
 {% block script_content %}
 	<script>
 		$(document).ready( function() {
-			$("#books_for_loan_bit").load("/books_for_loan/" + {{loan_form.data.id}})
+			$("#books_for_loan_bit").load("/books_for_loan/" + {{form.data.id}})
 		} )
 	</script>
 {% endblock script_content %}
diff --git a/templates/loans.html b/templates/loans.html
index 3d3d209..f748470 100644
--- a/templates/loans.html
+++ b/templates/loans.html
@@ -2,6 +2,12 @@
 
 {% block main_content %}
 <h3>Loans</h3>
+{% if message|length %}
+    <div class="row alert alert-{{alert}}">
+    {{message}}
+    {{ ClearStatus() }}
+    </div>
+{% endif %}
 <table id="book_table" class="table table-striped table-sm" data-toolbar="#toolbar" data-search="true">
 	<thead>
 		<tr class="thead-light"><th>Surname</th><th>Firstname(s)</th><th>Date Lent</th><th>Contact Details</th></tr>