Skip to content
Snippets Groups Projects
Commit 672cae6f authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Fixing viewing today's observations on frontpage and observations page

parent 14095d91
Branches
No related tags found
1 merge request!2Spotit multi org
......@@ -72,6 +72,7 @@ function cacheObservations(callback)
{
var systemTime = moment().add(settings.systemTimeOffsetMonths,"months");
var from = systemTime.format("YYYY") + "-01-01"; // XXXX-01-01
systemTime.add(1,'days');
var to = systemTime.format("YYYY-MM-DD");
var uuidParam = settings.userUuid != null ? "&userUUID=" + settings.userUuid : "";
//$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) {
......
......@@ -47,7 +47,7 @@ def index(request):
if request.GET.get("to", None) is not None:
date_to = datetime.strptime(request.GET["to"], "%Y-%m-%d")
else:
date_to = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)
date_to = datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS) + relativedelta(days=1)
#date_to = datetime.strptime(request.GET.get("to", "%s-12-31" % (datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)).year),"%Y-%m-%d")
period_days = date_to - date_from
current_day_in_period = (datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)) - date_from
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment