monopyly 1.5.2__py3-none-any.whl → 1.6.1__py3-none-any.whl

monopyly/templates/credit/statement_reconciliation/statement_reconciliation_page.html

@@ -1,6 +1,25 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', 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 type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/highlight-discrepant-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 header %}
 
   <h1>
@@ -13,7 +32,7 @@
 
 
 {% block content %}
-  {% set highlighted_transactions = statement_transactions|selectattr("highlight")|first %}
+  {% set highlighted_transactions = transactions|selectattr("highlight")|first %}
 
   <div id="credit-statement-reconciliation-details" class="details">
 
@@ -30,8 +49,8 @@
           </p>
         {% endif %}
 
-        {% with transactions = statement_transactions, full_view = False %}
-          {% include 'credit/transactions_table/transactions.html' %}
+        {% with full_view = False %}
+          {% include 'credit/transactions_table/table.html' %}
         {% endwith %}
       </div>
 
@@ -65,22 +84,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', 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 type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/highlight-discrepant-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/templates/credit/statement_summary.html

@@ -52,7 +52,7 @@
 
           <div class="form-line">
             <div class="dollar-sign">$</div>
-            <input id="pay-amount" type="number" name="pay_amount" value="{{ statement.balance }}" />
+            <input id="pay-amount" type="number" name="pay_amount" value="{{ statement.balance }}" step="0.01" />
             <input id="pay-date" type="date" name="pay_date" value="{{ date_today }}" />
           </div>
 
@@ -62,7 +62,7 @@
                 <option value="0">Select a bank</option>
                 {% for account in bank_accounts %}
                   <option value="{{ account.id }}">
-                    {{ account.bank.bank_name }} {{ account.account_type.type_name }} ({{ account.last_four_digits }})
+                    {{ account.bank.bank_name }} {{ account.account_type_view.type_name }} ({{ account.last_four_digits }})
                   </option>
                 {% endfor %}
               </optgroup>

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/templates/credit/transaction_form/transaction_form_page_update.html

@@ -1,6 +1,15 @@
 {% extends "credit/transaction_form/transaction_form_page.html" %}
 
 
+{% block javascript %}
+
+  {{ super() }}
+  <script type="module" src="{{ url_for('static', filename='js/use-suggested-amount.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block title %}
   Update Credit Transaction
 {% endblock %}
@@ -13,12 +22,3 @@
   {% endwith %}
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  {{ super() }}
-  <script type="module" src="{{ url_for('static', filename='js/use-suggested-amount.js') }}">
-  </script>
-
-{% endblock %}

monopyly/templates/credit/transaction_submission_page.html

@@ -43,11 +43,11 @@
       <div id="receipt-card">
         <div class="receipt-item">
           <div class="receipt-key">Card:</div>
-          <div class="receipt-value">{{ transaction.statement.card.account.bank.bank_name }} ****-{{ transaction.statement.card.last_four_digits }}</div>
+          <div class="receipt-value">{{ transaction.statement_view.card.account.bank.bank_name }} ****-{{ transaction.statement_view.card.last_four_digits }}</div>
         </div>
         <div class="receipt-item">
           <div class="receipt-key">Statement Date:</div>
-          <div class="receipt-value">{{ transaction.statement.issue_date }}</div>
+          <div class="receipt-value">{{ transaction.statement_view.issue_date }}</div>
         </div>
       </div>
 
@@ -62,7 +62,7 @@
         <a class="submission button" href="{{ url_for('credit.add_transaction') }}">
           Create a new transaction
         </a>
-        <a class="submission button" href="{{ url_for('credit.add_transaction', card_id=transaction.statement.card_id, statement_id=transaction.statement_id) }}">
+        <a class="submission button" href="{{ url_for('credit.add_transaction', card_id=transaction.statement_view.card_id, statement_id=transaction.statement_id) }}">
           Create a new transaction on this statement
         </a>
         <a class="submission button" href="{{ url_for('credit.load_statement_details', statement_id=transaction.statement_id) }}">

monopyly/templates/credit/transactions_page.html

@@ -1,4 +1,33 @@
 {% extends 'layout.html' %}
+{% 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 %}
@@ -60,30 +89,17 @@
   </div>
 
   <div class="transactions-container">
-    {% with full_view = True %}
-      {% include 'credit/transactions_table/transactions.html' %}
-    {% endwith %}
+    {% include 'credit/transactions_table/table.html' %}
+
+    {% if transactions|length < total_transactions %}
+      <div id="more-transactions" class="button">
+        <img class="icon" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}">
+        <div>Load more transactions</div>
+      </div>
+    {% endif %}
   </div>
 
-  <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') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-transactions-display.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>
+  <a name="bottom"></a>
 
 {% endblock %}

monopyly/templates/credit/transactions_table/condensed_row_content.html

@@ -19,7 +19,7 @@
 
 {% if full_view %}
   <div class="card column">
