summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2015-11-20 22:08:30 -0500
committerluxagraf <sng@luxagraf.net>2015-11-20 22:08:30 -0500
commit84f8428a929b33c3e88214901f53a0f302d69be6 (patch)
tree7018dab06de4e23a604d22df037c2c16eb68a57c /app
parent9412a3793b298daa14179c4f3789fe3ffc46ecba (diff)
added budget totals and prospects to monthly income views
Diffstat (limited to 'app')
-rw-r--r--app/TODO2
-rw-r--r--app/income/admin.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/app/TODO b/app/TODO
index ed6720c..6a32a83 100644
--- a/app/TODO
+++ b/app/TODO
@@ -16,8 +16,6 @@ revamp notes to be like my own personal instagram
income app:
-- Add pitched stories as possibilities below total, t
-- show totals alongside how much we need to live.
- add pay_turnaround field for each publisher and show in admin
---
diff --git a/app/income/admin.py b/app/income/admin.py
index 02c01ef..c4e858a 100644
--- a/app/income/admin.py
+++ b/app/income/admin.py
@@ -60,6 +60,11 @@ class GigAdmin(OSMGeoAdmin):
created__month=month,
status__in=[1, 2, 3]
)
+ context['pitched'] = self.model.objects.filter(
+ created__year=year,
+ created__month=month,
+ status=0
+ )
context['date'] = datetime.datetime.now()
context['billed'] = qs.filter(payment_status=1)
context['billed_total'] = qs.filter(payment_status=1).aggregate(total_payment=Sum('payment'))