diff --git a/forecasts/models.py b/forecasts/models.py index a6a55e54b806303a9b84dca2281f946440b10df1..1e5f71d08df68040107fd36349826429ff5606fb 100755 --- a/forecasts/models.py +++ b/forecasts/models.py @@ -229,6 +229,15 @@ 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, @@ -527,7 +536,3 @@ class ModelGraphParameter(models.Model): def __unicode__(self): return self.model_id + "/" + self.resultparameter.getNamespaceKey() - - - - diff --git a/forecasts/static/forecasts/js/forecasts.js b/forecasts/static/forecasts/js/forecasts.js index 8fa517a12e5d72ffe339c0b3a4dd5fd3f8d5ab3b..7853faa1a9294c8943b8a038fa3cd5e81db89735 100755 --- a/forecasts/static/forecasts/js/forecasts.js +++ b/forecasts/static/forecasts/js/forecasts.js @@ -45,8 +45,8 @@ Organism.prototype.getLocalName = function(languageCode) var PointOfInterest = function(pJSON) { - this.pointOfInterestId = pJSON.pointOfInterestId; - this.name = pJSON.name; + this.pointOfInterestId = pJSON != null ? pJSON.pointOfInterestId : -1; + this.name = pJSON != null ? pJSON.name : ""; }; // Defining the forecast configuration object