-    <span class="bank">{{ transaction.statement.card.account.bank.bank_name }}</span>
-    -<span class="digits">{{ transaction.statement.card.last_four_digits }}</span>
+    <span class="bank">{{ transaction.statement_view.card.account.bank.bank_name }}</span>
+    -<span class="digits">{{ transaction.statement_view.card.last_four_digits }}</span>
   </div>
 {% endif %}

monopyly/templates/credit/transactions_table/expanded_row_content.html

@@ -46,21 +46,21 @@
       <a href="{{ url_for('credit.load_statement_details', statement_id=transaction.statement_id) }}">
         <img src="{{ url_for('static', filename='img/statement.png') }}" />
         <div class="date">
-          <div class="month">{{ transaction.statement.issue_date.strftime('%b')|upper }}</div>
-          <div class="year">{{ transaction.statement.issue_date.year }}</div>
+          <div class="month">{{ transaction.statement_view.issue_date.strftime('%b')|upper }}</div>
+          <div class="year">{{ transaction.statement_view.issue_date.year }}</div>
         </div>
       </a>
     </div>
 
     <div class="card">
-      <a href="{{ url_for('credit.load_account', account_id=transaction.statement.card.account_id) }}">
+      <a href="{{ url_for('credit.load_account', account_id=transaction.statement_view.card.account_id) }}">
         {% with %}
           {% set img_base = url_for('static', filename='img/cards/') %}
-          {% set card_url =  img_base + transaction.statement.card.account.bank.bank_name.lower() + '-card.png' %}
+          {% set card_url =  img_base + transaction.statement_view.card.account.bank.bank_name.lower() + '-card.png' %}
           {% set template_url = img_base + 'template-card.png' %}
           <img class="card-background" src="{{ card_url }}" onerror="if (this.src != '{{ template_url }}') this.src = '{{ template_url }}'" />
           <div class="card-number">
-            {{ transaction.statement.card.last_four_digits }}
+            {{ transaction.statement_view.card.last_four_digits }}
           </div>
         {% endwith %}
       </a>

monopyly/templates/credit/transactions_table/table.html

@@ -0,0 +1,3 @@
+{% set field_title_template = 'credit/transactions_table/transaction_field_titles.html' %}
+{% set transactions_template = 'credit/transactions_table/transactions.html' %}
+{% include 'common/transactions_table/table.html' %}

monopyly/templates/credit/transactions_table/transactions.html

@@ -1,4 +1,3 @@
-{% set field_title_template = 'credit/transactions_table/transaction_field_titles.html' %}
 {% set condensed_row_content_template = 'credit/transactions_table/condensed_row_content.html' %}
 {% set expanded_row_content_template = 'credit/transactions_table/expanded_row_content.html' %}
 {% set update_transaction_function = 'credit.update_transaction' %}

monopyly/templates/layout.html

@@ -33,12 +33,24 @@
     <meta name="msapplication-config" content="{{ url_for('static', filename='favicon/browserconfig.xml') }}" />
     <!-- ****** faviconit.com favicons ****** -->
     <!-- Use Google JQuery CDN -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="{{ url_for('static', filename='jquery-3.7.0.min.js') }}"><\/script>')</script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+    <script>
+      window.jQuery || document.write('<script src="{{ url_for('static', filename='jquery-3.7.1.min.js') }}"><\/script>')
+    </script>
     <!-- Use Chartist via CDN -->
-    <link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css" />
-    <script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chartist@1.5.0/dist/index.min.css" />
+    <script src="https://cdn.jsdelivr.net/npm/chartist@1.5.0/dist/index.umd.min.js"></script>
+    <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">
@@ -112,10 +124,5 @@
         </p>
     </footer>
 
-    <script type="module" src="{{ url_for('static', filename='js/toggle-navigation.js') }}">
-    </script>
-    {% block javascript %}
-    {% endblock %}
-
   </body>
 </html>

{monopyly-1.5.2.dist-info → monopyly-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monopyly
-Version: 1.5.2
+Version: 1.6.1
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -22,16 +22,16 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
-Requires-Python: <3.11,>=3.10
-Requires-Dist: dry-foundation==1.3.0
+Requires-Python: >=3.10
+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: nltk==3.9.1
+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">
@@ -159,7 +159,7 @@ Card balances are also visible by visiting the pages for individual statements.
 A full history of statements for each card is available off the homepage.
 Each statement's page gives the statement's balance, transactions, and due date.
 
-<img class="screenshot" src="https://raw.githubusercontent.com/mitchnegus/monopyly/main/monopyly/static/img/about/statement-details.png" alt="statement details" width="800px" />
+<img class="screenshot" src="https://raw.githubusercontent.com/mitchnegus/monopyly/main/monopyly/static/img/about/credit-statement-details.png" alt="statement details" width="800px" />
 
 Payments can be made directly from a statement's page and can be linked to a bank account in the _Monopyly_ system for simplified tracking.
 (Note that even linked transactions must be edited independently, as there are times when a user may wish to have separate values for linked transactions. For example, a credit card payment may be processed on a given date while it is only registered as a bank account transaction several days later.)