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

Adding multiple orgs support for forecasts list

parent b21a74a0
No related branches found
No related tags found
2 merge requests!3Spotit multi org,!2Spotit multi org
...@@ -230,24 +230,34 @@ class ForecastConfiguration: ...@@ -230,24 +230,34 @@ class ForecastConfiguration:
for crop_organism_id in crop_organism_ids: for crop_organism_id in crop_organism_ids:
crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % ( request_result = None
settings.VIPSLOGIC_PROTOCOL, if settings.INCLUDE_ORGANIZATION_IDS == None:
settings.VIPSLOGIC_SERVER_NAME, print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPS_ORGANIZATION_ID, settings.VIPSLOGIC_PROTOCOL,
season, settings.VIPSLOGIC_SERVER_NAME,
season, settings.VIPS_ORGANIZATION_ID,
crop_organism_id_paramstring 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,
settings.VIPSLOGIC_SERVER_NAME, request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPS_ORGANIZATION_ID, settings.VIPSLOGIC_PROTOCOL,
season, settings.VIPSLOGIC_SERVER_NAME,
season, settings.VIPS_ORGANIZATION_ID,
crop_organism_id_paramstring season,
) season,
) crop_organism_id_paramstring
)
)
else:
request_result = requests.get("%s://%s/rest/forecastconfigurationsincludeorgs/%s?includeOrganizationIds=%s" % (
settings.VIPSLOGIC_PROTOCOL,
settings.VIPSLOGIC_SERVER_NAME,
settings.VIPS_ORGANIZATION_ID,
settings.INCLUDE_ORGANIZATION_IDS
)
)
return request_result return request_result
@staticmethod @staticmethod
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment