get dates timeperiod updates to work better with local time zones
This commit is contained in:
@@ -100,17 +100,25 @@ smoothingchoices = (
|
||||
(16,16),
|
||||
)
|
||||
|
||||
def half_year_from_now():
|
||||
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=182)).date()
|
||||
def half_year_from_now(ttz=None):
|
||||
if ttz is None:
|
||||
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=182)).date()
|
||||
return (datetime.datetime.utcnow()+timezone.timedelta(days=182)).astimezone(pytz.timezone(ttz)).date()
|
||||
|
||||
def a_week_from_now():
|
||||
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=7)).date()
|
||||
def a_week_from_now(ttz=None):
|
||||
if ttz is None:
|
||||
return (datetime.datetime.now(tz=timezone.utc)+timezone.timedelta(days=7)).date()
|
||||
return (datetime.datetime.utcnow()+timezone.timedelta(days=7)).astimezone(pytz.timezone(ttz)).date()
|
||||
|
||||
def current_day():
|
||||
return (datetime.datetime.now(tz=timezone.utc)).date()
|
||||
def current_day(ttz=None):
|
||||
if ttz is None:
|
||||
return (datetime.datetime.now(tz=timezone.utc)).date()
|
||||
return datetime.datetime.utcnow().astimezone(pytz.timezone(ttz)).date()
|
||||
|
||||
def current_time(): # pragma: no cover
|
||||
return datetime.datetime.now(tz=timezone.utc)
|
||||
def current_time(ttz=None): # pragma: no cover
|
||||
if ttz is None:
|
||||
return datetime.datetime.now(tz=timezone.utc)
|
||||
return (datetime.datetime.utcnow()).astimezone(pytz.timezone(ttz))
|
||||
|
||||
|
||||
class UserFullnameChoiceField(forms.ModelChoiceField):
|
||||
|
||||
Reference in New Issue
Block a user