Format large numbers to make reading them easier

demo/settings.py

@@ -35,6 +35,7 @@
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.humanize',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',

silverstrike/templates/silverstrike/account_detail.html

@@ -1,6 +1,7 @@
 {% extends 'silverstrike/base.html' %}
 {% load i18n %}
 {% load staticfiles %}
+{% load humanize %}
 
 {% block stylesheets %}
 <link rel="stylesheet" href="{% static 'vendor/css/daterangepicker.css' %}">
@@ -38,16 +39,16 @@ <h3 class="box-title">{% trans 'Overview' %}</h3>
       <div class="box-content">
         <table class="table">
           <tr>
-          <th>{% trans 'Current Balance' %}</th><td class="text-{% if balance < 0 %}red{% else %}green{% endif %}">{{ balance }}</td>
+          <th>{% trans 'Current Balance' %}</th><td class="text-{% if balance < 0 %}red{% else %}green{% endif %}">{{ balance|intcomma }}</td>
         </tr>
         <tr>
-          <th>{% trans 'In' %}</th><td>{{ in }}</td>
+          <th>{% trans 'In' %}</th><td>{{ in|intcomma }}</td>
         </tr>
         <tr>
-          <th>{% trans 'Out' %}</th><td class="text-red">{{ out }}</td>
+          <th>{% trans 'Out' %}</th><td class="text-red">{{ out|intcomma }}</td>
         </tr>
         <tr>
-          <th>{% trans 'Difference' %}</th><td{% if difference < 0 %} class="text-red"{% endif %}>{{ difference }}</td>
+          <th>{% trans 'Difference' %}</th><td{% if difference < 0 %} class="text-red"{% endif %}>{{ difference|intcomma }}</td>
         </tr>
         </table>
       </div>
@@ -96,7 +97,7 @@ <h3 class="box-title">{% trans 'Transaction list' %}</h3>
   <td><a href="{% url 'transaction_detail' transaction.transaction.pk %}">{{ transaction.transaction.title }}</a></td>
   <td>{{ transaction.transaction.date }}</td>
   <td class="hidden-xs">{{ transaction.date }}</td>
-  <td{% if transaction.amount < 0 %} class="text-red"{% elif transaction.is_deposit %} class="text-green"{% endif %}>{{ transaction.amount }}</td>
+  <td{% if transaction.amount < 0 %} class="text-red"{% elif transaction.is_deposit %} class="text-green"{% endif %}>{{ transaction.amount|intcomma }}</td>
   <td class="hidden-xs">{% if transaction.is_system %}{% trans 'Reconcilation' %}{% else %}<a href="{{ transaction.opposing_account.get_absolute_url }}">{{ transaction.opposing_account }}</a>{% endif %}</td>
   <td class="hidden-xs">
     {% if transaction.category %}

silverstrike/templates/silverstrike/accounts.html

@@ -1,6 +1,7 @@
 {% extends 'silverstrike/base.html' %}
 {% load i18n %}
 {% load staticfiles %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Accounts' %}
@@ -27,7 +28,7 @@ <h3 class="box-title">{% trans 'Accounts' %}</h3>
       {% for account in accounts %}
       <tr{% if not account.active %} class="inactive-account"{% endif %}>
         <td><a href="{% url 'account_view' account.id %}">{{ account.name }}</a></td>
-        <td>{{ account.balance }}</td>
+        <td>{{ account.balance|intcomma }}</td>
         <td>{% if account.active %}<i class="fa fa-check"></i>{% else %}<i class="fa fa-close"></i>{% endif %}</td>
         <td><a href="{% url 'account_update' account.id %}">{% trans 'Edit' %}</a></td>
       </tr>
@@ -58,4 +59,4 @@ <h3 class="box-title">{% trans 'Accounts' %}</h3>
     $('.inactive-account').hide();
   });
 </script>
-{% endblock %}
+{% endblock %}

silverstrike/templates/silverstrike/budget_index.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load widget_tweaks %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Budgets' %}</h1>
@@ -54,8 +55,8 @@ <h3 class="box-title">{% blocktrans with month_str=month|date:'F Y' %}Budget for
           <td>
               {{ form.amount|add_class:"form-control" }}
           </td>
-          <td>{{ form.spent.value }}</td>
-          <td>{{ form.left.value }}</td>
+          <td>{{ form.spent.value|intcomma }}</td>
+          <td>{{ form.left.value|intcomma }}</td>
         </tr>
         {% endfor %}
       </tbody>
@@ -66,4 +67,4 @@ <h3 class="box-title">{% blocktrans with month_str=month|date:'F Y' %}Budget for
   </div>
   </form>
 </div>
-{% endblock %}
+{% endblock %}

silverstrike/templates/silverstrike/category_assign.html

@@ -3,6 +3,7 @@
 {% load staticfiles %}
 {% load tags %}
 {% load widget_tweaks %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>Uncategorized expenses
@@ -34,7 +35,7 @@ <h3 class="box-title">{% trans 'Expenses' %}</h3>
         <tr>
         <td>{{ object.title }}</td>
         <td>{{ object.date }}</td>
-        <td>{{ object.amount }}</td>
+        <td>{{ object.amount|intcomma }}</td>
         <td>{{ form.id }}{{ form.category|add_class:"form-control" }}</td>
         </tr>
       {% endfor %}

silverstrike/templates/silverstrike/category_index.html

@@ -1,6 +1,7 @@
 {% extends 'silverstrike/base.html' %}
 {% load i18n %}
 {% load static %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>Categories</h1>
@@ -48,7 +49,7 @@ <h3 class="box-title">{% trans 'Categories' %}</h3>
         <td>
           <a href="{% url 'category_detail' category.0 %}" >{{ category.1 }}</a>
         </td>
-        <td>{{ category.2 }}</td>
+        <td>{{ category.2|intcomma }}</td>
       </tr>
       {% endif %}
       {% endfor %}

silverstrike/templates/silverstrike/foreign_accounts.html

@@ -1,10 +1,10 @@
 {% extends 'silverstrike/base.html' %}
 {% load i18n %}
 {% load staticfiles %}
+{% load humanize %}
 
 {% block content_header %}
-<h1>{% trans 'Accounts' %}
-</h1>
+<h1>{% trans 'Accounts' %}</h1>
 <ol class="breadcrumb">
   <li><a href="/">{% trans 'Home' %}</a></li>
   <li class="active">{% trans 'Accounts' %}</li>
@@ -26,7 +26,7 @@ <h3 class="box-title">{% trans 'Foreign Accounts' %}</h3>
       {% for account in object_list %}
       <tr>
         <td><a href="{% url 'account_view' account.id %}">{{ account.name }}</a></td>
-        <td>{{ account.balance }}</td>
+        <td>{{ account.balance|intcomma }}</td>
         <td><a href="{% url 'account_update' account.id %}">{% trans 'Edit' %}</a></td>
       </tr>
       {% endfor %}
@@ -76,4 +76,4 @@ <h3 class="box-title">{% trans 'Foreign Accounts' %}</h3>
     });
   })
 </script>
-{% endblock %}
+{% endblock %}

silverstrike/templates/silverstrike/index.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {% load tags %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Home' %}
@@ -17,31 +18,31 @@ <h1>{% trans 'Home' %}
     <div class="small-box bg-green">
       <div class="inner">
         <h4>{% trans 'Current Balance' %}</h4>
-        <h3>{{ balance }}</h3>
+        <h3>{{ balance|intcomma }}</h3>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="small-box bg-yellow">
       <div class="inner">
         <h4>{% trans 'Working Balance' %}</h4>
-        <h3>{{ working_balance}}</h3>
+        <h3>{{ working_balance|intcomma }}</h3>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="small-box bg-red">
       <div class="inner">
         <h4>{% trans 'Outstanding Recurrences' %}</h4>
-        <h3>{{ outstanding }}</h3>
+        <h3>{{ outstanding|intcomma }}</h3>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="small-box bg-blue">
       <div class="inner">
         <h4>{% trans 'End of Month Balance' %}</h4>
-        <h3>{{ expected_balance }}</h3>
+        <h3>{{ expected_balance|intcomma }}</h3>
       </div>
     </div>
   </div>
@@ -58,13 +59,13 @@ <h3>{{ expected_balance }}</h3>
         <table class="table">
           <tr><th></th><th>{{ today|date:"F" }}</th><th>{{ last_month|date:"F" }}</th></tr>
           <tr>
-            <th>{% trans 'Income' %}</th><td>{{ income }}</td><td>{{ previous_income }}</td>
+            <th>{% trans 'Income' %}</th><td>{{ income|intcomma }}</td><td>{{ previous_income|intcomma }}</td>
           </tr>
           <tr>
-            <th>{% trans 'Expenses' %}</th><td class="text-red">{{ expenses }}</td><td class="text-red">{{ previous_expenses }}</td>
+            <th>{% trans 'Expenses' %}</th><td class="text-red">{{ expenses|intcomma }}</td><td class="text-red">{{ previous_expenses|intcomma }}</td>
           </tr>
           <tr>
-            <th>{% trans 'Difference' %}</th><td{% if difference < 0 %} class="text-red"{% endif %}>{{ difference }}</td><td{% if previous_difference < 0 %} class="text-red"{% endif %}>{{ previous_difference }}</td>
+            <th>{% trans 'Difference' %}</th><td{% if difference < 0 %} class="text-red"{% endif %}>{{ difference|intcomma }}</td><td{% if previous_difference < 0 %} class="text-red"{% endif %}>{{ previous_difference|intcomma }}</td>
           </tr>
         </table>
       </div>
@@ -82,7 +83,7 @@ <h3 class="box-title">{% trans 'Accounts' %}</h3>
         {% for account in accounts %}
         <tr>
           <td><a href="{{ account.get_absolute_url }}">{{ account.name }}</a></td>
-          <td {% if account.balance < 0 %} class="text-red"{% endif %}>{{ account.balance }}</td>
+          <td {% if account.balance < 0 %} class="text-red"{% endif %}>{{ account.balance|intcomma }}</td>
         </tr>
         {% endfor %}
         </table>
@@ -116,7 +117,7 @@ <h3 class="box-title">{% trans 'Upcoming Transactions' %}</h3>
             <td><a href="{{ transaction.get_absolute_url }}">{{ transaction.title }}</a></td>
             <td>{{ transaction.date }}</td>
             <td><a href="{{ transaction.account.get_absolute_url }}">{{ transaction.account }}</a></td>
-            <td {% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.amount }}</td>
+            <td {% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.amount|intcomma }}</td>
           </tr>
           {% endfor %}
         </table>
@@ -140,7 +141,7 @@ <h3 class="box-title">{% trans 'Upcoming Recurrences' %}</h3>
           <tr>
             <td><a href="{{ transaction.get_absolute_url }}">{{ transaction.title }}</a></td>
             <td>{{ transaction.date }}</td>
-            <td {% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.signed_amount }}</td>
+            <td {% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.signed_amount|intcomma }}</td>
             <td>
               <a class="btn btn-xs {% if transaction.is_due %}btn-danger{% else %}btn-primary{% endif %}" href="{% url 'recurrence_transaction_create' transaction.pk %}">{% trans 'Create Transaction' %}</a>
             </td>
@@ -178,7 +179,7 @@ <h3 class="box-title">{% trans 'Recent Transactions' %}</h3>
             <td><a href="{{ transaction.get_absolute_url }}">{{ transaction.title }}</a></td>
             <td class="hidden-xs">{{ transaction.transaction.get_transaction_type_str }}</td>
             <td>{{ transaction.date|date:'d.m.Y' }}</td>
-            <td class="text-{% if transaction.is_deposit %}green{% elif transaction.is_withdraw %}red{% endif %}">{% if transaction.is_transfer %}{{ transaction.amount|negate }}{% else %}{{ transaction.amount }}{% endif %}</td>
+            <td class="text-{% if transaction.is_deposit %}green{% elif transaction.is_withdraw %}red{% endif %}">{% if transaction.is_transfer %}{{ transaction.amount|negate|intcomma }}{% else %}{{ transaction.amount|intcomma }}{% endif %}</td>
             <td class="hidden-xs"><a href="{{ transaction.account.get_absolute_url }}">{{ transaction.account }}</a></td>
             <td class="hidden-xs">{% if not transaction.is_system %}<a href="{{ transaction.opposing_account.get_absolute_url }}">{{ transaction.opposing_account }}</a>{% endif %}</td>
             <td class="hidden-xs">

silverstrike/templates/silverstrike/reconcile.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% load widget_tweaks %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Reconcile' %}
@@ -40,7 +41,7 @@ <h3 class="box-title">{% trans 'Create reconcile transaction' %}</h3>
         </label>
         <div class="col-sm-8">
           {{ form.balance|add_class:"form-control" }}
-          <span class="help-block">Current balance: {{ account.balance }} &bull; Difference: <span id="amount-difference"></span></span>
+          <span class="help-block">Current balance: {{ account.balance|intcomma }} &bull; Difference: <span id="amount-difference"></span></span>
           {% for error in form.balance.errors %}
           <span class="help-block">{{ error }}</span>
           {% endfor %}
@@ -86,4 +87,4 @@ <h3 class="box-title">{% trans 'Create reconcile transaction' %}</h3>
   $('#id_date').attr('autocomplete', 'off');
 })
 </script>
-{% endblock %}
+{% endblock %}

silverstrike/templates/silverstrike/recurring_transactions.html

@@ -1,9 +1,6 @@
 {% extends 'silverstrike/base.html' %}
 {% load i18n %}
-
-{% block stylesheets %}
-{% endblock %}
-
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Recurring Transactions' %}
@@ -20,31 +17,31 @@ <h1>{% trans 'Recurring Transactions' %}
     <div class="small-box bg-green">
       <div class="inner">
         <h4>{% trans 'Income this month' %}</h4>
-        <h3>{{ income }}</h3>
+        <h3>{{ income|intcomma }}</h3>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="small-box bg-red">
       <div class="inner">
         <h4>{% trans 'Expenses this month' %}</h4>
-        <h3>{{ expenses }}</h3>
+        <h3>{{ expenses|intcomma }}</h3>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="small-box bg-blue">
       <div class="inner">
         <h4>{% trans 'Total change this month' %}</h4>
-        <h3>{{ total }}</h3>
+        <h3>{{ total|intcomma }}</h3>
       </div>
     </div>
   </div>
 <div class="col-md-3">
     <div class="small-box bg-yellow">
       <div class="inner">
         <h4>{% trans 'Remaining change this month' %}</h4>
-        <h3>{{ remaining }}</h3>
+        <h3>{{ remaining|intcomma }}</h3>
       </div>
     </div>
   </div>
@@ -67,7 +64,7 @@ <h3 class="box-title">{% trans 'Recurrences' %}</h3>
 <tr>
   <td><a href="{{ transaction.get_absolute_url }}">{{ transaction.title }}</a></td>
   <td{% if transaction.is_due %} class="text-red"{% endif %}>{{ transaction.date }}</td>
-  <td{% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.signed_amount }}</td>
+  <td{% if transaction.is_deposit %} class="text-green"{% elif transaction.is_withdraw %} class="text-red" {% endif %}>{{ transaction.signed_amount|intcomma }}</td>
   <td class="hidden-xs"><a href="{{ transaction.src.get_absolute_url }}">{{ transaction.src }}</a></td>
   <td class="hidden-xs"><a href="{{ transaction.dst.get_absolute_url }}">{{ transaction.dst }}</a></td>
   <td class="hidden-xs">{{ transaction.get_recurrence }}</td>

silverstrike/templates/silverstrike/transaction_detail.html

@@ -3,6 +3,7 @@
 {% load static %}
 {% load widget_tweaks %}
 {% load tags %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{{ transaction.title }}</h1>
@@ -25,7 +26,7 @@ <h3 class="box-title">{% trans 'Transaction Details' %}</h3>
     <th>{% trans 'Date' %}</th><td>{{ transaction.date }}</td>
   </tr>
   <tr>
-    <th>{% trans 'Total amount' %}</th><td{% if transaction.is_withdraw %} class="text-red"{% elif transaction.is_deposit %} class="text-green"{% endif %}>{{ transaction.amount }}</td>
+    <th>{% trans 'Total amount' %}</th><td{% if transaction.is_withdraw %} class="text-red"{% elif transaction.is_deposit %} class="text-green"{% endif %}>{{ transaction.amount|intcomma }}</td>
   </tr>
   {% if transaction.notes %}
   <tr><th>{% trans 'Notes' %}</th><td>{{ transaction.notes }}</td></tr>
@@ -65,7 +66,7 @@ <h3 class="box-title">{% trans 'Splits' %}</h3>
     <td><a href="{{ split.account.get_absolute_url }}">{{ split.account }}</a></td>
     <td><a href="{{ split.opposing_account.get_absolute_url }}">{{ split.opposing_account }}</a></td>
     <td{% if split.is_withdraw %} class="text-red"{% elif split.is_deposit %} class="text-green"{% endif %}>
-      {% if split.is_transfer %}{{ split.amount|negate }}{% else %}{{ split.amount }}{% endif %}
+      {% if split.is_transfer %}{{ split.amount|negate|intcomma }}{% else %}{{ split.amount|intcomma }}{% endif %}
     </td>
     <td>{{ split.date }}</td>
     <td>{% if split.category %}<a href="{{ split.category.get_absolute_url }}">{{ split.category }}</a>{% endif %}</td>
@@ -74,4 +75,4 @@ <h3 class="box-title">{% trans 'Splits' %}</h3>
 </table>
 </div>
 </div>
-{% endblock %}
+{% endblock %}

silverstrike/templates/silverstrike/transaction_overview.html

@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {% load tags %}
+{% load humanize %}
 
 {% block content_header %}
 <h1>{% trans 'Transactions' %}</h1>
@@ -35,7 +36,7 @@ <h3 class="box-title">{% trans 'Transaction list' %}</h3>
   <td>{{ transaction.transaction.date }}</td>
   <td class="hidden-xs">{{ transaction.date }}</td>
   <td class="text-{% if transaction.is_deposit %}green{% elif transaction.is_withdraw %}red{% endif %}">
-    {% if transaction.is_transfer %}{{ transaction.amount|negate }}{% else %}{{ transaction.amount }}{% endif %}
+    {% if transaction.is_transfer %}{{ transaction.amount|negate|intcomma }}{% else %}{{ transaction.amount|intcomma }}{% endif %}
   </td>
   <td class="hidden-xs"><a href="{{ transaction.account.get_absolute_url }}">{{ transaction.account }}</a></td>
   <td class="hidden-xs">{% if not transaction.is_system %}<a href="{{ transaction.opposing_account.get_absolute_url }}">{{ transaction.opposing_account }}</a>{% endif %}</td>