Skip to content
Snippets Groups Projects

Spotit multi org

Merged Tor-Einar Skog requested to merge spotit_multi_org into master
12 files
+ 103
62
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -72,6 +72,7 @@ function cacheObservations(callback)
{
var systemTime = moment().add(settings.systemTimeOffsetMonths,"months");
var from = systemTime.format("YYYY") + "-01-01"; // XXXX-01-01
systemTime.add(1,'days');
var to = systemTime.format("YYYY-MM-DD");
var uuidParam = settings.userUuid != null ? "&userUUID=" + settings.userUuid : "";
//$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) {
@@ -532,7 +533,9 @@ var cachedPois;
function cacheForecastSummaries()
{
//$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId, function( json ) {
$.getJSON( "/vipslogicproxy/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId, function( json ) {
$.getJSON( "/vipslogicproxy/rest/forecastconfigurationsummaries/" + settings.vipsOrganizationId
+ (settings.includeOrganizationIds != null ? "?includeOrganizationIds=" + settings.includeOrganizationIds.join(",") : "")
, function( json ) {
cachedForecastSummaries = json;
cachePrivateForecastSummaries();
Loading