X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/28cb104054903726b0556222929f8f2e9941882d..62d83af2cafb15b3940311cf305a30d489909d95:/apps/funding/views.py

diff --git a/apps/funding/views.py b/apps/funding/views.py
index f54316208..3ea68b5f3 100644
--- a/apps/funding/views.py
+++ b/apps/funding/views.py
@@ -4,8 +4,9 @@
 #
 from django.conf import settings
 from django.core.urlresolvers import reverse
+from django.http import Http404
 from django.shortcuts import redirect, get_object_or_404
-from django.views.generic import TemplateView, FormView, DetailView
+from django.views.generic import TemplateView, FormView, DetailView, ListView
 from .forms import DummyForm
 from .models import Offer, Spent
 
@@ -21,7 +22,7 @@ def mix(*streams):
         else:
             substreams.append([read_date(item), item, iterstream, read_date, tag])
     while substreams:
-        i, substream = max(enumerate(substreams), key=lambda x: x[0])
+        i, substream = max(enumerate(substreams), key=lambda x: x[1][0])
         yield substream[4], substream[1]
         try:
             item = next(substream[2])
@@ -41,12 +42,21 @@ class WLFundView(TemplateView):
                 if tag == 'spent':
                     total += e.amount
                 else:
-                    total -= e.sum()
+                    total -= e.wlfund
                 yield tag, e
 
         ctx = super(WLFundView, self).get_context_data()
-        offers = [o for o in Offer.objects.all() if o.state() == 'lose' and o.sum()]
-        amount = sum(o.sum() for o in offers) - sum(o.amount for o in Spent.objects.all())
+        offers = []
+        for o in Offer.objects.all():
+            if o.state() == 'lose':
+                o.wlfund = o.sum()
+                if o.wlfund > 0:
+                    offers.append(o)
+            elif o.state() == 'win':
+                o.wlfund = o.sum() - o.target
+                if o.wlfund > 0:
+                    offers.append(o)
+        amount = sum(o.wlfund for o in offers) - sum(o.amount for o in Spent.objects.all())
         print offers
 
         ctx['amount'] = amount
@@ -61,8 +71,13 @@ class OfferDetailView(FormView):
     form_class = DummyForm
     template_name = "funding/offer_detail.html"
 
-    def dispatch(self, request, slug):
-        self.object = get_object_or_404(Offer.public(), slug=slug)
+    def dispatch(self, request, slug=None):
+        if slug:
+            self.object = get_object_or_404(Offer.public(), slug=slug)
+        else:
+            self.object = Offer.current()
+            if self.object is None:
+                raise Http404
         return super(OfferDetailView, self).dispatch(request, slug)
 
     def get_form(self, form_class):
@@ -74,6 +89,8 @@ class OfferDetailView(FormView):
     def get_context_data(self, *args, **kwargs):
         ctx = super(OfferDetailView, self).get_context_data(*args, **kwargs)
         ctx['object'] = self.object
+        if self.object.is_current():
+            ctx['funding_no_show_current'] = True
         return ctx
 
     def form_valid(self, form):
@@ -81,6 +98,15 @@ class OfferDetailView(FormView):
         return redirect(reverse("funding_thanks"))
 
 
+class OfferListView(ListView):
+    queryset = Offer.public()
+
+    def get_context_data(self, *args, **kwargs):
+        ctx = super(OfferListView, self).get_context_data(*args, **kwargs)
+        ctx['funding_no_show_current'] = True
+        return ctx
+
+
 class ThanksView(TemplateView):
     template_name = "funding/thanks.html"