monopyly 1.4.5__tar.gz → 1.4.6__tar.gz

{monopyly-1.4.5 → monopyly-1.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: monopyly
-Version: 1.4.5
+Version: 1.4.6
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -25,9 +25,9 @@ Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: <3.11,>=3.10
 Requires-Dist: authanor==1.1.0
 Requires-Dist: flask-wtf==1.2.1
-Requires-Dist: flask==3.0.2
+Requires-Dist: flask==3.0.3
 Requires-Dist: fuisce==1.0.2
-Requires-Dist: gunicorn==21.2.0
+Requires-Dist: gunicorn==22.0.0
 Requires-Dist: markdown==3.6
 Requires-Dist: python-dateutil==2.9.0
 Requires-Dist: rich==13.7.1

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '1.4.5'
-__version_tuple__ = version_tuple = (1, 4, 5)
+__version__ = version = '1.4.6'
+__version_tuple__ = version_tuple = (1, 4, 6)

{monopyly-1.4.5 → monopyly-1.4.6}/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-1.4.5 → monopyly-1.4.6}/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(

{monopyly-1.4.5 → monopyly-1.4.6}/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-1.4.5 → monopyly-1.4.6}/monopyly/static/css/style.css

@@ -1664,6 +1664,10 @@ form .autocomplete-box .item.active {
   text-align: center;
 }
 
+.details .summary-box .balance .dollar-sign {
+  margin-right: 5px;
+}
+
 .details .summary-box .projected-balance .amount {
   color: var(--moneytree);
   font-weight: 500;

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/auth/login.html

@@ -10,6 +10,6 @@
     <input name="username" id="username" required>
     <label for="password">Password</label>
     <input type="password" name="password" id="password" required>
-    <input class="button" type="submit" value="Log In">
+    <input class="button" type="submit" value="Log In" />
   </form>
 {% endblock %}

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/auth/register.html

@@ -10,6 +10,6 @@
     <input name="username" id="username" required>
     <label for="password">Password</label>
     <input type="password" name="password" id="password" required>
-    <input class="button" type="submit" value="Register">
+    <input class="button" type="submit" value="Register" />
   </form>
 {% endblock %}

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/banking/account_summary.html

@@ -9,7 +9,7 @@
   </div>
 
   <div class="balance">
-    <div>$</div>
+    <div class="dollar-sign">$</div>
     <div>{{ account.balance|currency }}</div>
   </div>
 

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/banking/transaction_form/transaction_form.html

@@ -1,4 +1,4 @@
-<form id="bank-transaction" class="transaction" action="{{ submission_url }}" method="POST" autocomplete="off">
+<form id="bank-transaction" class="transaction" action="{{ submission_url }}" method="post" autocomplete="off">
 
   {{ form.hidden_tag() }}
 

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/credit/card_graphic/card_back.html

@@ -10,7 +10,7 @@
 <div class="options">
 
   <label class="toggle-switch-gadget" for="card-{{ card.id }}-status">
-    <input id="card-{{ card.id }}-status" data-card-id="{{ card.id }}" type="checkbox" {{ 'checked' if card.active else '' }}/>
+    <input id="card-{{ card.id }}-status" data-card-id="{{ card.id }}" type="checkbox"{{ ' checked' if card.active else '' }} />
 
     <div class="option">
       <div class="text">

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/templates/credit/statement_summary.html

@@ -9,7 +9,7 @@
   </div>
 
   <div class="balance">
-    <div>$</div>
+    <div class="dollar-sign">$</div>
     <div>{{ statement.balance|currency }}</div>
   </div>
 
@@ -47,8 +47,8 @@
 
           <div class="form-line">
             <div class="dollar-sign">$</div>
-            <input id="pay-amount" type="text" name="pay_amount" value="{{ statement.balance|currency }}" maxlength="8"/>
-            <input id="pay-date" type="text" name="pay_date" value="{{ date_today }}" maxlength="10"/>
+            <input id="pay-amount" type="text" name="pay_amount" value="{{ statement.balance|currency }}" maxlength="8" />
+            <input id="pay-date" type="text" name="pay_date" value="{{ date_today }}" maxlength="10" />
           </div>
 
           <div class="form-line">

{monopyly-1.4.5 → monopyly-1.4.6}/pyproject.toml

@@ -12,10 +12,10 @@ license = { text = 'GNU GPLv3' }
 requires-python = '>=3.10,<3.11'
 dependencies = [
   'authanor==1.1.0',
-  'Flask==3.0.2',
+  'Flask==3.0.3',
   'Flask-WTF==1.2.1',
   'fuisce==1.0.2',
-  'gunicorn==21.2.0',
+  'gunicorn==22.0.0',
   'Markdown==3.6',
   'python-dateutil==2.9.0',
   'rich==13.7.1',

{monopyly-1.4.5 → monopyly-1.4.6}/monopyly/common/forms/_forms.py

@@ -34,16 +34,6 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         """
         Generate a duplicate prepopulated form.
 
-        Notes
-        -----
-        WTForms requires that a form be instantiated in order to be
-        able to properly introspect fields. Because of this, this method
-        will only return a duplicate form matching the type of the
-        form instance used to call it. Using the form's process method
-        will not properly handle enumeration of field lists, so it
-        can not be used as a replacement for populating an existing
-        form.
-
         Parameters
         ----------
         entry : database.models.Model
@@ -55,6 +45,16 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         form : EntryForm
             A duplicate form, prepopulated with the collected database
             information.
+
+        Notes
+        -----
+        WTForms requires that a form be instantiated in order to be
+        able to properly introspect fields. Because of this, this method
+        will only return a duplicate form matching the type of the
+        form instance used to call it. Using the form's process method
+        will not properly handle enumeration of field lists, so it
+        can not be used as a replacement for populating an existing
+        form.
         """
         data = self.gather_entry_data(entry)
         return self.__class__(data=data)