monopyly 1.6.0__tar.gz → 1.6.1__tar.gz

{monopyly-1.6.0 → monopyly-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.6.0
+Version: 1.6.1
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -23,15 +23,15 @@ Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: >=3.10
-Requires-Dist: dry-foundation==1.4.1
+Requires-Dist: dry-foundation==1.6.0
 Requires-Dist: flask-wtf==1.2.2
 Requires-Dist: flask==3.1.2
 Requires-Dist: gunicorn==23.0.0
-Requires-Dist: markdown==3.9
+Requires-Dist: markdown==3.10
 Requires-Dist: nltk==3.9.2
 Requires-Dist: python-dateutil==2.9.0
-Requires-Dist: rich==14.1.0
-Requires-Dist: sqlalchemy==2.0.43
+Requires-Dist: rich==14.2.0
+Requires-Dist: sqlalchemy==2.0.45
 Description-Content-Type: text/markdown
 
 <div id="header">

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/CHANGELOG.md

@@ -237,4 +237,11 @@
 - Update JavaScript libraries (jQuery, Chartist)
 
 
+### 1.6.1
+
+- Allow pie chart labels to overflow the SVG container
+- Define JavaScript elements in header (deferring execution when logical)
+- Bump dependencies
+
+
 <a name="bottom" id="bottom"></a>

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.0'
-__version_tuple__ = version_tuple = (1, 6, 0)
+__version__ = version = '1.6.1'
+__version_tuple__ = version_tuple = (1, 6, 1)

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/banking/forms.py

@@ -115,6 +115,10 @@ class BankAccountForm(EntryForm):
             }
             return account_type_data
 
+        def gather_entry_data(self, entry):
+            """Gather data for the form from the given database entry."""
+            raise NotImplementedError
+
     # Fields to identify the bank/account type information for the account
     bank_info = FormField(BankSubform)
     account_type_info = FormField(AccountTypeSubform)

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/common/forms/_forms.py

@@ -2,10 +2,10 @@
 General form constructions.
 """
 
-from abc import ABC, abstractmethod
+from abc import abstractmethod
 from datetime import date
 
-from flask_wtf import FlaskForm
+from dry_foundation.forms import AbstractFlaskForm, FlaskSubform
 from wtforms.fields import StringField, SubmitField
 from wtforms.validators import DataRequired
 
@@ -15,12 +15,7 @@ from .fields import CurrencyField, DateField
 form_err_msg = "There was an improper value in your form. Please try again."
 
 
-class AbstractEntryFormMixinMeta(type(FlaskForm), ABC):
-    # Defined to allow the forms to also to be abstract base classes
-    pass
-
-
-class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
+class EntryForm(AbstractFlaskForm):
     """
     A form designed to accept database entry information.
 
@@ -85,11 +80,8 @@ class EntryForm(FlaskForm, metaclass=AbstractEntryFormMixinMeta):
         )
 
 
-class EntrySubform(EntryForm):
-    """Subform disabling CSRF (CSRF is REQUIRED in encapsulating form)."""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(meta={"csrf": False}, *args, **kwargs)
+class EntrySubform(FlaskSubform, EntryForm):
+    """A subform implementing ``EntryForm`` behavior."""
 
 
 class AcquisitionSubform(EntrySubform):
@@ -149,7 +141,6 @@ class TransactionForm(EntryForm):
             }
             return data
 
-        @abstractmethod
         def gather_entry_data(self, entry):
             if self.subtransaction_model is None:
                 raise RuntimeError(

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/common/forms/fields.py

@@ -24,15 +24,6 @@ class DateField(wtforms_fields.DateField):
         super().__init__(*args, filters=filters, **kwargs)
 
 
-class OptionalDateField(DateField):
-    """A date field where the field value is optional."""
-
-    def process_formdata(self, valuelist):
-        """Process data from the form, ignoring an ommitted value."""
-        if valuelist != [""]:
-            super().process_formdata(valuelist)
-
-
 class CurrencyField(wtforms_fields.DecimalField):
     """A decimal field with currency-specific customizations."""
 

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/common/forms/utils.py

@@ -113,9 +113,9 @@ def extend_field_list_for_ajax(form_class, field_list_name, field_list_count):
 
     Parameters
     ----------
-    form_class : flask_wtf.FlaskForm
-        The class (not class instance) containing the field list to be
-        extended.
+    form_class : type
+        The form class (not class instance) containing the field list to
+        be extended.
     field_list_name : str
         The name of the field list to be extended.
     field_list_count : int

monopyly-1.6.1/monopyly/core/context_processors.py

@@ -0,0 +1,23 @@
+"""
+Filters defined for the application.
+"""
+
+from dry_foundation.utils import define_basic_template_global_variables
+
+from .actions import determine_summary_balance_svg_viewbox_width
+from .blueprint import bp
+
+
+@bp.app_context_processor
+def inject_global_template_variables():
+    """Inject template variables globally into the template context."""
+    return define_basic_template_global_variables("monopyly._version")
+
+
+@bp.app_context_processor
+def inject_utility_functions():
+    """Inject utility functions globally into the template context."""
+    utility_functions = {
+        "calculate_summary_balance_width": determine_summary_balance_svg_viewbox_width,
+    }
+    return utility_functions

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/credit/cards.py

@@ -137,7 +137,7 @@ def save_card(form, card_id=None):
 
     Parameters
     ----------
-    form : flask_wtf.FlaskForm
+    form : CreditCardForm
         The form beign used to provide the data being saved.
     card_id : int
         The ID of hte card to be saved. If provided, the named card will

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/credit/forms.py

@@ -5,6 +5,7 @@ Generate credit card forms for the user to complete.
 from flask import abort
 from wtforms.fields import (
     BooleanField,
+    DateField,
     FieldList,
     FormField,
     IntegerField,
@@ -18,7 +19,6 @@ from ..common.forms import AcquisitionSubform, EntryForm, EntrySubform, Transact
 from ..common.forms.fields import (
     CustomChoiceSelectField,
     LastFourDigitsField,
-    OptionalDateField,
     StringField,
 )
 from ..common.forms.utils import Autocompleter
@@ -152,6 +152,10 @@ class CardStatementTransferForm(EntryForm):
     transfer = RadioField("transfer", choices=[("yes", "Yes"), ("no", "No")])
     submit = SubmitField("Continue")
 
+    def gather_entry_data(self, entry):
+        """Gather data for the form from the given database entry."""
+        raise NotImplementedError
+
 
 class CreditTransactionForm(TransactionForm):
     """Form to input/edit credit card transactions."""
@@ -193,7 +197,7 @@ class CreditTransactionForm(TransactionForm):
         # Fields to identify the card/bank information for the statement
         card_info = FormField(CardSubform)
         # Fields pertaining to the statement
-        issue_date = OptionalDateField("Statement Date")
+        issue_date = DateField("Statement Date", [Optional()])
 
         def get_statement(self, transaction_date):
             """Get the credit card statement described by the form data."""

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/static/css/style.css

@@ -3481,6 +3481,10 @@ form#pay #make-payment[type="submit"] #prompt {
   min-height: 400px;
 }
 
+#category-chart.ct-chart svg {
+  overflow: visible;
+}
+
 #category-chart text.ct-label {
   transition: fill 0.1s ease;
 }

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/banking/account_form/account_form_page_new.html

@@ -1,6 +1,16 @@
 {% extends "common/form_page.html" %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/display-new-bank-inputs.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/display-new-account-type-inputs.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block title %}
   New Bank Account
 {% endblock %}
@@ -13,11 +23,3 @@
   {% endwith %}
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/display-new-bank-inputs.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/display-new-account-type-inputs.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/banking/accounts_page.html

@@ -1,6 +1,14 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/expand-bank-account.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -83,9 +91,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/expand-bank-account.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/core/index.html

@@ -1,5 +1,17 @@
 {% extends "layout.html" %}
 
+
+{% block javascript %}
+
+  <script>
+    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block content %}
 
   {% if session["show_homepage_block"] %}
@@ -170,11 +182,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block javascript %}
-  <script>
-    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/core/profile.html

@@ -1,13 +1,28 @@
 {% extends "layout.html" %}
 
-{% block title %}
-  Profile
+
+{% block javascript %}
+
+  <script>
+    const UPDATE_BANK_NAME_ENDPOINTS = {
+      {% for bank in banks %}
+        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
+      {% endfor %}
+    };
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
+  </script>
+
 {% endblock %}
 
+
 {% block header %}
-  <h1>Profile</h1>
+  <h1>{% block title %}Profile{% endblock %}</h1>
 {% endblock %}
 
+
 {% block content %}
 
   <div id="profile">
@@ -76,19 +91,3 @@
   </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script>
-
-    const UPDATE_BANK_NAME_ENDPOINTS = {
-      {% for bank in banks %}
-        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
-      {% endfor %}
-    };
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/credit/account_page.html

@@ -1,6 +1,23 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const UPDATE_CARD_STATUS_ENDPOINT = "{{ url_for('credit.update_card_status') }}";
+    const UPDATE_ACCOUNT_STATEMENT_ISSUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_issue_day', account_id=account.id) }}";
+    const UPDATE_ACCOUNT_STATEMENT_DUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_due_day', account_id=account.id) }}";
+  </script>
+  <script src="{{ url_for('static', filename='js/flip-card.js') }}" defer>
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-card-status.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-account-statement-parameters.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -100,20 +117,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const UPDATE_CARD_STATUS_ENDPOINT = "{{ url_for('credit.update_card_status') }}";
-    const UPDATE_ACCOUNT_STATEMENT_ISSUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_issue_day', account_id=account.id) }}";
-    const UPDATE_ACCOUNT_STATEMENT_DUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_due_day', account_id=account.id) }}";
-  </script>
-  <script src="{{ url_for('static', filename='js/flip-card.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-card-status.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-account-statement-parameters.js') }}">
-  </script>
-
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/credit/card_form/card_form_page_new.html

@@ -1,6 +1,14 @@
 {% extends "common/form_page.html" %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/display-new-credit-account-inputs.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block title %}
   New Card
 {% endblock %}
@@ -17,8 +25,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/display-new-credit-account-inputs.js') }}">
-  </script>
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/credit/statement_page.html

@@ -1,6 +1,49 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', statement_id=statement.id) }}";
+    const UPDATE_STATEMENT_DUE_DATE_ENDPOINT = "{{ url_for('credit.update_statement_due_date', statement_id=statement.id) }}";
+    const MAKE_PAYMENT_ENDPOINT = "{{ url_for('credit.pay_credit_card', card_id=statement.card_id, statement_id=statement.id) }}";
+    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
+    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
+  </script>
+  <script>
+    const CATEGORY_CHART_DATA = {
+      labels: [
+        {% for label in chart_data['labels'] %}
+          {% if label == '' %}
+            "Other",
+          {% else %}
+            "{{ label }}",
+          {% endif %}
+        {% endfor %}
+      ],
+      series: [
+        {% for subtotal in chart_data['subtotals'] %}
+          {{ subtotal }},
+        {% endfor %}
+      ],
+    };
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-statement-parameters.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/make-payment.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/create-category-chart.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -58,47 +101,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', statement_id=statement.id) }}";
-    const UPDATE_STATEMENT_DUE_DATE_ENDPOINT = "{{ url_for('credit.update_statement_due_date', statement_id=statement.id) }}";
-    const MAKE_PAYMENT_ENDPOINT = "{{ url_for('credit.pay_credit_card', card_id=statement.card_id, statement_id=statement.id) }}";
-    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
-    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
-  </script>
-  <script>
-    const CATEGORY_CHART_DATA = {
-      labels: [
-        {% for label in chart_data['labels'] %}
-          {% if label == '' %}
-            "Other",
-          {% else %}
-            "{{ label }}",
-          {% endif %}
-        {% endfor %}
-      ],
-      series: [
-        {% for subtotal in chart_data['subtotals'] %}
-          {{ subtotal }},
-        {% endfor %}
-      ],
-    };
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-statement-parameters.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/make-payment.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/create-category-chart.js') }}">
-  </script>
-
-{% endblock %}
-

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/credit/statements_page.html

