fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some layout experiments.
[wolnelektury.git]
/
apps
/
funding
/
models.py
diff --git
a/apps/funding/models.py
b/apps/funding/models.py
index
8d6fa62
..
de90226
100644
(file)
--- a/
apps/funding/models.py
+++ b/
apps/funding/models.py
@@
-31,7
+31,7
@@
class Offer(models.Model):
ordering = ['-end']
def __unicode__(self):
ordering = ['-end']
def __unicode__(self):
- return u"%s
–
%s" % (self.author, self.title)
+ return u"%s
-
%s" % (self.author, self.title)
def get_absolute_url(self):
return reverse('funding_offer', args=[self.slug])
def get_absolute_url(self):
return reverse('funding_offer', args=[self.slug])
@@
-39,6
+39,17
@@
class Offer(models.Model):
def is_current(self):
return self.start <= date.today() <= self.end
def is_current(self):
return self.start <= date.today() <= self.end
+ def is_win(self):
+ return self.sum() >= self.target
+
+ def remaining(self):
+ if self.is_current():
+ return None
+ if self.is_win():
+ return self.sum() - self.target
+ else:
+ return self.sum()
+
@classmethod
def current(cls):
""" Returns current fundraiser or None. """
@classmethod
def current(cls):
""" Returns current fundraiser or None. """
@@
-76,14
+87,6
@@
class Offer(models.Model):
""" The money gathered. """
return self.funding_payed().aggregate(s=models.Sum('amount'))['s'] or 0
""" The money gathered. """
return self.funding_payed().aggregate(s=models.Sum('amount'))['s'] or 0
- def state(self):
- if self.sum() >= self.target:
- return 'win'
- elif self.start <= date.today() <= self.end:
- return 'running'
- else:
- return 'lose'
-
class Perk(models.Model):
""" A perk offer.
class Perk(models.Model):
""" A perk offer.