From 53327a9e092a7b40350e04408431098752450154 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Wed, 19 Dec 2018 23:09:04 -0500
Subject: [PATCH 01/38] Initial commit.  Things dont work yet. -- user:
 JohnKent branch 'default' added greenfield_mortgage.txt added mortgage.py
 added mortgage_template.py added statement.pdf.jinja added
 statement.txt.jinja

---
 greenfield_mortgage.txt |  25 ++++
 mortgage.py             | 130 ++++++++++++++++++
 mortgage_template.py    | 290 ++++++++++++++++++++++++++++++++++++++++
 statement.pdf.jinja     |  82 ++++++++++++
 statement.txt.jinja     |  49 +++++++
 5 files changed, 576 insertions(+)
 create mode 100644 greenfield_mortgage.txt
 create mode 100644 mortgage.py
 create mode 100644 mortgage_template.py
 create mode 100644 statement.pdf.jinja
 create mode 100644 statement.txt.jinja

diff --git a/greenfield_mortgage.txt b/greenfield_mortgage.txt
new file mode 100644
index 0000000..91bc430
--- /dev/null
+++ b/greenfield_mortgage.txt
@@ -0,0 +1,25 @@
+{
+"principal": 97750.00,
+"interest rate": 5.5,
+"periods per year": 12,
+"periods": 182,
+"start date": "2017-11-07",
+"start_interest_date": "2017-11-11",
+"first payment month": "2017-12-15",
+"monthly_payment": 803.00,
+"payment day of month": "15",
+"payments": [
+   ["2017-12-11", "803.00"],
+   ["2018-01-23", "803.00"],
+   ["2018-03-23", "803.00"],
+   ["2018-04-18", "803.00"],
+   ["2018-04-26", "803.00"],
+   ["2018-05-15", "0.00"],
+   ["2018-06-15", "0.00"],
+   ["2018-07-12", "803.00"],
+   ["2018-08-07", "803.00"],
+   ["2018-09-06", "803.00"],
+   ["2018-10-11", "803.00"],
+   ["2018-11-13", "803.00"]
+ ]
+}
diff --git a/mortgage.py b/mortgage.py
new file mode 100644
index 0000000..18a582e
--- /dev/null
+++ b/mortgage.py
@@ -0,0 +1,130 @@
+import json
+from decimal import *
+from datetime import *
+
+# this program reads the json file describing a mortgage and calculate the actual and projected amortization
+# the first payment in the file should be the interest paid at closing
+# the interest at closing covers interest that would be incurred from the date of closing until the first day
+# that will be covered by the first loan payment
+# i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
+# at closing.  The first payment will incur interest from one month before the bill is due.
+
+#read in the file
+#filename = "./10Kloan.txt"
+filename = "./dadmortgage.txt"
+#filename = "./brendamortgage.txt"
+#filename = "./greenfield_mortgage.txt"
+
+if filename:
+    with open(filename, 'r') as f:
+        datastore = json.load(f)
+
+#read in the loan profile information
+annual_rate = Decimal(datastore['interest rate'])/100
+daily_interest_rate = annual_rate/360
+principal = Decimal(datastore["principal"]).quantize(Decimal("1.00"))
+periods_per_year = Decimal(datastore["periods per year"])
+total_periods = Decimal(datastore["periods"])
+payment_day_of_month = int(datastore['payment day of month'])
+
+if "monthly_payment" in datastore:
+    monthly_payment = Decimal(datastore["monthly_payment"]).quantize(Decimal("1.00"))
+else:
+    #calculate expected monthly payment
+    periodic_rate = annual_rate/periods_per_year
+    discount_factor = (((1+periodic_rate)**total_periods)-1) / (periodic_rate * ((1+periodic_rate)**total_periods))
+    monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
+
+
+
+print "Principal: ", principal
+print "Interest Rate: ", annual_rate
+print "Payments Per Year: ", periods_per_year
+print "Loan Term: ", total_periods
+print "Monthly Payment", monthly_payment
+print "Payments due day: ", payment_day_of_month
+
+print
+
+#loop over the payments and calculate the actual amortization
+actual_payments = datastore["payments"]
+
+remaining_principal = principal
+annual_interest = 0
+total_interest = 0
+
+interest_paid_through_date = datetime.strptime(datastore["start_interest_date"], "%Y-%m-%d").date()
+next_payment_date = datetime.strptime(datastore["first payment month"], '%Y-%m-%d').date()
+next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
+old_bill_date = next_bill_date
+payment_number = 1
+current_year = next_bill_date.year
+
+print "Payment History:"
+print "\tBill\t\t\tPayment\tDays of\tPayment\t\tRemaining\t\tPrincipal\tInterest\t\t\tNew"
+print "#\tDate\t\t\tDate\tInterst\tAmount\t\tPrincipal\t\tPayment\t\tPayment\t\t\tBalance"
+for payment in actual_payments:
+    payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
+    payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
+    #print next_bill_date, "\t", next_payment_date, "\t",
+    days_since_last_payment = (payment_date-interest_paid_through_date).days
+    #print days_since_last_payment
+    new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+#   new_principal = monthly_payment - new_interest
+    new_principal = payment_amount - new_interest
+
+    print payment_number, " ", next_bill_date, "\t\t", payment_date, "\t", days_since_last_payment, "\t", payment_amount, "\t\t\t", remaining_principal, "\t\t", new_principal,\
+        "\t\t", new_interest,
+
+    interest_paid_through_date = payment_date
+    total_interest = total_interest + new_interest
+    annual_interest=annual_interest+new_interest
+    remaining_principal = remaining_principal - new_principal
+    print "\t\t\t", remaining_principal
+    payment_number=payment_number+1
+    old_bill_date = next_bill_date
+
+    if old_bill_date.month < 12:
+        next_bill_date = date(year=old_bill_date.year, month = old_bill_date.month + 1, day=payment_day_of_month)
+        print "Total interest paid to date for", old_bill_date.year, " is", annual_interest
+    else:
+        next_bill_date = date(year=old_bill_date.year+1, month = 1, day=payment_day_of_month)
+        print "Total interest for ", old_bill_date.year, " was ", annual_interest
+        annual_interest = 0
+
+print "Total interest paid to date on this loan is", total_interest
+
+#loop over remaining scheduled payments and present estimated amortization
+print "\nEstimated future amortization"
+
+while (payment_number <= total_periods) and (remaining_principal > 0):
+    print payment_number, "\t",
+    payment_number = payment_number+1
+
+    print next_bill_date,
+
+    days_since_last_payment = (next_bill_date-interest_paid_through_date).days
+    print days_since_last_payment, "\t",
+    new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
+    #make sure the last payment isn't too much
+    if new_interest+remaining_principal < monthly_payment:
+        monthly_payment = new_interest + remaining_principal
+
+    new_principal = monthly_payment - new_interest
+
+    print monthly_payment, "\t\t\t", remaining_principal, "\t\t", new_principal,\
+        "\t\t", new_interest,
+
+    remaining_principal = remaining_principal - new_principal
+    print "\t", remaining_principal
+
+    interest_paid_through_date = next_bill_date
+    old_bill_date = next_bill_date
+    if old_bill_date.month < 12:
+        next_bill_date = date(year=old_bill_date.year, month = old_bill_date.month + 1, day=payment_day_of_month)
+    else:
+        next_bill_date = date(year=old_bill_date.year+1, month = 1, day=payment_day_of_month)
+
+if remaining_principal > 0:
+    print 'Balloon payment due:', remaining_principal
diff --git a/mortgage_template.py b/mortgage_template.py
new file mode 100644
index 0000000..29ea278
--- /dev/null
+++ b/mortgage_template.py
@@ -0,0 +1,290 @@
+import json
+from decimal import *
+from datetime import *
+from jinja2 import Environment, FileSystemLoader
+from fpdf import FPDF, HTMLMixin
+import smtplib
+from email.MIMEMultipart import MIMEMultipart
+from email.MIMEText import MIMEText
+from email.MIMEBase import MIMEBase
+from email import Encoders
+
+def loadLoanInformation(filename):
+
+    datastore = getDataStore(filename)
+
+    loanModel['loan'] = getLoan(dataStore)
+    loanModel['lender'] = getLender(datastore)
+    loanModel['borrower'] = getBorrower(datastore)
+    loanModel['paymentHistory'] = getPaymentHistory(datastore, loan, asOfDate)
+    loanModel['futureAmortization'] = getAmortization(datastore, loan, paymentHistory)
+    return loanModel
+
+def getLoan(datastore):
+    # read in the loan profile information
+
+    annual_rate = Decimal(datastore['loan.interest rate']) / 100
+    daily_interest_rate = annual_rate / 360
+    principal = Decimal(datastore["loan.principal"]).quantize(Decimal("1.00"))
+    periods_per_year = Decimal(datastore["loan.periods per year"])
+    total_periods = Decimal(datastore["loan.periods"])
+    payment_day_of_month = int(datastore['loan.payment day of month'])
+
+    if "monthly_payment" in datastore:
+        monthly_payment = Decimal(datastore["monthly_payment"]).quantize(Decimal("1.00"))
+    else:
+        # calculate expected monthly payment
+        periodic_rate = annual_rate / periods_per_year
+        discount_factor = (((1 + periodic_rate) ** total_periods) - 1) / (
+                periodic_rate * ((1 + periodic_rate) ** total_periods))
+        monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
+
+    loan['loan.account_number'] = '123456789'
+    loan['principal'] = principal
+    loan['term'] = total_periods
+    loan['annual_rate'] = annual_rate
+    loan['daily_interest_rate'] = daily_interest_rate
+    loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
+    loan['next_payment_amt'] = 0
+    loan['next_payment_date'] = '12/12/12'
+    return loan
+
+def getLender(datastore):
+    #to be replaced with real loading code
+    lender['name'] = 'Rivanna Graphite Investments, LLC'
+    lender['phone'] = '703.343.0782'
+    lender['address'] = '743 Madison St NW'
+    lender['city'] = 'Washington'
+    lender['state'] = 'DC'
+    lender['zip'] = '20011'
+    return getLender
+
+def getBorrower(datastore):
+    #to be replaced with real loading code
+    borrower['name'] = 'Bear Houses, LLC'
+    borrower['address'] = '123 Any Street'
+    borrower['city'] = 'Alltown'
+    borrower['state'] = 'VA'
+    borrower['zip'] = '11111'
+    return borrower
+
+def getDataStore(filename=None):
+    try:
+        if filename:
+            with open(filename, 'r') as f:
+                datastore = json.load(f)
+
+    except Exception as e:
+        print "An error occurred opening your loan file '#s'. " % filename
+        print "The Exception:"
+        print e.__repr__()
+        quit()
+
+    return datastore
+
+
+def calculateLoanAmortization(loanModel):
+
+
+    return loanModel
+
+def transformTemplate(template_fileName, loanModel):
+    # template_filename = "statement.txt.jinja"
+    # setup jinja for creating the statement
+    env = Environment(loader=FileSystemLoader('.'))
+    template = env.get_template(template_fileName)
+
+    report = template.render(original_principal_balance=principal, future_payments=future_payments, \
+                           past_payments=past_payments, balloon_payment=remaining_principal, \
+                           total_interest_paid_to_date=total_interest, statement=statement)
+    return report
+
+def generatePDFStatement():
+    template_filename = "statement.pdf.jinja"
+    pass
+
+def generateHTMLStatement():
+    pass
+
+def generateTextStatement():
+    pass
+
+def generateEmail(from_address, to_address, subject, body, attachment):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    msg.attach(MIMEText(body))
+
+    part = MIMEBase('application', "octet-stream")
+    part.set_payload(attachment)
+    Encoders.encode_base64(part)
+
+    part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
+
+    msg.attach(part)
+    return msg
+
+def main():
+    # this program reads the json file describing a mortgage and calculate the actual and projected amortization
+    # the first payment in the file should be the interest paid at closing
+    # the interest at closing covers interest that would be incurred from the date of closing until the first day
+    # that will be covered by the first loan payment
+    # i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
+    # at closing.  The first payment will incur interest from one month before the bill is due.
+
+    from_address = 'jkent3rd@gmail.com'
+    passwd = "pvyrbcnzrjoizprn"
+    subject = "Mortgage or Loan Statement"
+    to_address = 'jkent3rd@gmail.com'
+    body = 'This email contains a PDF of your mortgage statement.'
+
+    # read in the file
+    # filename = "./10Kloan.txt"
+    # filename = "./10Kloan.test.txt"
+    # filename = "./dadmortgage.txt"
+    # filename = "./brendamortgage.txt"
+    filename = "./greenfield_mortgage.txt"
+    template_filename = "statement.pdf.jinja"
+
+    loanInformation = loadLoanInformation(filename)
+
+    loanModel = calculateLoanAmortization(loanInformation)
+
+    # read in the statement information
+    statement, lender, borrower, loan = {}, {}, {}, {}
+    lender = loanModel.lender
+    borrower = loanModel.borrower
+    past_payments = loadModel.past_payments
+    future_payments = loanModel.future_payments
+
+    statement['title'] = "Mortgage Statement - 185 James River Rd"
+    statement['date'] = "Today"
+    statement['lender'] = lender
+    statement['borrower'] = borrower
+    statement['loan'] = loan
+
+    # loop over the payments and calculate the actual amortization
+    actual_payments = loanModel["payments"]
+
+    remaining_principal = principal
+    annual_interest = 0
+    total_interest = 0
+
+    interest_paid_through_date = datetime.strptime(loanModel["start_interest_date"], "%Y-%m-%d").date()
+    next_payment_date = datetime.strptime(loanModel["first payment month"], '%Y-%m-%d').date()
+    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
+    old_bill_date = next_bill_date
+    payment_number = 1
+    current_year = next_bill_date.year
+
+    for payment in actual_payments:
+        payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
+        payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
+        days_since_last_payment = (payment_date - interest_paid_through_date).days
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+        new_principal = payment_amount - new_interest
+        interest_paid_through_date = payment_date
+        total_interest = total_interest + new_interest
+        annual_interest = annual_interest + new_interest
+        remaining_principal = remaining_principal - new_principal
+
+        # create the payment record for the template to render
+        payment_record = {}
+        payment_record['payment_number'] = payment_number
+        payment_record['bill_date'] = next_bill_date
+        payment_record['payment_date'] = payment_date
+        payment_record['days_of_interest'] = days_since_last_payment
+        payment_record['payment_amount'] = payment_amount
+        payment_record['principal_payment'] = payment_amount - new_interest
+        payment_record['interest_payment'] = new_interest
+        payment_record['new_balance'] = remaining_principal
+        payment_record['interest_to_date'] = total_interest
+        payment_record['annual_interest_to_date'] = annual_interest
+        past_payments.append(payment_record)
+
+        payment_number = payment_number + 1
+        old_bill_date = next_bill_date
+
+        if old_bill_date.month < 12:
+            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            annual_interest_record['year'] = old_bill_date.year
+            annual_interest_record['interest'] = annual_interest
+            past_interest.append(annual_interest_record)
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+            payment_record['print_interest_total'] = True
+            payment_record[
+                'interest_total_message'] = "Total interest for " + old_bill_date.year.__str__() + " was $" + annual_interest.__str__()
+            annual_interest = 0
+
+    if old_bill_date.month < 12:
+        payment_record['print_interest_total'] = True
+        payment_record[
+            'interest_total_message'] = "Total interest to date for " + old_bill_date.year.__str__() + " is $" + annual_interest.__str__()
+
+    # loop over remaining scheduled payments and present estimated amortization
+    while (payment_number <= total_periods) and (remaining_principal > 0):
+        days_since_last_payment = (next_bill_date - interest_paid_through_date).days
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
+        # make sure the last payment isn't too much
+        if new_interest + remaining_principal < monthly_payment:
+            monthly_payment = new_interest + remaining_principal
+
+        new_principal = monthly_payment - new_interest
+
+        remaining_principal = remaining_principal - new_principal
+
+        interest_paid_through_date = next_bill_date
+
+        # complete the future payment amortization record
+        future_payment_record = {}
+        future_payment_record['payment_number'] = payment_number
+        future_payment_record['payment_date'] = next_bill_date
+        future_payment_record['days_of_interest'] = days_since_last_payment
+        future_payment_record['payment_amount'] = monthly_payment
+        future_payment_record['principal_payment'] = new_interest
+        future_payment_record['interest_payment'] = new_interest
+        future_payment_record['new_balance'] = remaining_principal
+        future_payments.append(future_payment_record)
+
+        payment_number = payment_number + 1
+        old_bill_date = next_bill_date
+        if old_bill_date.month < 12:
+            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+
+    report = transformTemplate('',loanModel)
+
+    # create pdf
+    class MyFPDF(FPDF, HTMLMixin):
+        pass
+
+    pdf = MyFPDF()
+    pdf.set_font(family='Arial', size=12)
+    pdf.add_page()
+    pdf.write_html(report)
+    # pdf.output(name='test.pdf', dest='F')
+    attachment = pdf.output(dest='S')
+
+    # send email
+    try:
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.ehlo()
+        server.starttls()
+        server.login(from_address, passwd)
+
+        email = generateEmail(from_address, to_address, subject, body, attachment)
+        server.sendmail(from_address, to_address, email.as_string())
+        server.close()
+    except:
+        print "Couldn't send email, dumping statement to file."
+        pdf.output(name='test.pdf', dest='F')
+        quit()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/statement.pdf.jinja b/statement.pdf.jinja
new file mode 100644
index 0000000..b1a43cd
--- /dev/null
+++ b/statement.pdf.jinja
@@ -0,0 +1,82 @@
+<html>
+<body>
+<font face='arial' size='14'><p align='center'>{{ statement.title }}</p></font>
+<font face='arial' size='10'><p align='center'>{{ statement.lender.name }}</p></font>
+<font face='arial' size='8'>
+<p align='center'>{{ statement.lender.phone }} - {{ statement.lender.address }} -
+{{ statement.lender.city }} {{statement.lender.state }} {{ statement.lender.zip }}</p>
+<p align='right'>Statement Date: {{ statement.date }}</p>
+
+<p/>
+<table>
+<thead><tr><th width='45%' align='left'>Loan Information</th><th width='45%'>&nbsp;</th></tr></thead>
+<tbody>
+    <tr><td>Borrower: {{ statement.borrower.name }}&nbsp;</td> <td>Account Number: {{ statement.loan.account_number }}</td></tr>
+    <tr><td>{{ statement.borrower.address }}&nbsp;</td> <td>Origination Date: {{ statement.loan.origination_date  }}</td></tr>
+    <tr><td>{{ statement.borrower.city }}, {{statement.borrower.state }} {{ statement.borrower.zip }}</td>
+       <td>Original Principal: {{ "$%.2f"|format(statement.loan.principal) }}</td></tr>
+    <tr><td>Rate: {{statement.loan.rate }} </td> <td>Term: {{statement.loan.term }} months </td></tr>
+    <tr><td>Next Payment Due Date: {{statement.loan.next_due_date}} </td> <td>Payment Due: {{ "$%.2f"|format(statement.loan.next_payment_amt) }} </td></tr>
+</tbody>
+</table>
+<p/>
+<p class='section_header' color='red'><font face='arial' size='14'>Payment History</font></p>
+<table>
+<thead><tr>
+    <th width='5%'>#</td>
+    <th width='10%'>Due Date</th>
+    <th width='10%'>Date Paid</th>
+    <th width='10%'>Days Interest</th>
+    <th width='15%' align='right'>Payment Amt</th>
+    <th width='15%' align='right'>Principal Pmt</th>
+    <th width='15%' align='right'>Interest Pmt</th>
+    <th width='20%' align='right'>New Balance</th>
+</tr></thead>
+<tbody>
+{% for item in past_payments %}
+<tr><td align='center'> {{ item.payment_number }} </td>
+    <td align='center'> {{ item.bill_date }} </td>
+    <td align='center'> {{ item.payment_date }} </td>
+    <td align='center'> {{ item.days_of_interest }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+</tr>
+    {% if item.print_interest_total %}
+<tr><td colspan='8'"> {{ item.interest_total_message }} </td></tr>
+    {% endif %}
+{% endfor %}
+</tbody>
+</table>
+<p>Total interest paid to date is {{ "$%.2f"|format(total_interest_paid_to_date) }}.</p>
+<p/> <p/>
+
+<p class='section_header'><font face='arial' size='14'>Remaining Amortization</font></p>
+<table>
+<thead><tr>
+    <th width='8%'>#</th>
+    <th width='15%'>Due Date</th>
+    <th width='8%'>Days Interest</th>
+    <th width='15%' align='right'>Payment Amt</th>
+    <th width='15%' align='right'>Principal Pmt</th>
+    <th width='15%' align='right'>Interest Pmt</th>
+    <th width='20%' align='right'>Principal Balance</th>
+</tr></thead>
+<tbody>
+{% for item in future_payments %}
+<tr><td align='center'> {{ item.payment_number }} </td>
+    <td align='center'> {{ item.payment_date }} </td>
+    <td align='center'> {{ item.days_of_interest }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+    </tr>
+{% endfor %}
+</tbody>
+</table>
+<p>Balloon Payment Due: {{ "$%.2f"|format(balloon_payment) }} </p>
+</font>
+</body>
+</html>
\ No newline at end of file
diff --git a/statement.txt.jinja b/statement.txt.jinja
new file mode 100644
index 0000000..d7fbef2
--- /dev/null
+++ b/statement.txt.jinja
@@ -0,0 +1,49 @@
+Original Principal Balance: {{ original_principal_balance }}
+
+Payment History
+    #\tBill Date
+    Payment Date
+    Days of Interest
+    Payment Amount
+    Principal Payment
+    Interest Payment
+    New Balance
+
+{% for item in past_payments %}
+{{ item.payment_number }}
+{{ item.bill_date }}
+{{ item.payment_date }}
+{{ item.days_of_interest }}
+{{ item.payment_amount }}
+{{ item.principal_payment }}
+{{ item.interest_payment }}
+{{ item.new_balance }}
+
+    {% if item.print_interest_total %}
+        {{ item.interest_total_message }}
+    {% endif %}
+{% endfor %}
+Total interest paid to date is {{ total_interest_paid_to_date }}.
+
+
+Remaining Amortization
+    #
+    Days of Interest
+    Due Date
+    Payment Amount
+    Scheduled Principal Payment
+    Scheduled Interest Payment
+    Expected New Balance
+
+{% for item in future_payments %}
+{{ item.payment_number }}
+{{ item.days_of_interest }}
+{{ item.payment_date }}
+{{ item.payment_amount }}
+{{ item.principal_payment }}
+{{ item.interest_payment }}
+{{ item.new_balance }}
+{% endfor %}
+    
+Balloon Payment Due: {{ balloon_payment }} 
+

From e274b96672598a0e35084598cbd74fcb9f89eb53 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 23 Dec 2018 01:05:36 -0500
Subject: [PATCH 02/38] Fixing references.

---
 mortgage_template.py | 67 +++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 29 deletions(-)

diff --git a/mortgage_template.py b/mortgage_template.py
index 29ea278..38e67a9 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -9,19 +9,30 @@ from email.MIMEText import MIMEText
 from email.MIMEBase import MIMEBase
 from email import Encoders
 
+
+def getPaymentHistory(datastore, loan, asOfDate):
+    pass
+
+
+def getAmortization(datastore, loan, paymentHistory):
+    pass
+
+
 def loadLoanInformation(filename):
+    datastore = getDatastore(filename)
+    loanModel = {}
 
-    datastore = getDataStore(filename)
-
-    loanModel['loan'] = getLoan(dataStore)
+    loanModel['loan'] = getLoan(datastore)
     loanModel['lender'] = getLender(datastore)
     loanModel['borrower'] = getBorrower(datastore)
     loanModel['paymentHistory'] = getPaymentHistory(datastore, loan, asOfDate)
-    loanModel['futureAmortization'] = getAmortization(datastore, loan, paymentHistory)
+    loanModel['futureAmortization'] = getAmortization(datastore, loan, loanModel.paymentHistory)
     return loanModel
 
+
 def getLoan(datastore):
     # read in the loan profile information
+    loan = {}
 
     annual_rate = Decimal(datastore['loan.interest rate']) / 100
     daily_interest_rate = annual_rate / 360
@@ -49,8 +60,10 @@ def getLoan(datastore):
     loan['next_payment_date'] = '12/12/12'
     return loan
 
+
 def getLender(datastore):
-    #to be replaced with real loading code
+    lender = {}
+    # to be replaced with real loading code
     lender['name'] = 'Rivanna Graphite Investments, LLC'
     lender['phone'] = '703.343.0782'
     lender['address'] = '743 Madison St NW'
@@ -59,8 +72,10 @@ def getLender(datastore):
     lender['zip'] = '20011'
     return getLender
 
+
 def getBorrower(datastore):
-    #to be replaced with real loading code
+    borrower = {}
+    # to be replaced with real loading code
     borrower['name'] = 'Bear Houses, LLC'
     borrower['address'] = '123 Any Street'
     borrower['city'] = 'Alltown'
@@ -68,7 +83,8 @@ def getBorrower(datastore):
     borrower['zip'] = '11111'
     return borrower
 
-def getDataStore(filename=None):
+
+def getDatastore(filename=None):
     try:
         if filename:
             with open(filename, 'r') as f:
@@ -84,31 +100,34 @@ def getDataStore(filename=None):
 
 
 def calculateLoanAmortization(loanModel):
-
-
     return loanModel
 
+
 def transformTemplate(template_fileName, loanModel):
     # template_filename = "statement.txt.jinja"
     # setup jinja for creating the statement
     env = Environment(loader=FileSystemLoader('.'))
     template = env.get_template(template_fileName)
 
-    report = template.render(original_principal_balance=principal, future_payments=future_payments, \
-                           past_payments=past_payments, balloon_payment=remaining_principal, \
-                           total_interest_paid_to_date=total_interest, statement=statement)
+    report = template.render(original_principal_balance=loanModel.principal, future_payments=loanModel.future_payments,
+                             past_payments=loanModel.past_payments, balloon_payment=loanModel.remaining_principal,
+                             total_interest_paid_to_date=loanModel.total_interest, statement=loanModel.statement)
     return report
 
+
 def generatePDFStatement():
     template_filename = "statement.pdf.jinja"
     pass
 
+
 def generateHTMLStatement():
     pass
 
+
 def generateTextStatement():
     pass
 
+
 def generateEmail(from_address, to_address, subject, body, attachment):
     msg = MIMEMultipart()
     msg['Subject'] = subject
@@ -126,6 +145,7 @@ def generateEmail(from_address, to_address, subject, body, attachment):
     msg.attach(part)
     return msg
 
+
 def main():
     # this program reads the json file describing a mortgage and calculate the actual and projected amortization
     # the first payment in the file should be the interest paid at closing
@@ -156,7 +176,7 @@ def main():
     statement, lender, borrower, loan = {}, {}, {}, {}
     lender = loanModel.lender
     borrower = loanModel.borrower
-    past_payments = loadModel.past_payments
+    past_payments = loanModel.past_payments
     future_payments = loanModel.future_payments
 
     statement['title'] = "Mortgage Statement - 185 James River Rd"
@@ -168,7 +188,10 @@ def main():
     # loop over the payments and calculate the actual amortization
     actual_payments = loanModel["payments"]
 
-    remaining_principal = principal
+    remaining_principal = loanModel.principal
+    payment_day_of_month = loanInformation.payment_day_of_month
+    daily_interest_rate = loanInformation.daily_interest_rate
+    total_periods = loanInformation.total_periods
     annual_interest = 0
     total_interest = 0
 
@@ -209,20 +232,6 @@ def main():
 
         if old_bill_date.month < 12:
             next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
-        else:
-            annual_interest_record['year'] = old_bill_date.year
-            annual_interest_record['interest'] = annual_interest
-            past_interest.append(annual_interest_record)
-            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-            payment_record['print_interest_total'] = True
-            payment_record[
-                'interest_total_message'] = "Total interest for " + old_bill_date.year.__str__() + " was $" + annual_interest.__str__()
-            annual_interest = 0
-
-    if old_bill_date.month < 12:
-        payment_record['print_interest_total'] = True
-        payment_record[
-            'interest_total_message'] = "Total interest to date for " + old_bill_date.year.__str__() + " is $" + annual_interest.__str__()
 
     # loop over remaining scheduled payments and present estimated amortization
     while (payment_number <= total_periods) and (remaining_principal > 0):
@@ -257,7 +266,7 @@ def main():
         else:
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
 
-    report = transformTemplate('',loanModel)
+    report = transformTemplate('', loanModel)
 
     # create pdf
     class MyFPDF(FPDF, HTMLMixin):

From 45d6e32149ab613310ea1b3d8e6b5f53f8765eb0 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 6 Jan 2019 16:39:54 -0500
Subject: [PATCH 03/38] Updated all of the payment files to reflect new format.
  Updated the PDF generation template.  Updated the email sending code.  Fixed
 a few off by one errors when the last payment also is the last payment of the
 year.

---
 10Kloan.json             |  63 ++++++++
 brendamortgage.json      |  56 +++++++
 dadmortgage.json         |  56 +++++++
 greenfield_mortgage.json |  63 ++++++++
 greenfield_mortgage.txt  |  25 ----
 mortgage_template.py     | 307 ++++++++++++++++++++-------------------
 statement.pdf.jinja      |  30 ++--
 7 files changed, 409 insertions(+), 191 deletions(-)
 create mode 100644 10Kloan.json
 create mode 100644 brendamortgage.json
 create mode 100644 dadmortgage.json
 create mode 100644 greenfield_mortgage.json
 delete mode 100644 greenfield_mortgage.txt

diff --git a/10Kloan.json b/10Kloan.json
new file mode 100644
index 0000000..b9cd72d
--- /dev/null
+++ b/10Kloan.json
@@ -0,0 +1,63 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "grady@gradystreet.com",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100100",
+  "principal": 10020.00,
+  "interest_rate": 6.5,
+  "periods_per_year": 12,
+  "periods": 18,
+  "start_date": "2017-12-05",
+  "start_interest_date": "2017-12-05",
+  "first_payment_month": "2018-01-15",
+  "monthly_payment": 589.00,
+  "payment_day_of_month": "15"
+  },
+"payments": [
+   ["2018-01-16", "589.00"],
+   ["2018-03-30", "589.00"],
+   ["2018-04-06", "589.00"],
+   ["2018-04-12", "589.00"],
+   ["2018-05-28", "589.00"],
+   ["2018-06-12", "589.00"],
+   ["2018-07-13", "589.00"],
+   ["2018-08-14", "589.00"],
+   ["2018-09-26", "589.00"],
+   ["2018-10-15", "0"],
+   ["2018-11-29", "589.00"],
+   ["2018-12-31", "589.00"]
+ ],
+"borrower": {
+  "name": "Bear Houses, LLC",
+  "address": "301 N Beauregard St Apt 203",
+  "city": "Alexandria",
+  "state": "VA",
+  "zip": "22312"
+  },
+"lender": {
+  "name": "John Kent",
+  "phone": "703.343.0782",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"header": {
+  "title": "Installment Loan Statement",
+  "date": "Today"
+  }
+}
+
diff --git a/brendamortgage.json b/brendamortgage.json
new file mode 100644
index 0000000..d13476f
--- /dev/null
+++ b/brendamortgage.json
@@ -0,0 +1,56 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "bck@virginia.edu",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100001",
+  "principal": 35000.00,
+  "interest_rate": 5.0,
+  "periods_per_year": 12,
+  "periods": 180,
+  "start_date": "2018-06-25",
+  "start_interest_date": "2018-07-01",
+  "first_payment_month": "2018-08-01",
+  "monthly_payment": 278.15,
+  "payment_day_of_month": "01"
+  },
+"borrower": {
+  "name": "Grandma Tina's Properties, LLC",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"lender": {
+  "name": "John Kent",
+  "phone": "434-510-7272",
+  "address": "109 Shores Rd",
+  "city": "Palmyra",
+  "state": "VA",
+  "zip": "22963"
+  },
+"header": {
+  "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA",
+  "date": "Today"
+  },
+"payments": [
+   ["2018-08-01", "278.15"],
+   ["2018-09-01", "278.15"],
+   ["2018-10-01", "278.15"],
+   ["2018-11-01", "278.15"],
+   ["2018-12-01", "278.15"],
+   ["2019-01-01", "278.15"]
+ ]
+}
diff --git a/dadmortgage.json b/dadmortgage.json
new file mode 100644
index 0000000..9ff0acb
--- /dev/null
+++ b/dadmortgage.json
@@ -0,0 +1,56 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "johnkent49@gmail.com",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100001",
+  "principal": 35000.00,
+  "interest_rate": 5.0,
+  "periods_per_year": 12,
+  "periods": 180,
+  "start_date": "2018-06-25",
+  "start_interest_date": "2018-07-01",
+  "first_payment_month": "2018-08-01",
+  "monthly_payment": 278.15,
+  "payment_day_of_month": "01"
+  },
+"borrower": {
+  "name": "Grandma Tina's Properties, LLC",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"lender": {
+  "name": "John Kent",
+  "phone": "434-510-7272",
+  "address": "109 Shores Rd",
+  "city": "Palmyra",
+  "state": "VA",
+  "zip": "22963"
+  },
+"header": {
+  "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA",
+  "date": "Today"
+  },
+"payments": [
+   ["2018-08-01", "278.15"],
+   ["2018-09-01", "278.15"],
+   ["2018-10-01", "278.15"],
+   ["2018-11-01", "278.15"],
+   ["2018-12-01", "278.15"],
+   ["2019-01-01", "278.15"]
+ ]
+}
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
new file mode 100644
index 0000000..65d2127
--- /dev/null
+++ b/greenfield_mortgage.json
@@ -0,0 +1,63 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "grady@gradystreet.com",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100001",
+  "principal": 97750.00,
+  "interest_rate": 5.5,
+  "periods_per_year": 12,
+  "periods": 182,
+  "start_date": "2017-11-07",
+  "start_interest_date": "2017-11-11",
+  "first_payment_month": "2017-12-15",
+  "monthly_payment": 803.00,
+  "payment_day_of_month": "15"
+  },
+"payments": [
+   ["2017-12-11", "803.00"],
+   ["2018-01-23", "803.00"],
+   ["2018-03-23", "803.00"],
+   ["2018-04-18", "803.00"],
+   ["2018-04-26", "803.00"],
+   ["2018-05-15", "0.00"],
+   ["2018-06-15", "0.00"],
+   ["2018-07-12", "803.00"],
+   ["2018-08-07", "803.00"],
+   ["2018-09-06", "803.00"],
+   ["2018-10-11", "803.00"],
+   ["2018-11-13", "803.00"],
+   ["2018-12-13", "803.00"]
+ ],
+"borrower": {
+  "name": "Bear Houses, LLC",
+  "address": "301 N Beauregard St Apt 203",
+  "city": "Alexandria",
+  "state": "VA",
+  "zip": "22312"
+  },
+"lender": {
+  "name": "Rivanna Graphite Investments, LLC",
+  "phone": "703.343.0782",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"header": {
+  "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS",
+  "date": "Today"
+  }
+}
diff --git a/greenfield_mortgage.txt b/greenfield_mortgage.txt
deleted file mode 100644
index 91bc430..0000000
--- a/greenfield_mortgage.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-"principal": 97750.00,
-"interest rate": 5.5,
-"periods per year": 12,
-"periods": 182,
-"start date": "2017-11-07",
-"start_interest_date": "2017-11-11",
-"first payment month": "2017-12-15",
-"monthly_payment": 803.00,
-"payment day of month": "15",
-"payments": [
-   ["2017-12-11", "803.00"],
-   ["2018-01-23", "803.00"],
-   ["2018-03-23", "803.00"],
-   ["2018-04-18", "803.00"],
-   ["2018-04-26", "803.00"],
-   ["2018-05-15", "0.00"],
-   ["2018-06-15", "0.00"],
-   ["2018-07-12", "803.00"],
-   ["2018-08-07", "803.00"],
-   ["2018-09-06", "803.00"],
-   ["2018-10-11", "803.00"],
-   ["2018-11-13", "803.00"]
- ]
-}
diff --git a/mortgage_template.py b/mortgage_template.py
index 38e67a9..df1cb4b 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -4,45 +4,47 @@ from datetime import *
 from jinja2 import Environment, FileSystemLoader
 from fpdf import FPDF, HTMLMixin
 import smtplib
+
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
 from email.MIMEBase import MIMEBase
 from email import Encoders
 
 
-def getPaymentHistory(datastore, loan, asOfDate):
-    pass
+def getStatementHeader(datastore):
+    return datastore['header']
 
 
-def getAmortization(datastore, loan, paymentHistory):
-    pass
+def getEmailInformation(datastore):
+    return datastore['email']
 
 
 def loadLoanInformation(filename):
     datastore = getDatastore(filename)
-    loanModel = {}
 
-    loanModel['loan'] = getLoan(datastore)
+    loanModel = {}
+    loanModel['datastore'] = datastore
+    loanModel['email'] = getEmailInformation(datastore)
+    loanModel['parameters'] = getLoanParameters(datastore)
     loanModel['lender'] = getLender(datastore)
     loanModel['borrower'] = getBorrower(datastore)
-    loanModel['paymentHistory'] = getPaymentHistory(datastore, loan, asOfDate)
-    loanModel['futureAmortization'] = getAmortization(datastore, loan, loanModel.paymentHistory)
+    loanModel['header'] = getStatementHeader(datastore)
     return loanModel
 
 
-def getLoan(datastore):
+def getLoanParameters(datastore):
     # read in the loan profile information
-    loan = {}
+    loan = datastore['parameters']
 
-    annual_rate = Decimal(datastore['loan.interest rate']) / 100
+    annual_rate = Decimal(loan['interest_rate']) / 100
     daily_interest_rate = annual_rate / 360
-    principal = Decimal(datastore["loan.principal"]).quantize(Decimal("1.00"))
-    periods_per_year = Decimal(datastore["loan.periods per year"])
-    total_periods = Decimal(datastore["loan.periods"])
-    payment_day_of_month = int(datastore['loan.payment day of month'])
+    principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
+    periods_per_year = Decimal(loan["periods_per_year"])
+    total_periods = Decimal(loan["periods"])
+    payment_day_of_month = int(loan['payment_day_of_month'])
 
-    if "monthly_payment" in datastore:
-        monthly_payment = Decimal(datastore["monthly_payment"]).quantize(Decimal("1.00"))
+    if "monthly_payment" in loan:
+        monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
     else:
         # calculate expected monthly payment
         periodic_rate = annual_rate / periods_per_year
@@ -50,38 +52,24 @@ def getLoan(datastore):
                 periodic_rate * ((1 + periodic_rate) ** total_periods))
         monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
 
-    loan['loan.account_number'] = '123456789'
-    loan['principal'] = principal
-    loan['term'] = total_periods
-    loan['annual_rate'] = annual_rate
+    loan['principal'] = principal       # standardizes the format
+    loan['annual_rate'] = annual_rate   # standardizes the format
     loan['daily_interest_rate'] = daily_interest_rate
     loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
     loan['next_payment_amt'] = 0
     loan['next_payment_date'] = '12/12/12'
+    loan['total_periods'] = total_periods
+    loan['monthly_payment'] = monthly_payment
+    datastore['parameters'] = loan
     return loan
 
 
 def getLender(datastore):
-    lender = {}
-    # to be replaced with real loading code
-    lender['name'] = 'Rivanna Graphite Investments, LLC'
-    lender['phone'] = '703.343.0782'
-    lender['address'] = '743 Madison St NW'
-    lender['city'] = 'Washington'
-    lender['state'] = 'DC'
-    lender['zip'] = '20011'
-    return getLender
+    return datastore['lender']
 
 
 def getBorrower(datastore):
-    borrower = {}
-    # to be replaced with real loading code
-    borrower['name'] = 'Bear Houses, LLC'
-    borrower['address'] = '123 Any Street'
-    borrower['city'] = 'Alltown'
-    borrower['state'] = 'VA'
-    borrower['zip'] = '11111'
-    return borrower
+    return datastore['borrower']
 
 
 def getDatastore(filename=None):
@@ -91,7 +79,7 @@ def getDatastore(filename=None):
                 datastore = json.load(f)
 
     except Exception as e:
-        print "An error occurred opening your loan file '#s'. " % filename
+        print "An error occurred opening your loan file '%s'. " % filename
         print "The Exception:"
         print e.__repr__()
         quit()
@@ -99,109 +87,29 @@ def getDatastore(filename=None):
     return datastore
 
 
-def calculateLoanAmortization(loanModel):
-    return loanModel
-
-
-def transformTemplate(template_fileName, loanModel):
-    # template_filename = "statement.txt.jinja"
-    # setup jinja for creating the statement
-    env = Environment(loader=FileSystemLoader('.'))
-    template = env.get_template(template_fileName)
-
-    report = template.render(original_principal_balance=loanModel.principal, future_payments=loanModel.future_payments,
-                             past_payments=loanModel.past_payments, balloon_payment=loanModel.remaining_principal,
-                             total_interest_paid_to_date=loanModel.total_interest, statement=loanModel.statement)
-    return report
-
-
-def generatePDFStatement():
-    template_filename = "statement.pdf.jinja"
-    pass
-
-
-def generateHTMLStatement():
-    pass
-
-
-def generateTextStatement():
-    pass
-
-
-def generateEmail(from_address, to_address, subject, body, attachment):
-    msg = MIMEMultipart()
-    msg['Subject'] = subject
-    msg['From'] = from_address
-    msg['To'] = to_address
-
-    msg.attach(MIMEText(body))
-
-    part = MIMEBase('application', "octet-stream")
-    part.set_payload(attachment)
-    Encoders.encode_base64(part)
-
-    part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
-
-    msg.attach(part)
-    return msg
-
-
-def main():
-    # this program reads the json file describing a mortgage and calculate the actual and projected amortization
-    # the first payment in the file should be the interest paid at closing
-    # the interest at closing covers interest that would be incurred from the date of closing until the first day
-    # that will be covered by the first loan payment
-    # i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
-    # at closing.  The first payment will incur interest from one month before the bill is due.
-
-    from_address = 'jkent3rd@gmail.com'
-    passwd = "pvyrbcnzrjoizprn"
-    subject = "Mortgage or Loan Statement"
-    to_address = 'jkent3rd@gmail.com'
-    body = 'This email contains a PDF of your mortgage statement.'
-
-    # read in the file
-    # filename = "./10Kloan.txt"
-    # filename = "./10Kloan.test.txt"
-    # filename = "./dadmortgage.txt"
-    # filename = "./brendamortgage.txt"
-    filename = "./greenfield_mortgage.txt"
-    template_filename = "statement.pdf.jinja"
-
-    loanInformation = loadLoanInformation(filename)
-
-    loanModel = calculateLoanAmortization(loanInformation)
-
-    # read in the statement information
-    statement, lender, borrower, loan = {}, {}, {}, {}
-    lender = loanModel.lender
-    borrower = loanModel.borrower
-    past_payments = loanModel.past_payments
-    future_payments = loanModel.future_payments
-
-    statement['title'] = "Mortgage Statement - 185 James River Rd"
-    statement['date'] = "Today"
-    statement['lender'] = lender
-    statement['borrower'] = borrower
-    statement['loan'] = loan
-
+def amortizeLoan(loan):
     # loop over the payments and calculate the actual amortization
-    actual_payments = loanModel["payments"]
+    monthly_payment = loan["parameters"]["monthly_payment"]
 
-    remaining_principal = loanModel.principal
-    payment_day_of_month = loanInformation.payment_day_of_month
-    daily_interest_rate = loanInformation.daily_interest_rate
-    total_periods = loanInformation.total_periods
+    actual_payments = loan["datastore"]["payments"]
+
+    remaining_principal = loan["parameters"]["principal"]
+    payment_day_of_month = int(loan["parameters"]["payment_day_of_month"])
+    daily_interest_rate = loan["parameters"]["daily_interest_rate"]
+    total_periods = loan["parameters"]["total_periods"]
+    interest_paid_through_date = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
+    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
+    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
+
+    payment_number = 1
     annual_interest = 0
     total_interest = 0
-
-    interest_paid_through_date = datetime.strptime(loanModel["start_interest_date"], "%Y-%m-%d").date()
-    next_payment_date = datetime.strptime(loanModel["first payment month"], '%Y-%m-%d').date()
-    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
     old_bill_date = next_bill_date
-    payment_number = 1
     current_year = next_bill_date.year
 
+    past_payments = []
+    future_payments = []
+
     for payment in actual_payments:
         payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
         payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
@@ -232,6 +140,16 @@ def main():
 
         if old_bill_date.month < 12:
             next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day = payment_day_of_month)
+
+    loan["total_interest_paid_to_date"] = total_interest
+    loan["parameters"]["next_due_date"] = next_bill_date
+
+    if (remaining_principal < monthly_payment):
+        loan["parameters"]["next_payment_amt"] = remaining_principal
+    else:
+        loan["parameters"]["next_payment_amt"] = monthly_payment
 
     # loop over remaining scheduled payments and present estimated amortization
     while (payment_number <= total_periods) and (remaining_principal > 0):
@@ -254,7 +172,7 @@ def main():
         future_payment_record['payment_date'] = next_bill_date
         future_payment_record['days_of_interest'] = days_since_last_payment
         future_payment_record['payment_amount'] = monthly_payment
-        future_payment_record['principal_payment'] = new_interest
+        future_payment_record['principal_payment'] = new_principal
         future_payment_record['interest_payment'] = new_interest
         future_payment_record['new_balance'] = remaining_principal
         future_payments.append(future_payment_record)
@@ -266,8 +184,68 @@ def main():
         else:
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
 
-    report = transformTemplate('', loanModel)
 
+    loan["balloon_payment"] = remaining_principal
+    loan["past_payments"] = past_payments
+    loan["future_payments"] = future_payments
+    return
+
+
+def transformTemplate(template_fileName, loanModel):
+    # template_filename = "statement.txt.jinja"
+    # setup jinja for creating the statement
+    env = Environment(loader=FileSystemLoader('.'))
+    template = env.get_template(template_fileName)
+
+    print loanModel
+    report = template.render(model=loanModel)
+    return report
+
+
+def generatePDFAttachment():
+    template_filename = "statement.pdf.jinja"
+    pass
+
+
+def generateEmail(from_address, to_address, subject, body, pdfAttachment, txtAttachment):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    msg.attach(MIMEText(body))
+
+    if (pdfAttachment != None):
+        part = MIMEBase("application", "octet-stream")
+        part.set_payload(pdfAttachment)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
+        msg.attach(part)
+
+    if (txtAttachment != None):
+        part = MIMEBase("text", "html")
+        part.set_payload(txtAttachment)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
+        msg.attach(part)
+
+    return msg
+
+
+def sendEmail(msg, from_address, to_address, passwd):
+    try:
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.ehlo()
+        server.starttls()
+        server.login(from_address, passwd)
+
+        server.sendmail(from_address, to_address, msg.as_string())
+        server.close()
+    except:
+        print "Couldn't send email."
+
+
+def createPDF(report):
     # create pdf
     class MyFPDF(FPDF, HTMLMixin):
         pass
@@ -277,22 +255,49 @@ def main():
     pdf.add_page()
     pdf.write_html(report)
     # pdf.output(name='test.pdf', dest='F')
-    attachment = pdf.output(dest='S')
+    return pdf.output(dest='S')
+
+
+def selectTemplate(loan):
+    templateKey = loan["datastore"]["format"] + "Template"
+    if templateKey in loan:
+        template = loan[templateKey]
+    else:
+        template = 'statement.pdf.jinja'
+
+    return template
+
+def main():
+    # this program reads the json file describing a mortgage and calculate the actual and projected amortization
+    # the first payment in the file should be the interest paid at closing
+    # the interest at closing covers interest that would be incurred from the date of closing until the first day
+    # that will be covered by the first loan payment
+    # i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
+    # at closing.  The first payment will incur interest from one month before the bill is due.
+
+    # read in the file
+    # filename = "./10Kloan.txt"
+    #filename = "./10Kloan.json"
+    # filename = "./dadmortgage.json"
+    # filename = "./brendamortgage.json"
+    filename = "./greenfield_mortgage.json"
+    template_filename = "statement.pdf.jinja"
+
+    loan = loadLoanInformation(filename)
+
+    amortizeLoan(loan)
+
+    report = transformTemplate(selectTemplate(loan), loan)
+
+    if loan["email"]["send_pdf"] == "true":
+        pdfAttachment = createPDF(report)
+
 
     # send email
-    try:
-        server = smtplib.SMTP('smtp.gmail.com', 587)
-        server.ehlo()
-        server.starttls()
-        server.login(from_address, passwd)
-
-        email = generateEmail(from_address, to_address, subject, body, attachment)
-        server.sendmail(from_address, to_address, email.as_string())
-        server.close()
-    except:
-        print "Couldn't send email, dumping statement to file."
-        pdf.output(name='test.pdf', dest='F')
-        quit()
+    emailParameters = loan["email"]
+    msg = generateEmail(emailParameters["from_address"], emailParameters["to_address"], emailParameters["subject"],
+                        emailParameters["body"], pdfAttachment, report)
+    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
 
 
 if __name__ == '__main__':
diff --git a/statement.pdf.jinja b/statement.pdf.jinja
index b1a43cd..1e2370c 100644
--- a/statement.pdf.jinja
+++ b/statement.pdf.jinja
@@ -1,22 +1,22 @@
 <html>
 <body>
-<font face='arial' size='14'><p align='center'>{{ statement.title }}</p></font>
-<font face='arial' size='10'><p align='center'>{{ statement.lender.name }}</p></font>
+<font face='arial' size='14'><p align='center'>{{ model.header.title }}</p></font>
+<font face='arial' size='10'><p align='center'>{{ model.lender.name }}</p></font>
 <font face='arial' size='8'>
-<p align='center'>{{ statement.lender.phone }} - {{ statement.lender.address }} -
-{{ statement.lender.city }} {{statement.lender.state }} {{ statement.lender.zip }}</p>
-<p align='right'>Statement Date: {{ statement.date }}</p>
+<p align='center'>{{ model.lender.phone }} - {{ model.lender.address }} -
+{{ model.lender.city }} {{model.lender.state }} {{ model.lender.zip }}</p>
+<p align='right'>Statement Date: {{ model.header.date }}</p>
 
 <p/>
 <table>
 <thead><tr><th width='45%' align='left'>Loan Information</th><th width='45%'>&nbsp;</th></tr></thead>
 <tbody>
-    <tr><td>Borrower: {{ statement.borrower.name }}&nbsp;</td> <td>Account Number: {{ statement.loan.account_number }}</td></tr>
-    <tr><td>{{ statement.borrower.address }}&nbsp;</td> <td>Origination Date: {{ statement.loan.origination_date  }}</td></tr>
-    <tr><td>{{ statement.borrower.city }}, {{statement.borrower.state }} {{ statement.borrower.zip }}</td>
-       <td>Original Principal: {{ "$%.2f"|format(statement.loan.principal) }}</td></tr>
-    <tr><td>Rate: {{statement.loan.rate }} </td> <td>Term: {{statement.loan.term }} months </td></tr>
-    <tr><td>Next Payment Due Date: {{statement.loan.next_due_date}} </td> <td>Payment Due: {{ "$%.2f"|format(statement.loan.next_payment_amt) }} </td></tr>
+    <tr><td>Borrower: {{ model.borrower.name }}&nbsp;</td> <td>Account Number: {{ model.parameters.account_number }}</td></tr>
+    <tr><td>{{ model.borrower.address }}&nbsp;</td> <td>Origination Date: {{ model.parameters.start_date  }}</td></tr>
+    <tr><td>{{ model.borrower.city }}, {{model.borrower.state }} {{ model.borrower.zip }}</td>
+       <td>Original Principal: {{ "$%.2f"|format(model.parameters.principal) }}</td></tr>
+    <tr><td>Rate: {{model.parameters.interest_rate }}% </td> <td>Term: {{model.parameters.periods }} months </td></tr>
+    <tr><td>Next Payment Due Date: {{model.parameters.next_due_date}} </td> <td>Payment Due: {{ "$%.2f"|format(model.parameters.next_payment_amt) }} </td></tr>
 </tbody>
 </table>
 <p/>
@@ -33,7 +33,7 @@
     <th width='20%' align='right'>New Balance</th>
 </tr></thead>
 <tbody>
-{% for item in past_payments %}
+{% for item in model.past_payments %}
 <tr><td align='center'> {{ item.payment_number }} </td>
     <td align='center'> {{ item.bill_date }} </td>
     <td align='center'> {{ item.payment_date }} </td>
@@ -49,7 +49,7 @@
 {% endfor %}
 </tbody>
 </table>
-<p>Total interest paid to date is {{ "$%.2f"|format(total_interest_paid_to_date) }}.</p>
+<p>Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</p>
 <p/> <p/>
 
 <p class='section_header'><font face='arial' size='14'>Remaining Amortization</font></p>
@@ -64,7 +64,7 @@
     <th width='20%' align='right'>Principal Balance</th>
 </tr></thead>
 <tbody>
-{% for item in future_payments %}
+{% for item in model.future_payments %}
 <tr><td align='center'> {{ item.payment_number }} </td>
     <td align='center'> {{ item.payment_date }} </td>
     <td align='center'> {{ item.days_of_interest }} </td>
@@ -76,7 +76,7 @@
 {% endfor %}
 </tbody>
 </table>
-<p>Balloon Payment Due: {{ "$%.2f"|format(balloon_payment) }} </p>
+<p>Balloon Payment Due: {{ "$%.2f"|format(model.balloon_payment) }} </p>
 </font>
 </body>
 </html>
\ No newline at end of file

From 7612f854d7d5f2575560955383ddc4f4ce3ddda3 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 13 Jan 2019 14:53:53 -0500
Subject: [PATCH 04/38] Fixed the program to print the annual interest paid.

---
 greenfield_mortgage.json | 3 ++-
 mortgage_template.py     | 8 +++++---
 statement.pdf.jinja      | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index 65d2127..c42064f 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -39,7 +39,8 @@
    ["2018-09-06", "803.00"],
    ["2018-10-11", "803.00"],
    ["2018-11-13", "803.00"],
-   ["2018-12-13", "803.00"]
+   ["2018-12-13", "803.00"],
+   ["2018-01-11", "803.00"]
  ],
 "borrower": {
   "name": "Bear Houses, LLC",
diff --git a/mortgage_template.py b/mortgage_template.py
index df1cb4b..69459c2 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -123,6 +123,8 @@ def amortizeLoan(loan):
 
         # create the payment record for the template to render
         payment_record = {}
+        payment_record['year']=next_bill_date.year
+        payment_record['month']=next_bill_date.month
         payment_record['payment_number'] = payment_number
         payment_record['bill_date'] = next_bill_date
         payment_record['payment_date'] = payment_date
@@ -276,11 +278,11 @@ def main():
     # at closing.  The first payment will incur interest from one month before the bill is due.
 
     # read in the file
-    # filename = "./10Kloan.txt"
-    #filename = "./10Kloan.json"
+    filename = "./testloan.json"
+    # filename = "./10Kloan.json"
     # filename = "./dadmortgage.json"
     # filename = "./brendamortgage.json"
-    filename = "./greenfield_mortgage.json"
+    #filename = "./greenfield_mortgage.json"
     template_filename = "statement.pdf.jinja"
 
     loan = loadLoanInformation(filename)
diff --git a/statement.pdf.jinja b/statement.pdf.jinja
index 1e2370c..288e119 100644
--- a/statement.pdf.jinja
+++ b/statement.pdf.jinja
@@ -43,13 +43,13 @@
     <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
 </tr>
-    {% if item.print_interest_total %}
-<tr><td colspan='8'"> {{ item.interest_total_message }} </td></tr>
+    {% if item.month == '12' or loop.last %}
+<tr><td colspan='8'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
     {% endif %}
 {% endfor %}
+<tr><td colspan='8'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
 </tbody>
 </table>
-<p>Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</p>
 <p/> <p/>
 
 <p class='section_header'><font face='arial' size='14'>Remaining Amortization</font></p>

From f5c78ca7dc4742f25fb40427d0a09fef51211455 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 13 Jan 2019 14:54:30 -0500
Subject: [PATCH 05/38] Added this file for testing of email function.

---
 testloan.json | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 testloan.json

diff --git a/testloan.json b/testloan.json
new file mode 100644
index 0000000..f0cc95c
--- /dev/null
+++ b/testloan.json
@@ -0,0 +1,63 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "jkent3rd@yahoo.com",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100100",
+  "principal": 10020.00,
+  "interest_rate": 6.5,
+  "periods_per_year": 12,
+  "periods": 18,
+  "start_date": "2017-12-05",
+  "start_interest_date": "2017-12-05",
+  "first_payment_month": "2018-01-15",
+  "monthly_payment": 589.00,
+  "payment_day_of_month": "15"
+  },
+"payments": [
+   ["2018-01-16", "589.00"],
+   ["2018-03-30", "589.00"],
+   ["2018-04-06", "589.00"],
+   ["2018-04-12", "589.00"],
+   ["2018-05-28", "589.00"],
+   ["2018-06-12", "589.00"],
+   ["2018-07-13", "589.00"],
+   ["2018-08-14", "589.00"],
+   ["2018-09-26", "589.00"],
+   ["2018-10-15", "0"],
+   ["2018-11-29", "589.00"],
+   ["2018-12-31", "589.00"]
+ ],
+"borrower": {
+  "name": "Bear Houses, LLC",
+  "address": "301 N Beauregard St Apt 203",
+  "city": "Alexandria",
+  "state": "VA",
+  "zip": "22312"
+  },
+"lender": {
+  "name": "John Kent",
+  "phone": "703.343.0782",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"header": {
+  "title": "Installment Loan Statement",
+  "date": "Today"
+  }
+}
+

From 4dae3256c532cb5b8d1a545959d04e0f48d213fa Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Tue, 5 Mar 2019 00:09:56 -0500
Subject: [PATCH 06/38] Updated the template to print the correct interest
 information.  Fixed logic in script to send correct interest information to
 the template.  Added ability to do a test run to a different email address
 with a real data file (the debug flag replaces the email address with a hard
 coded one).  Added an aborting checking that the payments are listed in
 order.

---
 mortgage_template.py | 25 ++++++++++++++++++++-----
 statement.pdf.jinja  |  2 +-
 testloan.json        |  6 ++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/mortgage_template.py b/mortgage_template.py
index 69459c2..8565c46 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -114,6 +114,13 @@ def amortizeLoan(loan):
         payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
         payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
         days_since_last_payment = (payment_date - interest_paid_through_date).days
+
+        #check for out of order payments, generally a sign of a data entry problem, especially years
+        if days_since_last_payment < 0:
+            print "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
+                  % (payment_number, payment_date, interest_paid_through_date)
+            quit()
+
         new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
         new_principal = payment_amount - new_interest
         interest_paid_through_date = payment_date
@@ -121,6 +128,7 @@ def amortizeLoan(loan):
         annual_interest = annual_interest + new_interest
         remaining_principal = remaining_principal - new_principal
 
+
         # create the payment record for the template to render
         payment_record = {}
         payment_record['year']=next_bill_date.year
@@ -143,6 +151,7 @@ def amortizeLoan(loan):
         if old_bill_date.month < 12:
             next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
         else:
+            annual_interest = Decimal("0.00")
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day = payment_day_of_month)
 
     loan["total_interest_paid_to_date"] = total_interest
@@ -278,10 +287,14 @@ def main():
     # at closing.  The first payment will incur interest from one month before the bill is due.
 
     # read in the file
+    test_flag = True
+    #test_flag = False
+    test_address = 'jkent3rd@yahoo.com'
+
     filename = "./testloan.json"
-    # filename = "./10Kloan.json"
-    # filename = "./dadmortgage.json"
-    # filename = "./brendamortgage.json"
+    #filename = "./10Kloan.json"
+    #filename = "./dadmortgage.json"
+    #filename = "./brendamortgage.json"
     #filename = "./greenfield_mortgage.json"
     template_filename = "statement.pdf.jinja"
 
@@ -299,8 +312,10 @@ def main():
     emailParameters = loan["email"]
     msg = generateEmail(emailParameters["from_address"], emailParameters["to_address"], emailParameters["subject"],
                         emailParameters["body"], pdfAttachment, report)
-    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
-
+    if test_flag == False:
+        sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
+    else:
+        sendEmail(msg, emailParameters["from_address"], test_address, emailParameters['password'])
 
 if __name__ == '__main__':
     main()
diff --git a/statement.pdf.jinja b/statement.pdf.jinja
index 288e119..acd59c5 100644
--- a/statement.pdf.jinja
+++ b/statement.pdf.jinja
@@ -43,7 +43,7 @@
     <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
 </tr>
-    {% if item.month == '12' or loop.last %}
+    {% if item.month == 12 or loop.last %}
 <tr><td colspan='8'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
     {% endif %}
 {% endfor %}
diff --git a/testloan.json b/testloan.json
index f0cc95c..8a7331b 100644
--- a/testloan.json
+++ b/testloan.json
@@ -4,7 +4,7 @@
 "format": "html",
 "email": {
   "from_address": "jkent3rd@gmail.com",
-  "to_address": "jkent3rd@yahoo.com",
+  "to_address": "jkent3rd@gmail.com",
   "server": "smtp.gmail.com",
   "password": "pvyrbcnzrjoizprn",
   "template": "./template.txt",
@@ -38,7 +38,9 @@
    ["2018-09-26", "589.00"],
    ["2018-10-15", "0"],
    ["2018-11-29", "589.00"],
-   ["2018-12-31", "589.00"]
+   ["2018-12-31", "589.00"],
+   ["2019-01-28", "589.00"],
+   ["2019-03-15", "589.00"]
  ],
 "borrower": {
   "name": "Bear Houses, LLC",

From 42232903c53dca1fdf518f73d9bf268464ed61f7 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Tue, 5 Mar 2019 00:10:22 -0500
Subject: [PATCH 07/38] Updated the payment history.

---
 10Kloan.json             | 6 ++++--
 brendamortgage.json      | 6 ++++--
 dadmortgage.json         | 4 +++-
 greenfield_mortgage.json | 3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/10Kloan.json b/10Kloan.json
index b9cd72d..a731fea 100644
--- a/10Kloan.json
+++ b/10Kloan.json
@@ -38,8 +38,10 @@
    ["2018-09-26", "589.00"],
    ["2018-10-15", "0"],
    ["2018-11-29", "589.00"],
-   ["2018-12-31", "589.00"]
- ],
+   ["2018-12-31", "589.00"],
+   ["2019-01-15", "0.00"],
+   ["2019-02-13", "589.00"]
+],
 "borrower": {
   "name": "Bear Houses, LLC",
   "address": "301 N Beauregard St Apt 203",
diff --git a/brendamortgage.json b/brendamortgage.json
index d13476f..b119644 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -4,7 +4,7 @@
 "format": "html",
 "email": {
   "from_address": "jkent3rd@gmail.com",
-  "to_address": "bck@virginia.edu",
+  "to_address": "jkent3rd@gmail.com",
   "server": "smtp.gmail.com",
   "password": "pvyrbcnzrjoizprn",
   "template": "./template.txt",
@@ -51,6 +51,8 @@
    ["2018-10-01", "278.15"],
    ["2018-11-01", "278.15"],
    ["2018-12-01", "278.15"],
-   ["2019-01-01", "278.15"]
+   ["2019-01-01", "278.15"],
+   ["2019-02-01", "278.15"],
+   ["2019-03-01", "278.15"]
  ]
 }
diff --git a/dadmortgage.json b/dadmortgage.json
index 9ff0acb..60d3f41 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -51,6 +51,8 @@
    ["2018-10-01", "278.15"],
    ["2018-11-01", "278.15"],
    ["2018-12-01", "278.15"],
-   ["2019-01-01", "278.15"]
+   ["2019-01-01", "278.15"],
+   ["2019-02-01", "278.15"],
+   ["2019-03-01", "278.15"]
  ]
 }
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index c42064f..e2147da 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -40,7 +40,8 @@
    ["2018-10-11", "803.00"],
    ["2018-11-13", "803.00"],
    ["2018-12-13", "803.00"],
-   ["2018-01-11", "803.00"]
+   ["2019-01-14", "803.00"],
+   ["2019-02-05", "803.00"]
  ],
 "borrower": {
   "name": "Bear Houses, LLC",

From 8cb4be32486f71ba327e8b4942ffb43441700c26 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Wed, 3 Apr 2019 14:06:02 -0400
Subject: [PATCH 08/38] Updated the payment history for April statements.

---
 10Kloan.json             | 3 ++-
 brendamortgage.json      | 3 ++-
 dadmortgage.json         | 3 ++-
 greenfield_mortgage.json | 3 ++-
 mortgage_template.py     | 8 ++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/10Kloan.json b/10Kloan.json
index a731fea..e7bb2f1 100644
--- a/10Kloan.json
+++ b/10Kloan.json
@@ -40,7 +40,8 @@
    ["2018-11-29", "589.00"],
    ["2018-12-31", "589.00"],
    ["2019-01-15", "0.00"],
-   ["2019-02-13", "589.00"]
+   ["2019-02-13", "589.00"],
+   ["2019-03-15", "0"]
 ],
 "borrower": {
   "name": "Bear Houses, LLC",
diff --git a/brendamortgage.json b/brendamortgage.json
index b119644..8176c6c 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -53,6 +53,7 @@
    ["2018-12-01", "278.15"],
    ["2019-01-01", "278.15"],
    ["2019-02-01", "278.15"],
-   ["2019-03-01", "278.15"]
+   ["2019-03-01", "278.15"],
+   ["2019-04-01", "278.15"]
  ]
 }
diff --git a/dadmortgage.json b/dadmortgage.json
index 60d3f41..c4c35f0 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -53,6 +53,7 @@
    ["2018-12-01", "278.15"],
    ["2019-01-01", "278.15"],
    ["2019-02-01", "278.15"],
-   ["2019-03-01", "278.15"]
+   ["2019-03-01", "278.15"],
+   ["2019-04-01", "278.15"]
  ]
 }
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index e2147da..d835dcd 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -41,7 +41,8 @@
    ["2018-11-13", "803.00"],
    ["2018-12-13", "803.00"],
    ["2019-01-14", "803.00"],
-   ["2019-02-05", "803.00"]
+   ["2019-02-05", "803.00"],
+   ["2019-03-05", "803.00"]
  ],
 "borrower": {
   "name": "Bear Houses, LLC",
diff --git a/mortgage_template.py b/mortgage_template.py
index 8565c46..6d6d81f 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -279,6 +279,7 @@ def selectTemplate(loan):
     return template
 
 def main():
+    test_flag = True
     # this program reads the json file describing a mortgage and calculate the actual and projected amortization
     # the first payment in the file should be the interest paid at closing
     # the interest at closing covers interest that would be incurred from the date of closing until the first day
@@ -287,14 +288,13 @@ def main():
     # at closing.  The first payment will incur interest from one month before the bill is due.
 
     # read in the file
-    test_flag = True
-    #test_flag = False
+    test_flag = False
     test_address = 'jkent3rd@yahoo.com'
 
-    filename = "./testloan.json"
+    #filename = "./testloan.json"
     #filename = "./10Kloan.json"
     #filename = "./dadmortgage.json"
-    #filename = "./brendamortgage.json"
+    filename = "./brendamortgage.json"
     #filename = "./greenfield_mortgage.json"
     template_filename = "statement.pdf.jinja"
 

From 56c0f333f6574dd212436f4ef7570c51ad848fe0 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 2 Jun 2019 18:35:16 -0400
Subject: [PATCH 09/38] Updated the payment history.

---
 brendamortgage.json | 6 ++++--
 dadmortgage.json    | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/brendamortgage.json b/brendamortgage.json
index 8176c6c..e79d4d0 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -4,7 +4,7 @@
 "format": "html",
 "email": {
   "from_address": "jkent3rd@gmail.com",
-  "to_address": "jkent3rd@gmail.com",
+  "to_address": "bck@virginia.edu",
   "server": "smtp.gmail.com",
   "password": "pvyrbcnzrjoizprn",
   "template": "./template.txt",
@@ -54,6 +54,8 @@
    ["2019-01-01", "278.15"],
    ["2019-02-01", "278.15"],
    ["2019-03-01", "278.15"],
-   ["2019-04-01", "278.15"]
+   ["2019-04-01", "278.15"],
+   ["2019-05-01", "278.15"],
+   ["2019-05-31", "278.15"]
  ]
 }
diff --git a/dadmortgage.json b/dadmortgage.json
index c4c35f0..107f7fa 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -54,6 +54,8 @@
    ["2019-01-01", "278.15"],
    ["2019-02-01", "278.15"],
    ["2019-03-01", "278.15"],
-   ["2019-04-01", "278.15"]
+   ["2019-04-01", "278.15"],
+   ["2019-05-01", "278.15"],
+   ["2019-05-31", "278.15"]
  ]
 }

From 8b2af86db972b8c7fcdc8c5c18dc853047ea19b7 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sat, 6 Jul 2019 14:50:59 -0400
Subject: [PATCH 10/38] Updated the payment history.

---
 10Kloan.json             | 5 ++++-
 brendamortgage.json      | 3 ++-
 dadmortgage.json         | 3 ++-
 greenfield_mortgage.json | 7 +++++--
 mortgage_template.py     | 4 ++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/10Kloan.json b/10Kloan.json
index e7bb2f1..3bac0b5 100644
--- a/10Kloan.json
+++ b/10Kloan.json
@@ -41,7 +41,10 @@
    ["2018-12-31", "589.00"],
    ["2019-01-15", "0.00"],
    ["2019-02-13", "589.00"],
-   ["2019-03-15", "0"]
+   ["2019-03-15", "0"],
+   ["2019-04-15", "0"],
+   ["2019-05-15", "589.00"],
+   ["2019-06-21", "2985.00"]
 ],
 "borrower": {
   "name": "Bear Houses, LLC",
diff --git a/brendamortgage.json b/brendamortgage.json
index e79d4d0..5b38944 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -56,6 +56,7 @@
    ["2019-03-01", "278.15"],
    ["2019-04-01", "278.15"],
    ["2019-05-01", "278.15"],
-   ["2019-05-31", "278.15"]
+   ["2019-05-31", "278.15"],
+   ["2019-07-01", "278.15"]
  ]
 }
diff --git a/dadmortgage.json b/dadmortgage.json
index 107f7fa..f7ec1a1 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -56,6 +56,7 @@
    ["2019-03-01", "278.15"],
    ["2019-04-01", "278.15"],
    ["2019-05-01", "278.15"],
-   ["2019-05-31", "278.15"]
+   ["2019-05-31", "278.15"],
+   ["2019-07-01", "278.15"]
  ]
 }
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index d835dcd..89e1a59 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -19,7 +19,7 @@
   "principal": 97750.00,
   "interest_rate": 5.5,
   "periods_per_year": 12,
-  "periods": 182,
+  "periods": 185,
   "start_date": "2017-11-07",
   "start_interest_date": "2017-11-11",
   "first_payment_month": "2017-12-15",
@@ -42,7 +42,10 @@
    ["2018-12-13", "803.00"],
    ["2019-01-14", "803.00"],
    ["2019-02-05", "803.00"],
-   ["2019-03-05", "803.00"]
+   ["2019-03-05", "803.00"],
+   ["2019-04-15", "803.00"],
+   ["2019-05-15", "0.00"],
+   ["2019-06-13", "803.00"]
  ],
 "borrower": {
   "name": "Bear Houses, LLC",
diff --git a/mortgage_template.py b/mortgage_template.py
index 6d6d81f..26bd2a8 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -292,9 +292,9 @@ def main():
     test_address = 'jkent3rd@yahoo.com'
 
     #filename = "./testloan.json"
-    #filename = "./10Kloan.json"
+    filename = "./10Kloan.json"
     #filename = "./dadmortgage.json"
-    filename = "./brendamortgage.json"
+    #filename = "./brendamortgage.json"
     #filename = "./greenfield_mortgage.json"
     template_filename = "statement.pdf.jinja"
 

From 6462ae562818b22150cd14f31229a1170c355ffc Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sat, 6 Jul 2019 14:58:43 -0400
Subject: [PATCH 11/38] Added options for the new 9K loan from Rivanna Graphite
 Investments, LLC.  Removed the personal 10K loan I made to Bear Houses, LLC

---
 9Kloan.json          | 51 ++++++++++++++++++++++++++++++++++++++++++++
 mortgage_template.py |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 9Kloan.json

diff --git a/9Kloan.json b/9Kloan.json
new file mode 100644
index 0000000..266d42a
--- /dev/null
+++ b/9Kloan.json
@@ -0,0 +1,51 @@
+{
+"htmlTemplate": "statement.pdf.jinja",
+"txtTemplate": "statement.txt.jinja",
+"format": "html",
+"email": {
+  "from_address": "jkent3rd@gmail.com",
+  "to_address": "grady@gradystreet.com",
+  "server": "smtp.gmail.com",
+  "password": "pvyrbcnzrjoizprn",
+  "template": "./template.txt",
+  "send_pdf": "true",
+  "send_text": "true",
+  "subject": "Your loan statement...",
+  "body": "Your loan statement is attached.",
+  "text": "Please see your most recent account statement."
+  },
+"parameters": {
+  "account_number": "100002",
+  "principal": 9000.00,
+  "interest_rate": 6.5,
+  "periods_per_year": 12,
+  "periods": 20,
+  "start_date": "2019-06-15",
+  "start_interest_date": "2019-06-17",
+  "first_payment_month": "2019-07-15",
+  "monthly_payment": 475.00,
+  "payment_day_of_month": "15"
+  },
+"payments": [
+],
+"borrower": {
+  "name": "Bear Houses, LLC",
+  "address": "301 N Beauregard St Apt 203",
+  "city": "Alexandria",
+  "state": "VA",
+  "zip": "22312"
+  },
+"lender": {
+  "name": "Rivanna Graphite Investments, LLC",
+  "phone": "703.343.0782",
+  "address": "743 Madison St NW",
+  "city": "Washington",
+  "state": "DC",
+  "zip": "20011"
+  },
+"header": {
+  "title": "Installment Loan Statement",
+  "date": "Today"
+  }
+}
+
diff --git a/mortgage_template.py b/mortgage_template.py
index 26bd2a8..f31ae5d 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -292,7 +292,7 @@ def main():
     test_address = 'jkent3rd@yahoo.com'
 
     #filename = "./testloan.json"
-    filename = "./10Kloan.json"
+    filename = "./9Kloan.json"
     #filename = "./dadmortgage.json"
     #filename = "./brendamortgage.json"
     #filename = "./greenfield_mortgage.json"

From 27cf64aceda6db709bdd05c9f5ba8fef7c02f0ed Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 7 Jul 2019 14:58:20 -0400
Subject: [PATCH 12/38] Updated Brenda's contact information which has been
 wrong.

---
 brendamortgage.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/brendamortgage.json b/brendamortgage.json
index 5b38944..2a9d7c7 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -34,12 +34,12 @@
   "zip": "20011"
   },
 "lender": {
-  "name": "John Kent",
-  "phone": "434-510-7272",
-  "address": "109 Shores Rd",
-  "city": "Palmyra",
+  "name": "Brenda Kelly",
+  "phone": "434-286-2110",
+  "address": "150 Confederate Street",
+  "city": "Scottsville",
   "state": "VA",
-  "zip": "22963"
+  "zip": "24590"
   },
 "header": {
   "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA",

From a30486970889feabe9716f80d91fd6fd0daa6abb Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 7 Jul 2019 14:59:33 -0400
Subject: [PATCH 13/38] At this state, it produces a nice web-based viewer of
 the loan files including the payment history and future amortization.

---
 templates/main.html | 159 +++++++++++++++++++++++++++++
 web.py              | 244 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 403 insertions(+)
 create mode 100644 templates/main.html
 create mode 100644 web.py

diff --git a/templates/main.html b/templates/main.html
new file mode 100644
index 0000000..674a873
--- /dev/null
+++ b/templates/main.html
@@ -0,0 +1,159 @@
+<html>
+<head>
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <link rel="stylesheet" href="/resources/demos/style.css">
+    <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script>
+      $( function() { $( "#tabs" ).tabs(); } );
+    </script>
+    <title>Loan Management</title>
+</head>
+<body>
+<p align="center">Web Mortgage Manager</p>
+<form>
+<table><tr>
+    <td>Loan:</td>
+    <td>
+    <select name="loan">
+    {% for loan in loans %}
+      {% if loan.filename==filename %}
+        <option value="{{loan.filename}}" selected>{{loan.name}}</option>
+      {% else %}
+        <option value="{{loan.filename}}">{{loan.name}}</option>
+      {% endif %}
+    {% endfor %}
+    </select>
+    <button>Select</button>
+    </td>
+</table>
+</form>
+</p>
+<div id="tabs">
+    <ul>
+        <li><a href="#loan_information">Loan Information</a></li>
+        <li><a href="#loan_history">Loan History</a></li>
+        <li><a href="#loan_amortization">Future Amortization</a></li>
+        <li><a href="#email">Email Statement</a></li>
+        <li><a href="#add_payment">Add Payment</a></li>
+    </ul>
+    <div id="loan_information">
+        <table align="center" border="1px">
+        <thead><tr><th colspan='2' width='60%' align='center'>Loan Information</th></tr></thead>
+        <tbody>
+            <tr>
+                <td><b>Lender:</b></td>
+                <td>{{ model.lender.name }}<br/>{{ model.lender.address }}<br/>
+                    {{ model.lender.city }} {{model.lender.state }} {{ model.lender.zip }}<br/>
+                    {{ model.lender.phone }}
+                </td></tr>
+            <tr><td><b>Borrower:</b></td><td>{{ model.borrower.name }}&nbsp;<br/>{{ model.borrower.address }}&nbsp;
+                <br/>{{ model.borrower.city }}, {{model.borrower.state }} {{ model.borrower.zip }}
+                </td></tr>
+            <tr><td><b>Account Number:</b></td><td>{{ model.parameters.account_number }}</td></tr>
+            <tr><td><b>Origination Date:</b></td><td> {{ model.parameters.start_date  }}</td></tr>
+            <tr><td><b>Original Principal:</b></td><td>{{ "$%.2f"|format(model.parameters.principal) }}</td></tr>
+            <tr><td><b>Rate:</b></td><td>{{model.parameters.interest_rate }}% </td></tr>
+            <tr><td><b>Term: </b></td><td>{{model.parameters.periods }} months </td></tr>
+            <tr><td><b>Next Payment Due Date:</b></td><td> {{model.parameters.next_due_date}} </td></tr>
+            <tr><td><b>Payment Due:</b></td><td> {{ "$%.2f"|format(model.parameters.next_payment_amt) }} </td></tr>
+        </tbody>
+        </table>
+        <p/>
+    </div>
+    <div id="loan_history">
+        <table border="1px" align="center">
+            <thead>
+            <tr>
+                <th colspan="8">Loan History</th>
+            </tr>
+            <tr>
+                <th width='5%'>#</td>
+                <th width='10%'>Due Date</th>
+                <th width='10%'>Date Paid</th>
+                <th width='10%'>Days Interest</th>
+                <th width='15%' align='right'>Payment Amt</th>
+                <th width='15%' align='right'>Principal Pmt</th>
+                <th width='15%' align='right'>Interest Pmt</th>
+                <th width='20%' align='right'>New Balance</th>
+            </tr>
+            </thead>
+        <tbody>
+        {% for item in model.past_payments %}
+            <tr>
+                <td align='center'> {{ item.payment_number }} </td>
+                <td align='center'> {{ item.bill_date }} </td>
+                <td align='center'> {{ item.payment_date }} </td>
+                <td align='center'> {{ item.days_of_interest }} </td>
+                <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+                <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+                <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+                <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+            </tr>
+        {% if item.month == 12 or loop.last %}
+            <tr><td colspan='8'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
+        {% endif %}
+        {% endfor %}
+            <tr><td colspan='8'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
+        </tbody>
+        </table>
+    </div>
+    <div id="loan_amortization">
+        <table border="1px">
+        <thead>
+        <tr>
+            <th colspan="7">Remaining Amortization</th>
+        </tr>
+        <tr>
+            <th width='8%'>#</th>
+            <th width='15%'>Due Date</th>
+            <th width='8%'>Days Interest</th>
+            <th width='15%' align='right'>Payment Amt</th>
+            <th width='15%' align='right'>Principal Pmt</th>
+            <th width='15%' align='right'>Interest Pmt</th>
+            <th width='20%' align='right'>Principal Balance</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in model.future_payments %}
+        <tr><td align='center'> {{ item.payment_number }} </td>
+            <td align='center'> {{ item.payment_date }} </td>
+            <td align='center'> {{ item.days_of_interest }} </td>
+            <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+            <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+            <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+            <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+            </tr>
+        {% endfor %}
+        <tr colspan="7">Balloon Payment Due: {{ "$%.2f"|format(model.balloon_payment) }}</tr>
+        </tbody>
+        </table>
+    </div>
+    <div id="email">
+        <form name="Send Statement" method="post" action="/send_statement">
+        <table>
+            <tr><td colspan="2">Generate and Send Statement</td></tr>
+            <tr><td>Send From:</td><td>{{model.email.from_address}}</td></tr>
+            <tr><td>Send To:</td><td>{{model.email.to_address}}</td></tr>
+            <tr><td>Topic:</td><td><input type="text" name="title" value="{{model.email.subject}}"></td></tr>
+            <tr><td>Message Body:</td><td><input type="textarea" name="message" value="{{model.email.body}}"></td></tr>
+            <tr><td>Send Statement As:</td><td><select name="style">
+                <option value="attach">Attachment</option>
+                <option value="embed">Embedded</option>
+            </select></td></tr>
+            <tr><td>Include Future Amortization</td>
+                <td><select name="amort">
+                <option value="yes">Yes</option>
+                <option value="no">No</option>
+            </select></td></tr>
+            <tr><td><button>Send Statement</button></td></tr>
+        </table>
+            <input hidden="loan" name='loan' value="{{filename}}" />
+        </form>
+    </div>
+    <div id="add_payment">
+        <p>Add Loan Payment Tab</p>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/web.py b/web.py
new file mode 100644
index 0000000..672499d
--- /dev/null
+++ b/web.py
@@ -0,0 +1,244 @@
+from flask import Flask, render_template, request, redirect, url_for
+import json
+from decimal import *
+from datetime import *
+from jinja2 import Environment, FileSystemLoader
+from fpdf import FPDF, HTMLMixin
+import smtplib
+
+from email.MIMEMultipart import MIMEMultipart
+from email.MIMEText import MIMEText
+from email.MIMEBase import MIMEBase
+from email import Encoders
+
+app = Flask(__name__)
+
+@app.route('/')
+def hello():
+
+    loans = []
+    loans.append( addLoan("1 Greenfield Lane Mortgage", "greenfield_mortgage.json" ) )
+    loans.append( addLoan("2 Bear Houses LLC Loan", "9Kloan.json" ) )
+    loans.append( addLoan("3 Brenda Mortgage", "brendamortgage.json" ) )
+    loans.append( addLoan("4 Dad Mortgage", "dadmortgage.json") )
+
+    if 'loan' in request.args:
+        filename = request.args["loan"]
+    else:
+        return redirect('/?loan=' + loans[0]['filename'])
+
+    loan = loadLoanInformation('/Users/john/PycharmProjects/mortgage/' + filename)
+    amortizeLoan(loan)
+
+    return render_template('main.html', filename=filename, loans=loans, model=loan)
+
+@app.route('/update_file')
+def update_file():
+    return
+
+@app.route('/send_statement', methods=['POST'])
+def send_statement():
+    loan = request.form["loan"]
+    redirect( '/?loan=' + loan )
+
+def addLoan(loanName, fileName):
+    x = {}
+    x['name'] = loanName
+    x['filename'] = fileName
+    return x
+
+'''from old code'''
+def getStatementHeader(datastore):
+    return datastore['header']
+
+
+def getEmailInformation(datastore):
+    return datastore['email']
+
+
+def loadLoanInformation(filename):
+    datastore = getDatastore(filename)
+
+    loanModel = {}
+    loanModel['datastore'] = datastore
+    loanModel['email'] = getEmailInformation(datastore)
+    loanModel['parameters'] = getLoanParameters(datastore)
+    loanModel['lender'] = getLender(datastore)
+    loanModel['borrower'] = getBorrower(datastore)
+    loanModel['header'] = getStatementHeader(datastore)
+    return loanModel
+
+
+def getLoanParameters(datastore):
+    # read in the loan profile information
+    loan = datastore['parameters']
+
+    annual_rate = Decimal(loan['interest_rate']) / 100
+    daily_interest_rate = annual_rate / 360
+    principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
+    periods_per_year = Decimal(loan["periods_per_year"])
+    total_periods = Decimal(loan["periods"])
+    payment_day_of_month = int(loan['payment_day_of_month'])
+
+    if "monthly_payment" in loan:
+        monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
+    else:
+        # calculate expected monthly payment
+        periodic_rate = annual_rate / periods_per_year
+        discount_factor = (((1 + periodic_rate) ** total_periods) - 1) / (
+                periodic_rate * ((1 + periodic_rate) ** total_periods))
+        monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
+
+    loan['principal'] = principal       # standardizes the format
+    loan['annual_rate'] = annual_rate   # standardizes the format
+    loan['daily_interest_rate'] = daily_interest_rate
+    loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
+    loan['next_payment_amt'] = 0
+    loan['next_payment_date'] = '12/12/12'
+    loan['total_periods'] = total_periods
+    loan['monthly_payment'] = monthly_payment
+    datastore['parameters'] = loan
+    return loan
+
+
+def getLender(datastore):
+    return datastore['lender']
+
+
+def getBorrower(datastore):
+    return datastore['borrower']
+
+
+def getDatastore(filename=None):
+    try:
+        if filename:
+            with open(filename, 'r') as f:
+                datastore = json.load(f)
+
+    except Exception as e:
+        print "An error occurred opening your loan file '%s'. " % filename
+        print "The Exception:"
+        print e.__repr__()
+        quit()
+
+    return datastore
+
+
+def amortizeLoan(loan):
+    # loop over the payments and calculate the actual amortization
+    monthly_payment = loan["parameters"]["monthly_payment"]
+
+    actual_payments = loan["datastore"]["payments"]
+
+    remaining_principal = loan["parameters"]["principal"]
+    payment_day_of_month = int(loan["parameters"]["payment_day_of_month"])
+    daily_interest_rate = loan["parameters"]["daily_interest_rate"]
+    total_periods = loan["parameters"]["total_periods"]
+    interest_paid_through_date = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
+    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
+    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
+
+    payment_number = 1
+    annual_interest = 0
+    total_interest = 0
+    old_bill_date = next_bill_date
+    current_year = next_bill_date.year
+
+    past_payments = []
+    future_payments = []
+
+    for payment in actual_payments:
+        payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
+        payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
+        days_since_last_payment = (payment_date - interest_paid_through_date).days
+
+        #check for out of order payments, generally a sign of a data entry problem, especially years
+        if days_since_last_payment < 0:
+            print "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
+                  % (payment_number, payment_date, interest_paid_through_date)
+            quit()
+
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+        new_principal = payment_amount - new_interest
+        interest_paid_through_date = payment_date
+        total_interest = total_interest + new_interest
+        annual_interest = annual_interest + new_interest
+        remaining_principal = remaining_principal - new_principal
+
+
+        # create the payment record for the template to render
+        payment_record = {}
+        payment_record['year']=next_bill_date.year
+        payment_record['month']=next_bill_date.month
+        payment_record['payment_number'] = payment_number
+        payment_record['bill_date'] = next_bill_date
+        payment_record['payment_date'] = payment_date
+        payment_record['days_of_interest'] = days_since_last_payment
+        payment_record['payment_amount'] = payment_amount
+        payment_record['principal_payment'] = payment_amount - new_interest
+        payment_record['interest_payment'] = new_interest
+        payment_record['new_balance'] = remaining_principal
+        payment_record['interest_to_date'] = total_interest
+        payment_record['annual_interest_to_date'] = annual_interest
+        past_payments.append(payment_record)
+
+        payment_number = payment_number + 1
+        old_bill_date = next_bill_date
+
+        if old_bill_date.month < 12:
+            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            annual_interest = Decimal("0.00")
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day = payment_day_of_month)
+
+    loan["total_interest_paid_to_date"] = total_interest
+    loan["parameters"]["next_due_date"] = next_bill_date
+
+    if (remaining_principal < monthly_payment):
+        loan["parameters"]["next_payment_amt"] = remaining_principal
+    else:
+        loan["parameters"]["next_payment_amt"] = monthly_payment
+
+    # loop over remaining scheduled payments and present estimated amortization
+    while (payment_number <= total_periods) and (remaining_principal > 0):
+        days_since_last_payment = (next_bill_date - interest_paid_through_date).days
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
+        # make sure the last payment isn't too much
+        if new_interest + remaining_principal < monthly_payment:
+            monthly_payment = new_interest + remaining_principal
+
+        new_principal = monthly_payment - new_interest
+
+        remaining_principal = remaining_principal - new_principal
+
+        interest_paid_through_date = next_bill_date
+
+        # complete the future payment amortization record
+        future_payment_record = {}
+        future_payment_record['payment_number'] = payment_number
+        future_payment_record['payment_date'] = next_bill_date
+        future_payment_record['days_of_interest'] = days_since_last_payment
+        future_payment_record['payment_amount'] = monthly_payment
+        future_payment_record['principal_payment'] = new_principal
+        future_payment_record['interest_payment'] = new_interest
+        future_payment_record['new_balance'] = remaining_principal
+        future_payments.append(future_payment_record)
+
+        payment_number = payment_number + 1
+        old_bill_date = next_bill_date
+        if old_bill_date.month < 12:
+            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+
+
+    loan["balloon_payment"] = remaining_principal
+    loan["past_payments"] = past_payments
+    loan["future_payments"] = future_payments
+    return
+
+
+if __name__ == '__main__':
+    app.debug = True
+    app.run()
\ No newline at end of file

From e9fefb1a1abd51871a984ae7994dc36243995475 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Mon, 8 Jul 2019 00:27:38 -0400
Subject: [PATCH 14/38] Web version updated to allow sending emails.

---
 templates/add.html                            |  18 +++
 templates/email.html                          |  19 +++
 templates/main.html                           |  35 ++---
 templates/statement.html.jinja                |  84 +++++++++++
 .../statement.pdf.jinja                       |   6 +-
 .../statement.text.jinja                      |   0
 web.py                                        | 134 +++++++++++++++++-
 7 files changed, 273 insertions(+), 23 deletions(-)
 create mode 100644 templates/add.html
 create mode 100644 templates/email.html
 create mode 100644 templates/statement.html.jinja
 rename statement.pdf.jinja => templates/statement.pdf.jinja (99%)
 rename statement.txt.jinja => templates/statement.text.jinja (100%)

diff --git a/templates/add.html b/templates/add.html
new file mode 100644
index 0000000..7e68337
--- /dev/null
+++ b/templates/add.html
@@ -0,0 +1,18 @@
+<html>
+<head>
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <link rel="stylesheet" href="/resources/demos/style.css">
+    <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script>
+      $( function() { $( "#tabs" ).tabs(); } );
+    </script>
+    <title>Loan Management</title>
+</head>
+<body>
+<p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
+
+
+<a href="/?loan={{filename}}">Return to Main Screen</a>.
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/email.html b/templates/email.html
new file mode 100644
index 0000000..530e273
--- /dev/null
+++ b/templates/email.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+    <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <link rel="stylesheet" href="/resources/demos/style.css">
+    <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script>
+      $( function() { $( "#tabs" ).tabs(); } );
+    </script>
+    <title>Loan Management</title>
+</head>
+<body>
+<p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
+
+<p> The email has been sent.</p>
+<a href="/?loan={{filename}}">Return to Main Screen</a>.
+
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/main.html b/templates/main.html
index 674a873..b311656 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -10,7 +10,7 @@
     <title>Loan Management</title>
 </head>
 <body>
-<p align="center">Web Mortgage Manager</p>
+<p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
 <form>
 <table><tr>
     <td>Loan:</td>
@@ -131,21 +131,24 @@
     </div>
     <div id="email">
         <form name="Send Statement" method="post" action="/send_statement">
-        <table>
-            <tr><td colspan="2">Generate and Send Statement</td></tr>
-            <tr><td>Send From:</td><td>{{model.email.from_address}}</td></tr>
-            <tr><td>Send To:</td><td>{{model.email.to_address}}</td></tr>
-            <tr><td>Topic:</td><td><input type="text" name="title" value="{{model.email.subject}}"></td></tr>
-            <tr><td>Message Body:</td><td><input type="textarea" name="message" value="{{model.email.body}}"></td></tr>
-            <tr><td>Send Statement As:</td><td><select name="style">
-                <option value="attach">Attachment</option>
-                <option value="embed">Embedded</option>
-            </select></td></tr>
-            <tr><td>Include Future Amortization</td>
-                <td><select name="amort">
-                <option value="yes">Yes</option>
-                <option value="no">No</option>
-            </select></td></tr>
+        <table align="center" border='1px' width="75%">
+            <tr><td align="center" bgcolor="darkgrey">Generate and Send Statement</td></tr>
+            <tr><td>Send From: {{model.email.from_address}}<br/>Send To: {{model.email.to_address}}</td></tr>
+            <tr><td bgcolor="beige">Subject:</td></tr>
+            <tr><td align="center"><textarea type="text" cols="120" name="subject">{{model.email.subject}}</textarea></td></tr>
+            <tr><td bgcolor="beige">Message:</td></tr>
+            <tr><td align="center"><textarea rows="8" cols="120" name="message">{{model.email.body}}</textarea></td></tr>
+            <tr><td bgcolor="beige">Send Statement As:</td></tr>
+            <tr><td>
+                <input type="checkbox" name="html" value="html"/> HTML
+                <input type="checkbox" name="pdf" value="pdf"/> PDF
+                <input type="checkbox" name="text" value="text" /> Plain Text
+            </td></tr>
+            <tr><td bgcolor="beige">Include Future Amortization</td></tr>
+            <tr><td>
+                <input name="amortization" type="radio" value="yes" checked>Yes
+                <input name="amortization" type="radio" value="no">No
+            </td></tr>
             <tr><td><button>Send Statement</button></td></tr>
         </table>
             <input hidden="loan" name='loan' value="{{filename}}" />
diff --git a/templates/statement.html.jinja b/templates/statement.html.jinja
new file mode 100644
index 0000000..48e124c
--- /dev/null
+++ b/templates/statement.html.jinja
@@ -0,0 +1,84 @@
+<html>
+<body>
+<font face='arial' size='14'><p align='center'>{{ model.header.title }}</p></font>
+<font face='arial' size='10'><p align='center'>{{ model.lender.name }}</p></font>
+<font face='arial' size='8'>
+<p align='center'>{{ model.lender.phone }} - {{ model.lender.address }} -
+{{ model.lender.city }} {{model.lender.state }} {{ model.lender.zip }}</p>
+<p align='right'>Statement Date: {{ model.header.date }}</p>
+
+<p/>
+<table>
+<thead><tr><th width='45%' align='left'>Loan Information</th><th width='45%'>&nbsp;</th></tr></thead>
+<tbody>
+    <tr><td>Borrower: {{ model.borrower.name }}&nbsp;</td> <td>Account Number: {{ model.parameters.account_number }}</td></tr>
+    <tr><td>{{ model.borrower.address }}&nbsp;</td> <td>Origination Date: {{ model.parameters.start_date  }}</td></tr>
+    <tr><td>{{ model.borrower.city }}, {{model.borrower.state }} {{ model.borrower.zip }}</td>
+       <td>Original Principal: {{ "$%.2f"|format(model.parameters.principal) }}</td></tr>
+    <tr><td>Rate: {{model.parameters.interest_rate }}% </td> <td>Term: {{model.parameters.periods }} months </td></tr>
+    <tr><td>Next Payment Due Date: {{model.parameters.next_due_date}} </td> <td>Payment Due: {{ "$%.2f"|format(model.parameters.next_payment_amt) }} </td></tr>
+</tbody>
+</table>
+<p/>
+<p class='section_header' color='red'><font face='arial' size='14'>Payment History</font></p>
+<table>
+<thead><tr>
+    <th width='5%'>#</td>
+    <th width='10%'>Due Date</th>
+    <th width='10%'>Date Paid</th>
+    <th width='10%'>Days Interest</th>
+    <th width='15%' align='right'>Payment Amt</th>
+    <th width='15%' align='right'>Principal Pmt</th>
+    <th width='15%' align='right'>Interest Pmt</th>
+    <th width='20%' align='right'>New Balance</th>
+</tr></thead>
+<tbody>
+{% for item in model.past_payments %}
+<tr><td align='center'> {{ item.payment_number }} </td>
+    <td align='center'> {{ item.bill_date }} </td>
+    <td align='center'> {{ item.payment_date }} </td>
+    <td align='center'> {{ item.days_of_interest }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+</tr>
+    {% if item.month == 12 or loop.last %}
+<tr><td colspan='8'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
+    {% endif %}
+{% endfor %}
+<tr><td colspan='8'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
+</tbody>
+</table>
+<p/> <p/>
+
+<p class='section_header'><font face='arial' size='14'>Remaining Amortization</font></p>
+<table>
+<thead>
+<tr>
+    <th width='8%'>#</th>
+    <th width='15%'>Due Date</th>
+    <th width='8%'>Days Interest</th>
+    <th width='15%' align='right'>Payment Amt</th>
+    <th width='15%' align='right'>Principal Pmt</th>
+    <th width='15%' align='right'>Interest Pmt</th>
+    <th width='20%' align='right'>Principal Balance</th>
+</tr>
+</thead>
+<tbody>
+{% for item in model.future_payments %}
+<tr><td align='center'> {{ item.payment_number }} </td>
+    <td align='center'> {{ item.payment_date }} </td>
+    <td align='center'> {{ item.days_of_interest }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
+    </tr>
+{% endfor %}
+</tbody>
+</table>
+<p>Balloon Payment Due: {{ "$%.2f"|format(model.balloon_payment) }} </p>
+</font>
+</body>
+</html>
\ No newline at end of file
diff --git a/statement.pdf.jinja b/templates/statement.pdf.jinja
similarity index 99%
rename from statement.pdf.jinja
rename to templates/statement.pdf.jinja
index acd59c5..48e124c 100644
--- a/statement.pdf.jinja
+++ b/templates/statement.pdf.jinja
@@ -54,7 +54,8 @@
 
 <p class='section_header'><font face='arial' size='14'>Remaining Amortization</font></p>
 <table>
-<thead><tr>
+<thead>
+<tr>
     <th width='8%'>#</th>
     <th width='15%'>Due Date</th>
     <th width='8%'>Days Interest</th>
@@ -62,7 +63,8 @@
     <th width='15%' align='right'>Principal Pmt</th>
     <th width='15%' align='right'>Interest Pmt</th>
     <th width='20%' align='right'>Principal Balance</th>
-</tr></thead>
+</tr>
+</thead>
 <tbody>
 {% for item in model.future_payments %}
 <tr><td align='center'> {{ item.payment_number }} </td>
diff --git a/statement.txt.jinja b/templates/statement.text.jinja
similarity index 100%
rename from statement.txt.jinja
rename to templates/statement.text.jinja
diff --git a/web.py b/web.py
index 672499d..d1a2361 100644
--- a/web.py
+++ b/web.py
@@ -2,9 +2,13 @@ from flask import Flask, render_template, request, redirect, url_for
 import json
 from decimal import *
 from datetime import *
-from jinja2 import Environment, FileSystemLoader
+import jinja2
 from fpdf import FPDF, HTMLMixin
 import smtplib
+import os
+
+loader=jinja2.FileSystemLoader([os.path.join(os.path.dirname(__file__),"templates")])
+environment = jinja2.Environment(loader=loader)
 
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
@@ -21,6 +25,7 @@ def hello():
     loans.append( addLoan("2 Bear Houses LLC Loan", "9Kloan.json" ) )
     loans.append( addLoan("3 Brenda Mortgage", "brendamortgage.json" ) )
     loans.append( addLoan("4 Dad Mortgage", "dadmortgage.json") )
+    loans.append( addLoan("5 Test Loan", "testloan.json"))
 
     if 'loan' in request.args:
         filename = request.args["loan"]
@@ -34,12 +39,49 @@ def hello():
 
 @app.route('/update_file')
 def update_file():
-    return
+    loanFile = request.form['loan']
+    return redirect( '/?loan=' + loan )
 
 @app.route('/send_statement', methods=['POST'])
 def send_statement():
-    loan = request.form["loan"]
-    redirect( '/?loan=' + loan )
+    loanFile = request.form["loan"]
+    subject = request.form["subject"]
+    message = request.form["message"]
+    style = request.form["style"]
+
+    loan = loadLoanInformation('/Users/john/PycharmProjects/mortgage/' + loanFile)
+    amortizeLoan(loan)
+
+    reportCreated = False
+    textReport = pdfReport = htmlReport = None
+
+    if 'text' in request.form:
+        textReport = transformTemplate(selectTemplate('text'), loan)
+        reportCreated = True
+
+    if 'pdf' in request.form:
+        pdfInterimReport = transformTemplate(selectTemplate('pdf'), loan)
+        pdfReport = createPDF(pdfInterimReport)
+        if style == 'embed':
+            style = 'attach'
+        reportCreated = True
+
+    if ('html' in request.form) or (reportCreated is False):
+        htmlReport = transformTemplate(selectTemplate('html'), loan)
+
+
+    # send email
+    emailParameters = loan["email"]
+
+    msg = generateEmail( emailParameters["from_address"],
+                             emailParameters["to_address"],
+                             subject,
+                             message, pdfReport, htmlReport, textReport)
+
+    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
+
+
+    return render_template('email.html', filename=loanFile)
 
 def addLoan(loanName, fileName):
     x = {}
@@ -47,7 +89,10 @@ def addLoan(loanName, fileName):
     x['filename'] = fileName
     return x
 
-'''from old code'''
+###################
+# from old code   #
+###################
+
 def getStatementHeader(datastore):
     return datastore['header']
 
@@ -238,6 +283,85 @@ def amortizeLoan(loan):
     loan["future_payments"] = future_payments
     return
 
+def transformTemplate(template_fileName, loanModel):
+    # template_filename = "statement.text.jinja"
+    # setup jinja for creating the statement
+    template = environment.get_template(template_fileName)
+
+    print loanModel
+    report = template.render(model=loanModel)
+    return report
+
+
+def generateEmail(from_address, to_address, subject, body, pdf, html, txt):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    msg.attach(MIMEText(body))
+
+    if (pdf != None):
+        part = MIMEBase("application", "octet-stream")
+        part.set_payload(pdf)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
+        msg.attach(part)
+
+    if (html != None):
+        part = MIMEBase("text", "html")
+        part.set_payload(html)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
+        msg.attach(part)
+
+    if (txt != None):
+        part = MIMEBase("text", "plain")
+        part.set_payload(txt)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.txt"')
+        msg.attach(part)
+
+    return msg
+
+
+def sendEmail(msg, from_address, to_address, passwd):
+    try:
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.ehlo()
+        server.starttls()
+        server.login(from_address, passwd)
+
+        server.sendmail(from_address, to_address, msg.as_string())
+        server.close()
+    except:
+        print "Couldn't send email."
+
+
+def createPDF(report):
+    # create pdf
+    class MyFPDF(FPDF, HTMLMixin):
+        pass
+
+    pdf = MyFPDF()
+    pdf.set_font(family='Arial', size=12)
+    pdf.add_page()
+    pdf.write_html(report)
+    # pdf.output(name='test.pdf', dest='F')
+    return pdf.output(dest='S')
+
+
+def selectTemplate(format):
+    if format == 'html':
+        return 'statement.html.jinja'
+
+    if format == 'pdf':
+        return 'statement.pdf.jinja'
+
+    if format == 'text':
+        return 'statement.text.jinja'
+
+    return 'statement.html.jinja'
 
 if __name__ == '__main__':
     app.debug = True

From 717210636d35ee357023b9daadb77745caf11815 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Wed, 10 Jul 2019 22:57:23 -0400
Subject: [PATCH 15/38] The tool can now update the payment history.

---
 mortgage_template.py |  26 ++++++-
 templates/add.html   |   6 +-
 templates/main.html  |  14 +++-
 testloan.json        | 167 ++++++++++++++++++++++++++++---------------
 4 files changed, 150 insertions(+), 63 deletions(-)

diff --git a/mortgage_template.py b/mortgage_template.py
index f31ae5d..dfa8260 100644
--- a/mortgage_template.py
+++ b/mortgage_template.py
@@ -203,7 +203,7 @@ def amortizeLoan(loan):
 
 
 def transformTemplate(template_fileName, loanModel):
-    # template_filename = "statement.txt.jinja"
+    # template_filename = "statement.text.jinja"
     # setup jinja for creating the statement
     env = Environment(loader=FileSystemLoader('.'))
     template = env.get_template(template_fileName)
@@ -242,6 +242,30 @@ def generateEmail(from_address, to_address, subject, body, pdfAttachment, txtAtt
 
     return msg
 
+def generateEmailWithAttachments(from_address, to_address, subject, body, pdfAttachment, htmlAttachment, txtAttachment):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    msg.attach(MIMEText(body))
+
+    if (pdfAttachment != None):
+        part = MIMEBase("application", "octet-stream")
+        part.set_payload(pdfAttachment)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
+        msg.attach(part)
+
+    if (txtAttachment != None):
+        part = MIMEBase("text", "html")
+        part.set_payload(txtAttachment)
+        Encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
+        msg.attach(part)
+
+    return msg
+
 
 def sendEmail(msg, from_address, to_address, passwd):
     try:
diff --git a/templates/add.html b/templates/add.html
index 7e68337..78323fd 100644
--- a/templates/add.html
+++ b/templates/add.html
@@ -12,7 +12,11 @@
 <body>
 <p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
 
-
+<table border="1px">
+{% for message in messages %}
+    <tr><td>{{message}}</td></tr>
+{% endfor %}
+</table>
 <a href="/?loan={{filename}}">Return to Main Screen</a>.
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/main.html b/templates/main.html
index b311656..9bc9409 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -151,11 +151,21 @@
             </td></tr>
             <tr><td><button>Send Statement</button></td></tr>
         </table>
-            <input hidden="loan" name='loan' value="{{filename}}" />
+            <input type="hidden" name='loan' value="{{filename}}" />
         </form>
     </div>
     <div id="add_payment">
-        <p>Add Loan Payment Tab</p>
+        <form name="AddPayment" method="post" action="/update_file">
+        <input type="hidden" name="loan" value="{{filename}}" />
+        <table align="center" border="1px" width="75%">
+            <tr><td align="center" bgcolor="darkgrey">Record a Payment</td></tr>
+            <tr><td bgcolor="beige">Payment Date:</td></tr>
+            <tr><td><input type="date" name="date"</td></tr>
+            <tr><td bgcolor="beige">Payment Amount:</td></tr>
+            <tr><td><input type="text" name="amount"></td></tr>
+            <tr><td><button>Record Payment</button></td></tr>
+        </table>
+        </form>
     </div>
 </div>
 </body>
diff --git a/testloan.json b/testloan.json
index 8a7331b..731c04d 100644
--- a/testloan.json
+++ b/testloan.json
@@ -1,65 +1,114 @@
 {
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "jkent3rd@gmail.com",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 589.0,
+    "interest_rate": 6.5,
+    "start_interest_date": "2017-12-05",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2018-01-15",
+    "account_number": "100100",
+    "principal": 10020.0,
+    "start_date": "2017-12-05",
+    "periods_per_year": 12,
+    "periods": 18
   },
-"parameters": {
-  "account_number": "100100",
-  "principal": 10020.00,
-  "interest_rate": 6.5,
-  "periods_per_year": 12,
-  "periods": 18,
-  "start_date": "2017-12-05",
-  "start_interest_date": "2017-12-05",
-  "first_payment_month": "2018-01-15",
-  "monthly_payment": 589.00,
-  "payment_day_of_month": "15"
+  "format": "html",
+  "txtTemplate": "statement.txt.jinja",
+  "lender": {
+    "city": "Washington",
+    "name": "Test Lender",
+    "zip": "20011",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "743 Madison St NW"
   },
-"payments": [
-   ["2018-01-16", "589.00"],
-   ["2018-03-30", "589.00"],
-   ["2018-04-06", "589.00"],
-   ["2018-04-12", "589.00"],
-   ["2018-05-28", "589.00"],
-   ["2018-06-12", "589.00"],
-   ["2018-07-13", "589.00"],
-   ["2018-08-14", "589.00"],
-   ["2018-09-26", "589.00"],
-   ["2018-10-15", "0"],
-   ["2018-11-29", "589.00"],
-   ["2018-12-31", "589.00"],
-   ["2019-01-28", "589.00"],
-   ["2019-03-15", "589.00"]
- ],
-"borrower": {
-  "name": "Bear Houses, LLC",
-  "address": "301 N Beauregard St Apt 203",
-  "city": "Alexandria",
-  "state": "VA",
-  "zip": "22312"
+  "header": {
+    "date": "Today",
+    "title": "Installment Loan Test Statement"
   },
-"lender": {
-  "name": "John Kent",
-  "phone": "703.343.0782",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
+  "payments": [
+    [
+      "2018-01-16",
+      "589.00"
+    ],
+    [
+      "2018-03-30",
+      "589.00"
+    ],
+    [
+      "2018-04-06",
+      "589.00"
+    ],
+    [
+      "2018-04-12",
+      "589.00"
+    ],
+    [
+      "2018-05-28",
+      "589.00"
+    ],
+    [
+      "2018-06-12",
+      "589.00"
+    ],
+    [
+      "2018-07-13",
+      "589.00"
+    ],
+    [
+      "2018-08-14",
+      "589.00"
+    ],
+    [
+      "2018-09-26",
+      "589.00"
+    ],
+    [
+      "2018-10-15",
+      "0"
+    ],
+    [
+      "2018-11-29",
+      "589.00"
+    ],
+    [
+      "2018-12-31",
+      "589.00"
+    ],
+    [
+      "2019-01-28",
+      "589.00"
+    ],
+    [
+      "2019-03-15",
+      "589.00"
+    ],
+    [
+      "2019-07-10",
+      "123.12"
+    ],
+    [
+      "2019-07-10",
+      "120"
+    ]
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Test Borrower Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
   },
-"header": {
-  "title": "Installment Loan Statement",
-  "date": "Today"
+  "email": {
+    "body": "Your test loan statement is attached.",
+    "to_address": "jkent3rd@gmail.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent test account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "pvyrbcnzrjoizprn",
+    "subject": "Your test loan statement..."
   }
-}
-
+}
\ No newline at end of file

From af033464ad8c6986c61f8c381989552e97f863fa Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Wed, 10 Jul 2019 22:57:55 -0400
Subject: [PATCH 16/38] The tool can now update payment history.

---
 web.py | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/web.py b/web.py
index d1a2361..6db08ac 100644
--- a/web.py
+++ b/web.py
@@ -1,4 +1,4 @@
-from flask import Flask, render_template, request, redirect, url_for
+from flask import Flask, render_template, request, redirect
 import json
 from decimal import *
 from datetime import *
@@ -32,15 +32,72 @@ def hello():
     else:
         return redirect('/?loan=' + loans[0]['filename'])
 
-    loan = loadLoanInformation('/Users/john/PycharmProjects/mortgage/' + filename)
+    loan = loadLoanInformation(getFullPathofLoanFile(filename))
     amortizeLoan(loan)
 
     return render_template('main.html', filename=filename, loans=loans, model=loan)
 
-@app.route('/update_file')
+@app.route('/update_file', methods=['POST'])
 def update_file():
-    loanFile = request.form['loan']
-    return redirect( '/?loan=' + loan )
+
+    messages = []
+
+    loanFile = request.form["loan"]
+    data = getDatastore(getFullPathofLoanFile(loanFile))
+
+    payment_history = data["payments"]
+
+    if 'date' in request.form:
+            if (request.form['date'] == ''):
+                now = datetime.now()
+                payment_date = str(now.strftime("%Y-%m-%d"))
+                messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
+            else:
+                payment_date = request.form['date']
+                messages.append("Date provided: " + payment_date + ".")
+    else:
+        now = datetime.now()
+        payment_date = str(now.strftime("%Y-%m-%d"))
+
+    payment_amount = Decimal('0.00')
+    proceed_flag = True
+    if 'amount' in request.form:
+        if (request.form['amount'] != ''):
+            try:
+                payment_amount = Decimal(request.form['amount'])
+                messages.append("Amount provided: " + str(payment_amount) + ".")
+            except:
+                payment_amount = Decimal('0.00')
+                messages.append("The amount provided could not be interpreted.  Your payment was not recorded.")
+                proceed_flag = False
+            else:
+                pass
+
+    if proceed_flag is True:
+        try:
+            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S")
+            backup_file = open(getFullPathofLoanFile(backup_filename), 'w+')
+            json.dump(data, backup_file)
+            backup_file.close()
+        except:
+            messages.append("A backup file could not be created.  Your payment was not recorded.")
+            proceed_flag = False
+        else:
+            messages.append("A backup of your file was created: '" + backup_filename +"'" )
+
+    if proceed_flag is True:
+        try:
+            payment_history.append( [payment_date, str(payment_amount)])
+            file = open(getFullPathofLoanFile(loanFile), 'w+')
+            json.dump(data, file)
+            file.close()
+        except:
+            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " + \
+                            "please consider rolling back to the backup created above.")
+        else:
+            messages.append("The payment was successfully written. ")
+
+    return render_template('add.html', filename=loanFile, messages=messages)
 
 @app.route('/send_statement', methods=['POST'])
 def send_statement():
@@ -49,7 +106,7 @@ def send_statement():
     message = request.form["message"]
     style = request.form["style"]
 
-    loan = loadLoanInformation('/Users/john/PycharmProjects/mortgage/' + loanFile)
+    loan = loadLoanInformation(getFullPathofLoanFile(loanFile))
     amortizeLoan(loan)
 
     reportCreated = False
@@ -89,6 +146,9 @@ def addLoan(loanName, fileName):
     x['filename'] = fileName
     return x
 
+def getFullPathofLoanFile(filename):
+    return '/Users/john/PycharmProjects/mortgage/' + filename
+
 ###################
 # from old code   #
 ###################

From 8bc23dc8b103b967bfd7f41dcc773dcb61c18fe3 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Wed, 10 Jul 2019 23:12:21 -0400
Subject: [PATCH 17/38] Fixed a problem in email sending when attach/embed flag
 was removed.

---
 testloan.json | 13 +++----------
 web.py        |  3 ---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/testloan.json b/testloan.json
index 731c04d..336c69c 100644
--- a/testloan.json
+++ b/testloan.json
@@ -1,5 +1,4 @@
 {
-  "htmlTemplate": "statement.pdf.jinja",
   "parameters": {
     "monthly_payment": 589.0,
     "interest_rate": 6.5,
@@ -12,8 +11,6 @@
     "periods_per_year": 12,
     "periods": 18
   },
-  "format": "html",
-  "txtTemplate": "statement.txt.jinja",
   "lender": {
     "city": "Washington",
     "name": "Test Lender",
@@ -100,15 +97,11 @@
     "address": "301 N Beauregard St Apt 203"
   },
   "email": {
-    "body": "Your test loan statement is attached.",
     "to_address": "jkent3rd@gmail.com",
     "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent test account statement.",
+    "subject": "Your test loan statement...",
+    "body": "Your test loan statement is attached.",
     "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "pvyrbcnzrjoizprn",
-    "subject": "Your test loan statement..."
+    "password": "pvyrbcnzrjoizprn"
   }
 }
\ No newline at end of file
diff --git a/web.py b/web.py
index 6db08ac..f75db46 100644
--- a/web.py
+++ b/web.py
@@ -104,7 +104,6 @@ def send_statement():
     loanFile = request.form["loan"]
     subject = request.form["subject"]
     message = request.form["message"]
-    style = request.form["style"]
 
     loan = loadLoanInformation(getFullPathofLoanFile(loanFile))
     amortizeLoan(loan)
@@ -119,8 +118,6 @@ def send_statement():
     if 'pdf' in request.form:
         pdfInterimReport = transformTemplate(selectTemplate('pdf'), loan)
         pdfReport = createPDF(pdfInterimReport)
-        if style == 'embed':
-            style = 'attach'
         reportCreated = True
 
     if ('html' in request.form) or (reportCreated is False):

From 3ffbd5ab3d0b2f90781a88adc30dbac2aeb61bfd Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Sun, 26 Jan 2020 14:02:44 -0500
Subject: [PATCH 18/38] Created a source directly for purposes of deployment as
 zip file.

Updated to Python 3.
---
 9Kloan.json                                   | 52 +-------------
 brendamortgage.json                           | 63 +----------------
 dadmortgage.json                              | 63 +----------------
 greenfield_mortgage.json                      | 70 +------------------
 .../mortgage_template.py                      |  0
 {templates => mortgage/templates}/add.html    |  0
 {templates => mortgage/templates}/email.html  |  0
 {templates => mortgage/templates}/main.html   | 11 ++-
 .../templates}/statement.html.jinja           |  0
 .../templates}/statement.pdf.jinja            |  0
 .../templates}/statement.text.jinja           |  0
 web.py => mortgage/web.py                     | 36 +++++-----
 12 files changed, 33 insertions(+), 262 deletions(-)
 rename mortgage_template.py => mortgage/mortgage_template.py (100%)
 rename {templates => mortgage/templates}/add.html (100%)
 rename {templates => mortgage/templates}/email.html (100%)
 rename {templates => mortgage/templates}/main.html (97%)
 rename {templates => mortgage/templates}/statement.html.jinja (100%)
 rename {templates => mortgage/templates}/statement.pdf.jinja (100%)
 rename {templates => mortgage/templates}/statement.text.jinja (100%)
 rename web.py => mortgage/web.py (96%)

diff --git a/9Kloan.json b/9Kloan.json
index 266d42a..d54e2af 100644
--- a/9Kloan.json
+++ b/9Kloan.json
@@ -1,51 +1 @@
-{
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "grady@gradystreet.com",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
-  },
-"parameters": {
-  "account_number": "100002",
-  "principal": 9000.00,
-  "interest_rate": 6.5,
-  "periods_per_year": 12,
-  "periods": 20,
-  "start_date": "2019-06-15",
-  "start_interest_date": "2019-06-17",
-  "first_payment_month": "2019-07-15",
-  "monthly_payment": 475.00,
-  "payment_day_of_month": "15"
-  },
-"payments": [
-],
-"borrower": {
-  "name": "Bear Houses, LLC",
-  "address": "301 N Beauregard St Apt 203",
-  "city": "Alexandria",
-  "state": "VA",
-  "zip": "22312"
-  },
-"lender": {
-  "name": "Rivanna Graphite Investments, LLC",
-  "phone": "703.343.0782",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
-  },
-"header": {
-  "title": "Installment Loan Statement",
-  "date": "Today"
-  }
-}
-
+{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 475.0, "interest_rate": 6.5, "start_interest_date": "2019-06-17", "payment_day_of_month": "15", "first_payment_month": "2019-07-15", "account_number": "100002", "periods": 20, "start_date": "2019-06-15", "periods_per_year": 12, "principal": 9000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "grady@gradystreet.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Washington", "name": "Rivanna Graphite Investments, LLC", "zip": "20011", "phone": "703.343.0782", "state": "DC", "address": "743 Madison St NW"}, "header": {"date": "Today", "title": "Installment Loan Statement"}, "payments": [["2019-07-15", "475.00"], ["2019-08-14", "475.00"], ["2019-09-17", "475"], ["2019-10-15", "0"], ["2019-11-15", "0"], ["2019-12-5", "475"]], "borrower": {"city": "Alexandria", "state": "VA", "name": "Bear Houses, LLC", "zip": "22312", "address": "301 N Beauregard St Apt 203"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
diff --git a/brendamortgage.json b/brendamortgage.json
index 2a9d7c7..948cec0 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -1,62 +1 @@
-{
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "bck@virginia.edu",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
-  },
-"parameters": {
-  "account_number": "100001",
-  "principal": 35000.00,
-  "interest_rate": 5.0,
-  "periods_per_year": 12,
-  "periods": 180,
-  "start_date": "2018-06-25",
-  "start_interest_date": "2018-07-01",
-  "first_payment_month": "2018-08-01",
-  "monthly_payment": 278.15,
-  "payment_day_of_month": "01"
-  },
-"borrower": {
-  "name": "Grandma Tina's Properties, LLC",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
-  },
-"lender": {
-  "name": "Brenda Kelly",
-  "phone": "434-286-2110",
-  "address": "150 Confederate Street",
-  "city": "Scottsville",
-  "state": "VA",
-  "zip": "24590"
-  },
-"header": {
-  "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA",
-  "date": "Today"
-  },
-"payments": [
-   ["2018-08-01", "278.15"],
-   ["2018-09-01", "278.15"],
-   ["2018-10-01", "278.15"],
-   ["2018-11-01", "278.15"],
-   ["2018-12-01", "278.15"],
-   ["2019-01-01", "278.15"],
-   ["2019-02-01", "278.15"],
-   ["2019-03-01", "278.15"],
-   ["2019-04-01", "278.15"],
-   ["2019-05-01", "278.15"],
-   ["2019-05-31", "278.15"],
-   ["2019-07-01", "278.15"]
- ]
-}
+{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 278.15, "interest_rate": 5.0, "start_interest_date": "2018-07-01", "payment_day_of_month": "01", "first_payment_month": "2018-08-01", "account_number": "100001", "periods": 180, "start_date": "2018-06-25", "periods_per_year": 12, "principal": 35000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "bck@virginia.edu", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Scottsville", "name": "Brenda Kelly", "zip": "24590", "phone": "434-286-2110", "state": "VA", "address": "150 Confederate Street"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"}, "payments": [["2018-08-01", "278.15"], ["2018-09-01", "278.15"], ["2018-10-01", "278.15"], ["2018-11-01", "278.15"], ["2018-12-01", "278.15"], ["2019-01-01", "278.15"], ["2019-02-01", "278.15"], ["2019-03-01", "278.15"], ["2019-04-01", "278.15"], ["2019-05-01", "278.15"], ["2019-05-31", "278.15"], ["2019-07-01", "278.15"], ["2019-08-01", "278.15"], ["2019-09-02", "278.15"], ["2019-10-01", "278.15"], ["2019-11-01", "278.15"], ["2019-12-02", "278.15"], ["2020-01-02", "278.15"]], "borrower": {"city": "Washington", "state": "DC", "name": "Grandma Tina's Properties, LLC", "zip": "20011", "address": "743 Madison St NW"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
diff --git a/dadmortgage.json b/dadmortgage.json
index f7ec1a1..933f1ee 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -1,62 +1 @@
-{
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "johnkent49@gmail.com",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
-  },
-"parameters": {
-  "account_number": "100001",
-  "principal": 35000.00,
-  "interest_rate": 5.0,
-  "periods_per_year": 12,
-  "periods": 180,
-  "start_date": "2018-06-25",
-  "start_interest_date": "2018-07-01",
-  "first_payment_month": "2018-08-01",
-  "monthly_payment": 278.15,
-  "payment_day_of_month": "01"
-  },
-"borrower": {
-  "name": "Grandma Tina's Properties, LLC",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
-  },
-"lender": {
-  "name": "John Kent",
-  "phone": "434-510-7272",
-  "address": "109 Shores Rd",
-  "city": "Palmyra",
-  "state": "VA",
-  "zip": "22963"
-  },
-"header": {
-  "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA",
-  "date": "Today"
-  },
-"payments": [
-   ["2018-08-01", "278.15"],
-   ["2018-09-01", "278.15"],
-   ["2018-10-01", "278.15"],
-   ["2018-11-01", "278.15"],
-   ["2018-12-01", "278.15"],
-   ["2019-01-01", "278.15"],
-   ["2019-02-01", "278.15"],
-   ["2019-03-01", "278.15"],
-   ["2019-04-01", "278.15"],
-   ["2019-05-01", "278.15"],
-   ["2019-05-31", "278.15"],
-   ["2019-07-01", "278.15"]
- ]
-}
+{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 278.15, "interest_rate": 5.0, "start_interest_date": "2018-07-01", "payment_day_of_month": "01", "first_payment_month": "2018-08-01", "account_number": "100001", "periods": 180, "start_date": "2018-06-25", "periods_per_year": 12, "principal": 35000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "johnkent49@gmail.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Palmyra", "name": "John Kent", "zip": "22963", "phone": "434-510-7272", "state": "VA", "address": "109 Shores Rd"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"}, "payments": [["2018-08-01", "278.15"], ["2018-09-01", "278.15"], ["2018-10-01", "278.15"], ["2018-11-01", "278.15"], ["2018-12-01", "278.15"], ["2019-01-01", "278.15"], ["2019-02-01", "278.15"], ["2019-03-01", "278.15"], ["2019-04-01", "278.15"], ["2019-05-01", "278.15"], ["2019-05-31", "278.15"], ["2019-07-01", "278.15"], ["2019-08-01", "278.15"], ["2019-09-02", "278.15"], ["2019-10-01", "278.15"], ["2019-11-01", "278.15"], ["2019-12-02", "278.15"], ["2020-01-02", "278.15"]], "borrower": {"city": "Washington", "state": "DC", "name": "Grandma Tina's Properties, LLC", "zip": "20011", "address": "743 Madison St NW"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index 89e1a59..e278296 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -1,69 +1 @@
-{
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "grady@gradystreet.com",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
-  },
-"parameters": {
-  "account_number": "100001",
-  "principal": 97750.00,
-  "interest_rate": 5.5,
-  "periods_per_year": 12,
-  "periods": 185,
-  "start_date": "2017-11-07",
-  "start_interest_date": "2017-11-11",
-  "first_payment_month": "2017-12-15",
-  "monthly_payment": 803.00,
-  "payment_day_of_month": "15"
-  },
-"payments": [
-   ["2017-12-11", "803.00"],
-   ["2018-01-23", "803.00"],
-   ["2018-03-23", "803.00"],
-   ["2018-04-18", "803.00"],
-   ["2018-04-26", "803.00"],
-   ["2018-05-15", "0.00"],
-   ["2018-06-15", "0.00"],
-   ["2018-07-12", "803.00"],
-   ["2018-08-07", "803.00"],
-   ["2018-09-06", "803.00"],
-   ["2018-10-11", "803.00"],
-   ["2018-11-13", "803.00"],
-   ["2018-12-13", "803.00"],
-   ["2019-01-14", "803.00"],
-   ["2019-02-05", "803.00"],
-   ["2019-03-05", "803.00"],
-   ["2019-04-15", "803.00"],
-   ["2019-05-15", "0.00"],
-   ["2019-06-13", "803.00"]
- ],
-"borrower": {
-  "name": "Bear Houses, LLC",
-  "address": "301 N Beauregard St Apt 203",
-  "city": "Alexandria",
-  "state": "VA",
-  "zip": "22312"
-  },
-"lender": {
-  "name": "Rivanna Graphite Investments, LLC",
-  "phone": "703.343.0782",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
-  },
-"header": {
-  "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS",
-  "date": "Today"
-  }
-}
+{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 803.0, "interest_rate": 5.5, "start_interest_date": "2017-11-11", "payment_day_of_month": "15", "first_payment_month": "2017-12-15", "account_number": "100001", "periods": 185, "start_date": "2017-11-07", "periods_per_year": 12, "principal": 97750.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "grady@gradystreet.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Washington", "name": "Rivanna Graphite Investments, LLC", "zip": "20011", "phone": "703.343.0782", "state": "DC", "address": "743 Madison St NW"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"}, "payments": [["2017-12-11", "803.00"], ["2018-01-23", "803.00"], ["2018-03-23", "803.00"], ["2018-04-18", "803.00"], ["2018-04-26", "803.00"], ["2018-05-15", "0.00"], ["2018-06-15", "0.00"], ["2018-07-12", "803.00"], ["2018-08-07", "803.00"], ["2018-09-06", "803.00"], ["2018-10-11", "803.00"], ["2018-11-13", "803.00"], ["2018-12-13", "803.00"], ["2019-01-14", "803.00"], ["2019-02-05", "803.00"], ["2019-03-05", "803.00"], ["2019-04-15", "803.00"], ["2019-05-15", "0.00"], ["2019-06-13", "803.00"], ["2019-07-25", "803.00"], ["2019-08-14", "803.00"], ["2019-09-13", "803.00"], ["2019-10-21", "803.00"], ["2019-11-29", "803.00"], ["2019-12-19", "803.00"], ["2020-01-15", "803"]], "borrower": {"city": "Alexandria", "state": "VA", "name": "Bear Houses, LLC", "zip": "22312", "address": "301 N Beauregard St Apt 203"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
diff --git a/mortgage_template.py b/mortgage/mortgage_template.py
similarity index 100%
rename from mortgage_template.py
rename to mortgage/mortgage_template.py
diff --git a/templates/add.html b/mortgage/templates/add.html
similarity index 100%
rename from templates/add.html
rename to mortgage/templates/add.html
diff --git a/templates/email.html b/mortgage/templates/email.html
similarity index 100%
rename from templates/email.html
rename to mortgage/templates/email.html
diff --git a/templates/main.html b/mortgage/templates/main.html
similarity index 97%
rename from templates/main.html
rename to mortgage/templates/main.html
index 9bc9409..9edc972 100644
--- a/templates/main.html
+++ b/mortgage/templates/main.html
@@ -15,7 +15,7 @@
 <table><tr>
     <td>Loan:</td>
     <td>
-    <select name="loan">
+    <select name="loan" id="loan">
     {% for loan in loans %}
       {% if loan.filename==filename %}
         <option value="{{loan.filename}}" selected>{{loan.name}}</option>
@@ -28,6 +28,15 @@
     </td>
 </table>
 </form>
+<script type="text/javascript">
+    $(
+        function() {
+            $("#loan").change(
+                function() {
+                    this.form.submit();
+                 });
+         });
+</script>
 </p>
 <div id="tabs">
     <ul>
diff --git a/templates/statement.html.jinja b/mortgage/templates/statement.html.jinja
similarity index 100%
rename from templates/statement.html.jinja
rename to mortgage/templates/statement.html.jinja
diff --git a/templates/statement.pdf.jinja b/mortgage/templates/statement.pdf.jinja
similarity index 100%
rename from templates/statement.pdf.jinja
rename to mortgage/templates/statement.pdf.jinja
diff --git a/templates/statement.text.jinja b/mortgage/templates/statement.text.jinja
similarity index 100%
rename from templates/statement.text.jinja
rename to mortgage/templates/statement.text.jinja
diff --git a/web.py b/mortgage/web.py
similarity index 96%
rename from web.py
rename to mortgage/web.py
index f75db46..90da3df 100644
--- a/web.py
+++ b/mortgage/web.py
@@ -10,11 +10,10 @@ import os
 loader=jinja2.FileSystemLoader([os.path.join(os.path.dirname(__file__),"templates")])
 environment = jinja2.Environment(loader=loader)
 
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.MIMEBase import MIMEBase
-from email import Encoders
-
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email import encoders
 app = Flask(__name__)
 
 @app.route('/')
@@ -218,9 +217,9 @@ def getDatastore(filename=None):
                 datastore = json.load(f)
 
     except Exception as e:
-        print "An error occurred opening your loan file '%s'. " % filename
-        print "The Exception:"
-        print e.__repr__()
+        print("An error occurred opening your loan file '%s'. " % filename)
+        print("The Exception:")
+        print(e.__repr__())
         quit()
 
     return datastore
@@ -256,8 +255,8 @@ def amortizeLoan(loan):
 
         #check for out of order payments, generally a sign of a data entry problem, especially years
         if days_since_last_payment < 0:
-            print "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
-                  % (payment_number, payment_date, interest_paid_through_date)
+            print("Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
+                  % (payment_number, payment_date, interest_paid_through_date))
             quit()
 
         new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
@@ -345,7 +344,7 @@ def transformTemplate(template_fileName, loanModel):
     # setup jinja for creating the statement
     template = environment.get_template(template_fileName)
 
-    print loanModel
+    print(loanModel)
     report = template.render(model=loanModel)
     return report
 
@@ -361,21 +360,21 @@ def generateEmail(from_address, to_address, subject, body, pdf, html, txt):
     if (pdf != None):
         part = MIMEBase("application", "octet-stream")
         part.set_payload(pdf)
-        Encoders.encode_base64(part)
+        encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
         msg.attach(part)
 
     if (html != None):
         part = MIMEBase("text", "html")
         part.set_payload(html)
-        Encoders.encode_base64(part)
+        encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
         msg.attach(part)
 
     if (txt != None):
         part = MIMEBase("text", "plain")
         part.set_payload(txt)
-        Encoders.encode_base64(part)
+        encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="statement.txt"')
         msg.attach(part)
 
@@ -392,7 +391,7 @@ def sendEmail(msg, from_address, to_address, passwd):
         server.sendmail(from_address, to_address, msg.as_string())
         server.close()
     except:
-        print "Couldn't send email."
+        print("Couldn't send email.")
 
 
 def createPDF(report):
@@ -420,6 +419,9 @@ def selectTemplate(format):
 
     return 'statement.html.jinja'
 
-if __name__ == '__main__':
+def main():
     app.debug = True
-    app.run()
\ No newline at end of file
+    app.run()
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file

From 219c1ada2f3425f935ba7eeee31d99b00e22fdf4 Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Tue, 23 Jun 2020 22:00:23 -0400
Subject: [PATCH 19/38] Data file updates.

---
 9Kloan.json              |  96 ++++++++++++++++++++-
 brendamortgage.json      | 143 ++++++++++++++++++++++++++++++-
 dadmortgage.json         | 143 ++++++++++++++++++++++++++++++-
 greenfield_mortgage.json | 176 ++++++++++++++++++++++++++++++++++++++-
 testloan.json            |  65 ++++-----------
 5 files changed, 569 insertions(+), 54 deletions(-)

diff --git a/9Kloan.json b/9Kloan.json
index d54e2af..a01c4b4 100644
--- a/9Kloan.json
+++ b/9Kloan.json
@@ -1 +1,95 @@
-{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 475.0, "interest_rate": 6.5, "start_interest_date": "2019-06-17", "payment_day_of_month": "15", "first_payment_month": "2019-07-15", "account_number": "100002", "periods": 20, "start_date": "2019-06-15", "periods_per_year": 12, "principal": 9000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "grady@gradystreet.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Washington", "name": "Rivanna Graphite Investments, LLC", "zip": "20011", "phone": "703.343.0782", "state": "DC", "address": "743 Madison St NW"}, "header": {"date": "Today", "title": "Installment Loan Statement"}, "payments": [["2019-07-15", "475.00"], ["2019-08-14", "475.00"], ["2019-09-17", "475"], ["2019-10-15", "0"], ["2019-11-15", "0"], ["2019-12-5", "475"]], "borrower": {"city": "Alexandria", "state": "VA", "name": "Bear Houses, LLC", "zip": "22312", "address": "301 N Beauregard St Apt 203"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 475.0,
+    "interest_rate": 6.5,
+    "start_interest_date": "2019-06-17",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2019-07-15",
+    "account_number": "100002",
+    "periods": 20,
+    "start_date": "2019-06-15",
+    "periods_per_year": 12,
+    "principal": 9000.0
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "grady@gradystreet.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "pvyrbcnzrjoizprn",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Washington",
+    "name": "Rivanna Graphite Investments, LLC",
+    "zip": "20008",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "3100 Connecticut Ave NW Apt 144"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Installment Loan Statement"
+  },
+  "payments": [
+    [
+      "2019-07-15",
+      "475.00"
+    ],
+    [
+      "2019-08-14",
+      "475.00"
+    ],
+    [
+      "2019-09-17",
+      "475"
+    ],
+    [
+      "2019-10-15",
+      "0"
+    ],
+    [
+      "2019-11-15",
+      "0"
+    ],
+    [
+      "2019-12-5",
+      "475"
+    ],
+    [
+      "2020-01-15",
+      "0",
+      "0"
+    ],
+    [
+      "2020-02-17",
+      "0"
+    ],
+    [
+      "2020-03-03",
+      "475"
+    ],
+    [
+      "2020-04-15",
+      "0"
+    ],
+    [
+      "2020-05-19",
+      "475"
+    ]
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Bear Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/brendamortgage.json b/brendamortgage.json
index 948cec0..12e74ba 100644
--- a/brendamortgage.json
+++ b/brendamortgage.json
@@ -1 +1,142 @@
-{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 278.15, "interest_rate": 5.0, "start_interest_date": "2018-07-01", "payment_day_of_month": "01", "first_payment_month": "2018-08-01", "account_number": "100001", "periods": 180, "start_date": "2018-06-25", "periods_per_year": 12, "principal": 35000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "bck@virginia.edu", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Scottsville", "name": "Brenda Kelly", "zip": "24590", "phone": "434-286-2110", "state": "VA", "address": "150 Confederate Street"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"}, "payments": [["2018-08-01", "278.15"], ["2018-09-01", "278.15"], ["2018-10-01", "278.15"], ["2018-11-01", "278.15"], ["2018-12-01", "278.15"], ["2019-01-01", "278.15"], ["2019-02-01", "278.15"], ["2019-03-01", "278.15"], ["2019-04-01", "278.15"], ["2019-05-01", "278.15"], ["2019-05-31", "278.15"], ["2019-07-01", "278.15"], ["2019-08-01", "278.15"], ["2019-09-02", "278.15"], ["2019-10-01", "278.15"], ["2019-11-01", "278.15"], ["2019-12-02", "278.15"], ["2020-01-02", "278.15"]], "borrower": {"city": "Washington", "state": "DC", "name": "Grandma Tina's Properties, LLC", "zip": "20011", "address": "743 Madison St NW"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 278.15,
+    "interest_rate": 5.0,
+    "start_interest_date": "2018-07-01",
+    "payment_day_of_month": "01",
+    "first_payment_month": "2018-08-01",
+    "account_number": "100001",
+    "periods": 180,
+    "start_date": "2018-06-25",
+    "periods_per_year": 12,
+    "principal": 35000.0
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "bck@virginia.edu",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "pvyrbcnzrjoizprn",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Scottsville",
+    "name": "Brenda Kelly",
+    "zip": "24590",
+    "phone": "434-286-2110",
+    "state": "VA",
+    "address": "150 Confederate Street"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"
+  },
+  "payments": [
+    [
+      "2018-08-01",
+      "278.15"
+    ],
+    [
+      "2018-09-01",
+      "278.15"
+    ],
+    [
+      "2018-10-01",
+      "278.15"
+    ],
+    [
+      "2018-11-01",
+      "278.15"
+    ],
+    [
+      "2018-12-01",
+      "278.15"
+    ],
+    [
+      "2019-01-01",
+      "278.15"
+    ],
+    [
+      "2019-02-01",
+      "278.15"
+    ],
+    [
+      "2019-03-01",
+      "278.15"
+    ],
+    [
+      "2019-04-01",
+      "278.15"
+    ],
+    [
+      "2019-05-01",
+      "278.15"
+    ],
+    [
+      "2019-05-31",
+      "278.15"
+    ],
+    [
+      "2019-07-01",
+      "278.15"
+    ],
+    [
+      "2019-08-01",
+      "278.15"
+    ],
+    [
+      "2019-09-02",
+      "278.15"
+    ],
+    [
+      "2019-10-01",
+      "278.15"
+    ],
+    [
+      "2019-11-01",
+      "278.15"
+    ],
+    [
+      "2019-12-02",
+      "278.15"
+    ],
+    [
+      "2020-01-02",
+      "278.15"
+    ],
+    [
+      "2020-02-01",
+      "278.15"
+    ],
+    [
+      "2020-03-01",
+      "278.15"
+    ],
+    [
+      "2020-04-01",
+      "278.15"
+    ],
+    [
+      "2020-05-01",
+      "278.15"
+    ],
+    [
+      "2020-06-01",
+      "278.15"
+    ]
+  ],
+  "borrower": {
+    "city": "Washington",
+    "state": "DC",
+    "name": "Grandma Tina's Properties, LLC",
+    "zip": "20008",
+    "address": "3100 Connecticut Ave NW Apt 144"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/dadmortgage.json b/dadmortgage.json
index 933f1ee..919852a 100644
--- a/dadmortgage.json
+++ b/dadmortgage.json
@@ -1 +1,142 @@
-{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 278.15, "interest_rate": 5.0, "start_interest_date": "2018-07-01", "payment_day_of_month": "01", "first_payment_month": "2018-08-01", "account_number": "100001", "periods": 180, "start_date": "2018-06-25", "periods_per_year": 12, "principal": 35000.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "johnkent49@gmail.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Palmyra", "name": "John Kent", "zip": "22963", "phone": "434-510-7272", "state": "VA", "address": "109 Shores Rd"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"}, "payments": [["2018-08-01", "278.15"], ["2018-09-01", "278.15"], ["2018-10-01", "278.15"], ["2018-11-01", "278.15"], ["2018-12-01", "278.15"], ["2019-01-01", "278.15"], ["2019-02-01", "278.15"], ["2019-03-01", "278.15"], ["2019-04-01", "278.15"], ["2019-05-01", "278.15"], ["2019-05-31", "278.15"], ["2019-07-01", "278.15"], ["2019-08-01", "278.15"], ["2019-09-02", "278.15"], ["2019-10-01", "278.15"], ["2019-11-01", "278.15"], ["2019-12-02", "278.15"], ["2020-01-02", "278.15"]], "borrower": {"city": "Washington", "state": "DC", "name": "Grandma Tina's Properties, LLC", "zip": "20011", "address": "743 Madison St NW"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 278.15,
+    "interest_rate": 5.0,
+    "start_interest_date": "2018-07-01",
+    "payment_day_of_month": "01",
+    "first_payment_month": "2018-08-01",
+    "account_number": "100001",
+    "periods": 180,
+    "start_date": "2018-06-25",
+    "periods_per_year": 12,
+    "principal": 35000.0
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "johnkent49@gmail.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "pvyrbcnzrjoizprn",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Palmyra",
+    "name": "John Kent",
+    "zip": "22963",
+    "phone": "434-510-7272",
+    "state": "VA",
+    "address": "109 Shores Rd"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"
+  },
+  "payments": [
+    [
+      "2018-08-01",
+      "278.15"
+    ],
+    [
+      "2018-09-01",
+      "278.15"
+    ],
+    [
+      "2018-10-01",
+      "278.15"
+    ],
+    [
+      "2018-11-01",
+      "278.15"
+    ],
+    [
+      "2018-12-01",
+      "278.15"
+    ],
+    [
+      "2019-01-01",
+      "278.15"
+    ],
+    [
+      "2019-02-01",
+      "278.15"
+    ],
+    [
+      "2019-03-01",
+      "278.15"
+    ],
+    [
+      "2019-04-01",
+      "278.15"
+    ],
+    [
+      "2019-05-01",
+      "278.15"
+    ],
+    [
+      "2019-05-31",
+      "278.15"
+    ],
+    [
+      "2019-07-01",
+      "278.15"
+    ],
+    [
+      "2019-08-01",
+      "278.15"
+    ],
+    [
+      "2019-09-02",
+      "278.15"
+    ],
+    [
+      "2019-10-01",
+      "278.15"
+    ],
+    [
+      "2019-11-01",
+      "278.15"
+    ],
+    [
+      "2019-12-02",
+      "278.15"
+    ],
+    [
+      "2020-01-02",
+      "278.15"
+    ],
+    [
+      "2020-02-01",
+      "278.15"
+    ],
+    [
+      "2020-03-02",
+      "278.15"
+    ],
+    [
+      "2020-04-01",
+      "278.15"
+    ],
+    [
+      "2020-05-01",
+      "278.15"
+    ],
+    [
+      "2020-06-01",
+      "278.15"
+    ]
+  ],
+  "borrower": {
+    "city": "Washington",
+    "state": "DC",
+    "name": "Grandma Tina's Properties, LLC",
+    "zip": "20008",
+    "address": "3100 Connecticut Ave NW Apt 144"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/greenfield_mortgage.json b/greenfield_mortgage.json
index e278296..1ea4eee 100644
--- a/greenfield_mortgage.json
+++ b/greenfield_mortgage.json
@@ -1 +1,175 @@
-{"htmlTemplate": "statement.pdf.jinja", "parameters": {"monthly_payment": 803.0, "interest_rate": 5.5, "start_interest_date": "2017-11-11", "payment_day_of_month": "15", "first_payment_month": "2017-12-15", "account_number": "100001", "periods": 185, "start_date": "2017-11-07", "periods_per_year": 12, "principal": 97750.0}, "format": "html", "email": {"body": "Your loan statement is attached.", "to_address": "grady@gradystreet.com", "from_address": "jkent3rd@gmail.com", "text": "Please see your most recent account statement.", "server": "smtp.gmail.com", "send_text": "true", "template": "./template.txt", "send_pdf": "true", "password": "pvyrbcnzrjoizprn", "subject": "Your loan statement..."}, "lender": {"city": "Washington", "name": "Rivanna Graphite Investments, LLC", "zip": "20011", "phone": "703.343.0782", "state": "DC", "address": "743 Madison St NW"}, "header": {"date": "Today", "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"}, "payments": [["2017-12-11", "803.00"], ["2018-01-23", "803.00"], ["2018-03-23", "803.00"], ["2018-04-18", "803.00"], ["2018-04-26", "803.00"], ["2018-05-15", "0.00"], ["2018-06-15", "0.00"], ["2018-07-12", "803.00"], ["2018-08-07", "803.00"], ["2018-09-06", "803.00"], ["2018-10-11", "803.00"], ["2018-11-13", "803.00"], ["2018-12-13", "803.00"], ["2019-01-14", "803.00"], ["2019-02-05", "803.00"], ["2019-03-05", "803.00"], ["2019-04-15", "803.00"], ["2019-05-15", "0.00"], ["2019-06-13", "803.00"], ["2019-07-25", "803.00"], ["2019-08-14", "803.00"], ["2019-09-13", "803.00"], ["2019-10-21", "803.00"], ["2019-11-29", "803.00"], ["2019-12-19", "803.00"], ["2020-01-15", "803"]], "borrower": {"city": "Alexandria", "state": "VA", "name": "Bear Houses, LLC", "zip": "22312", "address": "301 N Beauregard St Apt 203"}, "txtTemplate": "statement.txt.jinja"}
\ No newline at end of file
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 803.0,
+    "interest_rate": 5.5,
+    "start_interest_date": "2017-11-11",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2017-12-15",
+    "account_number": "100001",
+    "periods": 185,
+    "start_date": "2017-11-07",
+    "periods_per_year": 12,
+    "principal": 97750.0
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "grady@gradystreet.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "pvyrbcnzrjoizprn",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Washington",
+    "name": "Rivanna Graphite Investments, LLC",
+    "zip": "20008",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "3100 Connecticut Ave NW Apt 144"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"
+  },
+  "payments": [
+    [
+      "2017-12-11",
+      "803.00"
+    ],
+    [
+      "2018-01-23",
+      "803.00"
+    ],
+    [
+      "2018-03-23",
+      "803.00"
+    ],
+    [
+      "2018-04-18",
+      "803.00"
+    ],
+    [
+      "2018-04-26",
+      "803.00"
+    ],
+    [
+      "2018-05-15",
+      "0.00"
+    ],
+    [
+      "2018-06-15",
+      "0.00"
+    ],
+    [
+      "2018-07-12",
+      "803.00"
+    ],
+    [
+      "2018-08-07",
+      "803.00"
+    ],
+    [
+      "2018-09-06",
+      "803.00"
+    ],
+    [
+      "2018-10-11",
+      "803.00"
+    ],
+    [
+      "2018-11-13",
+      "803.00"
+    ],
+    [
+      "2018-12-13",
+      "803.00"
+    ],
+    [
+      "2019-01-14",
+      "803.00"
+    ],
+    [
+      "2019-02-05",
+      "803.00"
+    ],
+    [
+      "2019-03-05",
+      "803.00"
+    ],
+    [
+      "2019-04-15",
+      "803.00"
+    ],
+    [
+      "2019-05-15",
+      "0.00"
+    ],
+    [
+      "2019-06-13",
+      "803.00"
+    ],
+    [
+      "2019-07-25",
+      "803.00"
+    ],
+    [
+      "2019-08-14",
+      "803.00"
+    ],
+    [
+      "2019-09-13",
+      "803.00"
+    ],
+    [
+      "2019-10-21",
+      "803.00"
+    ],
+    [
+      "2019-11-29",
+      "803.00"
+    ],
+    [
+      "2019-12-19",
+      "803.00"
+    ],
+    [
+      "2020-01-15",
+      "803"
+    ],
+    [
+      "2020-03-06",
+      "803",
+      "32.12"
+    ],
+    [
+      "2020-03-13",
+      "803.00"
+    ],
+    [
+      "2020-04-15",
+      "803.00"
+    ],
+    [
+      "2020-05-13",
+      "803.00"
+    ],
+    [
+      "2020-06-16",
+      "803.00"
+    ]
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Bear Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/testloan.json b/testloan.json
index 336c69c..0be860b 100644
--- a/testloan.json
+++ b/testloan.json
@@ -23,70 +23,35 @@
     "date": "Today",
     "title": "Installment Loan Test Statement"
   },
-  "payments": [
+    "payments": [
     [
-      "2018-01-16",
-      "589.00"
+      "2019-07-15",
+      "475.00"
     ],
     [
-      "2018-03-30",
-      "589.00"
+      "2019-08-14",
+      "475.00"
     ],
     [
-      "2018-04-06",
-      "589.00"
+      "2019-09-17",
+      "475"
     ],
     [
-      "2018-04-12",
-      "589.00"
-    ],
-    [
-      "2018-05-28",
-      "589.00"
-    ],
-    [
-      "2018-06-12",
-      "589.00"
-    ],
-    [
-      "2018-07-13",
-      "589.00"
-    ],
-    [
-      "2018-08-14",
-      "589.00"
-    ],
-    [
-      "2018-09-26",
-      "589.00"
-    ],
-    [
-      "2018-10-15",
+      "2019-10-15",
       "0"
     ],
     [
-      "2018-11-29",
-      "589.00"
+      "2019-11-15",
+      "0"
     ],
     [
-      "2018-12-31",
-      "589.00"
+      "2019-12-5",
+      "475"
     ],
     [
-      "2019-01-28",
-      "589.00"
-    ],
-    [
-      "2019-03-15",
-      "589.00"
-    ],
-    [
-      "2019-07-10",
-      "123.12"
-    ],
-    [
-      "2019-07-10",
-      "120"
+      "2020-01-15",
+      "0",
+      "50"
     ]
   ],
   "borrower": {

From e5830536a134ef66f9cfb3f1caf3984a105e6cde Mon Sep 17 00:00:00 2001
From: JohnKent <devnull@localhost>
Date: Tue, 23 Jun 2020 22:03:38 -0400
Subject: [PATCH 20/38] Added late fee logic to calculation logic and the
 templates.

user: JohnKent
branch 'default'
added .hgignore
changed mortgage/templates/main.html
changed mortgage/templates/statement.html.jinja
changed mortgage/templates/statement.pdf.jinja
changed mortgage/templates/statement.text.jinja
changed mortgage/web.py
---
 .hgignore                               |  3 +++
 mortgage/templates/main.html            | 18 +++++++++++-------
 mortgage/templates/statement.html.jinja | 10 ++++++----
 mortgage/templates/statement.pdf.jinja  | 14 ++++++++------
 mortgage/templates/statement.text.jinja |  2 ++
 mortgage/web.py                         | 15 ++++++++++-----
 6 files changed, 40 insertions(+), 22 deletions(-)
 create mode 100644 .hgignore

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..1545b02
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,3 @@
+./venv/
+.hgignore
+.Python
diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 9edc972..1b0c7db 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -74,17 +74,18 @@
         <table border="1px" align="center">
             <thead>
             <tr>
-                <th colspan="8">Loan History</th>
+                <th colspan="9">Loan History</th>
             </tr>
             <tr>
                 <th width='5%'>#</td>
                 <th width='10%'>Due Date</th>
                 <th width='10%'>Date Paid</th>
                 <th width='10%'>Days Interest</th>
-                <th width='15%' align='right'>Payment Amt</th>
-                <th width='15%' align='right'>Principal Pmt</th>
-                <th width='15%' align='right'>Interest Pmt</th>
-                <th width='20%' align='right'>New Balance</th>
+                <th width='12%' align='right'>Payment Amt</th>
+                <th width='12%' align='right'>Principal Pmt</th>
+                <th width='12%' align='right'>Interest Pmt</th>
+                <th width='10%' align='right'>Late Fee</th>
+                <th width='24%' align='right'>New Balance</th>
             </tr>
             </thead>
         <tbody>
@@ -97,13 +98,14 @@
                 <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
                 <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
                 <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+                <td align='right'> {{ "$%.2f"|format(item.late_fee) }} </td>
                 <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
             </tr>
         {% if item.month == 12 or loop.last %}
-            <tr><td colspan='8'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
+            <tr><td colspan='9'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
         {% endif %}
         {% endfor %}
-            <tr><td colspan='8'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
+            <tr><td colspan='9'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
         </tbody>
         </table>
     </div>
@@ -172,6 +174,8 @@
             <tr><td><input type="date" name="date"</td></tr>
             <tr><td bgcolor="beige">Payment Amount:</td></tr>
             <tr><td><input type="text" name="amount"></td></tr>
+            <tr><td bgcolor="beige">Late Fee Amount:</td></tr>
+            <tr><td><input type="text" name="latefee"></td></tr>
             <tr><td><button>Record Payment</button></td></tr>
         </table>
         </form>
diff --git a/mortgage/templates/statement.html.jinja b/mortgage/templates/statement.html.jinja
index 48e124c..72db61f 100644
--- a/mortgage/templates/statement.html.jinja
+++ b/mortgage/templates/statement.html.jinja
@@ -27,10 +27,11 @@
     <th width='10%'>Due Date</th>
     <th width='10%'>Date Paid</th>
     <th width='10%'>Days Interest</th>
-    <th width='15%' align='right'>Payment Amt</th>
-    <th width='15%' align='right'>Principal Pmt</th>
-    <th width='15%' align='right'>Interest Pmt</th>
-    <th width='20%' align='right'>New Balance</th>
+    <th width='12%' align='right'>Payment Amt</th>
+    <th width='12%' align='right'>Principal Pmt</th>
+    <th width='12%' align='right'>Interest Pmt</th>
+    <th width='10%' align='right'>Late Fee</th>
+    <th width='19%' align='right'>New Balance</th>
 </tr></thead>
 <tbody>
 {% for item in model.past_payments %}
@@ -41,6 +42,7 @@
     <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.late_fee) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
 </tr>
     {% if item.month == 12 or loop.last %}
diff --git a/mortgage/templates/statement.pdf.jinja b/mortgage/templates/statement.pdf.jinja
index 48e124c..944d6f3 100644
--- a/mortgage/templates/statement.pdf.jinja
+++ b/mortgage/templates/statement.pdf.jinja
@@ -27,10 +27,11 @@
     <th width='10%'>Due Date</th>
     <th width='10%'>Date Paid</th>
     <th width='10%'>Days Interest</th>
-    <th width='15%' align='right'>Payment Amt</th>
-    <th width='15%' align='right'>Principal Pmt</th>
-    <th width='15%' align='right'>Interest Pmt</th>
-    <th width='20%' align='right'>New Balance</th>
+    <th width='12%' align='right'>Payment Amt</th>
+    <th width='12%' align='right'>Principal Pmt</th>
+    <th width='12%' align='right'>Interest Pmt</th>
+    <th width='10%' align='right'>Late Fee</th>
+    <th width='24%' align='right'>New Balance</th>
 </tr></thead>
 <tbody>
 {% for item in model.past_payments %}
@@ -41,6 +42,7 @@
     <td align='right'> {{ "$%.2f"|format(item.payment_amount) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.principal_payment) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.interest_payment) }} </td>
+    <td align='right'> {{ "$%.2f"|format(item.late_fee) }} </td>
     <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
 </tr>
     {% if item.month == 12 or loop.last %}
@@ -56,9 +58,9 @@
 <table>
 <thead>
 <tr>
-    <th width='8%'>#</th>
+    <th width='10%'>#</th>
     <th width='15%'>Due Date</th>
-    <th width='8%'>Days Interest</th>
+    <th width='10%'>Days Interest</th>
     <th width='15%' align='right'>Payment Amt</th>
     <th width='15%' align='right'>Principal Pmt</th>
     <th width='15%' align='right'>Interest Pmt</th>
diff --git a/mortgage/templates/statement.text.jinja b/mortgage/templates/statement.text.jinja
index d7fbef2..e205e2b 100644
--- a/mortgage/templates/statement.text.jinja
+++ b/mortgage/templates/statement.text.jinja
@@ -7,6 +7,7 @@ Payment History
     Payment Amount
     Principal Payment
     Interest Payment
+    Late Fee
     New Balance
 
 {% for item in past_payments %}
@@ -17,6 +18,7 @@ Payment History
 {{ item.payment_amount }}
 {{ item.principal_payment }}
 {{ item.interest_payment }}
+{{ item.late_fee }}
 {{ item.new_balance }}
 
     {% if item.print_interest_total %}
diff --git a/mortgage/web.py b/mortgage/web.py
index 90da3df..7413512 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -74,9 +74,9 @@ def update_file():
 
     if proceed_flag is True:
         try:
-            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S")
+            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
             backup_file = open(getFullPathofLoanFile(backup_filename), 'w+')
-            json.dump(data, backup_file)
+            json.dump(data, backup_file, indent=2)
             backup_file.close()
         except:
             messages.append("A backup file could not be created.  Your payment was not recorded.")
@@ -88,7 +88,7 @@ def update_file():
         try:
             payment_history.append( [payment_date, str(payment_amount)])
             file = open(getFullPathofLoanFile(loanFile), 'w+')
-            json.dump(data, file)
+            json.dump(data, file, indent=2)
             file.close()
         except:
             messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " + \
@@ -252,6 +252,10 @@ def amortizeLoan(loan):
         payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
         payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
         days_since_last_payment = (payment_date - interest_paid_through_date).days
+        if len(payment)>2:
+            late_fee = Decimal(payment[2]).quantize(Decimal("1.00"))
+        else:
+            late_fee = Decimal("0.00")
 
         #check for out of order payments, generally a sign of a data entry problem, especially years
         if days_since_last_payment < 0:
@@ -260,7 +264,7 @@ def amortizeLoan(loan):
             quit()
 
         new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-        new_principal = payment_amount - new_interest
+        new_principal = payment_amount - new_interest - late_fee
         interest_paid_through_date = payment_date
         total_interest = total_interest + new_interest
         annual_interest = annual_interest + new_interest
@@ -276,11 +280,12 @@ def amortizeLoan(loan):
         payment_record['payment_date'] = payment_date
         payment_record['days_of_interest'] = days_since_last_payment
         payment_record['payment_amount'] = payment_amount
-        payment_record['principal_payment'] = payment_amount - new_interest
+        payment_record['principal_payment'] = payment_amount - new_interest - late_fee
         payment_record['interest_payment'] = new_interest
         payment_record['new_balance'] = remaining_principal
         payment_record['interest_to_date'] = total_interest
         payment_record['annual_interest_to_date'] = annual_interest
+        payment_record['late_fee'] = late_fee
         past_payments.append(payment_record)
 
         payment_number = payment_number + 1

From 3ccd81cf76598d3fcdf76427df9e70a91a1104bb Mon Sep 17 00:00:00 2001
From: john
 <john@1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa>
Date: Sat, 16 Jan 2021 14:19:14 -0500
Subject: [PATCH 21/38] Added a requirements.txt to support dockerfile
 deployment.

---
 requirements.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..57e31fa
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+flask
+fpdf
+jinja2
\ No newline at end of file

From 466d2dce8b68288440a13779da7b58daa0bbedeb Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Mon, 3 Oct 2022 00:02:12 -0400
Subject: [PATCH 22/38] :G: Enter commit message.  Lines beginning with 'HG:'
 are removed.

---
 .hgignore                                     |   6 +-
 testloan.json => 0_Test_Loan.loan             |  34 +-
 10Kloan.json                                  |  69 ---
 dadmortgage.json => 1_Dad_Mortgage.loan       | 156 ++++-
 brendamortgage.json => 2_Brenda_Mortgage.loan | 156 ++++-
 9Kloan.json => 3_839_Harbor_Bend_2022.loan    |  71 +--
 ... => _Archive_Greenfield_Lane_Mortgage.loan |  86 ++-
 _Archive_Greenfield_Lane_Refinance-1.loan     | 128 +++++
 _Archive_Old_Harbor_Bend_Mortgage.loan        |  50 ++
 _Archive_Wayneland_Mortgage.loan              | 137 +++++
 mortgage.py                                   | 130 -----
 mortgage/calculate_interest_heloc.py          |  68 +++
 mortgage/mortgage_template.py                 | 345 -----------
 mortgage/templates/main.html                  |  20 +-
 .../payment_received_email.html.jinja         |  23 +
 mortgage/templates/statement.text.jinja       |  75 +--
 mortgage/web.py                               | 254 +++++---
 mortgage/web_ng.py                            | 544 ++++++++++++++++++
 pyvenv.cfg                                    |   3 +
 requirements.txt                              |   4 +-
 20 files changed, 1630 insertions(+), 729 deletions(-)
 rename testloan.json => 0_Test_Loan.loan (76%)
 delete mode 100644 10Kloan.json
 rename dadmortgage.json => 1_Dad_Mortgage.loan (54%)
 rename brendamortgage.json => 2_Brenda_Mortgage.loan (54%)
 rename 9Kloan.json => 3_839_Harbor_Bend_2022.loan (52%)
 rename greenfield_mortgage.json => _Archive_Greenfield_Lane_Mortgage.loan (72%)
 create mode 100644 _Archive_Greenfield_Lane_Refinance-1.loan
 create mode 100644 _Archive_Old_Harbor_Bend_Mortgage.loan
 create mode 100644 _Archive_Wayneland_Mortgage.loan
 delete mode 100644 mortgage.py
 create mode 100644 mortgage/calculate_interest_heloc.py
 delete mode 100644 mortgage/mortgage_template.py
 create mode 100644 mortgage/templates/payment_received_email.html.jinja
 create mode 100644 mortgage/web_ng.py
 create mode 100644 pyvenv.cfg

diff --git a/.hgignore b/.hgignore
index 1545b02..40b7757 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,5 @@
-./venv/
-.hgignore
 .Python
+.DS_Store
+./bin/
+./lib/
+./.idea/
diff --git a/testloan.json b/0_Test_Loan.loan
similarity index 76%
rename from testloan.json
rename to 0_Test_Loan.loan
index 0be860b..e8faba3 100644
--- a/testloan.json
+++ b/0_Test_Loan.loan
@@ -23,7 +23,7 @@
     "date": "Today",
     "title": "Installment Loan Test Statement"
   },
-    "payments": [
+  "payments": [
     [
       "2019-07-15",
       "475.00"
@@ -52,6 +52,36 @@
       "2020-01-15",
       "0",
       "50"
+    ],
+    [
+      "2020-09-27",
+      "278.15",
+      "20"
+    ],
+    [
+      "2020-09-29",
+      "296.12",
+      "25"
+    ],
+    [
+      "2020-10-16",
+      "133",
+      "0.00"
+    ],
+    [
+      "2020-10-16",
+      "133",
+      "0.00"
+    ],
+    [
+      "2020-10-16",
+      "133",
+      "0.00"
+    ],
+    [
+      "2021-05-03",
+      "1",
+      "1"
     ]
   ],
   "borrower": {
@@ -67,6 +97,6 @@
     "subject": "Your test loan statement...",
     "body": "Your test loan statement is attached.",
     "server": "smtp.gmail.com",
-    "password": "pvyrbcnzrjoizprn"
+    "password": "builcuouzobxroow"
   }
 }
\ No newline at end of file
diff --git a/10Kloan.json b/10Kloan.json
deleted file mode 100644
index 3bac0b5..0000000
--- a/10Kloan.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-"htmlTemplate": "statement.pdf.jinja",
-"txtTemplate": "statement.txt.jinja",
-"format": "html",
-"email": {
-  "from_address": "jkent3rd@gmail.com",
-  "to_address": "grady@gradystreet.com",
-  "server": "smtp.gmail.com",
-  "password": "pvyrbcnzrjoizprn",
-  "template": "./template.txt",
-  "send_pdf": "true",
-  "send_text": "true",
-  "subject": "Your loan statement...",
-  "body": "Your loan statement is attached.",
-  "text": "Please see your most recent account statement."
-  },
-"parameters": {
-  "account_number": "100100",
-  "principal": 10020.00,
-  "interest_rate": 6.5,
-  "periods_per_year": 12,
-  "periods": 18,
-  "start_date": "2017-12-05",
-  "start_interest_date": "2017-12-05",
-  "first_payment_month": "2018-01-15",
-  "monthly_payment": 589.00,
-  "payment_day_of_month": "15"
-  },
-"payments": [
-   ["2018-01-16", "589.00"],
-   ["2018-03-30", "589.00"],
-   ["2018-04-06", "589.00"],
-   ["2018-04-12", "589.00"],
-   ["2018-05-28", "589.00"],
-   ["2018-06-12", "589.00"],
-   ["2018-07-13", "589.00"],
-   ["2018-08-14", "589.00"],
-   ["2018-09-26", "589.00"],
-   ["2018-10-15", "0"],
-   ["2018-11-29", "589.00"],
-   ["2018-12-31", "589.00"],
-   ["2019-01-15", "0.00"],
-   ["2019-02-13", "589.00"],
-   ["2019-03-15", "0"],
-   ["2019-04-15", "0"],
-   ["2019-05-15", "589.00"],
-   ["2019-06-21", "2985.00"]
-],
-"borrower": {
-  "name": "Bear Houses, LLC",
-  "address": "301 N Beauregard St Apt 203",
-  "city": "Alexandria",
-  "state": "VA",
-  "zip": "22312"
-  },
-"lender": {
-  "name": "John Kent",
-  "phone": "703.343.0782",
-  "address": "743 Madison St NW",
-  "city": "Washington",
-  "state": "DC",
-  "zip": "20011"
-  },
-"header": {
-  "title": "Installment Loan Statement",
-  "date": "Today"
-  }
-}
-
diff --git a/dadmortgage.json b/1_Dad_Mortgage.loan
similarity index 54%
rename from dadmortgage.json
rename to 1_Dad_Mortgage.loan
index 919852a..c0faec1 100644
--- a/dadmortgage.json
+++ b/1_Dad_Mortgage.loan
@@ -22,7 +22,7 @@
     "send_text": "true",
     "template": "./template.txt",
     "send_pdf": "true",
-    "password": "pvyrbcnzrjoizprn",
+    "password": "builcuouzobxroow",
     "subject": "Your loan statement..."
   },
   "lender": {
@@ -129,14 +129,164 @@
     [
       "2020-06-01",
       "278.15"
+    ],
+    [
+      "2020-07-01",
+      "278.15"
+    ],
+    [
+      "2020-08-01",
+      "278.15"
+    ],
+    [
+      "2020-09-01",
+      "278.15"
+    ],
+    [
+      "2020-10-01",
+      "278.15"
+    ],
+    [
+      "2020-11-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2020-12-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-01-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-02-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-03-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-04-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-04-30",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-06-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-07-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-07-31",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-09-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-10-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-11-01",
+      "278.15",
+      "0",
+      "False"
+    ],
+    [
+      "2021-12-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-01-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-02-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-03-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-04-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-05-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-06-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-07-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-08-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-09-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-10-01",
+      "278.15",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
     "city": "Washington",
     "state": "DC",
     "name": "Grandma Tina's Properties, LLC",
-    "zip": "20008",
-    "address": "3100 Connecticut Ave NW Apt 144"
+    "zip": "20001",
+    "address": "1720 New Jersey Ave NW Unit 401"
   },
   "txtTemplate": "statement.txt.jinja"
 }
\ No newline at end of file
diff --git a/brendamortgage.json b/2_Brenda_Mortgage.loan
similarity index 54%
rename from brendamortgage.json
rename to 2_Brenda_Mortgage.loan
index 12e74ba..848a549 100644
--- a/brendamortgage.json
+++ b/2_Brenda_Mortgage.loan
@@ -22,7 +22,7 @@
     "send_text": "true",
     "template": "./template.txt",
     "send_pdf": "true",
-    "password": "pvyrbcnzrjoizprn",
+    "password": "builcuouzobxroow",
     "subject": "Your loan statement..."
   },
   "lender": {
@@ -129,14 +129,164 @@
     [
       "2020-06-01",
       "278.15"
+    ],
+    [
+      "2020-07-01",
+      "278.15"
+    ],
+    [
+      "2020-08-01",
+      "278.15"
+    ],
+    [
+      "2020-09-01",
+      "278.15"
+    ],
+    [
+      "2020-10-01",
+      "278.15"
+    ],
+    [
+      "2020-11-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2020-12-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-01-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-02-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-03-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-04-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-04-30",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-06-01",
+      "278.15",
+      "0.00"
+    ],
+    [
+      "2021-07-01",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-07-31",
+      "278.15",
+      "0"
+    ],
+    [
+      "2021-09-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-10-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-11-01",
+      "278.15",
+      "0",
+      "False"
+    ],
+    [
+      "2021-12-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-01-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-02-01",
+      "278.15",
+      "0",
+      "False"
+    ],
+    [
+      "2022-03-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-04-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-05-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-06-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-07-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-08-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-09-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-10-01",
+      "278.15",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
     "city": "Washington",
     "state": "DC",
     "name": "Grandma Tina's Properties, LLC",
-    "zip": "20008",
-    "address": "3100 Connecticut Ave NW Apt 144"
+    "zip": "20001",
+    "address": "1720 New Jersey Ave NW Unit 401"
   },
   "txtTemplate": "statement.txt.jinja"
 }
\ No newline at end of file
diff --git a/9Kloan.json b/3_839_Harbor_Bend_2022.loan
similarity index 52%
rename from 9Kloan.json
rename to 3_839_Harbor_Bend_2022.loan
index a01c4b4..3d41c1f 100644
--- a/9Kloan.json
+++ b/3_839_Harbor_Bend_2022.loan
@@ -1,16 +1,16 @@
 {
   "htmlTemplate": "statement.pdf.jinja",
   "parameters": {
-    "monthly_payment": 475.0,
-    "interest_rate": 6.5,
-    "start_interest_date": "2019-06-17",
+    "monthly_payment": 842.93,
+    "interest_rate": 5.75,
+    "start_interest_date": "2022-08-12",
     "payment_day_of_month": "15",
-    "first_payment_month": "2019-07-15",
-    "account_number": "100002",
-    "periods": 20,
-    "start_date": "2019-06-15",
+    "first_payment_month": "2022-09-15",
+    "account_number": "22-0001",
+    "periods": 180,
+    "start_date": "2022-08-12",
     "periods_per_year": 12,
-    "principal": 9000.0
+    "principal": 101508.04
   },
   "format": "html",
   "email": {
@@ -22,66 +22,33 @@
     "send_text": "true",
     "template": "./template.txt",
     "send_pdf": "true",
-    "password": "pvyrbcnzrjoizprn",
+    "password": "builcuouzobxroow",
     "subject": "Your loan statement..."
   },
   "lender": {
     "city": "Washington",
     "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20008",
+    "zip": "20001",
     "phone": "703.343.0782",
     "state": "DC",
-    "address": "3100 Connecticut Ave NW Apt 144"
+    "address": "1720 New Jersey Ave NW Unit 401"
   },
   "header": {
     "date": "Today",
-    "title": "Installment Loan Statement"
+    "title": "Mortgage Loan Statement - Harbor Bend Loan 1"
   },
   "payments": [
     [
-      "2019-07-15",
-      "475.00"
-    ],
-    [
-      "2019-08-14",
-      "475.00"
-    ],
-    [
-      "2019-09-17",
-      "475"
-    ],
-    [
-      "2019-10-15",
-      "0"
-    ],
-    [
-      "2019-11-15",
-      "0"
-    ],
-    [
-      "2019-12-5",
-      "475"
-    ],
-    [
-      "2020-01-15",
+      "2022-08-15",
+      "803",
       "0",
-      "0"
+      "False"
     ],
     [
-      "2020-02-17",
-      "0"
-    ],
-    [
-      "2020-03-03",
-      "475"
-    ],
-    [
-      "2020-04-15",
-      "0"
-    ],
-    [
-      "2020-05-19",
-      "475"
+      "2022-09-09",
+      "803",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
diff --git a/greenfield_mortgage.json b/_Archive_Greenfield_Lane_Mortgage.loan
similarity index 72%
rename from greenfield_mortgage.json
rename to _Archive_Greenfield_Lane_Mortgage.loan
index 1ea4eee..22fe53d 100644
--- a/greenfield_mortgage.json
+++ b/_Archive_Greenfield_Lane_Mortgage.loan
@@ -22,16 +22,16 @@
     "send_text": "true",
     "template": "./template.txt",
     "send_pdf": "true",
-    "password": "pvyrbcnzrjoizprn",
+    "password": "builcuouzobxroow",
     "subject": "Your loan statement..."
   },
   "lender": {
     "city": "Washington",
     "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20008",
+    "zip": "20001",
     "phone": "703.343.0782",
     "state": "DC",
-    "address": "3100 Connecticut Ave NW Apt 144"
+    "address": "1720 New Jersey Ave NW Unit 401"
   },
   "header": {
     "date": "Today",
@@ -162,6 +162,86 @@
     [
       "2020-06-16",
       "803.00"
+    ],
+    [
+      "2020-07-15",
+      "803"
+    ],
+    [
+      "2020-08-13",
+      "803"
+    ],
+    [
+      "2020-09-17",
+      "803"
+    ],
+    [
+      "2020-10-15",
+      "803",
+      "0.00"
+    ],
+    [
+      "2020-11-16",
+      "803.00",
+      "0"
+    ],
+    [
+      "2020-12-15",
+      "803.00",
+      "0.00"
+    ],
+    [
+      "2021-01-13",
+      "803.00",
+      "0"
+    ],
+    [
+      "2021-02-16",
+      "803.00",
+      "0"
+    ],
+    [
+      "2021-03-22",
+      "0",
+      "32.12"
+    ],
+    [
+      "2021-04-14",
+      "803.00",
+      "0.00"
+    ],
+    [
+      "2021-05-18",
+      "803.00",
+      "0"
+    ],
+    [
+      "2021-06-15",
+      "803.00",
+      "0"
+    ],
+    [
+      "2021-07-31",
+      "0",
+      "32.12"
+    ],
+    [
+      "2021-08-18",
+      "803",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-09-24",
+      "803",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-09-25",
+      "0",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
diff --git a/_Archive_Greenfield_Lane_Refinance-1.loan b/_Archive_Greenfield_Lane_Refinance-1.loan
new file mode 100644
index 0000000..5ab8f08
--- /dev/null
+++ b/_Archive_Greenfield_Lane_Refinance-1.loan
@@ -0,0 +1,128 @@
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 831.0,
+    "interest_rate": 5.5,
+    "start_interest_date": "2021-10-13",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2021-11-15",
+    "account_number": "21-0004",
+    "periods": 180,
+    "start_date": "2021-10-13",
+    "periods_per_year": 12,
+    "principal": 101123.26
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "grady@gradystreet.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "builcuouzobxroow",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Washington",
+    "name": "Rivanna Graphite Investments, LLC",
+    "zip": "20001",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "1720 New Jersey Ave NW Unit 401"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"
+  },
+  "payments": [
+    [
+      "2021-10-14",
+      "803",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-10-14",
+      "28",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-10-18",
+      "28",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-11-16",
+      "803.00",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-11-19",
+      "28",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-02-10",
+      "831",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-04-04",
+      "1000",
+      "55.00",
+      "False"
+    ],
+    [
+      "2022-05-15",
+      "0",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-06-15",
+      "0",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-07-15",
+      "0",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-07-26",
+      "803",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-08-12",
+      "0",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-08-12",
+      "101508.04",
+      "0.00",
+      "False"
+    ]
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Bear Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/_Archive_Old_Harbor_Bend_Mortgage.loan b/_Archive_Old_Harbor_Bend_Mortgage.loan
new file mode 100644
index 0000000..c89078d
--- /dev/null
+++ b/_Archive_Old_Harbor_Bend_Mortgage.loan
@@ -0,0 +1,50 @@
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 848,
+    "interest_rate": 5.75,
+    "start_interest_date": "2022-08-12",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2022-09-15",
+    "account_number": "22-0001",
+    "periods": 180,
+    "start_date": "2022-08-12",
+    "periods_per_year": 12,
+    "principal": 101508.04
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "grady@gradystreet.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "builcuouzobxroow",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Washington",
+    "name": "Rivanna Graphite Investments, LLC",
+    "zip": "20001",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "1720 New Jersey Ave NW Unit 401"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement - Harbor Bend Loan 1"
+  },
+  "payments": [
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Bear Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/_Archive_Wayneland_Mortgage.loan b/_Archive_Wayneland_Mortgage.loan
new file mode 100644
index 0000000..f7cde9e
--- /dev/null
+++ b/_Archive_Wayneland_Mortgage.loan
@@ -0,0 +1,137 @@
+{
+  "htmlTemplate": "statement.pdf.jinja",
+  "parameters": {
+    "monthly_payment": 175.55,
+    "interest_rate": 4.5,
+    "start_interest_date": "2020-07-15",
+    "payment_day_of_month": "15",
+    "first_payment_month": "2020-08-15",
+    "account_number": "100003",
+    "periods": 60,
+    "start_date": "2020-07-15",
+    "periods_per_year": 12,
+    "principal": 16884
+  },
+  "format": "html",
+  "email": {
+    "body": "Your loan statement is attached.",
+    "to_address": "grady@gradystreet.com",
+    "from_address": "jkent3rd@gmail.com",
+    "text": "Please see your most recent account statement.",
+    "server": "smtp.gmail.com",
+    "send_text": "true",
+    "template": "./template.txt",
+    "send_pdf": "true",
+    "password": "builcuouzobxroow",
+    "subject": "Your loan statement..."
+  },
+  "lender": {
+    "city": "Washington",
+    "name": "Rivanna Graphite Investments, LLC",
+    "zip": "20008",
+    "phone": "703.343.0782",
+    "state": "DC",
+    "address": "3100 Connecticut Ave NW Apt 144"
+  },
+  "header": {
+    "date": "Today",
+    "title": "Mortgage Loan Statement -  5025 Wayneland Drive Apt D11 Jackson MS 39211"
+  },
+  "payments": [
+    [
+      "2020-08-27",
+      "175.55"
+    ],
+    [
+      "2020-09-30",
+      "175.55"
+    ],
+    [
+      "2020-10-19",
+      "175.55",
+      "0.00"
+    ],
+    [
+      "2020-12-01",
+      "0",
+      "17.55"
+    ],
+    [
+      "2020-12-29",
+      "0",
+      "17.55"
+    ],
+    [
+      "2021-01-20",
+      "175.55",
+      "0"
+    ],
+    [
+      "2021-02-15",
+      "0.00",
+      "17.55"
+    ],
+    [
+      "2021-03-12",
+      "175.55",
+      "0.00"
+    ],
+    [
+      "2021-04-15",
+      "0",
+      "17.55"
+    ],
+    [
+      "2021-05-17",
+      "0",
+      "17.55"
+    ],
+    [
+      "2021-06-30",
+      "0",
+      "0.00"
+    ],
+    [
+      "2021-07-29",
+      "175.55",
+      "17.55"
+    ],
+    [
+      "2021-08-09",
+      "175.55",
+      "0"
+    ],
+    [
+      "2021-08-10",
+      "175.55",
+      "0",
+      "extra"
+    ],
+    [
+      "2021-09-03",
+      "175.55",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-09-17",
+      "175.55",
+      "0.00",
+      "False"
+    ],
+    [
+      "2021-09-18",
+      "0",
+      "0.00",
+      "False"
+    ]
+  ],
+  "borrower": {
+    "city": "Alexandria",
+    "state": "VA",
+    "name": "Bear Houses, LLC",
+    "zip": "22312",
+    "address": "301 N Beauregard St Apt 203"
+  },
+  "txtTemplate": "statement.txt.jinja"
+}
\ No newline at end of file
diff --git a/mortgage.py b/mortgage.py
deleted file mode 100644
index 18a582e..0000000
--- a/mortgage.py
+++ /dev/null
@@ -1,130 +0,0 @@
-import json
-from decimal import *
-from datetime import *
-
-# this program reads the json file describing a mortgage and calculate the actual and projected amortization
-# the first payment in the file should be the interest paid at closing
-# the interest at closing covers interest that would be incurred from the date of closing until the first day
-# that will be covered by the first loan payment
-# i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
-# at closing.  The first payment will incur interest from one month before the bill is due.
-
-#read in the file
-#filename = "./10Kloan.txt"
-filename = "./dadmortgage.txt"
-#filename = "./brendamortgage.txt"
-#filename = "./greenfield_mortgage.txt"
-
-if filename:
-    with open(filename, 'r') as f:
-        datastore = json.load(f)
-
-#read in the loan profile information
-annual_rate = Decimal(datastore['interest rate'])/100
-daily_interest_rate = annual_rate/360
-principal = Decimal(datastore["principal"]).quantize(Decimal("1.00"))
-periods_per_year = Decimal(datastore["periods per year"])
-total_periods = Decimal(datastore["periods"])
-payment_day_of_month = int(datastore['payment day of month'])
-
-if "monthly_payment" in datastore:
-    monthly_payment = Decimal(datastore["monthly_payment"]).quantize(Decimal("1.00"))
-else:
-    #calculate expected monthly payment
-    periodic_rate = annual_rate/periods_per_year
-    discount_factor = (((1+periodic_rate)**total_periods)-1) / (periodic_rate * ((1+periodic_rate)**total_periods))
-    monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
-
-
-
-print "Principal: ", principal
-print "Interest Rate: ", annual_rate
-print "Payments Per Year: ", periods_per_year
-print "Loan Term: ", total_periods
-print "Monthly Payment", monthly_payment
-print "Payments due day: ", payment_day_of_month
-
-print
-
-#loop over the payments and calculate the actual amortization
-actual_payments = datastore["payments"]
-
-remaining_principal = principal
-annual_interest = 0
-total_interest = 0
-
-interest_paid_through_date = datetime.strptime(datastore["start_interest_date"], "%Y-%m-%d").date()
-next_payment_date = datetime.strptime(datastore["first payment month"], '%Y-%m-%d').date()
-next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
-old_bill_date = next_bill_date
-payment_number = 1
-current_year = next_bill_date.year
-
-print "Payment History:"
-print "\tBill\t\t\tPayment\tDays of\tPayment\t\tRemaining\t\tPrincipal\tInterest\t\t\tNew"
-print "#\tDate\t\t\tDate\tInterst\tAmount\t\tPrincipal\t\tPayment\t\tPayment\t\t\tBalance"
-for payment in actual_payments:
-    payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
-    payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
-    #print next_bill_date, "\t", next_payment_date, "\t",
-    days_since_last_payment = (payment_date-interest_paid_through_date).days
-    #print days_since_last_payment
-    new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-#   new_principal = monthly_payment - new_interest
-    new_principal = payment_amount - new_interest
-
-    print payment_number, " ", next_bill_date, "\t\t", payment_date, "\t", days_since_last_payment, "\t", payment_amount, "\t\t\t", remaining_principal, "\t\t", new_principal,\
-        "\t\t", new_interest,
-
-    interest_paid_through_date = payment_date
-    total_interest = total_interest + new_interest
-    annual_interest=annual_interest+new_interest
-    remaining_principal = remaining_principal - new_principal
-    print "\t\t\t", remaining_principal
-    payment_number=payment_number+1
-    old_bill_date = next_bill_date
-
-    if old_bill_date.month < 12:
-        next_bill_date = date(year=old_bill_date.year, month = old_bill_date.month + 1, day=payment_day_of_month)
-        print "Total interest paid to date for", old_bill_date.year, " is", annual_interest
-    else:
-        next_bill_date = date(year=old_bill_date.year+1, month = 1, day=payment_day_of_month)
-        print "Total interest for ", old_bill_date.year, " was ", annual_interest
-        annual_interest = 0
-
-print "Total interest paid to date on this loan is", total_interest
-
-#loop over remaining scheduled payments and present estimated amortization
-print "\nEstimated future amortization"
-
-while (payment_number <= total_periods) and (remaining_principal > 0):
-    print payment_number, "\t",
-    payment_number = payment_number+1
-
-    print next_bill_date,
-
-    days_since_last_payment = (next_bill_date-interest_paid_through_date).days
-    print days_since_last_payment, "\t",
-    new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-
-    #make sure the last payment isn't too much
-    if new_interest+remaining_principal < monthly_payment:
-        monthly_payment = new_interest + remaining_principal
-
-    new_principal = monthly_payment - new_interest
-
-    print monthly_payment, "\t\t\t", remaining_principal, "\t\t", new_principal,\
-        "\t\t", new_interest,
-
-    remaining_principal = remaining_principal - new_principal
-    print "\t", remaining_principal
-
-    interest_paid_through_date = next_bill_date
-    old_bill_date = next_bill_date
-    if old_bill_date.month < 12:
-        next_bill_date = date(year=old_bill_date.year, month = old_bill_date.month + 1, day=payment_day_of_month)
-    else:
-        next_bill_date = date(year=old_bill_date.year+1, month = 1, day=payment_day_of_month)
-
-if remaining_principal > 0:
-    print 'Balloon payment due:', remaining_principal
diff --git a/mortgage/calculate_interest_heloc.py b/mortgage/calculate_interest_heloc.py
new file mode 100644
index 0000000..70e3961
--- /dev/null
+++ b/mortgage/calculate_interest_heloc.py
@@ -0,0 +1,68 @@
+'''''''take in the csv file of transactions'''
+import datetime
+from decimal import *
+import csv
+from calendar import monthrange
+
+def main():
+    getcontext().prec=10
+    open_balance = Decimal("-24521.81")
+    interest_rate = Decimal("8.00")/Decimal("100.00")/Decimal("365.00")
+    year = 2021
+
+    start_date = datetime.date(year, 1, 1)
+    end_date = datetime.date(year, 12, 31)+datetime.timedelta(1)
+    days_in_year = (end_date - start_date).days
+    print ("Days in year: %d" % days_in_year)
+
+    balances = [Decimal('0.00')] * days_in_year
+    interest_invoices = [Decimal('0.00')] * 12
+
+    with open("/Users/john/Downloads/query_result.csv") as f:
+        reader = csv.DictReader(f)
+        for row in reader:
+            print(row)
+            year = row['year']
+            month = row['month']
+            day = row['day']
+            amount = row['position (USD)']
+
+            date_val = datetime.date(int(year), int(month), int(day))
+            day_of_year = date_val.toordinal() - datetime.date(date_val.year, 1, 1).toordinal() + 1
+            print("Record created for day of year %d" % day_of_year)
+            print("%s - %s - %s: %s " % (year, month, day, amount))
+            balances[day_of_year] = balances[day_of_year] + Decimal(amount)
+
+    current_balance = open_balance
+    day_being_processed = 1
+    accumlated_interest = Decimal('0.000000')
+
+    while (day_being_processed <= days_in_year):
+        print("Day of year: %d" % day_being_processed)
+        #calculate the day's balance
+        current_balance = current_balance + balances[day_being_processed-1]
+        balances[day_being_processed-1] = current_balance
+
+        #accummulate the day's interest
+        todays_interest = current_balance * interest_rate
+        accumlated_interest = accumlated_interest + todays_interest
+
+        #check if this is the last day of the month, if it is do the transition stuff
+        current_month = datetime.date.fromordinal(start_date.toordinal()+day_being_processed-1).month
+        next_month = datetime.date.fromordinal(start_date.toordinal()+day_being_processed).month
+        print("Current Month: %d Next_month: %d" % (current_month, next_month ))
+        if (current_month != next_month):
+            interest_invoices[current_month-1] = accumlated_interest.quantize(Decimal('.01'))
+            current_balance = current_balance + accumlated_interest
+            accumlated_interest = Decimal('0.00')
+
+
+        day_being_processed = day_being_processed + 1
+
+    i=0
+    while (i<12):
+        print ("%d: %s" %(i+1, interest_invoices[i]) )
+        i = i +1
+
+if __name__ == '__main__':
+    main()
diff --git a/mortgage/mortgage_template.py b/mortgage/mortgage_template.py
deleted file mode 100644
index dfa8260..0000000
--- a/mortgage/mortgage_template.py
+++ /dev/null
@@ -1,345 +0,0 @@
-import json
-from decimal import *
-from datetime import *
-from jinja2 import Environment, FileSystemLoader
-from fpdf import FPDF, HTMLMixin
-import smtplib
-
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.MIMEBase import MIMEBase
-from email import Encoders
-
-
-def getStatementHeader(datastore):
-    return datastore['header']
-
-
-def getEmailInformation(datastore):
-    return datastore['email']
-
-
-def loadLoanInformation(filename):
-    datastore = getDatastore(filename)
-
-    loanModel = {}
-    loanModel['datastore'] = datastore
-    loanModel['email'] = getEmailInformation(datastore)
-    loanModel['parameters'] = getLoanParameters(datastore)
-    loanModel['lender'] = getLender(datastore)
-    loanModel['borrower'] = getBorrower(datastore)
-    loanModel['header'] = getStatementHeader(datastore)
-    return loanModel
-
-
-def getLoanParameters(datastore):
-    # read in the loan profile information
-    loan = datastore['parameters']
-
-    annual_rate = Decimal(loan['interest_rate']) / 100
-    daily_interest_rate = annual_rate / 360
-    principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
-    periods_per_year = Decimal(loan["periods_per_year"])
-    total_periods = Decimal(loan["periods"])
-    payment_day_of_month = int(loan['payment_day_of_month'])
-
-    if "monthly_payment" in loan:
-        monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
-    else:
-        # calculate expected monthly payment
-        periodic_rate = annual_rate / periods_per_year
-        discount_factor = (((1 + periodic_rate) ** total_periods) - 1) / (
-                periodic_rate * ((1 + periodic_rate) ** total_periods))
-        monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
-
-    loan['principal'] = principal       # standardizes the format
-    loan['annual_rate'] = annual_rate   # standardizes the format
-    loan['daily_interest_rate'] = daily_interest_rate
-    loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
-    loan['next_payment_amt'] = 0
-    loan['next_payment_date'] = '12/12/12'
-    loan['total_periods'] = total_periods
-    loan['monthly_payment'] = monthly_payment
-    datastore['parameters'] = loan
-    return loan
-
-
-def getLender(datastore):
-    return datastore['lender']
-
-
-def getBorrower(datastore):
-    return datastore['borrower']
-
-
-def getDatastore(filename=None):
-    try:
-        if filename:
-            with open(filename, 'r') as f:
-                datastore = json.load(f)
-
-    except Exception as e:
-        print "An error occurred opening your loan file '%s'. " % filename
-        print "The Exception:"
-        print e.__repr__()
-        quit()
-
-    return datastore
-
-
-def amortizeLoan(loan):
-    # loop over the payments and calculate the actual amortization
-    monthly_payment = loan["parameters"]["monthly_payment"]
-
-    actual_payments = loan["datastore"]["payments"]
-
-    remaining_principal = loan["parameters"]["principal"]
-    payment_day_of_month = int(loan["parameters"]["payment_day_of_month"])
-    daily_interest_rate = loan["parameters"]["daily_interest_rate"]
-    total_periods = loan["parameters"]["total_periods"]
-    interest_paid_through_date = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
-    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
-    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
-
-    payment_number = 1
-    annual_interest = 0
-    total_interest = 0
-    old_bill_date = next_bill_date
-    current_year = next_bill_date.year
-
-    past_payments = []
-    future_payments = []
-
-    for payment in actual_payments:
-        payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
-        payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
-        days_since_last_payment = (payment_date - interest_paid_through_date).days
-
-        #check for out of order payments, generally a sign of a data entry problem, especially years
-        if days_since_last_payment < 0:
-            print "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
-                  % (payment_number, payment_date, interest_paid_through_date)
-            quit()
-
-        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-        new_principal = payment_amount - new_interest
-        interest_paid_through_date = payment_date
-        total_interest = total_interest + new_interest
-        annual_interest = annual_interest + new_interest
-        remaining_principal = remaining_principal - new_principal
-
-
-        # create the payment record for the template to render
-        payment_record = {}
-        payment_record['year']=next_bill_date.year
-        payment_record['month']=next_bill_date.month
-        payment_record['payment_number'] = payment_number
-        payment_record['bill_date'] = next_bill_date
-        payment_record['payment_date'] = payment_date
-        payment_record['days_of_interest'] = days_since_last_payment
-        payment_record['payment_amount'] = payment_amount
-        payment_record['principal_payment'] = payment_amount - new_interest
-        payment_record['interest_payment'] = new_interest
-        payment_record['new_balance'] = remaining_principal
-        payment_record['interest_to_date'] = total_interest
-        payment_record['annual_interest_to_date'] = annual_interest
-        past_payments.append(payment_record)
-
-        payment_number = payment_number + 1
-        old_bill_date = next_bill_date
-
-        if old_bill_date.month < 12:
-            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
-        else:
-            annual_interest = Decimal("0.00")
-            next_bill_date = date(year=old_bill_date.year + 1, month=1, day = payment_day_of_month)
-
-    loan["total_interest_paid_to_date"] = total_interest
-    loan["parameters"]["next_due_date"] = next_bill_date
-
-    if (remaining_principal < monthly_payment):
-        loan["parameters"]["next_payment_amt"] = remaining_principal
-    else:
-        loan["parameters"]["next_payment_amt"] = monthly_payment
-
-    # loop over remaining scheduled payments and present estimated amortization
-    while (payment_number <= total_periods) and (remaining_principal > 0):
-        days_since_last_payment = (next_bill_date - interest_paid_through_date).days
-        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-
-        # make sure the last payment isn't too much
-        if new_interest + remaining_principal < monthly_payment:
-            monthly_payment = new_interest + remaining_principal
-
-        new_principal = monthly_payment - new_interest
-
-        remaining_principal = remaining_principal - new_principal
-
-        interest_paid_through_date = next_bill_date
-
-        # complete the future payment amortization record
-        future_payment_record = {}
-        future_payment_record['payment_number'] = payment_number
-        future_payment_record['payment_date'] = next_bill_date
-        future_payment_record['days_of_interest'] = days_since_last_payment
-        future_payment_record['payment_amount'] = monthly_payment
-        future_payment_record['principal_payment'] = new_principal
-        future_payment_record['interest_payment'] = new_interest
-        future_payment_record['new_balance'] = remaining_principal
-        future_payments.append(future_payment_record)
-
-        payment_number = payment_number + 1
-        old_bill_date = next_bill_date
-        if old_bill_date.month < 12:
-            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
-        else:
-            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-
-
-    loan["balloon_payment"] = remaining_principal
-    loan["past_payments"] = past_payments
-    loan["future_payments"] = future_payments
-    return
-
-
-def transformTemplate(template_fileName, loanModel):
-    # template_filename = "statement.text.jinja"
-    # setup jinja for creating the statement
-    env = Environment(loader=FileSystemLoader('.'))
-    template = env.get_template(template_fileName)
-
-    print loanModel
-    report = template.render(model=loanModel)
-    return report
-
-
-def generatePDFAttachment():
-    template_filename = "statement.pdf.jinja"
-    pass
-
-
-def generateEmail(from_address, to_address, subject, body, pdfAttachment, txtAttachment):
-    msg = MIMEMultipart()
-    msg['Subject'] = subject
-    msg['From'] = from_address
-    msg['To'] = to_address
-
-    msg.attach(MIMEText(body))
-
-    if (pdfAttachment != None):
-        part = MIMEBase("application", "octet-stream")
-        part.set_payload(pdfAttachment)
-        Encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
-        msg.attach(part)
-
-    if (txtAttachment != None):
-        part = MIMEBase("text", "html")
-        part.set_payload(txtAttachment)
-        Encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
-        msg.attach(part)
-
-    return msg
-
-def generateEmailWithAttachments(from_address, to_address, subject, body, pdfAttachment, htmlAttachment, txtAttachment):
-    msg = MIMEMultipart()
-    msg['Subject'] = subject
-    msg['From'] = from_address
-    msg['To'] = to_address
-
-    msg.attach(MIMEText(body))
-
-    if (pdfAttachment != None):
-        part = MIMEBase("application", "octet-stream")
-        part.set_payload(pdfAttachment)
-        Encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
-        msg.attach(part)
-
-    if (txtAttachment != None):
-        part = MIMEBase("text", "html")
-        part.set_payload(txtAttachment)
-        Encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
-        msg.attach(part)
-
-    return msg
-
-
-def sendEmail(msg, from_address, to_address, passwd):
-    try:
-        server = smtplib.SMTP('smtp.gmail.com', 587)
-        server.ehlo()
-        server.starttls()
-        server.login(from_address, passwd)
-
-        server.sendmail(from_address, to_address, msg.as_string())
-        server.close()
-    except:
-        print "Couldn't send email."
-
-
-def createPDF(report):
-    # create pdf
-    class MyFPDF(FPDF, HTMLMixin):
-        pass
-
-    pdf = MyFPDF()
-    pdf.set_font(family='Arial', size=12)
-    pdf.add_page()
-    pdf.write_html(report)
-    # pdf.output(name='test.pdf', dest='F')
-    return pdf.output(dest='S')
-
-
-def selectTemplate(loan):
-    templateKey = loan["datastore"]["format"] + "Template"
-    if templateKey in loan:
-        template = loan[templateKey]
-    else:
-        template = 'statement.pdf.jinja'
-
-    return template
-
-def main():
-    test_flag = True
-    # this program reads the json file describing a mortgage and calculate the actual and projected amortization
-    # the first payment in the file should be the interest paid at closing
-    # the interest at closing covers interest that would be incurred from the date of closing until the first day
-    # that will be covered by the first loan payment
-    # i.e., the first loan payment is expected a month and a half after closing, the first two weeks interest is due
-    # at closing.  The first payment will incur interest from one month before the bill is due.
-
-    # read in the file
-    test_flag = False
-    test_address = 'jkent3rd@yahoo.com'
-
-    #filename = "./testloan.json"
-    filename = "./9Kloan.json"
-    #filename = "./dadmortgage.json"
-    #filename = "./brendamortgage.json"
-    #filename = "./greenfield_mortgage.json"
-    template_filename = "statement.pdf.jinja"
-
-    loan = loadLoanInformation(filename)
-
-    amortizeLoan(loan)
-
-    report = transformTemplate(selectTemplate(loan), loan)
-
-    if loan["email"]["send_pdf"] == "true":
-        pdfAttachment = createPDF(report)
-
-
-    # send email
-    emailParameters = loan["email"]
-    msg = generateEmail(emailParameters["from_address"], emailParameters["to_address"], emailParameters["subject"],
-                        emailParameters["body"], pdfAttachment, report)
-    if test_flag == False:
-        sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
-    else:
-        sendEmail(msg, emailParameters["from_address"], test_address, emailParameters['password'])
-
-if __name__ == '__main__':
-    main()
diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 1b0c7db..29e8664 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -1,7 +1,6 @@
 <html>
 <head>
     <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
-    <link rel="stylesheet" href="/resources/demos/style.css">
     <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
     <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
     <script>
@@ -13,7 +12,7 @@
 <p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
 <form>
 <table><tr>
-    <td>Loan:</td>
+    <td><font face="Arial">Loan:</font></td>
     <td>
     <select name="loan" id="loan">
     {% for loan in loans %}
@@ -25,6 +24,7 @@
     {% endfor %}
     </select>
     <button>Select</button>
+    <button id='manageLoans'>Manage</button>
     </td>
 </table>
 </form>
@@ -45,6 +45,7 @@
         <li><a href="#loan_amortization">Future Amortization</a></li>
         <li><a href="#email">Email Statement</a></li>
         <li><a href="#add_payment">Add Payment</a></li>
+        <li><a href="#add_extra_payment">Add Payment</a></li>
     </ul>
     <div id="loan_information">
         <table align="center" border="1px">
@@ -176,10 +177,25 @@
             <tr><td><input type="text" name="amount"></td></tr>
             <tr><td bgcolor="beige">Late Fee Amount:</td></tr>
             <tr><td><input type="text" name="latefee"></td></tr>
+            <tr><td><input name="notify" type="checkbox" value="notify"/>Send Payment Recorded Notification</td></tr>
             <tr><td><button>Record Payment</button></td></tr>
         </table>
         </form>
     </div>
+    <div id="add_extra_payment">
+        <form name="AddExtraPayment" method="post" action="/update_file">
+        <input type="hidden" name="loan" value="{{filename}}" />
+        <table align="center" border="1px" width="75%">
+            <tr><td align="center" bgcolor="darkgrey">Record an Extra Payment</td></tr>
+            <tr><td bgcolor="beige">Payment Date:</td></tr>
+            <tr><td><input type="date" name="date"</td></tr>
+            <tr><td bgcolor="beige">Payment Amount:</td></tr>
+            <tr><td><input type="text" name="amount"></td></tr>
+            <tr><td><input name="notify" type="checkbox" value="notify"/>Send Payment Recorded Notification</td></tr>
+            <tr><td><button>Record Extra Payment</button></td></tr>
+        </table>
+        </form>
+    </div>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/mortgage/templates/payment_received_email.html.jinja b/mortgage/templates/payment_received_email.html.jinja
new file mode 100644
index 0000000..53a1a0c
--- /dev/null
+++ b/mortgage/templates/payment_received_email.html.jinja
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+Date: {{model.payment.today}}<br/>
+From:  {{model.payment.payee}}<br/>
+To:  {{model.payment.payer}}<br/>
+RE: Payment Received<br/>
+<br/>&nbsp;<br/>
+You are receiving this email to confirm receipt of your recent loan payment.<br/>
+<br/>&nbsp;<br/>
+Amount Received: {{ "$%.2f"|format(model.payment.amount) }}<br/>
+Date Received: {{model.payment.date}}<br/>
+{% if model.payment.late_fee != 0 %}
+Late Fee Assessed: {{model.payment.late_fee}}<br/>
+{% endif %}
+<br/>&nbsp;<br/>
+Thank you!<br/>
+</body>
+</html>
\ No newline at end of file
diff --git a/mortgage/templates/statement.text.jinja b/mortgage/templates/statement.text.jinja
index e205e2b..c96e31e 100644
--- a/mortgage/templates/statement.text.jinja
+++ b/mortgage/templates/statement.text.jinja
@@ -1,51 +1,36 @@
-Original Principal Balance: {{ original_principal_balance }}
+{{ model.header.title }}
+{{ model.lender.name }}
+{{ model.lender.address }}
+{{ model.lender.city }}, {{model.lender.state }} {{ model.lender.zip }}
+{{ model.lender.phone }}
+Statement Date: {{ model.header.date }}
+
+Loan Information
+Borrower: {{ model.borrower.name }}
+Account Number: {{ model.parameters.account_number }}
+Origination Date: {{ model.parameters.start_date  }}
+Address:
+{{ model.borrower.address }}
+{{ model.borrower.city }}, {{model.borrower.state }} {{ model.borrower.zip }}
+Original Principal: {{ "$%.2f"|format(model.parameters.principal) }}
+Rate: {{model.parameters.interest_rate }}%
+Term: {{model.parameters.periods }} months
+Next Payment Due Date: {{model.parameters.next_due_date}}
+Payment Due: {{ "$%.2f"|format(model.parameters.next_payment_amt) }}
 
 Payment History
-    #\tBill Date
-    Payment Date
-    Days of Interest
-    Payment Amount
-    Principal Payment
-    Interest Payment
-    Late Fee
-    New Balance
-
-{% for item in past_payments %}
-{{ item.payment_number }}
-{{ item.bill_date }}
-{{ item.payment_date }}
-{{ item.days_of_interest }}
-{{ item.payment_amount }}
-{{ item.principal_payment }}
-{{ item.interest_payment }}
-{{ item.late_fee }}
-{{ item.new_balance }}
-
-    {% if item.print_interest_total %}
-        {{ item.interest_total_message }}
-    {% endif %}
+#,Due Date,Date Paid,Days Interest,Payment Amt,Principal Pmt,Interest Pmt,Late Fee,New Balance
+{% for item in model.past_payments %}
+{{ item.payment_number }},{{ item.bill_date }},{{ item.payment_date }},{{ item.days_of_interest }},{{ "$%.2f"|format(item.payment_amount) }},{{ "$%.2f"|format(item.principal_payment) }},{{ "$%.2f"|format(item.interest_payment) }},{{ "$%.2f"|format(item.late_fee) }},{{ "$%.2f"|format(item.new_balance) }}
+{% if item.month == 12 or loop.last %}
+Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.
+{% endif %}
 {% endfor %}
-Total interest paid to date is {{ total_interest_paid_to_date }}.
-
+Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.
 
 Remaining Amortization
-    #
-    Days of Interest
-    Due Date
-    Payment Amount
-    Scheduled Principal Payment
-    Scheduled Interest Payment
-    Expected New Balance
-
-{% for item in future_payments %}
-{{ item.payment_number }}
-{{ item.days_of_interest }}
-{{ item.payment_date }}
-{{ item.payment_amount }}
-{{ item.principal_payment }}
-{{ item.interest_payment }}
-{{ item.new_balance }}
+#,Due Date,Days Interest,Payment Amt,Principal Pmt,Interest Pmt,Principal Balance<
+{% for item in model.future_payments %}
+{{ item.payment_number }},{{ item.payment_date }},{{ item.days_of_interest }},{{ "$%.2f"|format(item.payment_amount) }},{{ "$%.2f"|format(item.principal_payment) }},{{ "$%.2f"|format(item.interest_payment) }},{{ "$%.2f"|format(item.new_balance) }}
 {% endfor %}
-    
-Balloon Payment Due: {{ balloon_payment }} 
-
+Balloon Payment Due: {{ "$%.2f"|format(model.balloon_payment) }}
diff --git a/mortgage/web.py b/mortgage/web.py
index 7413512..8cb3c0c 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -1,31 +1,32 @@
-from flask import Flask, render_template, request, redirect
 import json
-from decimal import *
-from datetime import *
 import jinja2
-from fpdf import FPDF, HTMLMixin
 import smtplib
 import os
-
-loader=jinja2.FileSystemLoader([os.path.join(os.path.dirname(__file__),"templates")])
-environment = jinja2.Environment(loader=loader)
-
+from flask import Flask, render_template, request, redirect
+from decimal import *
+from datetime import *
+from fpdf import FPDF, HTML2FPDF, HTMLMixin
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
 from email import encoders
+
+module_directory = os.path.dirname(__file__)
+app_directory = os.path.normpath(os.path.join(module_directory, ".."))
+loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
+environment = jinja2.Environment(loader=loader)
 app = Flask(__name__)
 
+######
+# Flask Call Backs
+######
+
+
 @app.route('/')
 def hello():
+    loans = getLoanFiles(app_directory)
 
-    loans = []
-    loans.append( addLoan("1 Greenfield Lane Mortgage", "greenfield_mortgage.json" ) )
-    loans.append( addLoan("2 Bear Houses LLC Loan", "9Kloan.json" ) )
-    loans.append( addLoan("3 Brenda Mortgage", "brendamortgage.json" ) )
-    loans.append( addLoan("4 Dad Mortgage", "dadmortgage.json") )
-    loans.append( addLoan("5 Test Loan", "testloan.json"))
-
+    #if a loan was not specified, choose the first loan and reload page with it
     if 'loan' in request.args:
         filename = request.args["loan"]
     else:
@@ -36,42 +37,56 @@ def hello():
 
     return render_template('main.html', filename=filename, loans=loans, model=loan)
 
+
 @app.route('/update_file', methods=['POST'])
 def update_file():
-
     messages = []
 
     loanFile = request.form["loan"]
     data = getDatastore(getFullPathofLoanFile(loanFile))
 
+    late_fee = Decimal('0.00').quantize(Decimal('1.00'))
+    extra_payment = False
+    payment_amount = Decimal('0.00').quantize(Decimal('1.00'))
     payment_history = data["payments"]
-
+    todays_date = str(datetime.now().strftime("%Y-%m-%d"))
     if 'date' in request.form:
-            if (request.form['date'] == ''):
-                now = datetime.now()
-                payment_date = str(now.strftime("%Y-%m-%d"))
-                messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
-            else:
-                payment_date = request.form['date']
-                messages.append("Date provided: " + payment_date + ".")
+        if request.form['date'] == '':
+            payment_date = todays_date
+            messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
+        else:
+            payment_date = request.form['date']
+            messages.append("Date provided: " + payment_date + ".")
     else:
-        now = datetime.now()
-        payment_date = str(now.strftime("%Y-%m-%d"))
+        payment_date = todays_date
+        messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
 
-    payment_amount = Decimal('0.00')
     proceed_flag = True
     if 'amount' in request.form:
-        if (request.form['amount'] != ''):
+        if request.form['amount'] != '':
             try:
                 payment_amount = Decimal(request.form['amount'])
                 messages.append("Amount provided: " + str(payment_amount) + ".")
             except:
-                payment_amount = Decimal('0.00')
                 messages.append("The amount provided could not be interpreted.  Your payment was not recorded.")
                 proceed_flag = False
             else:
                 pass
 
+    if 'latefee' in request.form:
+        if request.form['latefee'] != '':
+            try:
+                late_fee = Decimal(request.form['latefee'])
+                messages.append("Late fee amount: " + str(late_fee) + ".")
+            except:
+                messages.append("The late fee amount was specified but could not be interpreted. " +
+                                "Your payment was not recorded.")
+                proceed_flag = False
+
+    if 'extra' in request.form:
+        if request.form['extra'] != '':
+            extra_payment = True
+
     if proceed_flag is True:
         try:
             backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
@@ -82,22 +97,47 @@ def update_file():
             messages.append("A backup file could not be created.  Your payment was not recorded.")
             proceed_flag = False
         else:
-            messages.append("A backup of your file was created: '" + backup_filename +"'" )
+            messages.append("A backup of your file was created: '" + backup_filename + "'")
 
     if proceed_flag is True:
         try:
-            payment_history.append( [payment_date, str(payment_amount)])
+            payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
             file = open(getFullPathofLoanFile(loanFile), 'w+')
             json.dump(data, file, indent=2)
             file.close()
         except:
-            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " + \
+            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " +
                             "please consider rolling back to the backup created above.")
         else:
             messages.append("The payment was successfully written. ")
 
+    # see if an email notification was requested, if not, exit now
+    if 'notify' not in request.form:
+        messages.append("Payment notification email not requested.")
+        return render_template('add.html', filename=loanFile, messages=messages)
+
+    messages.append("Payment notification email requested.")
+    # send email
+    emailParameters = data["email"]
+    result = {}
+    payment = {}
+    result['payment'] = payment
+    payment['today'] = todays_date
+    payment['date'] = payment_date
+    payment['payer'] = data['borrower']['name']
+    payment['payee'] = data['lender']['name']
+    payment['amount'] = payment_amount
+    payment['late_fee'] = late_fee
+    payment['extra_payment'] = extra_payment
+
+    subject = "Your loan payment has been received"
+    html = transformTemplate(selectTemplate('paymentNotification'), result)
+    msg = generatePaymentNotificationEmail(emailParameters["from_address"], emailParameters["to_address"],
+                                           subject, html)
+    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
     return render_template('add.html', filename=loanFile, messages=messages)
 
+
 @app.route('/send_statement', methods=['POST'])
 def send_statement():
     loanFile = request.form["loan"]
@@ -122,32 +162,67 @@ def send_statement():
     if ('html' in request.form) or (reportCreated is False):
         htmlReport = transformTemplate(selectTemplate('html'), loan)
 
-
     # send email
     emailParameters = loan["email"]
 
-    msg = generateEmail( emailParameters["from_address"],
-                             emailParameters["to_address"],
-                             subject,
-                             message, pdfReport, htmlReport, textReport)
+    msg = generateStatementEmail(emailParameters["from_address"],
+                                 emailParameters["to_address"],
+                                 subject,
+                                 message, pdfReport, htmlReport, textReport)
 
     sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
 
-
     return render_template('email.html', filename=loanFile)
 
-def addLoan(loanName, fileName):
+
+######
+# Loan File Functions
+######
+
+
+def getLoanFiles(directory):
+    loans = []
+    count = 0
+
+    directory = os.path.normpath(directory)
+    print("Directory {}".format(directory))
+    fileNames = os.listdir(directory)
+    fileNames.sort()
+    for filename in fileNames:
+        if filename.endswith(".loan"):
+            displayName = filename.removesuffix(".loan").replace("_"," ")
+            loans.append(createLoanEntryMenuItem("{0}".format(displayName), filename))
+
+    #loans.append(createLoanEntryMenuItem("1 Brenda Mortgage", "brendamortgage.json"))
+    #loans.append(createLoanEntryMenuItem("2 Dad Mortgage", "Dad-Mortgage.loan"))
+    #loans.append(createLoanEntryMenuItem("3 839 Harbor Bend Loan 1", "HarborBend839-2022.json"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Bear Houses LLC Loan", "9Kloan.loan"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Test Loan", "testloan.json"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Greenfield Lane Mortgage", "greenfield_mortgage.json"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Greenfield Lane Refinance", "greenfield_refinance.json"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Harbor Bend Loan 1", "BearHousesLLC-22-0001.json"))
+    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Wayneland Dr D11 Mortgage", "wayneland_mortgage.json"))
+    return loans
+
+
+def createLoanEntryMenuItem(loanName, fileName):
     x = {}
     x['name'] = loanName
     x['filename'] = fileName
     return x
 
-def getFullPathofLoanFile(filename):
-    return '/Users/john/PycharmProjects/mortgage/' + filename
 
-###################
-# from old code   #
-###################
+def getFullPathofLoanFile(filename):
+    app_path = os.path.dirname(__file__)
+    file_path = os.path.normpath(os.path.join(os.path.dirname(__file__),'..'))
+    print("App Path: {0}\nFile Path: {1}".format(app_path, file_path))
+    return os.path.join(file_path, filename)
+
+
+######
+# Datastore Manipulation Functions
+######
+
 
 def getStatementHeader(datastore):
     return datastore['header']
@@ -179,7 +254,7 @@ def getLoanParameters(datastore):
     principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
     periods_per_year = Decimal(loan["periods_per_year"])
     total_periods = Decimal(loan["periods"])
-    payment_day_of_month = int(loan['payment_day_of_month'])
+    #payment_day_of_month = int(loan['payment_day_of_month'])
 
     if "monthly_payment" in loan:
         monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
@@ -190,8 +265,8 @@ def getLoanParameters(datastore):
                 periodic_rate * ((1 + periodic_rate) ** total_periods))
         monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
 
-    loan['principal'] = principal       # standardizes the format
-    loan['annual_rate'] = annual_rate   # standardizes the format
+    loan['principal'] = principal  # standardizes the format
+    loan['annual_rate'] = annual_rate  # standardizes the format
     loan['daily_interest_rate'] = daily_interest_rate
     loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
     loan['next_payment_amt'] = 0
@@ -224,6 +299,10 @@ def getDatastore(filename=None):
 
     return datastore
 
+######
+# Loan Calculation Functions
+######
+
 
 def amortizeLoan(loan):
     # loop over the payments and calculate the actual amortization
@@ -242,8 +321,8 @@ def amortizeLoan(loan):
     payment_number = 1
     annual_interest = 0
     total_interest = 0
-    old_bill_date = next_bill_date
-    current_year = next_bill_date.year
+    #old_bill_date = next_bill_date
+    #current_year = next_bill_date.year
 
     past_payments = []
     future_payments = []
@@ -252,15 +331,16 @@ def amortizeLoan(loan):
         payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
         payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
         days_since_last_payment = (payment_date - interest_paid_through_date).days
-        if len(payment)>2:
+        if len(payment) > 2:
             late_fee = Decimal(payment[2]).quantize(Decimal("1.00"))
         else:
             late_fee = Decimal("0.00")
 
-        #check for out of order payments, generally a sign of a data entry problem, especially years
+        # check for out of order payments, generally a sign of a data entry problem, especially years
         if days_since_last_payment < 0:
-            print("Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'." \
-                  % (payment_number, payment_date, interest_paid_through_date))
+            print(
+                "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'."
+                % (payment_number, payment_date, interest_paid_through_date))
             quit()
 
         new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
@@ -270,11 +350,10 @@ def amortizeLoan(loan):
         annual_interest = annual_interest + new_interest
         remaining_principal = remaining_principal - new_principal
 
-
         # create the payment record for the template to render
         payment_record = {}
-        payment_record['year']=next_bill_date.year
-        payment_record['month']=next_bill_date.month
+        payment_record['year'] = next_bill_date.year
+        payment_record['month'] = next_bill_date.month
         payment_record['payment_number'] = payment_number
         payment_record['bill_date'] = next_bill_date
         payment_record['payment_date'] = payment_date
@@ -289,16 +368,24 @@ def amortizeLoan(loan):
         past_payments.append(payment_record)
 
         payment_number = payment_number + 1
-        old_bill_date = next_bill_date
 
-        if old_bill_date.month < 12:
-            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        print("Payment record length: " + str(len(payment)))
+        #check for the extra payment flag, if its there, don't advance the next payment date
+        if len(payment) > 3 and payment[3] == "extra":
+            print("Extra payment flag: " + payment[3])
+            #this is an extra payment don't advance the date
         else:
-            annual_interest = Decimal("0.00")
-            next_bill_date = date(year=old_bill_date.year + 1, month=1, day = payment_day_of_month)
+            old_bill_date = next_bill_date
+
+            if old_bill_date.month < 12:
+                next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+            else:
+                annual_interest = Decimal("0.00")
+                next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+
+            loan["parameters"]["next_due_date"] = next_bill_date
 
     loan["total_interest_paid_to_date"] = total_interest
-    loan["parameters"]["next_due_date"] = next_bill_date
 
     if (remaining_principal < monthly_payment):
         loan["parameters"]["next_payment_amt"] = remaining_principal
@@ -338,12 +425,17 @@ def amortizeLoan(loan):
         else:
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
 
-
     loan["balloon_payment"] = remaining_principal
     loan["past_payments"] = past_payments
     loan["future_payments"] = future_payments
     return
 
+
+######
+# Report Generation Functions
+######
+
+
 def transformTemplate(template_fileName, loanModel):
     # template_filename = "statement.text.jinja"
     # setup jinja for creating the statement
@@ -354,7 +446,7 @@ def transformTemplate(template_fileName, loanModel):
     return report
 
 
-def generateEmail(from_address, to_address, subject, body, pdf, html, txt):
+def generateStatementEmail(from_address, to_address, subject, body, pdf, html, txt):
     msg = MIMEMultipart()
     msg['Subject'] = subject
     msg['From'] = from_address
@@ -362,21 +454,21 @@ def generateEmail(from_address, to_address, subject, body, pdf, html, txt):
 
     msg.attach(MIMEText(body))
 
-    if (pdf != None):
+    if pdf is not None:
         part = MIMEBase("application", "octet-stream")
         part.set_payload(pdf)
         encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
         msg.attach(part)
 
-    if (html != None):
+    if html is not None:
         part = MIMEBase("text", "html")
         part.set_payload(html)
         encoders.encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
         msg.attach(part)
 
-    if (txt != None):
+    if txt is not None:
         part = MIMEBase("text", "plain")
         part.set_payload(txt)
         encoders.encode_base64(part)
@@ -386,6 +478,22 @@ def generateEmail(from_address, to_address, subject, body, pdf, html, txt):
     return msg
 
 
+def generatePaymentNotificationEmail(from_address, to_address, subject, html):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    #msg.attach(MIMEText(body))
+    part = MIMEBase("text", "html")
+    part.set_payload(html)
+    encoders.encode_base64(part)
+    part.add_header('Content-Disposition', 'attachment; filename="notification.html"')
+    msg.attach(part)
+
+    return msg
+
+
 def sendEmail(msg, from_address, to_address, passwd):
     try:
         server = smtplib.SMTP('smtp.gmail.com', 587)
@@ -401,18 +509,20 @@ def sendEmail(msg, from_address, to_address, passwd):
 
 def createPDF(report):
     # create pdf
-    class MyFPDF(FPDF, HTMLMixin):
+    class PDF(FPDF, HTMLMixin):
         pass
 
-    pdf = MyFPDF()
+    pdf = PDF()
     pdf.set_font(family='Arial', size=12)
     pdf.add_page()
     pdf.write_html(report)
-    # pdf.output(name='test.pdf', dest='F')
     return pdf.output(dest='S')
 
 
 def selectTemplate(format):
+    if format == 'paymentNotification':
+        return 'payment_received_email.html.jinja'
+
     if format == 'html':
         return 'statement.html.jinja'
 
@@ -424,9 +534,11 @@ def selectTemplate(format):
 
     return 'statement.html.jinja'
 
+
 def main():
     app.debug = True
     app.run()
 
+
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/mortgage/web_ng.py b/mortgage/web_ng.py
new file mode 100644
index 0000000..a9fd4f8
--- /dev/null
+++ b/mortgage/web_ng.py
@@ -0,0 +1,544 @@
+import json
+import jinja2
+import smtplib
+import os
+from flask import Flask, render_template, request, redirect
+from decimal import *
+from datetime import *
+from fpdf import FPDF, HTMLMixin
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.mime.base import MIMEBase
+from email import encoders
+
+module_directory = os.path.dirname(__file__)
+app_directory = os.path.normpath(os.path.join(module_directory, ".."))
+loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
+environment = jinja2.Environment(loader=loader)
+app = Flask(__name__)
+
+
+######
+# Flask Call Backs
+######
+
+
+@app.route('/')
+def hello():
+    loans = getLoanFiles(app_directory)
+
+    #if a loan was not specified, choose the first loan and reload page with it
+    if 'loan' in request.args:
+        filename = request.args["loan"]
+    else:
+        return redirect('/?loan=' + loans[0]['filename'])
+
+    loan = loadLoanInformation(getFullPathofLoanFile(filename))
+    amortizeLoan(loan)
+
+    return render_template('main.html', filename=filename, loans=loans, model=loan)
+
+
+@app.route('/update_file', methods=['POST'])
+def update_file():
+    messages = []
+
+    loanFile = request.form["loan"]
+    data = getDatastore(getFullPathofLoanFile(loanFile))
+
+    late_fee = Decimal('0.00').quantize(Decimal('1.00'))
+    extra_payment = False
+    payment_amount = Decimal('0.00').quantize(Decimal('1.00'))
+    payment_history = data["payments"]
+    todays_date = str(datetime.now().strftime("%Y-%m-%d"))
+    if 'date' in request.form:
+        if request.form['date'] == '':
+            payment_date = todays_date
+            messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
+        else:
+            payment_date = request.form['date']
+            messages.append("Date provided: " + payment_date + ".")
+    else:
+        payment_date = todays_date
+        messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
+
+    proceed_flag = True
+    if 'amount' in request.form:
+        if request.form['amount'] != '':
+            try:
+                payment_amount = Decimal(request.form['amount'])
+                messages.append("Amount provided: " + str(payment_amount) + ".")
+            except:
+                messages.append("The amount provided could not be interpreted.  Your payment was not recorded.")
+                proceed_flag = False
+            else:
+                pass
+
+    if 'latefee' in request.form:
+        if request.form['latefee'] != '':
+            try:
+                late_fee = Decimal(request.form['latefee'])
+                messages.append("Late fee amount: " + str(late_fee) + ".")
+            except:
+                messages.append("The late fee amount was specified but could not be interpreted. " +
+                                "Your payment was not recorded.")
+                proceed_flag = False
+
+    if 'extra' in request.form:
+        if request.form['extra'] != '':
+            extra_payment = True
+
+    if proceed_flag is True:
+        try:
+            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
+            backup_file = open(getFullPathofLoanFile(backup_filename), 'w+')
+            json.dump(data, backup_file, indent=2)
+            backup_file.close()
+        except:
+            messages.append("A backup file could not be created.  Your payment was not recorded.")
+            proceed_flag = False
+        else:
+            messages.append("A backup of your file was created: '" + backup_filename + "'")
+
+    if proceed_flag is True:
+        try:
+            payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
+            file = open(getFullPathofLoanFile(loanFile), 'w+')
+            json.dump(data, file, indent=2)
+            file.close()
+        except:
+            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " +
+                            "please consider rolling back to the backup created above.")
+        else:
+            messages.append("The payment was successfully written. ")
+
+    # see if an email notification was requested, if not, exit now
+    if 'notify' not in request.form:
+        messages.append("Payment notification email not requested.")
+        return render_template('add.html', filename=loanFile, messages=messages)
+
+    messages.append("Payment notification email requested.")
+    # send email
+    emailParameters = data["email"]
+    result = {}
+    payment = {}
+    result['payment'] = payment
+    payment['today'] = todays_date
+    payment['date'] = payment_date
+    payment['payer'] = data['borrower']['name']
+    payment['payee'] = data['lender']['name']
+    payment['amount'] = payment_amount
+    payment['late_fee'] = late_fee
+    payment['extra_payment'] = extra_payment
+
+    subject = "Your loan payment has been received"
+    html = transformTemplate(selectTemplate('paymentNotification'), result)
+    msg = generatePaymentNotificationEmail(emailParameters["from_address"], emailParameters["to_address"],
+                                           subject, html)
+    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
+    return render_template('add.html', filename=loanFile, messages=messages)
+
+
+@app.route('/send_statement', methods=['POST'])
+def send_statement():
+    loanFile = request.form["loan"]
+    subject = request.form["subject"]
+    message = request.form["message"]
+
+    loan = loadLoanInformation(getFullPathofLoanFile(loanFile))
+    amortizeLoan(loan)
+
+    reportCreated = False
+    textReport = pdfReport = htmlReport = None
+
+    if 'text' in request.form:
+        textReport = transformTemplate(selectTemplate('text'), loan)
+        reportCreated = True
+
+    if 'pdf' in request.form:
+        pdfInterimReport = transformTemplate(selectTemplate('pdf'), loan)
+        pdfReport = createPDF(pdfInterimReport)
+        reportCreated = True
+
+    if ('html' in request.form) or (reportCreated is False):
+        htmlReport = transformTemplate(selectTemplate('html'), loan)
+
+    # send email
+    emailParameters = loan["email"]
+
+    msg = generateStatementEmail(emailParameters["from_address"],
+                                 emailParameters["to_address"],
+                                 subject,
+                                 message, pdfReport, htmlReport, textReport)
+
+    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
+
+    return render_template('email.html', filename=loanFile)
+
+
+######
+# Loan File Functions
+######
+
+def getLoanFiles(directory):
+    loans = []
+    count = 0
+
+    directory = os.path.normpath(directory)
+    print("Directory {}".format(directory))
+    for filename in os.listdir(directory):
+        if filename.endswith(".loan"):
+            count=count+1
+            loans.append(createLoanEntryMenuItem("{0} {1}".format(count, filename.removesuffix(".loan")), filename))
+
+    return loans
+
+
+def createLoanEntryMenuItem(loanName, fileName):
+    x = {}
+    x['name'] = loanName
+    x['filename'] = fileName
+    return x
+
+
+def getFullPathofLoanFile(filename):
+    app_path = os.path.dirname(__file__)
+    file_path = os.path.normpath(os.path.join(os.path.dirname(__file__),'..'))
+    print("App Path: {0}\nFile Path: {1}".format(app_path, file_path))
+    return os.path.join(file_path, filename)
+
+
+######
+# Datastore Manipulation Functions
+######
+
+
+def getStatementHeader(datastore):
+    return datastore['header']
+
+
+def getEmailInformation(datastore):
+    return datastore['email']
+
+
+def loadLoanInformation(filename):
+    datastore = getDatastore(filename)
+
+    loanModel = {}
+    loanModel['datastore'] = datastore
+    loanModel['email'] = getEmailInformation(datastore)
+    loanModel['parameters'] = getLoanParameters(datastore)
+    loanModel['lender'] = getLender(datastore)
+    loanModel['borrower'] = getBorrower(datastore)
+    loanModel['header'] = getStatementHeader(datastore)
+    return loanModel
+
+
+def getLoanParameters(datastore):
+    # read in the loan profile information
+    loan = datastore['parameters']
+
+    annual_rate = Decimal(loan['interest_rate']) / 100
+    daily_interest_rate = annual_rate / 360
+    principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
+    periods_per_year = Decimal(loan["periods_per_year"])
+    total_periods = Decimal(loan["periods"])
+    #payment_day_of_month = int(loan['payment_day_of_month'])
+
+    if "monthly_payment" in loan:
+        monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
+    else:
+        # calculate expected monthly payment
+        periodic_rate = annual_rate / periods_per_year
+        discount_factor = (((1 + periodic_rate) ** total_periods) - 1) / (
+                periodic_rate * ((1 + periodic_rate) ** total_periods))
+        monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
+
+    loan['principal'] = principal  # standardizes the format
+    loan['annual_rate'] = annual_rate  # standardizes the format
+    loan['daily_interest_rate'] = daily_interest_rate
+    loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
+    loan['next_payment_amt'] = 0
+    loan['next_payment_date'] = '12/12/12'
+    loan['total_periods'] = total_periods
+    loan['monthly_payment'] = monthly_payment
+    datastore['parameters'] = loan
+    return loan
+
+
+def getLender(datastore):
+    return datastore['lender']
+
+
+def getBorrower(datastore):
+    return datastore['borrower']
+
+
+def getDatastore(filename=None):
+    try:
+        if filename:
+            with open(filename, 'r') as f:
+                datastore = json.load(f)
+
+    except Exception as e:
+        print("An error occurred opening your loan file '%s'. " % filename)
+        print("The Exception:")
+        print(e.__repr__())
+        quit()
+
+    return datastore
+
+######
+# Loan Calculation Functions
+######
+
+def new_amortizeLoan(loan):
+    #loop over the historical data and re-calculate the actual amortization
+    monthly_payment = loan["parameters"]["monthly_payment"]
+    first_day_interest_accrues = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
+    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
+
+
+
+def amortizeLoan(loan):
+    # loop over the payments and calculate the actual amortization
+    monthly_payment = loan["parameters"]["monthly_payment"]
+
+    actual_payments = loan["datastore"]["payments"]
+    #invoices = loan["datastore"]["invoices"]
+    #payments = loan["datastore"]["payments"]
+    #allocations = loan["datastore"]["allocations"]
+
+
+    remaining_principal = loan["parameters"]["principal"]
+    payment_day_of_month = int(loan["parameters"]["payment_day_of_month"])
+    daily_interest_rate = loan["parameters"]["daily_interest_rate"]
+    total_periods = loan["parameters"]["total_periods"]
+    interest_paid_through_date = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
+    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
+    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
+
+    payment_number = 1
+    annual_interest = 0
+    total_interest = 0
+    #old_bill_date = next_bill_date
+    #current_year = next_bill_date.year
+
+    past_payments = []
+    future_payments = []
+
+    for payment in actual_payments:
+        payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
+        payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
+        days_since_last_payment = (payment_date - interest_paid_through_date).days
+        if len(payment) > 2:
+            late_fee = Decimal(payment[2]).quantize(Decimal("1.00"))
+        else:
+            late_fee = Decimal("0.00")
+
+        # check for out of order payments, generally a sign of a data entry problem, especially years
+        if days_since_last_payment < 0:
+            print(
+                "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'."
+                % (payment_number, payment_date, interest_paid_through_date))
+            quit()
+
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+        new_principal = payment_amount - new_interest - late_fee
+        interest_paid_through_date = payment_date
+        total_interest = total_interest + new_interest
+        annual_interest = annual_interest + new_interest
+        remaining_principal = remaining_principal - new_principal
+
+        # create the payment record for the template to render
+        payment_record = {}
+        payment_record['year'] = next_bill_date.year
+        payment_record['month'] = next_bill_date.month
+        payment_record['payment_number'] = payment_number
+        payment_record['bill_date'] = next_bill_date
+        payment_record['payment_date'] = payment_date
+        payment_record['days_of_interest'] = days_since_last_payment
+        payment_record['payment_amount'] = payment_amount
+        payment_record['principal_payment'] = payment_amount - new_interest - late_fee
+        payment_record['interest_payment'] = new_interest
+        payment_record['new_balance'] = remaining_principal
+        payment_record['interest_to_date'] = total_interest
+        payment_record['annual_interest_to_date'] = annual_interest
+        payment_record['late_fee'] = late_fee
+        past_payments.append(payment_record)
+
+        payment_number = payment_number + 1
+
+        print("Payment record length: " + str(len(payment)))
+        #check for the extra payment flag, if its there, don't advance the next payment date
+        if len(payment) > 3 and payment[3] == "extra":
+            print("Extra payment flag: " + payment[3])
+            #this is an extra payment don't advance the date
+        else:
+            old_bill_date = next_bill_date
+
+            if old_bill_date.month < 12:
+                next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+            else:
+                annual_interest = Decimal("0.00")
+                next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+
+            loan["parameters"]["next_due_date"] = next_bill_date
+
+    loan["total_interest_paid_to_date"] = total_interest
+
+    if (remaining_principal < monthly_payment):
+        loan["parameters"]["next_payment_amt"] = remaining_principal
+    else:
+        loan["parameters"]["next_payment_amt"] = monthly_payment
+
+    # loop over remaining scheduled payments and present estimated amortization
+    while (payment_number <= total_periods) and (remaining_principal > 0):
+        days_since_last_payment = (next_bill_date - interest_paid_through_date).days
+        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
+        # make sure the last payment isn't too much
+        if new_interest + remaining_principal < monthly_payment:
+            monthly_payment = new_interest + remaining_principal
+
+        new_principal = monthly_payment - new_interest
+
+        remaining_principal = remaining_principal - new_principal
+
+        interest_paid_through_date = next_bill_date
+
+        # complete the future payment amortization record
+        future_payment_record = {}
+        future_payment_record['payment_number'] = payment_number
+        future_payment_record['payment_date'] = next_bill_date
+        future_payment_record['days_of_interest'] = days_since_last_payment
+        future_payment_record['payment_amount'] = monthly_payment
+        future_payment_record['principal_payment'] = new_principal
+        future_payment_record['interest_payment'] = new_interest
+        future_payment_record['new_balance'] = remaining_principal
+        future_payments.append(future_payment_record)
+
+        payment_number = payment_number + 1
+        old_bill_date = next_bill_date
+        if old_bill_date.month < 12:
+            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
+        else:
+            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
+
+    loan["balloon_payment"] = remaining_principal
+    loan["past_payments"] = past_payments
+    loan["future_payments"] = future_payments
+    return
+
+
+######
+# Report Generation Functions
+######
+
+
+def transformTemplate(template_fileName, loanModel):
+    # template_filename = "statement.text.jinja"
+    # setup jinja for creating the statement
+    template = environment.get_template(template_fileName)
+
+    print(loanModel)
+    report = template.render(model=loanModel)
+    return report
+
+
+def generateStatementEmail(from_address, to_address, subject, body, pdf, html, txt):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    msg.attach(MIMEText(body))
+
+    if pdf is not None:
+        part = MIMEBase("application", "octet-stream")
+        part.set_payload(pdf)
+        encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
+        msg.attach(part)
+
+    if html is not None:
+        part = MIMEBase("text", "html")
+        part.set_payload(html)
+        encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
+        msg.attach(part)
+
+    if txt is not None:
+        part = MIMEBase("text", "plain")
+        part.set_payload(txt)
+        encoders.encode_base64(part)
+        part.add_header('Content-Disposition', 'attachment; filename="statement.txt"')
+        msg.attach(part)
+
+    return msg
+
+
+def generatePaymentNotificationEmail(from_address, to_address, subject, html):
+    msg = MIMEMultipart()
+    msg['Subject'] = subject
+    msg['From'] = from_address
+    msg['To'] = to_address
+
+    #msg.attach(MIMEText(body))
+    part = MIMEBase("text", "html")
+    part.set_payload(html)
+    encoders.encode_base64(part)
+    part.add_header('Content-Disposition', 'attachment; filename="notification.html"')
+    msg.attach(part)
+
+    return msg
+
+
+def sendEmail(msg, from_address, to_address, passwd):
+    try:
+        server = smtplib.SMTP('smtp.gmail.com', 587)
+        server.ehlo()
+        server.starttls()
+        server.login(from_address, passwd)
+
+        server.sendmail(from_address, to_address, msg.as_string())
+        server.close()
+    except:
+        print("Couldn't send email.")
+
+
+def createPDF(report):
+    # create pdf
+    class MyFPDF(FPDF, HTMLMixin):
+        pass
+
+    pdf = MyFPDF()
+    pdf.set_font(family='Arial', size=12)
+    pdf.add_page()
+    pdf.write_html(report)
+    return pdf.output(dest='S')
+
+
+def selectTemplate(format):
+    if format == 'paymentNotification':
+        return 'payment_received_email.html.jinja'
+
+    if format == 'html':
+        return 'statement.html.jinja'
+
+    if format == 'pdf':
+        return 'statement.pdf.jinja'
+
+    if format == 'text':
+        return 'statement.text.jinja'
+
+    return 'statement.html.jinja'
+
+
+def main():
+    app.debug = True
+    app.run()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/pyvenv.cfg b/pyvenv.cfg
new file mode 100644
index 0000000..ee06fe5
--- /dev/null
+++ b/pyvenv.cfg
@@ -0,0 +1,3 @@
+home = /opt/local/bin
+include-system-site-packages = false
+version = 3.10.7
diff --git a/requirements.txt b/requirements.txt
index 57e31fa..4df3530 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 flask
-fpdf
-jinja2
\ No newline at end of file
+fpdf2
+jinja2

From bf3e789a25613ed9074aac8bd38e350c40ecf736 Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Mon, 3 Oct 2022 00:09:12 -0400
Subject: [PATCH 23/38] Cleaning up...

---
 .hgignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.hgignore b/.hgignore
index 40b7757..747c327 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,5 @@
 .Python
 .DS_Store
-./bin/
-./lib/
-./.idea/
+bin/
+lib/
+.idea/

From 6261ff78957b033de24ab754ba03372af89171da Mon Sep 17 00:00:00 2001
From: john <john@Helium.local>
Date: Sun, 2 Apr 2023 23:45:26 -0400
Subject: [PATCH 24/38] Creating new baseline.  This will be the starting point
 for the updates.

---
 1_Dad_Mortgage.loan         | 38 ++++++++++++++++++++++++++++++++++++-
 2_Brenda_Mortgage.loan      | 36 +++++++++++++++++++++++++++++++++++
 3_839_Harbor_Bend_2022.loan | 30 +++++++++++++++++++++++++++++
 mortgage/web.py             |  9 ++++++++-
 4 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/1_Dad_Mortgage.loan b/1_Dad_Mortgage.loan
index c0faec1..15f9453 100644
--- a/1_Dad_Mortgage.loan
+++ b/1_Dad_Mortgage.loan
@@ -15,7 +15,7 @@
   "format": "html",
   "email": {
     "body": "Your loan statement is attached.",
-    "to_address": "johnkent49@gmail.com",
+    "to_address": "johnakent722@gmail.com",
     "from_address": "jkent3rd@gmail.com",
     "text": "Please see your most recent account statement.",
     "server": "smtp.gmail.com",
@@ -279,6 +279,42 @@
       "278.15",
       "0.00",
       "False"
+    ],
+    [
+      "2022-10-31",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-12-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-01-03",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-02-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-03-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-04-01",
+      "278.15",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
diff --git a/2_Brenda_Mortgage.loan b/2_Brenda_Mortgage.loan
index 848a549..00912f2 100644
--- a/2_Brenda_Mortgage.loan
+++ b/2_Brenda_Mortgage.loan
@@ -279,6 +279,42 @@
       "278.15",
       "0.00",
       "False"
+    ],
+    [
+      "2022-10-31",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-12-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-01-03",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-02-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-03-01",
+      "278.15",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-04-01",
+      "278.15",
+      "0.00",
+      "False"
     ]
   ],
   "borrower": {
diff --git a/3_839_Harbor_Bend_2022.loan b/3_839_Harbor_Bend_2022.loan
index 3d41c1f..3fa68d7 100644
--- a/3_839_Harbor_Bend_2022.loan
+++ b/3_839_Harbor_Bend_2022.loan
@@ -49,6 +49,36 @@
       "803",
       "0.00",
       "False"
+    ],
+    [
+      "2022-11-17",
+      "842.93",
+      "0.00",
+      "False"
+    ],
+    [
+      "2022-12-29",
+      "842.93",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-01-27",
+      "842.93",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-02-10",
+      "842.93",
+      "0.00",
+      "False"
+    ],
+    [
+      "2023-03-31",
+      "0",
+      "33.68",
+      "False"
     ]
   ],
   "borrower": {
diff --git a/mortgage/web.py b/mortgage/web.py
index 8cb3c0c..87833ad 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -359,6 +359,7 @@ def amortizeLoan(loan):
         payment_record['payment_date'] = payment_date
         payment_record['days_of_interest'] = days_since_last_payment
         payment_record['payment_amount'] = payment_amount
+        principal_payment = payment_amount - new_interest - late_fee
         payment_record['principal_payment'] = payment_amount - new_interest - late_fee
         payment_record['interest_payment'] = new_interest
         payment_record['new_balance'] = remaining_principal
@@ -369,7 +370,13 @@ def amortizeLoan(loan):
 
         payment_number = payment_number + 1
 
-        print("Payment record length: " + str(len(payment)))
+        print("; Autogenerated 'ledger' transaction")
+        print(f'{payment_date} * " payee Mortgage Payment {payment_number-1}"')
+        print(f"  Assets:Current:Checking -{payment_amount} USD")
+        print(f"  Liabilities:Mortgages:Mortgage {principal_payment} USD")
+        print(f"  Expenses:Rental:MortgageInterest")
+        print(";")
+
         #check for the extra payment flag, if its there, don't advance the next payment date
         if len(payment) > 3 and payment[3] == "extra":
             print("Extra payment flag: " + payment[3])

From c6291c3ab99a74806cc2d58ace4127a9f9741d07 Mon Sep 17 00:00:00 2001
From: john
 <john@1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa>
Date: Wed, 5 Apr 2023 13:57:55 -0400
Subject: [PATCH 25/38] Starting the process of migrating to a Docker
 container.

---
 Dockerfile      |  8 ++++++++
 mortgage/web.py | 38 +++++++++++++-------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..336d66a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.8-slim-buster
+
+COPY requirements.txt requirements.txt
+RUN pip3 install -r requirements.txt
+
+COPY . .
+
+CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"]
\ No newline at end of file
diff --git a/mortgage/web.py b/mortgage/web.py
index 87833ad..b3a16f8 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -5,7 +5,7 @@ import os
 from flask import Flask, render_template, request, redirect
 from decimal import *
 from datetime import *
-from fpdf import FPDF, HTML2FPDF, HTMLMixin
+from fpdf import FPDF, HTMLMixin
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
@@ -32,7 +32,7 @@ def hello():
     else:
         return redirect('/?loan=' + loans[0]['filename'])
 
-    loan = loadLoanInformation(getFullPathofLoanFile(filename))
+    loan = loadLoanInformation(getFullPathOfLoanFile(filename))
     amortizeLoan(loan)
 
     return render_template('main.html', filename=filename, loans=loans, model=loan)
@@ -43,7 +43,7 @@ def update_file():
     messages = []
 
     loanFile = request.form["loan"]
-    data = getDatastore(getFullPathofLoanFile(loanFile))
+    data = getDatastore(getFullPathOfLoanFile(loanFile))
 
     late_fee = Decimal('0.00').quantize(Decimal('1.00'))
     extra_payment = False
@@ -90,7 +90,7 @@ def update_file():
     if proceed_flag is True:
         try:
             backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
-            backup_file = open(getFullPathofLoanFile(backup_filename), 'w+')
+            backup_file = open(getFullPathOfLoanFile(backup_filename), 'w+')
             json.dump(data, backup_file, indent=2)
             backup_file.close()
         except:
@@ -102,7 +102,7 @@ def update_file():
     if proceed_flag is True:
         try:
             payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
-            file = open(getFullPathofLoanFile(loanFile), 'w+')
+            file = open(getFullPathOfLoanFile(loanFile), 'w+')
             json.dump(data, file, indent=2)
             file.close()
         except:
@@ -144,7 +144,7 @@ def send_statement():
     subject = request.form["subject"]
     message = request.form["message"]
 
-    loan = loadLoanInformation(getFullPathofLoanFile(loanFile))
+    loan = loadLoanInformation(getFullPathOfLoanFile(loanFile))
     amortizeLoan(loan)
 
     reportCreated = False
@@ -182,7 +182,6 @@ def send_statement():
 
 def getLoanFiles(directory):
     loans = []
-    count = 0
 
     directory = os.path.normpath(directory)
     print("Directory {}".format(directory))
@@ -193,26 +192,15 @@ def getLoanFiles(directory):
             displayName = filename.removesuffix(".loan").replace("_"," ")
             loans.append(createLoanEntryMenuItem("{0}".format(displayName), filename))
 
-    #loans.append(createLoanEntryMenuItem("1 Brenda Mortgage", "brendamortgage.json"))
-    #loans.append(createLoanEntryMenuItem("2 Dad Mortgage", "Dad-Mortgage.loan"))
-    #loans.append(createLoanEntryMenuItem("3 839 Harbor Bend Loan 1", "HarborBend839-2022.json"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Bear Houses LLC Loan", "9Kloan.loan"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Test Loan", "testloan.json"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Greenfield Lane Mortgage", "greenfield_mortgage.json"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Greenfield Lane Refinance", "greenfield_refinance.json"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Harbor Bend Loan 1", "BearHousesLLC-22-0001.json"))
-    #loans.append(createLoanEntryMenuItem("--ARCHIVE-- Wayneland Dr D11 Mortgage", "wayneland_mortgage.json"))
     return loans
 
-
 def createLoanEntryMenuItem(loanName, fileName):
     x = {}
     x['name'] = loanName
     x['filename'] = fileName
     return x
 
-
-def getFullPathofLoanFile(filename):
+def getFullPathOfLoanFile(filename):
     app_path = os.path.dirname(__file__)
     file_path = os.path.normpath(os.path.join(os.path.dirname(__file__),'..'))
     print("App Path: {0}\nFile Path: {1}".format(app_path, file_path))
@@ -394,7 +382,7 @@ def amortizeLoan(loan):
 
     loan["total_interest_paid_to_date"] = total_interest
 
-    if (remaining_principal < monthly_payment):
+    if remaining_principal < monthly_payment:
         loan["parameters"]["next_payment_amt"] = remaining_principal
     else:
         loan["parameters"]["next_payment_amt"] = monthly_payment
@@ -526,17 +514,17 @@ def createPDF(report):
     return pdf.output(dest='S')
 
 
-def selectTemplate(format):
-    if format == 'paymentNotification':
+def selectTemplate(formatType):
+    if formatType == 'paymentNotification':
         return 'payment_received_email.html.jinja'
 
-    if format == 'html':
+    if formatType == 'html':
         return 'statement.html.jinja'
 
-    if format == 'pdf':
+    if formatType == 'pdf':
         return 'statement.pdf.jinja'
 
-    if format == 'text':
+    if formatType == 'text':
         return 'statement.text.jinja'
 
     return 'statement.html.jinja'

From 5930ad5af110fbbc28b08e89114698e918036c04 Mon Sep 17 00:00:00 2001
From: john <john@helium.local>
Date: Sun, 14 May 2023 10:19:04 -0400
Subject: [PATCH 26/38] Additional changes to move application to CouchDB
 database backend.  Removed loan files from repository (now in selfhosted
 couchdb instance).

---
 0_Test_Loan.loan                          | 102 -------
 1_Dad_Mortgage.loan                       | 328 ----------------------
 2_Brenda_Mortgage.loan                    | 328 ----------------------
 3_839_Harbor_Bend_2022.loan               |  92 ------
 Dockerfile                                |   4 +-
 _Archive_Greenfield_Lane_Mortgage.loan    | 255 -----------------
 _Archive_Greenfield_Lane_Refinance-1.loan | 128 ---------
 _Archive_Old_Harbor_Bend_Mortgage.loan    |  50 ----
 _Archive_Wayneland_Mortgage.loan          | 137 ---------
 mortgage/templates/add.html               |   2 +-
 mortgage/templates/email.html             |   2 +-
 mortgage/templates/main.html              |  16 +-
 mortgage/web.py                           | 108 +++----
 13 files changed, 49 insertions(+), 1503 deletions(-)
 delete mode 100644 0_Test_Loan.loan
 delete mode 100644 1_Dad_Mortgage.loan
 delete mode 100644 2_Brenda_Mortgage.loan
 delete mode 100644 3_839_Harbor_Bend_2022.loan
 delete mode 100644 _Archive_Greenfield_Lane_Mortgage.loan
 delete mode 100644 _Archive_Greenfield_Lane_Refinance-1.loan
 delete mode 100644 _Archive_Old_Harbor_Bend_Mortgage.loan
 delete mode 100644 _Archive_Wayneland_Mortgage.loan

diff --git a/0_Test_Loan.loan b/0_Test_Loan.loan
deleted file mode 100644
index e8faba3..0000000
--- a/0_Test_Loan.loan
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "parameters": {
-    "monthly_payment": 589.0,
-    "interest_rate": 6.5,
-    "start_interest_date": "2017-12-05",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2018-01-15",
-    "account_number": "100100",
-    "principal": 10020.0,
-    "start_date": "2017-12-05",
-    "periods_per_year": 12,
-    "periods": 18
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Test Lender",
-    "zip": "20011",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "743 Madison St NW"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Installment Loan Test Statement"
-  },
-  "payments": [
-    [
-      "2019-07-15",
-      "475.00"
-    ],
-    [
-      "2019-08-14",
-      "475.00"
-    ],
-    [
-      "2019-09-17",
-      "475"
-    ],
-    [
-      "2019-10-15",
-      "0"
-    ],
-    [
-      "2019-11-15",
-      "0"
-    ],
-    [
-      "2019-12-5",
-      "475"
-    ],
-    [
-      "2020-01-15",
-      "0",
-      "50"
-    ],
-    [
-      "2020-09-27",
-      "278.15",
-      "20"
-    ],
-    [
-      "2020-09-29",
-      "296.12",
-      "25"
-    ],
-    [
-      "2020-10-16",
-      "133",
-      "0.00"
-    ],
-    [
-      "2020-10-16",
-      "133",
-      "0.00"
-    ],
-    [
-      "2020-10-16",
-      "133",
-      "0.00"
-    ],
-    [
-      "2021-05-03",
-      "1",
-      "1"
-    ]
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Test Borrower Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "email": {
-    "to_address": "jkent3rd@gmail.com",
-    "from_address": "jkent3rd@gmail.com",
-    "subject": "Your test loan statement...",
-    "body": "Your test loan statement is attached.",
-    "server": "smtp.gmail.com",
-    "password": "builcuouzobxroow"
-  }
-}
\ No newline at end of file
diff --git a/1_Dad_Mortgage.loan b/1_Dad_Mortgage.loan
deleted file mode 100644
index 15f9453..0000000
--- a/1_Dad_Mortgage.loan
+++ /dev/null
@@ -1,328 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 278.15,
-    "interest_rate": 5.0,
-    "start_interest_date": "2018-07-01",
-    "payment_day_of_month": "01",
-    "first_payment_month": "2018-08-01",
-    "account_number": "100001",
-    "periods": 180,
-    "start_date": "2018-06-25",
-    "periods_per_year": 12,
-    "principal": 35000.0
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "johnakent722@gmail.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Palmyra",
-    "name": "John Kent",
-    "zip": "22963",
-    "phone": "434-510-7272",
-    "state": "VA",
-    "address": "109 Shores Rd"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"
-  },
-  "payments": [
-    [
-      "2018-08-01",
-      "278.15"
-    ],
-    [
-      "2018-09-01",
-      "278.15"
-    ],
-    [
-      "2018-10-01",
-      "278.15"
-    ],
-    [
-      "2018-11-01",
-      "278.15"
-    ],
-    [
-      "2018-12-01",
-      "278.15"
-    ],
-    [
-      "2019-01-01",
-      "278.15"
-    ],
-    [
-      "2019-02-01",
-      "278.15"
-    ],
-    [
-      "2019-03-01",
-      "278.15"
-    ],
-    [
-      "2019-04-01",
-      "278.15"
-    ],
-    [
-      "2019-05-01",
-      "278.15"
-    ],
-    [
-      "2019-05-31",
-      "278.15"
-    ],
-    [
-      "2019-07-01",
-      "278.15"
-    ],
-    [
-      "2019-08-01",
-      "278.15"
-    ],
-    [
-      "2019-09-02",
-      "278.15"
-    ],
-    [
-      "2019-10-01",
-      "278.15"
-    ],
-    [
-      "2019-11-01",
-      "278.15"
-    ],
-    [
-      "2019-12-02",
-      "278.15"
-    ],
-    [
-      "2020-01-02",
-      "278.15"
-    ],
-    [
-      "2020-02-01",
-      "278.15"
-    ],
-    [
-      "2020-03-02",
-      "278.15"
-    ],
-    [
-      "2020-04-01",
-      "278.15"
-    ],
-    [
-      "2020-05-01",
-      "278.15"
-    ],
-    [
-      "2020-06-01",
-      "278.15"
-    ],
-    [
-      "2020-07-01",
-      "278.15"
-    ],
-    [
-      "2020-08-01",
-      "278.15"
-    ],
-    [
-      "2020-09-01",
-      "278.15"
-    ],
-    [
-      "2020-10-01",
-      "278.15"
-    ],
-    [
-      "2020-11-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2020-12-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-01-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-02-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-03-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-04-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-04-30",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-06-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-07-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-07-31",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-09-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-10-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-11-01",
-      "278.15",
-      "0",
-      "False"
-    ],
-    [
-      "2021-12-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-01-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-02-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-03-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-04-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-05-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-06-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-07-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-08-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-09-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-10-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-10-31",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-12-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-01-03",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-02-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-03-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-04-01",
-      "278.15",
-      "0.00",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Washington",
-    "state": "DC",
-    "name": "Grandma Tina's Properties, LLC",
-    "zip": "20001",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/2_Brenda_Mortgage.loan b/2_Brenda_Mortgage.loan
deleted file mode 100644
index 00912f2..0000000
--- a/2_Brenda_Mortgage.loan
+++ /dev/null
@@ -1,328 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 278.15,
-    "interest_rate": 5.0,
-    "start_interest_date": "2018-07-01",
-    "payment_day_of_month": "01",
-    "first_payment_month": "2018-08-01",
-    "account_number": "100001",
-    "periods": 180,
-    "start_date": "2018-06-25",
-    "periods_per_year": 12,
-    "principal": 35000.0
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "bck@virginia.edu",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Scottsville",
-    "name": "Brenda Kelly",
-    "zip": "24590",
-    "phone": "434-286-2110",
-    "state": "VA",
-    "address": "150 Confederate Street"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - 185 James River Rd, Scottsville VA"
-  },
-  "payments": [
-    [
-      "2018-08-01",
-      "278.15"
-    ],
-    [
-      "2018-09-01",
-      "278.15"
-    ],
-    [
-      "2018-10-01",
-      "278.15"
-    ],
-    [
-      "2018-11-01",
-      "278.15"
-    ],
-    [
-      "2018-12-01",
-      "278.15"
-    ],
-    [
-      "2019-01-01",
-      "278.15"
-    ],
-    [
-      "2019-02-01",
-      "278.15"
-    ],
-    [
-      "2019-03-01",
-      "278.15"
-    ],
-    [
-      "2019-04-01",
-      "278.15"
-    ],
-    [
-      "2019-05-01",
-      "278.15"
-    ],
-    [
-      "2019-05-31",
-      "278.15"
-    ],
-    [
-      "2019-07-01",
-      "278.15"
-    ],
-    [
-      "2019-08-01",
-      "278.15"
-    ],
-    [
-      "2019-09-02",
-      "278.15"
-    ],
-    [
-      "2019-10-01",
-      "278.15"
-    ],
-    [
-      "2019-11-01",
-      "278.15"
-    ],
-    [
-      "2019-12-02",
-      "278.15"
-    ],
-    [
-      "2020-01-02",
-      "278.15"
-    ],
-    [
-      "2020-02-01",
-      "278.15"
-    ],
-    [
-      "2020-03-01",
-      "278.15"
-    ],
-    [
-      "2020-04-01",
-      "278.15"
-    ],
-    [
-      "2020-05-01",
-      "278.15"
-    ],
-    [
-      "2020-06-01",
-      "278.15"
-    ],
-    [
-      "2020-07-01",
-      "278.15"
-    ],
-    [
-      "2020-08-01",
-      "278.15"
-    ],
-    [
-      "2020-09-01",
-      "278.15"
-    ],
-    [
-      "2020-10-01",
-      "278.15"
-    ],
-    [
-      "2020-11-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2020-12-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-01-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-02-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-03-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-04-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-04-30",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-06-01",
-      "278.15",
-      "0.00"
-    ],
-    [
-      "2021-07-01",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-07-31",
-      "278.15",
-      "0"
-    ],
-    [
-      "2021-09-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-10-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-11-01",
-      "278.15",
-      "0",
-      "False"
-    ],
-    [
-      "2021-12-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-01-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-02-01",
-      "278.15",
-      "0",
-      "False"
-    ],
-    [
-      "2022-03-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-04-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-05-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-06-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-07-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-08-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-09-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-10-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-10-31",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-12-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-01-03",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-02-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-03-01",
-      "278.15",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-04-01",
-      "278.15",
-      "0.00",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Washington",
-    "state": "DC",
-    "name": "Grandma Tina's Properties, LLC",
-    "zip": "20001",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/3_839_Harbor_Bend_2022.loan b/3_839_Harbor_Bend_2022.loan
deleted file mode 100644
index 3fa68d7..0000000
--- a/3_839_Harbor_Bend_2022.loan
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 842.93,
-    "interest_rate": 5.75,
-    "start_interest_date": "2022-08-12",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2022-09-15",
-    "account_number": "22-0001",
-    "periods": 180,
-    "start_date": "2022-08-12",
-    "periods_per_year": 12,
-    "principal": 101508.04
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "grady@gradystreet.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20001",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - Harbor Bend Loan 1"
-  },
-  "payments": [
-    [
-      "2022-08-15",
-      "803",
-      "0",
-      "False"
-    ],
-    [
-      "2022-09-09",
-      "803",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-11-17",
-      "842.93",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-12-29",
-      "842.93",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-01-27",
-      "842.93",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-02-10",
-      "842.93",
-      "0.00",
-      "False"
-    ],
-    [
-      "2023-03-31",
-      "0",
-      "33.68",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Bear Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 336d66a..0c6ffa6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,6 @@ FROM python:3.8-slim-buster
 COPY requirements.txt requirements.txt
 RUN pip3 install -r requirements.txt
 
-COPY . .
+COPY mortgage/ .
 
-CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"]
\ No newline at end of file
+CMD [ "python3", "-m" , "web", "run", "--host=0.0.0.0"]
\ No newline at end of file
diff --git a/_Archive_Greenfield_Lane_Mortgage.loan b/_Archive_Greenfield_Lane_Mortgage.loan
deleted file mode 100644
index 22fe53d..0000000
--- a/_Archive_Greenfield_Lane_Mortgage.loan
+++ /dev/null
@@ -1,255 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 803.0,
-    "interest_rate": 5.5,
-    "start_interest_date": "2017-11-11",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2017-12-15",
-    "account_number": "100001",
-    "periods": 185,
-    "start_date": "2017-11-07",
-    "periods_per_year": 12,
-    "principal": 97750.0
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "grady@gradystreet.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20001",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"
-  },
-  "payments": [
-    [
-      "2017-12-11",
-      "803.00"
-    ],
-    [
-      "2018-01-23",
-      "803.00"
-    ],
-    [
-      "2018-03-23",
-      "803.00"
-    ],
-    [
-      "2018-04-18",
-      "803.00"
-    ],
-    [
-      "2018-04-26",
-      "803.00"
-    ],
-    [
-      "2018-05-15",
-      "0.00"
-    ],
-    [
-      "2018-06-15",
-      "0.00"
-    ],
-    [
-      "2018-07-12",
-      "803.00"
-    ],
-    [
-      "2018-08-07",
-      "803.00"
-    ],
-    [
-      "2018-09-06",
-      "803.00"
-    ],
-    [
-      "2018-10-11",
-      "803.00"
-    ],
-    [
-      "2018-11-13",
-      "803.00"
-    ],
-    [
-      "2018-12-13",
-      "803.00"
-    ],
-    [
-      "2019-01-14",
-      "803.00"
-    ],
-    [
-      "2019-02-05",
-      "803.00"
-    ],
-    [
-      "2019-03-05",
-      "803.00"
-    ],
-    [
-      "2019-04-15",
-      "803.00"
-    ],
-    [
-      "2019-05-15",
-      "0.00"
-    ],
-    [
-      "2019-06-13",
-      "803.00"
-    ],
-    [
-      "2019-07-25",
-      "803.00"
-    ],
-    [
-      "2019-08-14",
-      "803.00"
-    ],
-    [
-      "2019-09-13",
-      "803.00"
-    ],
-    [
-      "2019-10-21",
-      "803.00"
-    ],
-    [
-      "2019-11-29",
-      "803.00"
-    ],
-    [
-      "2019-12-19",
-      "803.00"
-    ],
-    [
-      "2020-01-15",
-      "803"
-    ],
-    [
-      "2020-03-06",
-      "803",
-      "32.12"
-    ],
-    [
-      "2020-03-13",
-      "803.00"
-    ],
-    [
-      "2020-04-15",
-      "803.00"
-    ],
-    [
-      "2020-05-13",
-      "803.00"
-    ],
-    [
-      "2020-06-16",
-      "803.00"
-    ],
-    [
-      "2020-07-15",
-      "803"
-    ],
-    [
-      "2020-08-13",
-      "803"
-    ],
-    [
-      "2020-09-17",
-      "803"
-    ],
-    [
-      "2020-10-15",
-      "803",
-      "0.00"
-    ],
-    [
-      "2020-11-16",
-      "803.00",
-      "0"
-    ],
-    [
-      "2020-12-15",
-      "803.00",
-      "0.00"
-    ],
-    [
-      "2021-01-13",
-      "803.00",
-      "0"
-    ],
-    [
-      "2021-02-16",
-      "803.00",
-      "0"
-    ],
-    [
-      "2021-03-22",
-      "0",
-      "32.12"
-    ],
-    [
-      "2021-04-14",
-      "803.00",
-      "0.00"
-    ],
-    [
-      "2021-05-18",
-      "803.00",
-      "0"
-    ],
-    [
-      "2021-06-15",
-      "803.00",
-      "0"
-    ],
-    [
-      "2021-07-31",
-      "0",
-      "32.12"
-    ],
-    [
-      "2021-08-18",
-      "803",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-09-24",
-      "803",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-09-25",
-      "0",
-      "0.00",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Bear Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/_Archive_Greenfield_Lane_Refinance-1.loan b/_Archive_Greenfield_Lane_Refinance-1.loan
deleted file mode 100644
index 5ab8f08..0000000
--- a/_Archive_Greenfield_Lane_Refinance-1.loan
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 831.0,
-    "interest_rate": 5.5,
-    "start_interest_date": "2021-10-13",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2021-11-15",
-    "account_number": "21-0004",
-    "periods": 180,
-    "start_date": "2021-10-13",
-    "periods_per_year": 12,
-    "principal": 101123.26
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "grady@gradystreet.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20001",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - 195 Greenfield Lane, Pearl MS"
-  },
-  "payments": [
-    [
-      "2021-10-14",
-      "803",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-10-14",
-      "28",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-10-18",
-      "28",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-11-16",
-      "803.00",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-11-19",
-      "28",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-02-10",
-      "831",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-04-04",
-      "1000",
-      "55.00",
-      "False"
-    ],
-    [
-      "2022-05-15",
-      "0",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-06-15",
-      "0",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-07-15",
-      "0",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-07-26",
-      "803",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-08-12",
-      "0",
-      "0.00",
-      "False"
-    ],
-    [
-      "2022-08-12",
-      "101508.04",
-      "0.00",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Bear Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/_Archive_Old_Harbor_Bend_Mortgage.loan b/_Archive_Old_Harbor_Bend_Mortgage.loan
deleted file mode 100644
index c89078d..0000000
--- a/_Archive_Old_Harbor_Bend_Mortgage.loan
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 848,
-    "interest_rate": 5.75,
-    "start_interest_date": "2022-08-12",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2022-09-15",
-    "account_number": "22-0001",
-    "periods": 180,
-    "start_date": "2022-08-12",
-    "periods_per_year": 12,
-    "principal": 101508.04
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "grady@gradystreet.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20001",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "1720 New Jersey Ave NW Unit 401"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement - Harbor Bend Loan 1"
-  },
-  "payments": [
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Bear Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/_Archive_Wayneland_Mortgage.loan b/_Archive_Wayneland_Mortgage.loan
deleted file mode 100644
index f7cde9e..0000000
--- a/_Archive_Wayneland_Mortgage.loan
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "htmlTemplate": "statement.pdf.jinja",
-  "parameters": {
-    "monthly_payment": 175.55,
-    "interest_rate": 4.5,
-    "start_interest_date": "2020-07-15",
-    "payment_day_of_month": "15",
-    "first_payment_month": "2020-08-15",
-    "account_number": "100003",
-    "periods": 60,
-    "start_date": "2020-07-15",
-    "periods_per_year": 12,
-    "principal": 16884
-  },
-  "format": "html",
-  "email": {
-    "body": "Your loan statement is attached.",
-    "to_address": "grady@gradystreet.com",
-    "from_address": "jkent3rd@gmail.com",
-    "text": "Please see your most recent account statement.",
-    "server": "smtp.gmail.com",
-    "send_text": "true",
-    "template": "./template.txt",
-    "send_pdf": "true",
-    "password": "builcuouzobxroow",
-    "subject": "Your loan statement..."
-  },
-  "lender": {
-    "city": "Washington",
-    "name": "Rivanna Graphite Investments, LLC",
-    "zip": "20008",
-    "phone": "703.343.0782",
-    "state": "DC",
-    "address": "3100 Connecticut Ave NW Apt 144"
-  },
-  "header": {
-    "date": "Today",
-    "title": "Mortgage Loan Statement -  5025 Wayneland Drive Apt D11 Jackson MS 39211"
-  },
-  "payments": [
-    [
-      "2020-08-27",
-      "175.55"
-    ],
-    [
-      "2020-09-30",
-      "175.55"
-    ],
-    [
-      "2020-10-19",
-      "175.55",
-      "0.00"
-    ],
-    [
-      "2020-12-01",
-      "0",
-      "17.55"
-    ],
-    [
-      "2020-12-29",
-      "0",
-      "17.55"
-    ],
-    [
-      "2021-01-20",
-      "175.55",
-      "0"
-    ],
-    [
-      "2021-02-15",
-      "0.00",
-      "17.55"
-    ],
-    [
-      "2021-03-12",
-      "175.55",
-      "0.00"
-    ],
-    [
-      "2021-04-15",
-      "0",
-      "17.55"
-    ],
-    [
-      "2021-05-17",
-      "0",
-      "17.55"
-    ],
-    [
-      "2021-06-30",
-      "0",
-      "0.00"
-    ],
-    [
-      "2021-07-29",
-      "175.55",
-      "17.55"
-    ],
-    [
-      "2021-08-09",
-      "175.55",
-      "0"
-    ],
-    [
-      "2021-08-10",
-      "175.55",
-      "0",
-      "extra"
-    ],
-    [
-      "2021-09-03",
-      "175.55",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-09-17",
-      "175.55",
-      "0.00",
-      "False"
-    ],
-    [
-      "2021-09-18",
-      "0",
-      "0.00",
-      "False"
-    ]
-  ],
-  "borrower": {
-    "city": "Alexandria",
-    "state": "VA",
-    "name": "Bear Houses, LLC",
-    "zip": "22312",
-    "address": "301 N Beauregard St Apt 203"
-  },
-  "txtTemplate": "statement.txt.jinja"
-}
\ No newline at end of file
diff --git a/mortgage/templates/add.html b/mortgage/templates/add.html
index 78323fd..a797f44 100644
--- a/mortgage/templates/add.html
+++ b/mortgage/templates/add.html
@@ -17,6 +17,6 @@
     <tr><td>{{message}}</td></tr>
 {% endfor %}
 </table>
-<a href="/?loan={{filename}}">Return to Main Screen</a>.
+<a href="/?loan={{document_id}}">Return to Main Screen</a>.
 </body>
 </html>
\ No newline at end of file
diff --git a/mortgage/templates/email.html b/mortgage/templates/email.html
index 530e273..609fde3 100644
--- a/mortgage/templates/email.html
+++ b/mortgage/templates/email.html
@@ -13,7 +13,7 @@
 <p id="header" align="center"><font face="Arial" size=+2 >Web Mortgage Manager</font></p>
 
 <p> The email has been sent.</p>
-<a href="/?loan={{filename}}">Return to Main Screen</a>.
+<a href="/?loan={{document_id}}">Return to Main Screen</a>.
 
 </body>
 </html>
\ No newline at end of file
diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 29e8664..2315490 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -16,10 +16,10 @@
     <td>
     <select name="loan" id="loan">
     {% for loan in loans %}
-      {% if loan.filename==filename %}
-        <option value="{{loan.filename}}" selected>{{loan.name}}</option>
+      {% if loan.document_id==document_id %}
+        <option value="{{loan.document_id}}" selected>{{loan.name}}</option>
       {% else %}
-        <option value="{{loan.filename}}">{{loan.name}}</option>
+        <option value="{{loan.document_id}}">{{loan.name}}</option>
       {% endif %}
     {% endfor %}
     </select>
@@ -44,8 +44,8 @@
         <li><a href="#loan_history">Loan History</a></li>
         <li><a href="#loan_amortization">Future Amortization</a></li>
         <li><a href="#email">Email Statement</a></li>
-        <li><a href="#add_payment">Add Payment</a></li>
-        <li><a href="#add_extra_payment">Add Payment</a></li>
+        <li><a href="#add_payment">Add a Regular Payment</a></li>
+        <li><a href="#add_extra_payment">Add an Extra Payment</a></li>
     </ul>
     <div id="loan_information">
         <table align="center" border="1px">
@@ -163,12 +163,12 @@
             </td></tr>
             <tr><td><button>Send Statement</button></td></tr>
         </table>
-            <input type="hidden" name='loan' value="{{filename}}" />
+            <input type="hidden" name='loan' value="{{document_id}}" />
         </form>
     </div>
     <div id="add_payment">
         <form name="AddPayment" method="post" action="/update_file">
-        <input type="hidden" name="loan" value="{{filename}}" />
+        <input type="hidden" name="loan" value="{{document_id}}" />
         <table align="center" border="1px" width="75%">
             <tr><td align="center" bgcolor="darkgrey">Record a Payment</td></tr>
             <tr><td bgcolor="beige">Payment Date:</td></tr>
@@ -184,7 +184,7 @@
     </div>
     <div id="add_extra_payment">
         <form name="AddExtraPayment" method="post" action="/update_file">
-        <input type="hidden" name="loan" value="{{filename}}" />
+        <input type="hidden" name="loan" value="{{document_id}}" />
         <table align="center" border="1px" width="75%">
             <tr><td align="center" bgcolor="darkgrey">Record an Extra Payment</td></tr>
             <tr><td bgcolor="beige">Payment Date:</td></tr>
diff --git a/mortgage/web.py b/mortgage/web.py
index b3a16f8..676e5a3 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -10,9 +10,12 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
 from email import encoders
+import couchdb
+
+couch = couchdb.Server('https://admin:ams19230@couch.jkent.org:443/')
+database = couch['mortgage']
 
 module_directory = os.path.dirname(__file__)
-app_directory = os.path.normpath(os.path.join(module_directory, ".."))
 loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
 environment = jinja2.Environment(loader=loader)
 app = Flask(__name__)
@@ -24,31 +27,31 @@ app = Flask(__name__)
 
 @app.route('/')
 def hello():
-    loans = getLoanFiles(app_directory)
+    loans = getLoanFiles(database)
 
     #if a loan was not specified, choose the first loan and reload page with it
     if 'loan' in request.args:
-        filename = request.args["loan"]
+        document_id = request.args["loan"]
     else:
-        return redirect('/?loan=' + loans[0]['filename'])
+        return redirect('/?loan=' + loans[0]['document_id'])
 
-    loan = loadLoanInformation(getFullPathOfLoanFile(filename))
+    loan = loadLoanInformation(document_id)
     amortizeLoan(loan)
 
-    return render_template('main.html', filename=filename, loans=loans, model=loan)
+    return render_template('main.html', document_id=document_id, loans=loans, model=loan)
 
 
 @app.route('/update_file', methods=['POST'])
 def update_file():
     messages = []
 
-    loanFile = request.form["loan"]
-    data = getDatastore(getFullPathOfLoanFile(loanFile))
+    document_id = request.form["loan"]
+    document = getDatastore(document_id)
 
     late_fee = Decimal('0.00').quantize(Decimal('1.00'))
     extra_payment = False
     payment_amount = Decimal('0.00').quantize(Decimal('1.00'))
-    payment_history = data["payments"]
+    payment_history = document["payments"]
     todays_date = str(datetime.now().strftime("%Y-%m-%d"))
     if 'date' in request.form:
         if request.form['date'] == '':
@@ -88,44 +91,25 @@ def update_file():
             extra_payment = True
 
     if proceed_flag is True:
-        try:
-            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
-            backup_file = open(getFullPathOfLoanFile(backup_filename), 'w+')
-            json.dump(data, backup_file, indent=2)
-            backup_file.close()
-        except:
-            messages.append("A backup file could not be created.  Your payment was not recorded.")
-            proceed_flag = False
-        else:
-            messages.append("A backup of your file was created: '" + backup_filename + "'")
-
-    if proceed_flag is True:
-        try:
-            payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
-            file = open(getFullPathOfLoanFile(loanFile), 'w+')
-            json.dump(data, file, indent=2)
-            file.close()
-        except:
-            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " +
-                            "please consider rolling back to the backup created above.")
-        else:
-            messages.append("The payment was successfully written. ")
+        payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
+        database[document_id]=document
+        messages.append("The payment was successfully written. ")
 
     # see if an email notification was requested, if not, exit now
     if 'notify' not in request.form:
         messages.append("Payment notification email not requested.")
-        return render_template('add.html', filename=loanFile, messages=messages)
+        return render_template('add.html', document_id=document_id, messages=messages)
 
     messages.append("Payment notification email requested.")
     # send email
-    emailParameters = data["email"]
+    emailParameters = document["email"]
     result = {}
     payment = {}
     result['payment'] = payment
     payment['today'] = todays_date
     payment['date'] = payment_date
-    payment['payer'] = data['borrower']['name']
-    payment['payee'] = data['lender']['name']
+    payment['payer'] = document['borrower']['name']
+    payment['payee'] = document['lender']['name']
     payment['amount'] = payment_amount
     payment['late_fee'] = late_fee
     payment['extra_payment'] = extra_payment
@@ -135,16 +119,16 @@ def update_file():
     msg = generatePaymentNotificationEmail(emailParameters["from_address"], emailParameters["to_address"],
                                            subject, html)
     sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
-    return render_template('add.html', filename=loanFile, messages=messages)
+    return render_template('add.html', document_id=document_id, messages=messages)
 
 
 @app.route('/send_statement', methods=['POST'])
 def send_statement():
-    loanFile = request.form["loan"]
+    document_id = request.form["loan"]
     subject = request.form["subject"]
     message = request.form["message"]
 
-    loan = loadLoanInformation(getFullPathOfLoanFile(loanFile))
+    loan = loadLoanInformation(document_id)
     amortizeLoan(loan)
 
     reportCreated = False
@@ -172,7 +156,7 @@ def send_statement():
 
     sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
 
-    return render_template('email.html', filename=loanFile)
+    return render_template('email.html', document_id=document_id)
 
 
 ######
@@ -181,37 +165,27 @@ def send_statement():
 
 
 def getLoanFiles(directory):
+    #iterate over each of the documents found in the mortgage couchdb
+    #database and pull their display name
     loans = []
 
-    directory = os.path.normpath(directory)
-    print("Directory {}".format(directory))
-    fileNames = os.listdir(directory)
-    fileNames.sort()
-    for filename in fileNames:
-        if filename.endswith(".loan"):
-            displayName = filename.removesuffix(".loan").replace("_"," ")
-            loans.append(createLoanEntryMenuItem("{0}".format(displayName), filename))
+    for document_id in database:
+        document = database[document_id]
+        displayName = document['displayName']
+        loans.append(createLoanEntryMenuItem(displayName, document_id))
 
     return loans
 
-def createLoanEntryMenuItem(loanName, fileName):
+def createLoanEntryMenuItem(loanName, document_id):
     x = {}
     x['name'] = loanName
-    x['filename'] = fileName
+    x['document_id'] = document_id
     return x
 
-def getFullPathOfLoanFile(filename):
-    app_path = os.path.dirname(__file__)
-    file_path = os.path.normpath(os.path.join(os.path.dirname(__file__),'..'))
-    print("App Path: {0}\nFile Path: {1}".format(app_path, file_path))
-    return os.path.join(file_path, filename)
-
-
 ######
 # Datastore Manipulation Functions
 ######
 
-
 def getStatementHeader(datastore):
     return datastore['header']
 
@@ -220,8 +194,8 @@ def getEmailInformation(datastore):
     return datastore['email']
 
 
-def loadLoanInformation(filename):
-    datastore = getDatastore(filename)
+def loadLoanInformation(document_id):
+    datastore = getDatastore(document_id)
 
     loanModel = {}
     loanModel['datastore'] = datastore
@@ -273,18 +247,11 @@ def getBorrower(datastore):
     return datastore['borrower']
 
 
-def getDatastore(filename=None):
-    try:
-        if filename:
-            with open(filename, 'r') as f:
-                datastore = json.load(f)
-
-    except Exception as e:
-        print("An error occurred opening your loan file '%s'. " % filename)
-        print("The Exception:")
-        print(e.__repr__())
-        quit()
+def getDatastore(document_id=None):
+    if document_id == None:
+        quit("Invalid document.")
 
+    datastore = database[document_id]
     return datastore
 
 ######
@@ -479,7 +446,6 @@ def generatePaymentNotificationEmail(from_address, to_address, subject, html):
     msg['From'] = from_address
     msg['To'] = to_address
 
-    #msg.attach(MIMEText(body))
     part = MIMEBase("text", "html")
     part.set_payload(html)
     encoders.encode_base64(part)

From c76cec1a73016cb09875767c5fc0c325059f2cab Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sun, 14 May 2023 10:25:35 -0400
Subject: [PATCH 27/38] Updated ignore file to include __pycache__/ directory.

user: john
branch 'default'
changed .hgignore
---
 .hgignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgignore b/.hgignore
index 747c327..60ac2d3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,3 +3,5 @@
 bin/
 lib/
 .idea/
+__pycache__/
+

From 5f5d025d72d59287b1c8c2666919fad19d1f6d13 Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sun, 14 May 2023 10:37:32 -0400
Subject: [PATCH 28/38] Cleaning up what is kept in repository so that its not
 copied to server.

user: john
branch 'default'
changed .hgignore
---
 .hgignore                            |  2 +-
 mortgage/calculate_interest_heloc.py | 68 ----------------------------
 pyvenv.cfg                           |  3 --
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 mortgage/calculate_interest_heloc.py
 delete mode 100644 pyvenv.cfg

diff --git a/.hgignore b/.hgignore
index 60ac2d3..503f669 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,4 +4,4 @@ bin/
 lib/
 .idea/
 __pycache__/
-
+pyvenv.cfg
diff --git a/mortgage/calculate_interest_heloc.py b/mortgage/calculate_interest_heloc.py
deleted file mode 100644
index 70e3961..0000000
--- a/mortgage/calculate_interest_heloc.py
+++ /dev/null
@@ -1,68 +0,0 @@
-'''''''take in the csv file of transactions'''
-import datetime
-from decimal import *
-import csv
-from calendar import monthrange
-
-def main():
-    getcontext().prec=10
-    open_balance = Decimal("-24521.81")
-    interest_rate = Decimal("8.00")/Decimal("100.00")/Decimal("365.00")
-    year = 2021
-
-    start_date = datetime.date(year, 1, 1)
-    end_date = datetime.date(year, 12, 31)+datetime.timedelta(1)
-    days_in_year = (end_date - start_date).days
-    print ("Days in year: %d" % days_in_year)
-
-    balances = [Decimal('0.00')] * days_in_year
-    interest_invoices = [Decimal('0.00')] * 12
-
-    with open("/Users/john/Downloads/query_result.csv") as f:
-        reader = csv.DictReader(f)
-        for row in reader:
-            print(row)
-            year = row['year']
-            month = row['month']
-            day = row['day']
-            amount = row['position (USD)']
-
-            date_val = datetime.date(int(year), int(month), int(day))
-            day_of_year = date_val.toordinal() - datetime.date(date_val.year, 1, 1).toordinal() + 1
-            print("Record created for day of year %d" % day_of_year)
-            print("%s - %s - %s: %s " % (year, month, day, amount))
-            balances[day_of_year] = balances[day_of_year] + Decimal(amount)
-
-    current_balance = open_balance
-    day_being_processed = 1
-    accumlated_interest = Decimal('0.000000')
-
-    while (day_being_processed <= days_in_year):
-        print("Day of year: %d" % day_being_processed)
-        #calculate the day's balance
-        current_balance = current_balance + balances[day_being_processed-1]
-        balances[day_being_processed-1] = current_balance
-
-        #accummulate the day's interest
-        todays_interest = current_balance * interest_rate
-        accumlated_interest = accumlated_interest + todays_interest
-
-        #check if this is the last day of the month, if it is do the transition stuff
-        current_month = datetime.date.fromordinal(start_date.toordinal()+day_being_processed-1).month
-        next_month = datetime.date.fromordinal(start_date.toordinal()+day_being_processed).month
-        print("Current Month: %d Next_month: %d" % (current_month, next_month ))
-        if (current_month != next_month):
-            interest_invoices[current_month-1] = accumlated_interest.quantize(Decimal('.01'))
-            current_balance = current_balance + accumlated_interest
-            accumlated_interest = Decimal('0.00')
-
-
-        day_being_processed = day_being_processed + 1
-
-    i=0
-    while (i<12):
-        print ("%d: %s" %(i+1, interest_invoices[i]) )
-        i = i +1
-
-if __name__ == '__main__':
-    main()
diff --git a/pyvenv.cfg b/pyvenv.cfg
deleted file mode 100644
index ee06fe5..0000000
--- a/pyvenv.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-home = /opt/local/bin
-include-system-site-packages = false
-version = 3.10.7

From 5eb42e203035a88cd225f6161c02be208154187d Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sun, 14 May 2023 10:55:15 -0400
Subject: [PATCH 29/38] Found out the requirements were out of date.  Recreated
 from pip freeze.

user: john
branch 'default'
changed .hgignore
---
 requirements.txt | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4df3530..9ad34f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,12 @@
-flask
-fpdf2
-jinja2
+click==8.1.3
+CouchDB==1.2
+defusedxml==0.7.1
+Flask==2.2.2
+fonttools==4.37.4
+fpdf2==2.5.7
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.1
+Pillow==9.2.0
+svg.path==6.2
+Werkzeug==2.2.2

From 94b1e97f4df4ca0eadd08b412c7deb187b825d7a Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sun, 14 May 2023 11:39:19 -0400
Subject: [PATCH 30/38] Updated program to take database connection information
 from environment variables.

---
 mortgage/web.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mortgage/web.py b/mortgage/web.py
index 676e5a3..db5b8ef 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -12,7 +12,13 @@ from email.mime.base import MIMEBase
 from email import encoders
 import couchdb
 
-couch = couchdb.Server('https://admin:ams19230@couch.jkent.org:443/')
+dbUserName = os.environ['COUCHDB_USERNAME']
+dbPassword = os.environ['COUCHDB_PW']
+dbURL = os.environ['COUCHDB_URL']
+
+couch = couchdb.Server(dbURL)
+couch.resource.credentials = (dbUserName, dbPassword)
+
 database = couch['mortgage']
 
 module_directory = os.path.dirname(__file__)

From afa799479e507adab4da8ef2d1e6d18d081822d8 Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Tue, 16 May 2023 20:26:43 -0400
Subject: [PATCH 31/38] Working issues with couchdb access in docker container.

---
 mortgage/web.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/mortgage/web.py b/mortgage/web.py
index db5b8ef..8ba5a35 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -12,14 +12,28 @@ from email.mime.base import MIMEBase
 from email import encoders
 import couchdb
 
-dbUserName = os.environ['COUCHDB_USERNAME']
-dbPassword = os.environ['COUCHDB_PW']
-dbURL = os.environ['COUCHDB_URL']
+try:
+  dbUserName = os.environ['COUCHDB_USERNAME']
+except:
+  dbUserName = 'admin'
 
-couch = couchdb.Server(dbURL)
-couch.resource.credentials = (dbUserName, dbPassword)
+try:
+  dbPassword = os.environ['COUCHDB_PW']
+except:
+  dbPassword = 'ams19230'
+
+try:
+  dbHost = os.environ['COUCHDB_HOST']
+except:
+  dbHost = 'couch.jkent.org'
+
+connectString = f'https://{dbUserName}:{dbPassword}@{dbHost}/'
+print(connectString)
+
+couch = couchdb.Server(connectString)
 
 database = couch['mortgage']
+print(f"Database: {database}")
 
 module_directory = os.path.dirname(__file__)
 loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
@@ -38,7 +52,9 @@ def hello():
     #if a loan was not specified, choose the first loan and reload page with it
     if 'loan' in request.args:
         document_id = request.args["loan"]
+        print(f"Hello was access with document_id: '{request.args['loan']}'")
     else:
+        print(f"Hello was accessed without document_id parameter.  Using '{loans[0]['document_id']}'.")
         return redirect('/?loan=' + loans[0]['document_id'])
 
     loan = loadLoanInformation(document_id)

From a7611261486d97d96d7deede9cac62e7a8ca166a Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sat, 20 May 2023 14:34:13 -0400
Subject: [PATCH 32/38] Working issues with couchdb access in docker container.
 Set container to listen on all interfaces, not just localhost.

---
 mortgage/web.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mortgage/web.py b/mortgage/web.py
index 8ba5a35..11e244c 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -36,7 +36,10 @@ database = couch['mortgage']
 print(f"Database: {database}")
 
 module_directory = os.path.dirname(__file__)
-loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
+print(f"Module Directory: {module_directory}")
+templates_directory = os.path.join(module_directory, "templates")
+print(f"Templates Directory: {templates_directory}")
+loader = jinja2.FileSystemLoader([templates_directory])
 environment = jinja2.Environment(loader=loader)
 app = Flask(__name__)
 
@@ -520,7 +523,7 @@ def selectTemplate(formatType):
 
 def main():
     app.debug = True
-    app.run()
+    app.run(host = '0.0.0.0')
 
 
 if __name__ == '__main__':

From 3757989fcc20e07b65f22f97e1d1aff43b8aa7e7 Mon Sep 17 00:00:00 2001
From: john <devnull@localhost>
Date: Sun, 21 May 2023 14:20:19 +0000
Subject: [PATCH 33/38] Updated Dockerfile and removed web_ng.py

user: john
branch 'default'
changed Dockerfile
removed mortgage/web_ng.py
---
 Dockerfile         |   4 +-
 mortgage/web_ng.py | 544 ---------------------------------------------
 2 files changed, 3 insertions(+), 545 deletions(-)
 delete mode 100644 mortgage/web_ng.py

diff --git a/Dockerfile b/Dockerfile
index 0c6ffa6..b60507b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
 FROM python:3.8-slim-buster
 
+WORKDIR /app
+
 COPY requirements.txt requirements.txt
 RUN pip3 install -r requirements.txt
 
 COPY mortgage/ .
 
-CMD [ "python3", "-m" , "web", "run", "--host=0.0.0.0"]
\ No newline at end of file
+CMD [ "python3", "-m" , "web", "run", "--host=0.0.0.0"]
diff --git a/mortgage/web_ng.py b/mortgage/web_ng.py
deleted file mode 100644
index a9fd4f8..0000000
--- a/mortgage/web_ng.py
+++ /dev/null
@@ -1,544 +0,0 @@
-import json
-import jinja2
-import smtplib
-import os
-from flask import Flask, render_template, request, redirect
-from decimal import *
-from datetime import *
-from fpdf import FPDF, HTMLMixin
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from email.mime.base import MIMEBase
-from email import encoders
-
-module_directory = os.path.dirname(__file__)
-app_directory = os.path.normpath(os.path.join(module_directory, ".."))
-loader = jinja2.FileSystemLoader([os.path.join(module_directory, "templates")])
-environment = jinja2.Environment(loader=loader)
-app = Flask(__name__)
-
-
-######
-# Flask Call Backs
-######
-
-
-@app.route('/')
-def hello():
-    loans = getLoanFiles(app_directory)
-
-    #if a loan was not specified, choose the first loan and reload page with it
-    if 'loan' in request.args:
-        filename = request.args["loan"]
-    else:
-        return redirect('/?loan=' + loans[0]['filename'])
-
-    loan = loadLoanInformation(getFullPathofLoanFile(filename))
-    amortizeLoan(loan)
-
-    return render_template('main.html', filename=filename, loans=loans, model=loan)
-
-
-@app.route('/update_file', methods=['POST'])
-def update_file():
-    messages = []
-
-    loanFile = request.form["loan"]
-    data = getDatastore(getFullPathofLoanFile(loanFile))
-
-    late_fee = Decimal('0.00').quantize(Decimal('1.00'))
-    extra_payment = False
-    payment_amount = Decimal('0.00').quantize(Decimal('1.00'))
-    payment_history = data["payments"]
-    todays_date = str(datetime.now().strftime("%Y-%m-%d"))
-    if 'date' in request.form:
-        if request.form['date'] == '':
-            payment_date = todays_date
-            messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
-        else:
-            payment_date = request.form['date']
-            messages.append("Date provided: " + payment_date + ".")
-    else:
-        payment_date = todays_date
-        messages.append("No date was provided.  Assuming today's date of " + payment_date + ".")
-
-    proceed_flag = True
-    if 'amount' in request.form:
-        if request.form['amount'] != '':
-            try:
-                payment_amount = Decimal(request.form['amount'])
-                messages.append("Amount provided: " + str(payment_amount) + ".")
-            except:
-                messages.append("The amount provided could not be interpreted.  Your payment was not recorded.")
-                proceed_flag = False
-            else:
-                pass
-
-    if 'latefee' in request.form:
-        if request.form['latefee'] != '':
-            try:
-                late_fee = Decimal(request.form['latefee'])
-                messages.append("Late fee amount: " + str(late_fee) + ".")
-            except:
-                messages.append("The late fee amount was specified but could not be interpreted. " +
-                                "Your payment was not recorded.")
-                proceed_flag = False
-
-    if 'extra' in request.form:
-        if request.form['extra'] != '':
-            extra_payment = True
-
-    if proceed_flag is True:
-        try:
-            backup_filename = loanFile + ".backup-" + datetime.now().strftime("%Y-%m-%d %H-%M-%S") + ".json"
-            backup_file = open(getFullPathofLoanFile(backup_filename), 'w+')
-            json.dump(data, backup_file, indent=2)
-            backup_file.close()
-        except:
-            messages.append("A backup file could not be created.  Your payment was not recorded.")
-            proceed_flag = False
-        else:
-            messages.append("A backup of your file was created: '" + backup_filename + "'")
-
-    if proceed_flag is True:
-        try:
-            payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
-            file = open(getFullPathofLoanFile(loanFile), 'w+')
-            json.dump(data, file, indent=2)
-            file.close()
-        except:
-            messages.append("An error occurred writing to the file.  Your payment file may be corrupt, " +
-                            "please consider rolling back to the backup created above.")
-        else:
-            messages.append("The payment was successfully written. ")
-
-    # see if an email notification was requested, if not, exit now
-    if 'notify' not in request.form:
-        messages.append("Payment notification email not requested.")
-        return render_template('add.html', filename=loanFile, messages=messages)
-
-    messages.append("Payment notification email requested.")
-    # send email
-    emailParameters = data["email"]
-    result = {}
-    payment = {}
-    result['payment'] = payment
-    payment['today'] = todays_date
-    payment['date'] = payment_date
-    payment['payer'] = data['borrower']['name']
-    payment['payee'] = data['lender']['name']
-    payment['amount'] = payment_amount
-    payment['late_fee'] = late_fee
-    payment['extra_payment'] = extra_payment
-
-    subject = "Your loan payment has been received"
-    html = transformTemplate(selectTemplate('paymentNotification'), result)
-    msg = generatePaymentNotificationEmail(emailParameters["from_address"], emailParameters["to_address"],
-                                           subject, html)
-    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
-    return render_template('add.html', filename=loanFile, messages=messages)
-
-
-@app.route('/send_statement', methods=['POST'])
-def send_statement():
-    loanFile = request.form["loan"]
-    subject = request.form["subject"]
-    message = request.form["message"]
-
-    loan = loadLoanInformation(getFullPathofLoanFile(loanFile))
-    amortizeLoan(loan)
-
-    reportCreated = False
-    textReport = pdfReport = htmlReport = None
-
-    if 'text' in request.form:
-        textReport = transformTemplate(selectTemplate('text'), loan)
-        reportCreated = True
-
-    if 'pdf' in request.form:
-        pdfInterimReport = transformTemplate(selectTemplate('pdf'), loan)
-        pdfReport = createPDF(pdfInterimReport)
-        reportCreated = True
-
-    if ('html' in request.form) or (reportCreated is False):
-        htmlReport = transformTemplate(selectTemplate('html'), loan)
-
-    # send email
-    emailParameters = loan["email"]
-
-    msg = generateStatementEmail(emailParameters["from_address"],
-                                 emailParameters["to_address"],
-                                 subject,
-                                 message, pdfReport, htmlReport, textReport)
-
-    sendEmail(msg, emailParameters["from_address"], emailParameters["to_address"], emailParameters['password'])
-
-    return render_template('email.html', filename=loanFile)
-
-
-######
-# Loan File Functions
-######
-
-def getLoanFiles(directory):
-    loans = []
-    count = 0
-
-    directory = os.path.normpath(directory)
-    print("Directory {}".format(directory))
-    for filename in os.listdir(directory):
-        if filename.endswith(".loan"):
-            count=count+1
-            loans.append(createLoanEntryMenuItem("{0} {1}".format(count, filename.removesuffix(".loan")), filename))
-
-    return loans
-
-
-def createLoanEntryMenuItem(loanName, fileName):
-    x = {}
-    x['name'] = loanName
-    x['filename'] = fileName
-    return x
-
-
-def getFullPathofLoanFile(filename):
-    app_path = os.path.dirname(__file__)
-    file_path = os.path.normpath(os.path.join(os.path.dirname(__file__),'..'))
-    print("App Path: {0}\nFile Path: {1}".format(app_path, file_path))
-    return os.path.join(file_path, filename)
-
-
-######
-# Datastore Manipulation Functions
-######
-
-
-def getStatementHeader(datastore):
-    return datastore['header']
-
-
-def getEmailInformation(datastore):
-    return datastore['email']
-
-
-def loadLoanInformation(filename):
-    datastore = getDatastore(filename)
-
-    loanModel = {}
-    loanModel['datastore'] = datastore
-    loanModel['email'] = getEmailInformation(datastore)
-    loanModel['parameters'] = getLoanParameters(datastore)
-    loanModel['lender'] = getLender(datastore)
-    loanModel['borrower'] = getBorrower(datastore)
-    loanModel['header'] = getStatementHeader(datastore)
-    return loanModel
-
-
-def getLoanParameters(datastore):
-    # read in the loan profile information
-    loan = datastore['parameters']
-
-    annual_rate = Decimal(loan['interest_rate']) / 100
-    daily_interest_rate = annual_rate / 360
-    principal = Decimal(loan["principal"]).quantize(Decimal("1.00"))
-    periods_per_year = Decimal(loan["periods_per_year"])
-    total_periods = Decimal(loan["periods"])
-    #payment_day_of_month = int(loan['payment_day_of_month'])
-
-    if "monthly_payment" in loan:
-        monthly_payment = Decimal(loan["monthly_payment"]).quantize(Decimal("1.00"))
-    else:
-        # calculate expected monthly payment
-        periodic_rate = annual_rate / periods_per_year
-        discount_factor = (((1 + periodic_rate) ** total_periods) - 1) / (
-                periodic_rate * ((1 + periodic_rate) ** total_periods))
-        monthly_payment = (principal / discount_factor).quantize(Decimal("1.00"))
-
-    loan['principal'] = principal  # standardizes the format
-    loan['annual_rate'] = annual_rate  # standardizes the format
-    loan['daily_interest_rate'] = daily_interest_rate
-    loan['rate'] = '' + (annual_rate * 100).__str__() + '%'
-    loan['next_payment_amt'] = 0
-    loan['next_payment_date'] = '12/12/12'
-    loan['total_periods'] = total_periods
-    loan['monthly_payment'] = monthly_payment
-    datastore['parameters'] = loan
-    return loan
-
-
-def getLender(datastore):
-    return datastore['lender']
-
-
-def getBorrower(datastore):
-    return datastore['borrower']
-
-
-def getDatastore(filename=None):
-    try:
-        if filename:
-            with open(filename, 'r') as f:
-                datastore = json.load(f)
-
-    except Exception as e:
-        print("An error occurred opening your loan file '%s'. " % filename)
-        print("The Exception:")
-        print(e.__repr__())
-        quit()
-
-    return datastore
-
-######
-# Loan Calculation Functions
-######
-
-def new_amortizeLoan(loan):
-    #loop over the historical data and re-calculate the actual amortization
-    monthly_payment = loan["parameters"]["monthly_payment"]
-    first_day_interest_accrues = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
-    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
-
-
-
-def amortizeLoan(loan):
-    # loop over the payments and calculate the actual amortization
-    monthly_payment = loan["parameters"]["monthly_payment"]
-
-    actual_payments = loan["datastore"]["payments"]
-    #invoices = loan["datastore"]["invoices"]
-    #payments = loan["datastore"]["payments"]
-    #allocations = loan["datastore"]["allocations"]
-
-
-    remaining_principal = loan["parameters"]["principal"]
-    payment_day_of_month = int(loan["parameters"]["payment_day_of_month"])
-    daily_interest_rate = loan["parameters"]["daily_interest_rate"]
-    total_periods = loan["parameters"]["total_periods"]
-    interest_paid_through_date = datetime.strptime(loan["parameters"]["start_interest_date"], "%Y-%m-%d").date()
-    next_payment_date = datetime.strptime(loan["parameters"]["first_payment_month"], '%Y-%m-%d').date()
-    next_bill_date = date(year=next_payment_date.year, month=next_payment_date.month, day=payment_day_of_month)
-
-    payment_number = 1
-    annual_interest = 0
-    total_interest = 0
-    #old_bill_date = next_bill_date
-    #current_year = next_bill_date.year
-
-    past_payments = []
-    future_payments = []
-
-    for payment in actual_payments:
-        payment_date = datetime.strptime((payment[0]), '%Y-%m-%d').date()
-        payment_amount = Decimal(payment[1]).quantize(Decimal("1.00"))
-        days_since_last_payment = (payment_date - interest_paid_through_date).days
-        if len(payment) > 2:
-            late_fee = Decimal(payment[2]).quantize(Decimal("1.00"))
-        else:
-            late_fee = Decimal("0.00")
-
-        # check for out of order payments, generally a sign of a data entry problem, especially years
-        if days_since_last_payment < 0:
-            print(
-                "Payment Number %s appears out of order.  The payment date '%s' is before the previous payment on '%s'."
-                % (payment_number, payment_date, interest_paid_through_date))
-            quit()
-
-        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-        new_principal = payment_amount - new_interest - late_fee
-        interest_paid_through_date = payment_date
-        total_interest = total_interest + new_interest
-        annual_interest = annual_interest + new_interest
-        remaining_principal = remaining_principal - new_principal
-
-        # create the payment record for the template to render
-        payment_record = {}
-        payment_record['year'] = next_bill_date.year
-        payment_record['month'] = next_bill_date.month
-        payment_record['payment_number'] = payment_number
-        payment_record['bill_date'] = next_bill_date
-        payment_record['payment_date'] = payment_date
-        payment_record['days_of_interest'] = days_since_last_payment
-        payment_record['payment_amount'] = payment_amount
-        payment_record['principal_payment'] = payment_amount - new_interest - late_fee
-        payment_record['interest_payment'] = new_interest
-        payment_record['new_balance'] = remaining_principal
-        payment_record['interest_to_date'] = total_interest
-        payment_record['annual_interest_to_date'] = annual_interest
-        payment_record['late_fee'] = late_fee
-        past_payments.append(payment_record)
-
-        payment_number = payment_number + 1
-
-        print("Payment record length: " + str(len(payment)))
-        #check for the extra payment flag, if its there, don't advance the next payment date
-        if len(payment) > 3 and payment[3] == "extra":
-            print("Extra payment flag: " + payment[3])
-            #this is an extra payment don't advance the date
-        else:
-            old_bill_date = next_bill_date
-
-            if old_bill_date.month < 12:
-                next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
-            else:
-                annual_interest = Decimal("0.00")
-                next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-
-            loan["parameters"]["next_due_date"] = next_bill_date
-
-    loan["total_interest_paid_to_date"] = total_interest
-
-    if (remaining_principal < monthly_payment):
-        loan["parameters"]["next_payment_amt"] = remaining_principal
-    else:
-        loan["parameters"]["next_payment_amt"] = monthly_payment
-
-    # loop over remaining scheduled payments and present estimated amortization
-    while (payment_number <= total_periods) and (remaining_principal > 0):
-        days_since_last_payment = (next_bill_date - interest_paid_through_date).days
-        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
-
-        # make sure the last payment isn't too much
-        if new_interest + remaining_principal < monthly_payment:
-            monthly_payment = new_interest + remaining_principal
-
-        new_principal = monthly_payment - new_interest
-
-        remaining_principal = remaining_principal - new_principal
-
-        interest_paid_through_date = next_bill_date
-
-        # complete the future payment amortization record
-        future_payment_record = {}
-        future_payment_record['payment_number'] = payment_number
-        future_payment_record['payment_date'] = next_bill_date
-        future_payment_record['days_of_interest'] = days_since_last_payment
-        future_payment_record['payment_amount'] = monthly_payment
-        future_payment_record['principal_payment'] = new_principal
-        future_payment_record['interest_payment'] = new_interest
-        future_payment_record['new_balance'] = remaining_principal
-        future_payments.append(future_payment_record)
-
-        payment_number = payment_number + 1
-        old_bill_date = next_bill_date
-        if old_bill_date.month < 12:
-            next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
-        else:
-            next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-
-    loan["balloon_payment"] = remaining_principal
-    loan["past_payments"] = past_payments
-    loan["future_payments"] = future_payments
-    return
-
-
-######
-# Report Generation Functions
-######
-
-
-def transformTemplate(template_fileName, loanModel):
-    # template_filename = "statement.text.jinja"
-    # setup jinja for creating the statement
-    template = environment.get_template(template_fileName)
-
-    print(loanModel)
-    report = template.render(model=loanModel)
-    return report
-
-
-def generateStatementEmail(from_address, to_address, subject, body, pdf, html, txt):
-    msg = MIMEMultipart()
-    msg['Subject'] = subject
-    msg['From'] = from_address
-    msg['To'] = to_address
-
-    msg.attach(MIMEText(body))
-
-    if pdf is not None:
-        part = MIMEBase("application", "octet-stream")
-        part.set_payload(pdf)
-        encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.pdf"')
-        msg.attach(part)
-
-    if html is not None:
-        part = MIMEBase("text", "html")
-        part.set_payload(html)
-        encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.html"')
-        msg.attach(part)
-
-    if txt is not None:
-        part = MIMEBase("text", "plain")
-        part.set_payload(txt)
-        encoders.encode_base64(part)
-        part.add_header('Content-Disposition', 'attachment; filename="statement.txt"')
-        msg.attach(part)
-
-    return msg
-
-
-def generatePaymentNotificationEmail(from_address, to_address, subject, html):
-    msg = MIMEMultipart()
-    msg['Subject'] = subject
-    msg['From'] = from_address
-    msg['To'] = to_address
-
-    #msg.attach(MIMEText(body))
-    part = MIMEBase("text", "html")
-    part.set_payload(html)
-    encoders.encode_base64(part)
-    part.add_header('Content-Disposition', 'attachment; filename="notification.html"')
-    msg.attach(part)
-
-    return msg
-
-
-def sendEmail(msg, from_address, to_address, passwd):
-    try:
-        server = smtplib.SMTP('smtp.gmail.com', 587)
-        server.ehlo()
-        server.starttls()
-        server.login(from_address, passwd)
-
-        server.sendmail(from_address, to_address, msg.as_string())
-        server.close()
-    except:
-        print("Couldn't send email.")
-
-
-def createPDF(report):
-    # create pdf
-    class MyFPDF(FPDF, HTMLMixin):
-        pass
-
-    pdf = MyFPDF()
-    pdf.set_font(family='Arial', size=12)
-    pdf.add_page()
-    pdf.write_html(report)
-    return pdf.output(dest='S')
-
-
-def selectTemplate(format):
-    if format == 'paymentNotification':
-        return 'payment_received_email.html.jinja'
-
-    if format == 'html':
-        return 'statement.html.jinja'
-
-    if format == 'pdf':
-        return 'statement.pdf.jinja'
-
-    if format == 'text':
-        return 'statement.text.jinja'
-
-    return 'statement.html.jinja'
-
-
-def main():
-    app.debug = True
-    app.run()
-
-
-if __name__ == '__main__':
-    main()

From 9d74519c3e1eb9fc1a9883f5d4271c9d162eacce Mon Sep 17 00:00:00 2001
From: john <john@helium.local>
Date: Mon, 4 Sep 2023 14:56:34 -0400
Subject: [PATCH 34/38] Updated files to produce accounting information.

---
 mortgage/templates/main.html | 15 +++++++++++++++
 mortgage/web.py              | 14 ++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 2315490..e7bbb3a 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -42,6 +42,7 @@
     <ul>
         <li><a href="#loan_information">Loan Information</a></li>
         <li><a href="#loan_history">Loan History</a></li>
+        <li><a href="#loan_accounting">Loan Accounting</a></li>
         <li><a href="#loan_amortization">Future Amortization</a></li>
         <li><a href="#email">Email Statement</a></li>
         <li><a href="#add_payment">Add a Regular Payment</a></li>
@@ -110,6 +111,20 @@
         </tbody>
         </table>
     </div>
+    <div id="loan_accounting">
+        <h3>Loan Accounting</h3>
+        <textarea border="1px" width="70%" cols="120" rows="25">
+        {% for item in model.past_payments %}
+{{item.payment_date }} * "{{item.payee}}" "Payment #{{ item.payment_number}}"
+  {{item.payment_account}} {{ "%.2f"|format(item.payment_amount * -1) }} USD
+  {{item.loan_account}} {{ "%.2f"|format(item.principal_payment) }} USD
+  {{item.interest_account}} {{ "%.2f"|format(item.interest_payment) }} USD
+  {% if item.late_fee != 0 %}
+  {{item.late_fee_account}} {{ "%.2f"|format(item.late_fee) }} USD
+  {% endif %}
+            {% endfor %}
+        </textarea>
+    </div>
     <div id="loan_amortization">
         <table border="1px">
         <thead>
diff --git a/mortgage/web.py b/mortgage/web.py
index 11e244c..55ce417 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -346,17 +346,15 @@ def amortizeLoan(loan):
         payment_record['interest_to_date'] = total_interest
         payment_record['annual_interest_to_date'] = annual_interest
         payment_record['late_fee'] = late_fee
+        payment_record['payee'] = loan["lender"]["name"]
+        payment_record['payment_account'] = loan["accounting"]["payment_account"]
+        payment_record['loan_account'] = loan["accounting"]["loan_account"]
+        payment_record['interest_account'] = loan["accounting"]["interest_account"]
+        payment_record['late_fee_account'] = "Expenses:Interest:LateFees"
         past_payments.append(payment_record)
 
         payment_number = payment_number + 1
 
-        print("; Autogenerated 'ledger' transaction")
-        print(f'{payment_date} * " payee Mortgage Payment {payment_number-1}"')
-        print(f"  Assets:Current:Checking -{payment_amount} USD")
-        print(f"  Liabilities:Mortgages:Mortgage {principal_payment} USD")
-        print(f"  Expenses:Rental:MortgageInterest")
-        print(";")
-
         #check for the extra payment flag, if its there, don't advance the next payment date
         if len(payment) > 3 and payment[3] == "extra":
             print("Extra payment flag: " + payment[3])
@@ -523,7 +521,7 @@ def selectTemplate(formatType):
 
 def main():
     app.debug = True
-    app.run(host = '0.0.0.0')
+    app.run(host = '0.0.0.0', port='8000')
 
 
 if __name__ == '__main__':

From cf2748c00726086d910f19037ac04d5a0219a498 Mon Sep 17 00:00:00 2001
From: john <john@helium.local>
Date: Mon, 4 Sep 2023 15:30:32 -0400
Subject: [PATCH 35/38] Updated files to produce accounting information.

---
 mortgage/web.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mortgage/web.py b/mortgage/web.py
index 55ce417..f28db28 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -215,6 +215,13 @@ def getStatementHeader(datastore):
     return datastore['header']
 
 
+def getAccounting(datastore):
+    try:
+      return datastore['accounting']
+    except:
+      return {"payment_account":"", "loan_account":"", "interest_account": ""}
+
+
 def getEmailInformation(datastore):
     return datastore['email']
 
@@ -229,6 +236,7 @@ def loadLoanInformation(document_id):
     loanModel['lender'] = getLender(datastore)
     loanModel['borrower'] = getBorrower(datastore)
     loanModel['header'] = getStatementHeader(datastore)
+    loanModel['accounting'] = getAccounting(datastore)
     return loanModel
 
 

From d9d62a09b5772bf7419833d6efc1a363900e5f0f Mon Sep 17 00:00:00 2001
From: john <john@helium.local>
Date: Mon, 4 Sep 2023 15:42:32 -0400
Subject: [PATCH 36/38] Updated files to produce accounting information.

---
 mortgage/templates/main.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index e7bbb3a..5a6217c 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -115,7 +115,7 @@
         <h3>Loan Accounting</h3>
         <textarea border="1px" width="70%" cols="120" rows="25">
         {% for item in model.past_payments %}
-{{item.payment_date }} * "{{item.payee}}" "Payment #{{ item.payment_number}}"
+{{item.payment_date }} * "{{item.payee}}" "{{item.payee}} Mortgage Payment {{ item.payment_number}}"
   {{item.payment_account}} {{ "%.2f"|format(item.payment_amount * -1) }} USD
   {{item.loan_account}} {{ "%.2f"|format(item.principal_payment) }} USD
   {{item.interest_account}} {{ "%.2f"|format(item.interest_payment) }} USD

From d6bd844d5d7f472d1ce2e984120256f03e64810e Mon Sep 17 00:00:00 2001
From: john
 <john@1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa>
Date: Mon, 20 May 2024 17:54:42 -0400
Subject: [PATCH 37/38] Updated files to produce current daily interest accrual
 information.

---
 mortgage/templates/main.html | 21 +++++++++---------
 mortgage/web.py              | 42 +++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 5a6217c..72e004e 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -37,7 +37,7 @@
                  });
          });
 </script>
-</p>
+<p></p>
 <div id="tabs">
     <ul>
         <li><a href="#loan_information">Loan Information</a></li>
@@ -68,9 +68,10 @@
             <tr><td><b>Term: </b></td><td>{{model.parameters.periods }} months </td></tr>
             <tr><td><b>Next Payment Due Date:</b></td><td> {{model.parameters.next_due_date}} </td></tr>
             <tr><td><b>Payment Due:</b></td><td> {{ "$%.2f"|format(model.parameters.next_payment_amt) }} </td></tr>
+            <tr><td><b>Daily Interest Accrual:</b></td><td> {{ "$%.2f"|format(model.current_daily_interest_accrual) }}</td></tr>
         </tbody>
         </table>
-        <p/>
+        <p></p>
     </div>
     <div id="loan_history">
         <table border="1px" align="center">
@@ -79,7 +80,7 @@
                 <th colspan="9">Loan History</th>
             </tr>
             <tr>
-                <th width='5%'>#</td>
+                <th width='5%'>#</th>
                 <th width='10%'>Due Date</th>
                 <th width='10%'>Date Paid</th>
                 <th width='10%'>Days Interest</th>
@@ -104,18 +105,18 @@
                 <td align='right'> {{ "$%.2f"|format(item.new_balance) }} </td>
             </tr>
         {% if item.month == 12 or loop.last %}
-            <tr><td colspan='9'"> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
+            <tr><td colspan='9'> Total interest paid in {{item.year}} is {{ "$%.2f"|format(item.annual_interest_to_date) }}.</td></tr>
         {% endif %}
         {% endfor %}
-            <tr><td colspan='9'"> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
+            <tr><td colspan='9'> Total interest paid to date is {{ "$%.2f"|format(model.total_interest_paid_to_date) }}.</td></tr>
         </tbody>
         </table>
     </div>
     <div id="loan_accounting">
         <h3>Loan Accounting</h3>
         <textarea border="1px" width="70%" cols="120" rows="25">
-        {% for item in model.past_payments %}
-{{item.payment_date }} * "{{item.payee}}" "{{item.payee}} Mortgage Payment {{ item.payment_number}}"
+        {% for item in model.past_payments | reverse %}
+  {{item.payment_date }} * "{{item.payee}}" "{{item.payee}} Mortgage Payment {{ item.payment_number}}"
   {{item.payment_account}} {{ "%.2f"|format(item.payment_amount * -1) }} USD
   {{item.loan_account}} {{ "%.2f"|format(item.principal_payment) }} USD
   {{item.interest_account}} {{ "%.2f"|format(item.interest_payment) }} USD
@@ -162,7 +163,7 @@
             <tr><td align="center" bgcolor="darkgrey">Generate and Send Statement</td></tr>
             <tr><td>Send From: {{model.email.from_address}}<br/>Send To: {{model.email.to_address}}</td></tr>
             <tr><td bgcolor="beige">Subject:</td></tr>
-            <tr><td align="center"><textarea type="text" cols="120" name="subject">{{model.email.subject}}</textarea></td></tr>
+            <tr><td align="center"><textarea cols="120" name="subject">{{model.email.subject}}</textarea></td></tr>
             <tr><td bgcolor="beige">Message:</td></tr>
             <tr><td align="center"><textarea rows="8" cols="120" name="message">{{model.email.body}}</textarea></td></tr>
             <tr><td bgcolor="beige">Send Statement As:</td></tr>
@@ -187,7 +188,7 @@
         <table align="center" border="1px" width="75%">
             <tr><td align="center" bgcolor="darkgrey">Record a Payment</td></tr>
             <tr><td bgcolor="beige">Payment Date:</td></tr>
-            <tr><td><input type="date" name="date"</td></tr>
+            <tr><td><input type="date" name="date"></td></tr>
             <tr><td bgcolor="beige">Payment Amount:</td></tr>
             <tr><td><input type="text" name="amount"></td></tr>
             <tr><td bgcolor="beige">Late Fee Amount:</td></tr>
@@ -203,7 +204,7 @@
         <table align="center" border="1px" width="75%">
             <tr><td align="center" bgcolor="darkgrey">Record an Extra Payment</td></tr>
             <tr><td bgcolor="beige">Payment Date:</td></tr>
-            <tr><td><input type="date" name="date"</td></tr>
+            <tr><td><input type="date" name="date"></td></tr>
             <tr><td bgcolor="beige">Payment Amount:</td></tr>
             <tr><td><input type="text" name="amount"></td></tr>
             <tr><td><input name="notify" type="checkbox" value="notify"/>Send Payment Recorded Notification</td></tr>
diff --git a/mortgage/web.py b/mortgage/web.py
index f28db28..d737b22 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -1,4 +1,3 @@
-import json
 import jinja2
 import smtplib
 import os
@@ -13,19 +12,19 @@ from email import encoders
 import couchdb
 
 try:
-  dbUserName = os.environ['COUCHDB_USERNAME']
+    dbUserName = os.environ['COUCHDB_USERNAME']
 except:
-  dbUserName = 'admin'
+    dbUserName = 'admin'
 
 try:
-  dbPassword = os.environ['COUCHDB_PW']
+    dbPassword = os.environ['COUCHDB_PW']
 except:
-  dbPassword = 'ams19230'
+    dbPassword = 'ams19230'
 
 try:
-  dbHost = os.environ['COUCHDB_HOST']
+    dbHost = os.environ['COUCHDB_HOST']
 except:
-  dbHost = 'couch.jkent.org'
+    dbHost = 'couch.jkent.org'
 
 connectString = f'https://{dbUserName}:{dbPassword}@{dbHost}/'
 print(connectString)
@@ -50,7 +49,7 @@ app = Flask(__name__)
 
 @app.route('/')
 def hello():
-    loans = getLoanFiles(database)
+    loans = getLoanFiles()
 
     #if a loan was not specified, choose the first loan and reload page with it
     if 'loan' in request.args:
@@ -117,7 +116,7 @@ def update_file():
 
     if proceed_flag is True:
         payment_history.append([payment_date, str(payment_amount), str(late_fee), str(extra_payment)])
-        database[document_id]=document
+        database[document_id] = document
         messages.append("The payment was successfully written. ")
 
     # see if an email notification was requested, if not, exit now
@@ -189,7 +188,7 @@ def send_statement():
 ######
 
 
-def getLoanFiles(directory):
+def getLoanFiles():
     #iterate over each of the documents found in the mortgage couchdb
     #database and pull their display name
     loans = []
@@ -201,25 +200,26 @@ def getLoanFiles(directory):
 
     return loans
 
+
 def createLoanEntryMenuItem(loanName, document_id):
     x = {}
     x['name'] = loanName
     x['document_id'] = document_id
     return x
 
+
 ######
 # Datastore Manipulation Functions
 ######
-
 def getStatementHeader(datastore):
     return datastore['header']
 
 
 def getAccounting(datastore):
     try:
-      return datastore['accounting']
+        return datastore['accounting']
     except:
-      return {"payment_account":"", "loan_account":"", "interest_account": ""}
+        return {"payment_account": "", "loan_account": "", "interest_account": ""}
 
 
 def getEmailInformation(datastore):
@@ -281,17 +281,16 @@ def getBorrower(datastore):
 
 
 def getDatastore(document_id=None):
-    if document_id == None:
+    if document_id is None:
         quit("Invalid document.")
 
     datastore = database[document_id]
     return datastore
 
+
 ######
 # Loan Calculation Functions
 ######
-
-
 def amortizeLoan(loan):
     # loop over the payments and calculate the actual amortization
     monthly_payment = loan["parameters"]["monthly_payment"]
@@ -331,7 +330,8 @@ def amortizeLoan(loan):
                 % (payment_number, payment_date, interest_paid_through_date))
             quit()
 
-        new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+        new_daily_interest = (remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+        new_interest = (days_since_last_payment * new_daily_interest).quantize(Decimal("0.00"))
         new_principal = payment_amount - new_interest - late_fee
         interest_paid_through_date = payment_date
         total_interest = total_interest + new_interest
@@ -346,8 +346,8 @@ def amortizeLoan(loan):
         payment_record['bill_date'] = next_bill_date
         payment_record['payment_date'] = payment_date
         payment_record['days_of_interest'] = days_since_last_payment
+        payment_record['daily_interest'] = new_daily_interest
         payment_record['payment_amount'] = payment_amount
-        principal_payment = payment_amount - new_interest - late_fee
         payment_record['principal_payment'] = payment_amount - new_interest - late_fee
         payment_record['interest_payment'] = new_interest
         payment_record['new_balance'] = remaining_principal
@@ -388,6 +388,7 @@ def amortizeLoan(loan):
     # loop over remaining scheduled payments and present estimated amortization
     while (payment_number <= total_periods) and (remaining_principal > 0):
         days_since_last_payment = (next_bill_date - interest_paid_through_date).days
+        new_daily_interest = (remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
         new_interest = (days_since_last_payment * remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
 
         # make sure the last payment isn't too much
@@ -405,6 +406,7 @@ def amortizeLoan(loan):
         future_payment_record['payment_number'] = payment_number
         future_payment_record['payment_date'] = next_bill_date
         future_payment_record['days_of_interest'] = days_since_last_payment
+        future_payment_record['daily_interest'] = new_daily_interest
         future_payment_record['payment_amount'] = monthly_payment
         future_payment_record['principal_payment'] = new_principal
         future_payment_record['interest_payment'] = new_interest
@@ -417,7 +419,7 @@ def amortizeLoan(loan):
             next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
         else:
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-
+    loan["current_daily_interest_accrual"] = (remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
     loan["balloon_payment"] = remaining_principal
     loan["past_payments"] = past_payments
     loan["future_payments"] = future_payments
@@ -529,7 +531,7 @@ def selectTemplate(formatType):
 
 def main():
     app.debug = True
-    app.run(host = '0.0.0.0', port='8000')
+    app.run(host='0.0.0.0', port=8000)
 
 
 if __name__ == '__main__':

From b5645e2492fb7babe154771b5f8c18112494c431 Mon Sep 17 00:00:00 2001
From: john
 <john@1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa>
Date: Mon, 20 May 2024 18:15:36 -0400
Subject: [PATCH 38/38] Updated files to produce current daily interest accrual
 information. Fixed calculation bug. Added current balance to loan information
 screen.

---
 mortgage/templates/main.html | 1 +
 mortgage/web.py              | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mortgage/templates/main.html b/mortgage/templates/main.html
index 72e004e..0e457da 100644
--- a/mortgage/templates/main.html
+++ b/mortgage/templates/main.html
@@ -68,6 +68,7 @@
             <tr><td><b>Term: </b></td><td>{{model.parameters.periods }} months </td></tr>
             <tr><td><b>Next Payment Due Date:</b></td><td> {{model.parameters.next_due_date}} </td></tr>
             <tr><td><b>Payment Due:</b></td><td> {{ "$%.2f"|format(model.parameters.next_payment_amt) }} </td></tr>
+            <tr><td><b>Current Balance</b></td><td> {{ "$%.2f"|format(model.current_balance) }}</td></tr>
             <tr><td><b>Daily Interest Accrual:</b></td><td> {{ "$%.2f"|format(model.current_daily_interest_accrual) }}</td></tr>
         </tbody>
         </table>
diff --git a/mortgage/web.py b/mortgage/web.py
index d737b22..e040033 100644
--- a/mortgage/web.py
+++ b/mortgage/web.py
@@ -385,6 +385,9 @@ def amortizeLoan(loan):
     else:
         loan["parameters"]["next_payment_amt"] = monthly_payment
 
+    loan["current_balance"] = remaining_principal
+    loan["current_daily_interest_accrual"] = (remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
     # loop over remaining scheduled payments and present estimated amortization
     while (payment_number <= total_periods) and (remaining_principal > 0):
         days_since_last_payment = (next_bill_date - interest_paid_through_date).days
@@ -419,7 +422,7 @@ def amortizeLoan(loan):
             next_bill_date = date(year=old_bill_date.year, month=old_bill_date.month + 1, day=payment_day_of_month)
         else:
             next_bill_date = date(year=old_bill_date.year + 1, month=1, day=payment_day_of_month)
-    loan["current_daily_interest_accrual"] = (remaining_principal * daily_interest_rate).quantize(Decimal("0.00"))
+
     loan["balloon_payment"] = remaining_principal
     loan["past_payments"] = past_payments
     loan["future_payments"] = future_payments