From b9f1ef2ed21de96895885af85b60af1928692b87 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 12 Feb 2020 19:51:00 +0100
Subject: [PATCH] Giving season choice for multi org forecast list

---
 forecasts/models.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/forecasts/models.py b/forecasts/models.py
index d9cd618c..10d896ce 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
-- 
GitLab