diff --git a/forecasts/models.py b/forecasts/models.py index d9cd618c4b31289e77ac9bdec42ad6b8c3ce38c8..10d896ce40af705cd8571f43570e95c553affbfc 100755 --- a/forecasts/models.py +++ b/forecasts/models.py @@ -232,14 +232,14 @@ class ForecastConfiguration: request_result = None if settings.INCLUDE_ORGANIZATION_IDS == None: - print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( + """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, @@ -251,11 +251,21 @@ class ForecastConfiguration: ) ) else: - request_result = requests.get("%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s" % ( + """print "%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s&from=%s-01-01&to=%s-12-31" % ( + settings.VIPSLOGIC_PROTOCOL, + settings.VIPSLOGIC_SERVER_NAME, + settings.VIPS_ORGANIZATION_ID, + ",".join(str(x) for x in settings.INCLUDE_ORGANIZATION_IDS), + season, + season + )""" + request_result = requests.get("%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s&from=%s-01-01&to=%s-12-31" % ( settings.VIPSLOGIC_PROTOCOL, settings.VIPSLOGIC_SERVER_NAME, settings.VIPS_ORGANIZATION_ID, - ",".join(str(x) for x in settings.INCLUDE_ORGANIZATION_IDS) + ",".join(str(x) for x in settings.INCLUDE_ORGANIZATION_IDS), + season, + season ) ) return request_result