fundgoal: Display time remaining in progressbar.

This commit is contained in:
Brett Smith 2019-01-08 17:59:23 -05:00
parent e13bc9400c
commit 742850eaf9
2 changed files with 24 additions and 2 deletions

View file

@ -1,6 +1,16 @@
from datetime import datetime as DateTime
from pytz import utc as UTC
import conservancy.settings
from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal
SITE_FUNDGOAL = 'cy2018-end-year-match'
# FIXME: Move this information into the model.
FUNDGOAL_ENDTIMES = {
# End of 2019-01-15 AOE is 2019-01-16 noon UTC.
'cy2018-end-year-match': DateTime(2019, 1, 16, 12, tzinfo=UTC),
}
def fundgoal_lookup(fundraiser_sought):
try:
return FundraisingGoal.objects.get(fundraiser_code_name=fundraiser_sought)
@ -9,7 +19,10 @@ def fundgoal_lookup(fundraiser_sought):
return None
def sitefundraiser(request):
return {'sitefundgoal': fundgoal_lookup('cy2018-end-year-match') }
return {
'sitefundgoal': fundgoal_lookup(SITE_FUNDGOAL),
'sitefundgoal_timeleft': FUNDGOAL_ENDTIMES[SITE_FUNDGOAL] - DateTime.now(UTC),
}
if conservancy.settings.FORCE_CANONICAL_HOSTNAME:
_HOST_URL_VAR = {'host_url': 'https://' + conservancy.settings.FORCE_CANONICAL_HOSTNAME}

View file

@ -71,7 +71,16 @@ this_match_remaining: this_match_goal - this_match_so_far
Thanks to {{ sitegoal.fundraiser_donation_count|intcomma }} Supporters we earned our full match! Help us go further to stand up for software
freedom &mdash; <a href="/supporter">sign up now</a>!
{% else %}
The next ${{ this_match_remaining|floatformat:0|intcomma }} of support we receive will be matched thanks to Private Internet Access and a group of generous donors, including {{ sitefundgoal.random_providers }}! <a href="/supporter/">Support Conservancy today!</a>
{% if sitefundgoal_timeleft.total_seconds <= 0 %}
The
{% elif sitefundgoal_timeleft.days == 0 %}
Through today only, the
{% elif sitefundgoal_timeleft.days == 1 %}
Through tomorrow only, the
{% else %}
For only {{ sitefundgoal_timeleft.days }} more days, the
{% endif %}
next ${{ this_match_remaining|floatformat:0|intcomma }} of support we receive will be matched thanks to Private Internet Access and a group of generous donors, including {{ sitefundgoal.random_providers }}! <a href="/supporter/">Support Conservancy today!</a>
{% endif %}
</p>