Added support for multiple remote middlewares

volkszaehler · Dec 14, 2013 · f117a19 · f117a19
1 parent 4e4a782
commit f117a19
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 22 deletions.
diff --git a/htdocs/frontend/javascripts/entities.js b/htdocs/frontend/javascripts/entities.js
@@ -70,7 +70,6 @@ vz.entities.loadData = function() {
 			queue.push(entity.loadData());
 		}
 	}, true); // recursive!
-
 	return $.when.apply($, queue);
 };
 

diff --git a/htdocs/frontend/javascripts/init.js b/htdocs/frontend/javascripts/init.js
@@ -71,9 +71,20 @@ $(document).ready(function() {
 	// initialize variables
 	vz.middleware.push({ // default middleware
 		url: vz.options.localMiddleware,
+		title: 'Local (default)',
 		public: [ ] // public entities
 		/* capabilities: { } */
 	});
+
+	// remote middleware(s)
+	vz.options.remoteMiddleware.forEach(function(middleware) {
+		vz.middleware.push({
+			url: middleware.url,
+			title: middleware.title,
+			public: [ ] // public entities
+			/* capabilities: { } */
+		});
+	});
 
 	// TODO make language/translation dependent (vz.options.language)
 	vz.options.plot.xaxis.monthNames = vz.options.monthNames;

diff --git a/htdocs/frontend/javascripts/options.js b/htdocs/frontend/javascripts/options.js
@@ -33,6 +33,10 @@ vz.options = {
 	minTimeout: 2000,	// minimum refresh time in ms
 	interval: 24*60*60*1000, // 1 day
 	localMiddleware: '../middleware.php',
+	remoteMiddleware: [{
+		title: 'Volkszaehler Demo',
+		url: 'http://demo.volkszaehler.org/middleware.php'
+	}],
 	monthNames: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
 	dayNames: ['Son', 'Mon', 'Di', 'Mi', 'Do', 'Fr', 'Sam'],
 	lineWidthDefault: 2,

diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
@@ -107,24 +107,25 @@ vz.wui.dialogs.init = function() {
 	$('#entity-add.dialog > div').tabs({
 		activate: function(event, ui) { // lazy loading public entities
 			if (ui.newTab.attr('aria-controls') == 'entity-public') {
-				vz.load({
-					controller: 'entity',
-					success: function(json) {
-						var public = new Array;
-						json.entities.each(function(index, json) {
-							public.push(new Entity(json));
-						});
-
-						public.sort(Entity.compare);
-						vz.middleware[0].public = public;
-
-						$('#entity-public-entity').empty();
-						public.each(function(index, entity) {
-							$('#entity-public-entity').append(
-								$('<option>').html(entity.title).val(entity.uuid).data('entity', entity)
-							);
-						});
-					}
+				// populate MW entities (vz.middleware[0] is the default local)
+				vz.middleware.forEach(function(middleware, idx) {
+					vz.load({
+						controller: 'entity',
+						url: middleware.url,
+						success: function(json) {
+							var public = new Array;
+							json.entities.each(function(index, json) {
+								public.push(new Entity(json));
+							});
+
+							public.sort(Entity.compare);
+							vz.middleware[idx].public = public;
+
+							if (idx == 0) {
+								populateEntities(vz.middleware[idx]);
+							}
+						}
+					});
 				});
 			}
 		}
@@ -144,12 +145,25 @@ vz.wui.dialogs.init = function() {
 
 	// set defaults
 	$('#entity-subscribe-middleware').val(vz.options.localMiddleware);
-	$('#entity-public-middleware').append($('<option>').val(vz.options.localMiddleware).text('Local (default)'));
+	// add middlewares
+	vz.middleware.forEach(function(middleware, idx) {
+		$('#entity-public-middleware').append($('<option>').val(middleware.url).text(middleware.title));
+	});
 	$('#entity-create-middleware').val(vz.options.localMiddleware);
 	$('#entity-subscribe-cookie').attr('checked', 'checked');
 	$('#entity-public-cookie').attr('checked', 'checked');
 
 	// actions
+	$('#entity-public-middleware').change(function() {
+		var title = $('#entity-public-middleware option:selected').text();
+		vz.middleware.forEach(function(middleware) {
+			// populate entities for selected middleware
+			if (middleware.title == title) {
+				populateEntities(middleware);
+			}
+		});
+	});
+
 	$('#entity-subscribe input[type=button]').click(function() {
 		try {
 			var entity = new Entity({
@@ -196,6 +210,17 @@ vz.wui.dialogs.init = function() {
 		}
 	});
 
+	function populateEntities(middleware) {
+		var public = middleware.public;
+
+		$('#entity-public-entity').empty();
+		public.each(function(index, entity) {
+			$('#entity-public-entity').append(
+				$('<option>').html(entity.title).val(entity.uuid).data('entity', entity)
+			);
+		});
+	}
+
 	// show available properties for selected type
 	function addProperties(proplist, className) {
 		proplist.each(function(index, def) {
@@ -253,7 +278,6 @@ vz.wui.dialogs.init = function() {
 	});
 	$('#entity-create select').change();
 
-
 	$('#entity-create form').submit(function() {
 		var def = $('select[name=type] option:selected', this).data('definition');
 		var properties = {};
@@ -319,7 +343,6 @@ vz.wui.zoom = function(from, to) {
 		vz.options.plot.xaxis.min = 0;
 	}
 
-
 	vz.options.plot.yaxes.each(function(i) {
 		vz.options.plot.yaxes[i].max = null; // autoscaling
 		vz.options.plot.yaxes[i].min = 0; // fixed to 0