From bf91cd1f5e2af910951f06dc003b685cdc8c4976 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 11 Jun 2019 10:38:30 +0200
Subject: [PATCH] Adding multiple orgs support for forecasts list
---
forecasts/models.py | 46 +++++++++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/forecasts/models.py b/forecasts/models.py
index 42b2a96c..e62bb8fd 100755
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -230,24 +230,34 @@ class ForecastConfiguration:
for crop_organism_id in crop_organism_ids:
crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
- 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,
- settings.VIPSLOGIC_SERVER_NAME,
- settings.VIPS_ORGANIZATION_ID,
- season,
- season,
- crop_organism_id_paramstring
- )
- )
+ request_result = None
+ if settings.INCLUDE_ORGANIZATION_IDS == None:
+ 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,
+ settings.VIPSLOGIC_SERVER_NAME,
+ settings.VIPS_ORGANIZATION_ID,
+ 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
@staticmethod
--
GitLab