About halfway through adding income by month section to admin.

2 files changed, 126 insertions, 0 deletions

diff --git a/design/templates/admin/income_month.html b/design/templates/admin/income_month.html
new file mode 100644
index 0000000..e34cdbf
--- /dev/null
+++ b/design/templates/admin/income_month.html
@@ -0,0 +1,123 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls admin_static %}
+
+{# Admin styling code largely taken from http://www.dmertl.com/blog/?p=116 #}
+
+{% block extrastyle %}
+	{{ block.super }}
+<script type="text/javascript" src="/admin/jsi18n/"></script>
+<script type="text/javascript" src="/static/admin/js/core.js"></script>
+<script type="text/javascript" src="/static/admin/js/admin/RelatedObjectLookups.js"></script>
+<script type="text/javascript" src="/static/admin/js/jquery.js"></script>
+<script type="text/javascript" src="/static/admin/js/jquery.init.js"></script>
+<script type="text/javascript" src="/static/admin/js/actions.js"></script>
+<script type="text/javascript" src="/static/admin/js/calendar.js"></script>
+<script type="text/javascript" src="/static/admin/js/admin/DateTimeShortcuts.js"></script>
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"/>
+    <style>
+    .field-title {min-width: 200px;}
+    .results {margin-bottom: 4em;}
+    </style>
+{% endblock %}
+
+{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
+
+{% block breadcrumbs %}
+    <div class="breadcrumbs">
+        <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+        &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ app_label|capfirst|escape }}</a>
+        &rsaquo; {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">
+        {{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
+        &rsaquo; {% trans 'Upload' %}
+    </div>
+{% endblock %}
+
+{% block content_title %}{% endblock %}
+
+{% block content %}
+	
+<h1>{% trans "Income for the month of" %} {{date|date:"F Y"}}</h1>
+<h2>{% trans "Billed" %}</h2>
+
+
+<div style="float: left; width: 40%">
+<div class="results">
+<table id="result_list">
+<thead>
+<tr>
+
+<th scope="col" class="sortable column-title">
+   <div class="text"><a href="?o=1">Title</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Amount</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Source</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Date Invoiced</a></div>
+   <div class="clear"></div>
+</th>
+</tr>
+</thead>
+<tbody>
+
+{% for gig in billed %}
+
+<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title">{{gig.title}}</th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.invoice_date}}</td></tr>
+{%endfor%}
+<tr class="row2"><th class="field-title">&nbsp;</th><td class="field-status"></td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
+<tr class="row2"><th class="field-title">Total Billed:</th><td class="field-status">${{billed_total.total_payment}}</td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
+</tbody>
+</table>
+</div>
+
+<h2>{% trans "Unbilled" %}</h2>
+<div class="results">
+<table id="result_list_2">
+<thead>
+<tr>
+
+<th scope="col" class="sortable column-title">
+   <div class="text"><a href="?o=1">Title</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Amount</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Source</a></div>
+   <div class="clear"></div>
+</th>
+<th scope="col" class="sortable column-status">
+   <div class="text"><a href="?o=5">Date Invoiced</a></div>
+   <div class="clear"></div>
+</th>
+</tr>
+</thead>
+<tbody>
+
+{% for gig in unbilled %}
+
+<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title">{{gig.title}}</th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.invoice_date}}</td></tr>
+{%endfor%}
+<tr class="row2"><th class="field-title">&nbsp;</th><td class="field-status"></td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
+<tr class="row2"><th class="field-title">Total Billed:</th><td class="field-status">${{unbilled_total.total_payment}}</td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
+</tbody>
+</table>
+</div>
+<h2>{% trans "Total Outstanding:" %} ${{total_outstanding.total_payment}}</h2>
+</div>
+
+<div style="float:left; margin-left: 4em;">
+<h3>{% trans "Income by Month" %}</h3>
+<ul>{% for month in months %}
+<li><a href="?m={{month|date:"Y-m"|slugify}}">{{month|date:"F Y"}}</a></li>
+{%endfor%}</ul>
+</div>
+{% endblock %}
diff --git a/design/templates/admin/index.html b/design/templates/admin/index.html
index cbaa89f..19a5d1b 100644
--- a/design/templates/admin/index.html
+++ b/design/templates/admin/index.html
@@ -41,6 +41,9 @@
                 <td>&nbsp;</td>
             {% endif %}
             </tr>
+            {% if model.name == "Gigs"%}
+            <tr>    <th scope="row"><a href="{{ model.admin_url }}monthly/">Income for month</a></th></tr>
+                {% endif %}
         {% endfor %}
         </table>
         </div>