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

Merge branch 'spotit_multi_org' into 'develop' 

Giving season choice for multi org forecast list

See merge request !4
parents ec5d1eb1 2b949a4a
No related branches found
No related tags found
1 merge request!4Giving season choice for multi org forecast list
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 2 deletions
forecasts/models.py
+ 12
− 2
View file @ b2335157
...@@ -251,11 +251,21 @@ class ForecastConfiguration: ...@@ -251,11 +251,21 @@ class ForecastConfiguration:
) )
) )
else: 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_PROTOCOL,
settings.VIPSLOGIC_SERVER_NAME, settings.VIPSLOGIC_SERVER_NAME,
settings.VIPS_ORGANIZATION_ID, 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
)"""
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),
season,
season
) )
) )
return request_result return request_result
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment