monopyly 1.4.5__py3-none-any.whl → 1.4.7__py3-none-any.whl

monopyly/credit/actions.py

@@ -13,7 +13,7 @@ def get_card_statement_grouping(cards):
 
     Parameters
     ----------
-    cards : list of sqlite3.Row
+    cards : list of database.models.CreditCard
         The database card entries for which to get statements.
 
     Returns
@@ -31,6 +31,33 @@ def get_card_statement_grouping(cards):
     return card_statements
 
 
+def get_statement_and_transactions(statement_id, transaction_sort_order="DESC"):
+    """
+    Given a statement ID, get the corresponding statement and transactions.
+
+    Parameters
+    ----------
+    statement_id : int
+        The ID of the statement to acquire.
+    transaction_sort_order : str
+        The order to sort transactions returned for the statement. The
+        default is 'DESC' for transactions sorted in descending order.
+
+    Returns
+    -------
+    statement : database.models.CreditStatementView
+        The statement with the given ID.
+    transactions : list of database.models.CreditTransactionView
+        All transactions on the statement with the given ID.
+    """
+    statement = CreditStatementHandler.get_entry(statement_id)
+    transactions = CreditTransactionHandler.get_transactions(
+        statement_ids=(statement_id,),
+        sort_order=transaction_sort_order,
+    )
+    return statement, transactions.all()
+
+
 def get_potential_preceding_card(card):
     """
     Get the card that this new card may be intended to replace (if any).
@@ -42,7 +69,7 @@ def get_potential_preceding_card(card):
 
     Parameters
     ----------
-    card : sqlite3.Row
+    card : database.models.CreditCard
         The new card being added to the database.
 
     Returns

monopyly/credit/routes.py

@@ -22,6 +22,7 @@ from .accounts import CreditAccountHandler
 from .actions import (
     get_card_statement_grouping,
     get_potential_preceding_card,
+    get_statement_and_transactions,
     make_payment,
     transfer_credit_card_statement,
 )
@@ -177,11 +178,7 @@ def update_statements_display():
 @bp.route("/statement/<int:statement_id>")
 @login_required
 def load_statement_details(statement_id):
-    statement = CreditStatementHandler.get_entry(statement_id)
-    transactions = CreditTransactionHandler.get_transactions(
-        statement_ids=(statement_id,),
-        sort_order="DESC",
-    )
+    statement, transactions = get_statement_and_transactions(statement_id)
     # Get bank accounts for potential payments
     bank_accounts = BankAccountHandler.get_accounts()
     return render_template(
@@ -219,12 +216,20 @@ def pay_credit_card(card_id, statement_id):
     make_payment(card_id, payment_account_id, payment_date, payment_amount)
     # Get the current statement information from the database
     statement = CreditStatementHandler.get_entry(statement_id)
+    transactions = CreditTransactionHandler.get_transactions(
+        statement_ids=(statement_id,)
+    )
     bank_accounts = BankAccountHandler.get_accounts()
-    return render_template(
+    summary_template = render_template(
         "credit/statement_summary.html",
         statement=statement,
         bank_accounts=bank_accounts,
     )
+    transactions_table_template = render_template(
+        "credit/transactions_table/transactions.html",
+        transactions=transactions,
+    )
+    return jsonify((summary_template, transactions_table_template))
 
 
 @bp.route("/transactions", defaults={"card_id": None})

monopyly/credit/statements.py

@@ -3,6 +3,7 @@ Tools for interacting with the credit statements in the database.
 """
 
 from authanor.database.handler import DatabaseViewHandler
