From f57731abf206bf3030a7a95a9019aa398c3dea2e Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 3 Dec 2018 19:03:24 +0100
Subject: [locationinfo] add new settings for panels (counter, updaterate) -
 setting: consider only clients in roomplaner, instead of ip range - add
 option to set update rate in summary panels - directly initialize when mode
 is "only calendar" - Set counter to "-" if room has ongoing event - fix some
 spelling / unused code

---
 .../locationinfo/templates/frontend-default.html   | 25 ++++++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'modules-available/locationinfo/templates/frontend-default.html')

diff --git a/modules-available/locationinfo/templates/frontend-default.html b/modules-available/locationinfo/templates/frontend-default.html
index d1ecaae8..7317f8e2 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -619,6 +619,11 @@ optional:
 			generateProgressBar();
 		}
 
+		// Manually initialize mode 2, as initRoomLayout isn't called for this mode
+		if (room.config.mode === 2) {
+			queryCalendars();
+			queryRooms();
+		}
 		mainUpdateLoop();
 		setInterval(mainUpdateLoop, 10000);
 		setInterval(updateHeaders, globalConfig.eco ? 10000 : 1000);
@@ -1116,12 +1121,11 @@ optional:
 	 * @param room Room
 	 */
 	function SetFreeSeats(room) {
-		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '');
+		// if room has no allowed value, set text in the box to -
+		room.$.seatsCounter.text(room.freePcs >= 0 ? room.freePcs : '-');
 		room.$.seatsCounter.data('state', JSON.stringify(room.state));
 		if (room.freePcs > 0 && room.state && room.state.free) {
-				room.$.seatsBackground.css('background-color', '#250');
-		} else if (room.freePcs === -1) {
-			room.$.seatsBackground.css('background-color', 'red');
+			room.$.seatsBackground.css('background-color', '#250');
 		} else {
 			room.$.seatsBackground.css('background-color', 'red');
 		}
@@ -1148,7 +1152,8 @@ optional:
 			if (!same) newText = t("closed");
 		} else if (tmp.state === "CalendarEvent") {
 			if (!same) newText = tmp.title;
-			seats = -1;
+			// whilst event is running set freePcs to -, hopefully not breaking anything else with this
+			room.freePcs = "-";
 		} else if (tmp.state === "Free") {
 			if (!same) newText = t("free");
 		} else if (tmp.state === "FreeNoEnd") {
@@ -1496,8 +1501,14 @@ optional:
 		for (var i = 0; i < update.length; i++) {
 			var $div = $("#pc_" + room.id + "_" + update[i].id);
 			// Pc free
-			if (update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") {
-				freePcs++;
+			if (room.config.roomplaner === true) {
+				if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) {
+					freePcs++;
+				}
+			} else {
+				if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY")) {
+					freePcs++;
+				}
 			}
 
 			$div.removeClass('BROKEN OFFLINE IDLE OCCUPIED STANDBY'.replace(update[i].pcState, '')).addClass(update[i].pcState);
-- 
cgit v1.2.3-55-g7522