fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some minor funding changes.
[wolnelektury.git]
/
apps
/
funding
/
views.py
diff --git
a/apps/funding/views.py
b/apps/funding/views.py
index
05bf398
..
3ea68b5
100644
(file)
--- a/
apps/funding/views.py
+++ b/
apps/funding/views.py
@@
-1,7
+1,12
@@
-# Create your views here.
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from django.conf import settings
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse
+from django.http import Http404
from django.shortcuts import redirect, get_object_or_404
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
from .forms import DummyForm
from .models import Offer, Spent
@@
-17,7
+22,7
@@
def mix(*streams):
else:
substreams.append([read_date(item), item, iterstream, read_date, tag])
while substreams:
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])
yield substream[4], substream[1]
try:
item = next(substream[2])
@@
-37,12
+42,21
@@
class WLFundView(TemplateView):
if tag == 'spent':
total += e.amount
else:
if tag == 'spent':
total += e.amount
else:
- total -= e.
sum()
+ total -= e.
wlfund
yield tag, e
ctx = super(WLFundView, self).get_context_data()
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
print offers
ctx['amount'] = amount
@@
-57,19
+71,26
@@
class OfferDetailView(FormView):
form_class = DummyForm
template_name = "funding/offer_detail.html"
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):
if self.request.method == 'POST':
return form_class(self.object, self.request.POST)
else:
return super(OfferDetailView, self).dispatch(request, slug)
def get_form(self, form_class):
if self.request.method == 'POST':
return form_class(self.object, self.request.POST)
else:
- return form_class(self.object)
+ return form_class(self.object
, initial={'amount': settings.FUNDING_DEFAULT}
)
def get_context_data(self, *args, **kwargs):
ctx = super(OfferDetailView, self).get_context_data(*args, **kwargs)
ctx['object'] = self.object
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):
return ctx
def form_valid(self, form):
@@
-77,6
+98,15
@@
class OfferDetailView(FormView):
return redirect(reverse("funding_thanks"))
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"
class ThanksView(TemplateView):
template_name = "funding/thanks.html"