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

Bugfix: List of forecasts from previous seasons now work again

parent a7260bae
No related branches found
No related tags found
No related merge requests found
......@@ -231,15 +231,15 @@ class ForecastConfiguration:
crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
request_result = None
if settings.INCLUDE_ORGANIZATION_IDS == None:
print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
if settings.INCLUDE_ORGANIZATION_IDS == None or len(settings.INCLUDE_ORGANIZATION_IDS) == 1:
"""print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPSLOGIC_PROTOCOL,
settings.VIPSLOGIC_SERVER_NAME,
settings.VIPS_ORGANIZATION_ID,
season,
season,
crop_organism_id_paramstring
)
)"""
request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPSLOGIC_PROTOCOL,
......
......@@ -32,6 +32,7 @@ def index(request):
season_range = range(2016, datetime.now().year + 1)
season = int(request.GET.get("season", (datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)).year))
forecast_configurations = ForecastConfiguration.get_forecast_configurations_from_vipslogic(None, season).text
#print forecast_configurations
private_forecast_configurations = None
if request.session.get("user_uuid",None) != None:
private_forecast_configurations = ForecastConfiguration.get_private_forecast_configurations(request.session["user_uuid"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment