monopyly 1.5.1__py3-none-any.whl → 1.6.0__py3-none-any.whl

monopyly/static/js/load-more-transactions.js

@@ -0,0 +1,27 @@
+/*
+ * Load more transactions when the plus icon is clicked.
+ */
+
+import { executeAjaxRequest } from './modules/ajax.js';
+
+
+(function() {
+
+  const endpoint = LOAD_TRANSACTIONS_ENDPOINT;
+  const rawData = LOAD_TRANSACTIONS_SELECTORS;
+
+  $("#more-transactions.button").on("click", function() {
+    let $button = $(this);
+    let $container = $button.closest(".transactions-container");
+    let $table = $container.find(".transactions-table");
+    rawData["block_count"] += 1;
+    executeAjaxRequest(endpoint, rawData, function(response) {
+      if (response) {
+        $table.append(response);
+      } else {
+        console.log("no response");
+      }
+    });
+  });
+
+})();

monopyly/static/js/modules/expand-transaction.js

@@ -25,8 +25,9 @@ class TransactionToggleManager {
    */
   constructor(callback = null) {
     // Identify the plus/minus icons
-    this.$iconsMoreInfoButtons = $('.transaction .more.button');
-    this.$iconsLessInfoButtons = $('.transaction .less.button');
+    this.$table = $('.transactions-table');
+    this.iconsMoreInfoSelector = '.transaction .more.button';
+    this.iconsLessInfoSelector = '.transaction .less.button';
     this.#registerClickExpand(callback);
     this.#registerClickCollapse();
   }
@@ -37,8 +38,8 @@ class TransactionToggleManager {
 
   #registerClickExpand(callback) {
     const self = this;
-    this.$iconsMoreInfoButtons.on('click', function(event) {
-      const $transaction = self.getButtonTransaction(this);
+    self.$table.on('click', self.iConsMoreInfoSelector, function(event) {
+      const $transaction = self.getButtonTransaction(event.target);
       const toggler = new TransactionToggler($transaction);
       toggler.expand(callback);
       // Do not propagate any additional events up the DOM tree
@@ -49,8 +50,8 @@ class TransactionToggleManager {
 
   #registerClickCollapse() {
     const self = this;
-    this.$iconsLessInfoButtons.on('click', function(event) {
-      const $transaction = self.getButtonTransaction(this);
+    self.$table.on('click', self.iconsLessInfoSelector, function(event) {
+      const $transaction = self.getButtonTransaction(event.target);
       const toggler = new TransactionToggler($transaction);
       toggler.collapse();
       // Do not propagate any additional events up the DOM tree

monopyly/static/js/modules/update-display-ajax.js

@@ -30,4 +30,23 @@ function replaceDisplayContentsAjaxRequest(
 }
 
 
-export { replaceDisplayContentsAjaxRequest };
+function replaceDisplayElementAjaxRequest(
+  endpoint, rawData, $display, callback = null
+) {
+
+  // The action is to replace the display element entirely
+  function action(response) {
+    $display.replaceWith(response);
+    // Execute the callback function, if given
+    if (callback != null) {
+      callback();
+    }
+  }
+
+  // Assign the response to the display object
+  executeAjaxRequest(endpoint, rawData, action);
+
+}
+
+
+export { replaceDisplayContentsAjaxRequest, replaceDisplayElementAjaxRequest};

monopyly/static/js/update-transactions-display.js

@@ -17,7 +17,7 @@ import {
   TransactionToggleManager, displaySubtransactions
 } from './modules/expand-transaction.js';
 import {
-  replaceDisplayContentsAjaxRequest
+  replaceDisplayElementAjaxRequest
 } from './modules/update-display-ajax.js';
 
 
@@ -27,6 +27,8 @@ import {
   const $filterContainer = $('#card-filter');
   // Identify the transactions container
   const $container = $('.transactions-container');
+  // Identify selectors used when loading additional transactions
+  const selectors = LOAD_TRANSACTIONS_SELECTORS;
 
   // Send the Ajax request on click
   const $filters = $filterContainer.find('.card');
@@ -58,6 +60,7 @@ import {
       sortOrder = 'desc';
     }
     // Update the table with the filters and ordering
+    const $table = $container.find('.transactions-table');
     const endpoint = FILTER_ENDPOINT;
     const rawData = {
       'card_ids': cardIDs,
@@ -67,7 +70,10 @@ import {
     function callback() {
       const toggleManager = new TransactionToggleManager(displaySubtransactions)
     }
-    replaceDisplayContentsAjaxRequest(endpoint, rawData, $container, callback)
+    replaceDisplayElementAjaxRequest(endpoint, rawData, $table, callback)
+    // Update the selectors with the new filters and ordering
+    selectors["selected_card_ids"] = cardIDs;
+    selectors["sort_order"] = sortOrder;
   }
 
 })();

monopyly/templates/banking/account_page.html

@@ -27,9 +27,14 @@
       </div>
 
       <div id="account-transactions-container" class="transactions-container">
-        {% with transactions = account_transactions %}
-          {% include 'banking/transactions_table/transactions.html' %}
-        {% endwith %}
+        {% include 'banking/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>
 
     </div>
@@ -59,20 +64,14 @@
   <script>
     const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('banking.expand_transaction') }}";
     const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('banking.show_linked_transaction') }}";
-  </script>
-  <script>
-    const BALANCE_CHART_DATA = {
-      series: [
-        {
-          name: 'balances',
-          data: [
-            {% for x, y in chart_data %}
-              {x: {{ x }}, y: {{ y }}},
-            {% endfor %}
-          ],
-        },
-      ],
+    const LOAD_TRANSACTIONS_ENDPOINT = "{{ url_for('banking.load_more_transactions') }}";
+    const LOAD_TRANSACTIONS_SELECTORS = {
+      "account_id": {{ account.id }},
+      "block_count": 1
     };
+    const BALANCE_CHART_DATA = {{ chart_data|tojson }};
+  </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>

monopyly/templates/banking/account_summaries.html

@@ -8,7 +8,7 @@
 
         <h2 class="stack-title">
           {{ account_type.type_name }}
-          {% if accounts|length> 1 %}
+          {% if accounts|length > 1 %}
             <span class="stack-title-info">${{ accounts|sum(attribute='balance')|currency }}</span>
           {% endif %}
         </h2>
@@ -19,7 +19,7 @@
             <a class="account-block button-block" href="{{ url_for('banking.load_account_details', account_id=account.id) }}">
               <div class="title">
                 <span class="digits">{{ account.last_four_digits }}</span>
-                <b>{{ account.account_type.type_name }}</b>
+                <b>{{ account.account_type_view.type_name }}</b>
               </div>
               <div class="balance">${{ account.balance|currency }}</div>
             </a>

monopyly/templates/banking/account_summary.html

@@ -5,7 +5,7 @@
   </div>
 
   <div class="title">
-    {{ account.account_type.type_common_name.upper() }}
+    {{ account.account_type_view.type_common_name.upper() }}
   </div>
 
   <div class="balance">

monopyly/templates/banking/accounts_page.html

@@ -16,7 +16,7 @@
 
   <div id="bank-container">
     {% for bank in banks %}
-      {% set bank_accounts = bank.bank_accounts %}
+      {% set bank_accounts = bank.bank_account_views %}
       {% if bank_accounts %}
 
         <div class="bank-stack group-stack">
@@ -28,7 +28,7 @@
               <div class="account-block box-row">
 
                 <div class="account-info">
-                  <span class="digits">{{ account.last_four_digits }}</span> <b>{{ account.account_type.type_name }}</b>
+                  <span class="digits">{{ account.last_four_digits }}</span> <b>{{ account.account_type_view.type_name }}</b>
                </div>
 
                 <div class="expanded">

monopyly/templates/banking/transactions_table/table.html

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

monopyly/templates/banking/transactions_table/transactions.html

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

monopyly/templates/common/tag_tree.html

@@ -0,0 +1,25 @@
+{% for tag in tags_hierarchy recursive %}
+  <li class="tag-container">
+    <div class="tag-area">
+      <div class="tag">{{ tag.tag_name }}</div>
+      <div class="buttons">
+        <img class="new-tag button" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}" />
+        {% if tag.user_id != 0 %}
+          <a class="action button delete">
+        {% endif %}
+        </a>
+      </div>
+    </div>
+
+    <ul class="tags subtags">
+      {{ loop(tags_hierarchy[tag]) }}
+    </ul>
+
+  </li>
+
+  {% if loop.last %}
+    <input class="new-tag" type="text" />
+  {% endif %}
+{% else %}
+  <input class="new-tag" type="text" />
+{% endfor %}

monopyly/templates/{credit → common}/tags_page.html

@@ -20,7 +20,11 @@
 
     <div id="tags-container" class="tag-container">
 
-      {% include 'credit/tag_tree/tag_tree.html' %}
+      <ul class="tags">
+        {% include 'common/tag_tree.html' %}
+      </ul>
+
+      <img class="root new-tag button" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}" />
 
     </div>
 
@@ -32,8 +36,8 @@
 {% block javascript %}
 
   <script>
-    const ADD_TAG_ENDPOINT = "{{ url_for('credit.add_tag') }}";
-    const REMOVE_TAG_ENDPOINT = "{{ url_for('credit.delete_tag') }}";
+    const ADD_TAG_ENDPOINT = "{{ url_for('banking.add_tag') }}";
+    const REMOVE_TAG_ENDPOINT = "{{ url_for('banking.delete_tag') }}";
   </script>
   <script type="module" src="{{ url_for('static', filename='js/bind-tag-actions.js') }}">
   </script>

monopyly/templates/common/transactions_table/linked_bank_transaction.html

@@ -4,9 +4,9 @@
 
 <div class="description-header">
   <div class="account">
-    {{ transaction.account.bank.bank_name }} ({{ transaction.account.last_four_digits }})
+    {{ transaction.account_view.bank.bank_name }} ({{ transaction.account_view.last_four_digits }})
     <div class="account-type">
-      {{ transaction.account.account_type.type_common_name }}
+      {{ transaction.account_view.account_type_view.type_common_name }}
     </div>
   </div>
   <div class="total">

monopyly/templates/common/transactions_table/table.html

@@ -0,0 +1,6 @@
+<div class="transactions-table">
+
+  {% include field_title_template %}
+  {% include transactions_template %}
+
+</div>

monopyly/templates/common/transactions_table/transactions.html

@@ -1,18 +1,12 @@
-<div class="transactions-table">
+{% for transaction in transactions %}
 
-  {% include field_title_template %}
+  {% if transaction.transaction_date > date_today %}
+    {% set future = ' future' %}
+  {% endif %}
 
-  {% for transaction in transactions %}
+  <div id="transaction-{{ transaction.id }}" class="transaction{{ future }} row" data-transaction-id="{{ transaction.id }}">
+    {% include 'common/transactions_table/transaction_condensed.html' %}
+    {% include 'common/transactions_table/transaction_expanded.html' %}
+  </div>
 
-    {% if transaction.transaction_date > date_today %}
-      {% set future = ' future' %}
-    {% endif %}
-
-    <div id="transaction-{{ transaction.id }}" class="transaction{{ future }} row" data-transaction-id="{{ transaction.id }}">
-      {% include 'common/transactions_table/transaction_condensed.html' %}
-      {% include 'common/transactions_table/transaction_expanded.html' %}
-    </div>
-
-  {% endfor %}
-
-</div>
+{% endfor %}

monopyly/templates/core/index.html

@@ -17,134 +17,145 @@
   {% if g.user %}
     <div id="homepage-panels">
 
-      <div id="banking" class="panel">
-
-        <h2>Bank Accounts</h2>
-
-        <ul class="category">
-          <h4>Profile</h4>
-          <li>
-            <a href="{{ url_for('banking.load_accounts') }}">
-              Manage accounts
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('banking.add_account') }}">
-              Add a new account
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_tags') }}">
-              Manage transaction tags
-            </a>
-          </li>
-        </ul>
-
-        <h3>Banks</h3>
-
-        {% for bank in bank_accounts %}
-          <ul class="category">
+      <div class="panel-column">
+
+        <div id="banking" class="panel">
 
-            <h4>{{ bank.bank_name }}</h4>
+          <h2>Bank Accounts</h2>
+
+          <ul class="category">
+            <h4>Profile</h4>
             <li>
-              <a href="{{ url_for('banking.load_account_summaries', bank_id=bank.id) }}">
-                See account summaries
+              <a href="{{ url_for('banking.load_accounts') }}">
+                Manage accounts
               </a>
-              <ul>
-                {% for account in bank_accounts[bank]|sort(attribute='account_type.type_common_name,last_four_digits') %}
-                  <li>
-                    <a href="{{ url_for('banking.load_account_details', account_id=account.id) }}">
-                      {{ account.account_type.type_common_name }} {{ account.last_four_digits }}
-                    </a>
-                  </li>
-                {% endfor %}
-              </ul>
             </li>
             <li>
-              <a href="{{ url_for('banking.add_transaction', bank_id=bank.id) }}">
-                Create a new transaction
+              <a href="{{ url_for('banking.add_account') }}">
+                Add a new account
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('banking.load_tags') }}">
+                Manage transaction tags
               </a>
             </li>
-
           </ul>
-        {% endfor %}
 
-      </div>
+          <h3>Banks</h3>
 
-      <div id="credit" class="panel">
-
-        <h2>Credit Cards</h2>
-
-        <ul class="category">
-          <h4>Profile</h4>
-          <li>
-            <a href="{{ url_for('credit.load_cards') }}">
-              Manage cards
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.add_card') }}">
-              Add a new card
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_tags') }}">
-              Manage transaction tags
-            </a>
-          </li>
-        </ul>
-
-        <ul class="category">
-          <h4>History</h4>
-          <li>
-            <a href="{{ url_for('credit.load_statements') }}">
-              See statement history
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_transactions') }}">
-              See transaction history
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.add_transaction') }}">
-              Create a new transaction
-            </a>
-          </li>
-        </ul>
-
-        <h3>Cards</h3>
-
-        {% for card in cards %}
-          <ul class="category">
+          {% for bank in bank_accounts %}
+            <ul class="category">
 
-            <h4>{{ card.account.bank.bank_name }} {{ card.last_four_digits }}</h4>
-            {% if card.last_statement_id %}
+              <h4>{{ bank.bank_name }}</h4>
+              <li>
+                <a href="{{ url_for('banking.load_account_summaries', bank_id=bank.id) }}">
+                  See account summaries
+                </a>
+                <ul>
+                  {% for account in bank_accounts[bank]|sort(attribute='account_type_view.type_common_name,last_four_digits') %}
+                    <li>
+                      <a href="{{ url_for('banking.load_account_details', account_id=account.id) }}">
+                        {{ account.account_type_view.type_common_name }} {{ account.last_four_digits }}
+                      </a>
+                    </li>
+                  {% endfor %}
+                </ul>
+              </li>
               <li>
-                <a href="{{ url_for('credit.load_statement_details', statement_id=card.last_statement_id) }}">
-                  See most recent statement
+                <a href="{{ url_for('banking.add_transaction', bank_id=bank.id) }}">
+                  Create a new transaction
                 </a>
               </li>
-            {% endif %}
+
+            </ul>
+          {% endfor %}
+
+        </div>
+
+      </div>
+
+      <div class="panel-column">
+
+        <div id="credit" class="panel">
+
+          <h2>Credit Cards</h2>
+
+          <ul class="category">
+            <h4>Profile</h4>
+            <li>
+              <a href="{{ url_for('credit.load_cards') }}">
+                Manage cards
+              </a>
+            </li>
             <li>
-              <a href="{{ url_for('credit.load_transactions', card_id=card.id) }}">
+              <a href="{{ url_for('credit.add_card') }}">
+                Add a new card
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('banking.load_tags') }}">
+                Manage transaction tags
+              </a>
+            </li>
+          </ul>
+
+          <ul class="category">
+            <h4>History</h4>
+            <li>
+              <a href="{{ url_for('credit.load_statements') }}">
+                See statement history
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('credit.load_transactions') }}">
                 See transaction history
               </a>
             </li>
             <li>
-              <a href="{{ url_for('credit.add_transaction', card_id=card.id) }}">
+              <a href="{{ url_for('credit.add_transaction') }}">
                 Create a new transaction
               </a>
             </li>
-
           </ul>
-        {% endfor %}
 
+          <h3>Cards</h3>
+
+          {% for card in cards %}
+            <ul class="category">
+
+              <h4>{{ card.account.bank.bank_name }} {{ card.last_four_digits }}</h4>
+              {% if card.last_statement_id %}
+                <li>
+                  <a href="{{ url_for('credit.load_statement_details', statement_id=card.last_statement_id) }}">
+                    See most recent statement
+                  </a>
+                </li>
+              {% endif %}
+              <li>
+                <a href="{{ url_for('credit.load_transactions', card_id=card.id) }}">
+                  See transaction history
+                </a>
+              </li>
+              <li>
+                <a href="{{ url_for('credit.add_transaction', card_id=card.id) }}">
+                  Create a new transaction
+                </a>
+              </li>
+
+            </ul>
+          {% endfor %}
+
+        </div>
 
       </div>
 
-      <div id="investments" class="panel">
-        <h2>Coming soon!</h2>
+      <div class="panel-column">
+
+        <div id="investments" class="panel">
+          <h2>Coming soon!</h2>
+        </div>
+
       </div>
 
     </div>

monopyly/templates/core/profile.html

@@ -67,7 +67,7 @@
 
         <h2>Transactions</h2>
 
-        <a href="{{ url_for('credit.load_tags') }}">Manage transaction tags</a>
+        <a href="{{ url_for('banking.load_tags') }}">Manage transaction tags</a>
 
       </div>
 

monopyly/templates/credit/statement_page.html

@@ -23,8 +23,8 @@
       </div>
 
       <div id="statement-transactions-container" class="transactions-container">
-        {% 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>
 

monopyly/templates/credit/statement_reconciliation/statement_reconciliation_inquiry.html

@@ -8,7 +8,7 @@
       </div>
 
       <p class="instructions">
-        Load a CSV file containing credit activity for comparison against this statement. The CSV file must be located in the <code>Downloads</code> directory on the machine running the Monopyly app.
+        Load a CSV file containing credit activity for comparison against this statement.
       </p>
 
       <form action="{{ url_for('credit.load_statement_reconciliation_details', statement_id=statement_id) }}" method="post" enctype="multipart/form-data">

monopyly/templates/credit/statement_reconciliation/statement_reconciliation_page.html

@@ -13,7 +13,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 +30,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>
 

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>