@@ -1,6 +1,19 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script src="{{ url_for('static', filename='js/define-filter.js') }}" defer>
+  </script>
+  <script>
+    const FILTER_ENDPOINT = "{{ url_for('credit.update_statements_display') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-statements-display.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block left_sidebar %}
 
   <nav id="sidebar-nav-menu">
@@ -54,16 +67,3 @@
   <a name="bottom"></a>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script src="{{ url_for('static', filename='js/define-filter.js') }}">
-  </script>
-  <script>
-    const FILTER_ENDPOINT = "{{ url_for('credit.update_statements_display') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-statements-display.js') }}">
-  </script>
-
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/credit/transactions_page.html

@@ -2,6 +2,34 @@
 {% set full_view = True %}
 
 
+{% block javascript %}
+
+  <script src="{{ url_for('static', filename='js/define-filter.js') }}" defer>
+  </script>
+  <script>
+    const FILTER_ENDPOINT = "{{ url_for('credit.update_transactions_display') }}";
+    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
+    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
+    const LOAD_TRANSACTIONS_ENDPOINT = "{{ url_for('credit.load_more_transactions') }}";
+    const LOAD_TRANSACTIONS_SELECTORS = {
+      "selected_card_ids": {{ selected_card_ids }},
+      "sort_order": "{{ sort_order }}",
+      "block_count": 1,
+      "full_view": {{ full_view|tojson }}
+    }
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-transactions-display.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/load-more-transactions.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block left_sidebar %}
 
   <nav id="sidebar-nav-menu">
@@ -75,31 +103,3 @@
   <a name="bottom"></a>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script src="{{ url_for('static', filename='js/define-filter.js') }}">
-  </script>
-  <script>
-    const FILTER_ENDPOINT = "{{ url_for('credit.update_transactions_display') }}";
-    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
-    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
-    const LOAD_TRANSACTIONS_ENDPOINT = "{{ url_for('credit.load_more_transactions') }}";
-    const LOAD_TRANSACTIONS_SELECTORS = {
-      "selected_card_ids": {{ selected_card_ids }},
-      "sort_order": "{{ sort_order }}",
-      "block_count": 1,
-      "full_view": {{ full_view|tojson }}
-    }
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-transactions-display.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/load-more-transactions.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
-  </script>
-
-{% endblock %}

{monopyly-1.6.0 → monopyly-1.6.1}/monopyly/templates/layout.html

@@ -43,7 +43,14 @@
     <script>
       window.Chartist || document.write('<script src="{{ url_for('static', filename='chartist-1.5.0.min.js') }}"><\/script>')
     </script>
+    <!-- Custom application JavaScript -->
+    <script type="module" src="{{ url_for('static', filename='js/toggle-navigation.js') }}">
+    </script>
+    {% block javascript %}
+    {% endblock %}
+
   </head>
+
   <body>
 
     <header id="masthead">
@@ -117,10 +124,5 @@
         </p>
     </footer>
 
-    <script type="module" src="{{ url_for('static', filename='js/toggle-navigation.js') }}">
-    </script>
-    {% block javascript %}
-    {% endblock %}
-
   </body>
 </html>