+from dateutil.relativedelta import relativedelta
 
 from ..common.utils import get_next_occurrence_of_day
 from ..database.models import (
@@ -136,7 +137,7 @@ class CreditStatementHandler(
 
         Returns
         -------
-        statement : database.models.CreditStatementView
+        statement : database.models.CreditStatement
             The inferred statement entry for the transaction.
         """
         issue_day = card.account.statement_issue_day
@@ -146,6 +147,25 @@ class CreditStatementHandler(
             statement = cls.add_statement(card, issue_date)
         return statement
 
+    @classmethod
+    @DatabaseViewHandler.view_query
+    def get_prior_statement(cls, statement):
+        """
+        Given a statement, get the immediately preceding statement.
+
+        Parameters
+        ----------
+        statement : database.models.CreditStatement
+            The statement for which to find the preceding statement.
+
+        Returns
+        -------
+        statement : database.models.CreditStatementView
+            The statement immediately preceding the given statement.
+        """
+        issue_date = statement.issue_date + relativedelta(months=-1)
+        return cls.find_statement(statement.card.id, issue_date=issue_date)
+
     @classmethod
     def add_statement(cls, card, issue_date, due_date=None):
         """Add a statement to the database."""

monopyly/credit/transactions/_transactions.py

@@ -52,7 +52,7 @@ class CreditTransactionHandler(
 
         Parameters
         ----------
-        statement_ids : tuple of str, optional
+        statement_ids : tuple of int, optional
             A sequence of statement IDs with which to filter
             transactions (if `None`, all statement IDs will be shown).
         card_ids : tuple of int, optional

monopyly/static/css/style.css

@@ -7,7 +7,10 @@
 :root {
   --moneytree: #5e8f40;
   --moneytree-leaves: #85bb65;
+  --silver-dollar: #cccccc;
   --masthead-height: 50px;
+  --masthead-color: #2b2b2b;
+  --border-gray: #dddddd;
 }
 
 html {
@@ -94,7 +97,7 @@ header#masthead {
   border-width: 0 0 4px 3px;
   border-style: solid;
   border-color: var(--moneytree-leaves);
-  background-color: #2b2b2b;
+  background-color: var(--masthead-color);
   opacity: 0.9;
 }
 
@@ -117,7 +120,7 @@ header#masthead {
 }
 
 .monopyly-logo:hover {
-  color: #f5f5f5;
+  filter: brightness(0.95);
 }
 
 
@@ -161,7 +164,7 @@ footer#site-info {
 }
 
 #site-info p {
-  color: #cccccc;
+  color: var(--silver-dollar);
   font-size: 9pt;
   text-align: center;
 }
@@ -193,7 +196,7 @@ aside.sidebar {
   height: 100%;
   width: 10%;
   min-width: 50px;
-  margin-top: 50px; /* Account for content header */
+  margin-top: 50px; /* account for content header */
 }
 
 #content-header h1 {
@@ -201,12 +204,40 @@ aside.sidebar {
   box-sizing: border-box;
   margin: 0 0 30px 0;
   padding-bottom: 10px;
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-gray);
   text-align: center;
   font-size: 2em;
   letter-spacing: -2px;
 }
 
+#content-header h1.error {
+  text-align: left;
+}
+
+
+/*
+ * Provide styles for error pages
+ */
+.error span.code {
+  margin-left: 30px;
+  color: var(--silver-dollar);
+  font-weight: 300;
+  letter-spacing: 1px;
+}
+
+.custom-error-content p {
+  font-size: 18pt;
+}
+
+.standard-error-content {
+  margin-top: 50px;
+}
+
+.standard-error-content p.error-description {
+  font-size: 12pt;
+  font-style: oblique;
+}
+
 
 /*
  * General object characteristics
@@ -233,7 +264,8 @@ aside.sidebar {
 }
 
 .button-block {
-  border: 1px solid #dddddd;
+  margin: 15px 0;
+  border: 1px solid var(--border-gray);
   border-radius: 10px;
   box-shadow: 1px 1px 3px #bbbbbb;
   background-color: #eeeeee;
@@ -241,6 +273,14 @@ aside.sidebar {
   color: inherit;
 }
 
+.button-block:first-of-type {
+  margin-top: 0;
+}
+
+.button-block:last-of-type {
+  margin-bottom: 0;
+}
+
 .button-block:hover {
   filter: brightness(0.98);
   text-decoration: none;
@@ -253,16 +293,34 @@ aside.sidebar {
 .screenshot {
   width: 100%; /* override the markdown default */
   margin: 20px 0;
-  border: 1px solid #f3f3f3;
+  border: 1px solid #bbbbbb;
   box-shadow: 3px 3px 5px #bbbbbb;
 }
 
-.grouping {
+.group-stack {
+  margin: 15px 10px 25px;
+  padding: 20px 30px;
   border-radius: 15px;
   box-shadow: 0 0 20px #eeeeee;
   background-color: #eef5eb;
 }
 
+.group-stack .stack-title {
+  display: flex;
+  justify-content: space-between;
+  margin: 0 0 15px 0;
+  padding: 0 15px;
+  font-size: 1.1em;
+  letter-spacing: 1px;
+  text-transform: uppercase;
+}
+
+.group-stack .stack-title-info {
+  margin-left: 15px;
+  color: #888888;
+  font-weight: 400;
+}
+
 .paid-notice {
   color: var(--moneytree-leaves);
   font-weight: bold;
@@ -491,7 +549,8 @@ form .autocomplete-box {
   z-index: 99;
   width: 100%;
   padding-right: 10px;
-  border: 1px solid #cccccc;
+  border: 1px solid var(--silver-dollar);
+  box-sizing: border-box;
   background-color: white;
 }
 
@@ -502,7 +561,7 @@ form .autocomplete-box .item {
 }
 
 form .autocomplete-box .item:hover {
-  background-color: #cccccc;
+  background-color: var(--silver-dollar);
 }
 
 form .autocomplete-box .item.active {
@@ -643,7 +702,7 @@ form .autocomplete-box .item.active {
   position: relative;
   right: -100%;
   width: min-content;
-  transition: 0.4s;
+  transition: 0.4s 0.2s;
 }
 
 .slide-text-gadget:hover .sleeve {
@@ -653,7 +712,7 @@ form .autocomplete-box .item.active {
 .slide-text-gadget .sleeve .main {
   position: absolute;
   transform: translateX(-100%);
-  transition: 0.2s;
+  transition: 0.2s 0.2s;
 }
 
 .slide-text-gadget:hover .sleeve .main {
@@ -746,8 +805,8 @@ form .autocomplete-box .item.active {
 .toggle-switch-gadget .option .slider .switch {
   position: relative;
   left: 0;
-  width: 50%;
   height: 100%;
+  width: 50%;
   box-sizing: border-box;
   border-radius: 50%;
   background-color: #eeeeee;
@@ -772,7 +831,7 @@ form .autocomplete-box .item.active {
  * Style generic box tables
  */
 .box-table {
-  border: 2px solid #dddddd;
+  border: 2px solid var(--border-gray);
 }
 
 .box-table .icon-button {
@@ -789,8 +848,8 @@ form .autocomplete-box .item.active {
 }
 
 .box-table .box-row {
-  border-top: 0.5px solid #dddddd;
-  border-bottom: 0.5px solid #dddddd;
+  border-top: 0.5px solid var(--border-gray);
+  border-bottom: 0.5px solid var(--border-gray);
   background-color: #f5f5f5;
 }
 
@@ -822,7 +881,7 @@ form .autocomplete-box .item.active {
 }
 
 #card-filter .card:hover {
-  background-color: #cccccc;
+  background-color: var(--silver-dollar);
   text-decoration: none;
 }
 
@@ -878,7 +937,7 @@ form .autocomplete-box .item.active {
   position: absolute;
   height: 100%;
   width: 100%;
-  border: 1px solid #cccccc;
+  border: 1px solid var(--silver-dollar);
   border-radius: 20px;
   box-shadow: 1px 1px 3px #222222;
   text-align: center;
@@ -949,7 +1008,7 @@ form .autocomplete-box .item.active {
 }
 
 .credit-card.inactive .card-face.front {
-  color: #cccccc;
+  color: var(--silver-dollar);
   filter: brightness(0.9);
 }
 
@@ -1088,7 +1147,7 @@ form .autocomplete-box .item.active {
 
 .transactions-table .titles,
 .transactions-table .transaction {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid var(--border-gray);
 }
 
 .transactions-table .titles {
@@ -1612,13 +1671,12 @@ form .autocomplete-box .item.active {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
-  align-items: center;
+  align-items: stretch;
   gap: 10px;
   width: 100%;
 }
 @media screen and (max-width: 1500px) {
   .details .primary-info {
-    display: flex;
     align-items: center;
   }
 }
@@ -1639,14 +1697,16 @@ form .autocomplete-box .item.active {
 .details .summary-container {
   display: flex;
   justify-content: center;
-  min-width: 45%;
+  width: 45%;
+  min-width: 500px;
   margin: 0 0 0 0;
 }
 
 .details .summary-box {
   display: flex;
   flex-direction: column;
-  width: min-content;
+  width: 500px;
+  box-sizing: border-box;
   padding: 40px 50px 60px;
   border-radius: 25px;
   box-shadow: 1px 1px 5px #dddddd;
@@ -1656,7 +1716,6 @@ form .autocomplete-box .item.active {
 .details .summary-box .balance {
   display: flex;
   justify-content: space-between;
-  min-width: 325px;
   margin: 20px 0;
   font-size: 72pt;
   font-weight: bold;
@@ -1694,12 +1753,13 @@ form .autocomplete-box .item.active {
 }
 
 .details .transactions-container {
-  width: 50%;
+  width: 52.5%;
   order: 2;
   min-width: 500px;
 }
 @media screen and (max-width: 1500px) {
   .details .transactions-container {
+    width: 50%;
     order: 1;
     margin-top: 50px;
   }
@@ -1816,10 +1876,10 @@ form .autocomplete-box .item.active {
 #homepage-block {
   margin-bottom: 20px;
   padding: 0 0 30px 0;
-  background-color: #dddddd;
-  border: 1px solid #d8d8d8;
+  background-color: gainsboro;
+  border: 1px solid lightgray;
   border-radius: 6px;
-  box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px var(--silver-dollar);
 }
 
 #homepage-block h2 {
@@ -1869,7 +1929,7 @@ form .autocomplete-box .item.active {
   margin: 20px;
   padding: 50px;
   border: 1px solid #f5f5f5;
-  box-shadow: 2px 2px 5px #cccccc;
+  box-shadow: 2px 2px 5px var(--silver-dollar);
   background-color: #fafafa;
 }
 
@@ -1957,6 +2017,38 @@ form .autocomplete-box .item.active {
   margin-top: 50px;
 }
 
+#readme .warning {
+  padding: 15px 25px;
+  border: 1px solid var(--silver-dollar);
+  border-radius: 10px;
+  box-shadow: 2px 2px 3px var(--silver-dollar);
+  background-color: #f2d7a5;
+}
+
+#readme .warning h5 {
+  margin: 0 0 5px 0;
+}
+
+#changelog {
+  width: 80%;
+  margin: 0 auto;
+}
+
+#changelog h1 {
+  font-size: 32pt;
+  text-align: center;
+}
+
+#changelog h2 {
+  border-bottom: 1px solid var(--border-gray);
+}
+
+#changelog a.latest-release {
+  display: block;
+  margin: 30px 0;
+  font-size: 1.5em;
+}
+
 #story .signature {
   margin-bottom: 100px;
   font-weight: bold;
@@ -1965,6 +2057,14 @@ form .autocomplete-box .item.active {
 }
 
 
+/*
+ * Customization for the 'Credits' page
+ */
+.affiliation-disclaimer {
+  margin-top: 80px;
+}
+
+
 /*
  * Customization for the 'Profile' page
  */
@@ -1998,7 +2098,7 @@ form .autocomplete-box .item.active {
   flex-basis: 100%;
   margin-right: 0;
   padding-bottom: 50px;
-  border-bottom: 0.5px solid #dddddd;
+  border-bottom: 0.5px solid var(--border-gray);
 }
 
 #profile .banking.profile-section .bank-list {
@@ -2021,15 +2121,9 @@ form .autocomplete-box .item.active {
 /*
  * Customization for the 'Bank Accounts' page
  */
-#bank-container .bank-block {
-  margin: 25px 0;
-  padding: 30px;
-}
-
-#bank-container .bank-block h3 {
-  margin-top: 0;
+#bank-container .bank-stack .stack-title {
   padding: 0 30px;
-  /*text-align: center;*/
+  text-align: left;
 }
 
 #bank-container .account-block {
@@ -2064,7 +2158,7 @@ form .autocomplete-box .item.active {
 #account-type-container {
   width: 30%;
   min-width: 350px;
-  border: 2px solid #dddddd;
+  border: 2px solid var(--border-gray);
   background-color: #f5f5f5;
 }
 
@@ -2074,13 +2168,13 @@ form .autocomplete-box .item.active {
 }
 
 #account-type-container .account-types {
-  border-top: 2px solid #dddddd;
+  border-top: 2px solid var(--border-gray);
 }
 
 #account-type-container .account-type {
   padding: 10px;
-  border-top: 0.5px solid #dddddd;
-  border-bottom: 0.5px solid #dddddd;
+  border-top: 0.5px solid var(--border-gray);
+  border-bottom: 0.5px solid var(--border-gray);
 }
 
 
@@ -2101,10 +2195,22 @@ form#bank-account .hidden {
   align-items: center
 }
 
-#bank-account-summaries-container .bank {
-  margin: 0 0 10px;
+#bank-account-summaries-container h2.bank {
+  margin: 0 0 5px;
+  font-size: 1.6em;
+  letter-spacing: 1px;
+  text-transform: uppercase;
   text-align: center;
+}
+
+#bank-account-summaries-container h3.balance {
+  margin: 0 0 10px;
+  color: gray;
+  font-size: 1em;
+  font-weight: 300;
   text-transform: uppercase;
+  text-align: center;
+  letter-spacing: 1px;
 }
 
 #bank-account-summaries {
@@ -2113,29 +2219,21 @@ form#bank-account .hidden {
   width: 100%;
 }
 
-#bank-account-summaries .account-type-block {
+#bank-account-summaries .account-type-stack {
   display: flex;
   flex-direction: column;
-  width: 50%;
+  width: 60%;
   min-width: 400px;
-  margin: 10px auto;
-  padding: 25px;
+  margin: 15px auto 25px;
 }
 
 #bank-account-summaries .account-block {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  width: 100%;
-  box-sizing: border-box;
-  margin-bottom: 15px;
   padding: 30px 10%;
 }
 
-#bank-account-summaries a.account-block:last-of-type {
-  margin-bottom: 0;
-}
-
 #bank-account-summaries .account-block .title {
   font-size: 16pt;
 }
@@ -2404,27 +2502,21 @@ form#card #statement-due-day-field  {
   justify-content: space-around;
 }
 
-#credit-statements .card-column {
+#credit-statements .card-stack {
   display: flex;
   flex-direction: column;
   height: min-content;
-  margin: 15px 10px;
-  padding: 20px;
-  text-transform: uppercase;
-  text-align: center;
-  font-size: 1.1em;
 }
 
-#credit-statements-container .card-column .digits {
-  color: #888888;
+#credit-statements .card-stack .stack-title {
+  justify-content: center;
 }
 
 #credit-statements .statement-block {
   display: flex;
-  align-items: center;
   justify-content: space-between;
+  align-items: center;
   width: 275px;
-  margin: 15px;
   padding: 45px 50px;
 }
 
@@ -2507,7 +2599,7 @@ form#pay input {
 }
 
 form#pay .form-inputs {
-  border: 1px solid #cccccc;
+  border: 1px solid var(--silver-dollar);
   border-radius: inherit;
 }
 
@@ -2673,7 +2765,7 @@ form#credit-transaction .merchant-field {
   border-radius: 20px;
   text-align: center;
   outline: none;
-  caret-color: #cccccc;
+  caret-color: var(--silver-dollar);
   transition: border 0.1s ease;
 }
 
@@ -2729,6 +2821,6 @@ form#credit-transaction .merchant-field {
 #transaction-tags .subtags {
   margin: 0 0 0 10px;
   padding-left: 40px;
-  border-left: 1px solid #dddddd;
+  border-left: 1px solid var(--border-gray);
 }
 

monopyly/static/js/make-payment.js

@@ -17,7 +17,8 @@ import { executeAjaxRequest } from './modules/ajax.js';
 
 (function() {
 
-  const $container = $('#statement-summary-container');
+  const $summaryContainer = $('#statement-summary-container');
+  const $transactionContainer = $('#statement-transactions-container');
   prepareForm();
 
   function prepareForm() {
@@ -82,7 +83,8 @@ import { executeAjaxRequest } from './modules/ajax.js';
   function updateStatementPaymentAjaxRequest(rawData) {
     // Return the newly updated statement payment info
     function updateAction(response) {
-      $container.html(response)
+      $summaryContainer.html(response[0]);
+      $transactionContainer.html(response[1]);
       // Prepare the form again (in case statement is not paid in full)
       prepareForm();
     }