diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js index ae22a091dc338e52f1fbbb0e118f677eb145a0f5..81eccbc11b74249245e015061b4acbee6db4ccb4 100755 --- a/VIPSWeb/static/js/frontpage.js +++ b/VIPSWeb/static/js/frontpage.js @@ -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 ) { diff --git a/observations/views.py b/observations/views.py index 3b5e60e615f90aa511b491a10aed7056af5946f2..1591cc104d8a2425d481d6483c8c94cf1460458c 100755 --- a/observations/views.py +++ b/observations/views.py @@ -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