From 609b257e89aecf4c382146ffa2cb4f8eb1e8d168 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 26 Mar 2019 17:18:35 +0100
Subject: [locationinfo] UI rework - add Icons to Buttons - override config for
specific room - change roomplanner switch with dropdown menu - new texts for
roomplanner dropdown - when roomplanner is empty show empty green box instead
of red 0
---
.../locationinfo/templates/frontend-default.html | 33 +++++++++++++---------
1 file changed, 19 insertions(+), 14 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 d4e8109a..7cd52094 100755
--- a/modules-available/locationinfo/templates/frontend-default.html
+++ b/modules-available/locationinfo/templates/frontend-default.html
@@ -592,7 +592,6 @@ optional:
room.$.header = $header;
$loc.append($header);
$header.append('
');
-
if (room.name !== null) {
room.$.locationName.text(room.name);
}
@@ -606,6 +605,15 @@ optional:
if (room.config.mode === 4) {
hasMode4 = true;
}
+ // Manually initialize mode 2, as initRoomLayout isn't called for this mode
+ if (room.config.mode === 2) {
+ var date = MyDate();
+ var now = date.getTime();
+ queryCalendars();
+ queryRooms();
+ lastCalendarUpdate = now;
+ lastRoomUpdate = now;
+ }
SetOpeningTimes(room);
UpdateRoomHeader(room);
@@ -620,15 +628,6 @@ optional:
generateProgressBar();
}
- // Manually initialize mode 2, as initRoomLayout isn't called for this mode
- if (room.config.mode === 2) {
- var date = MyDate();
- var now = date.getTime();
- queryCalendars();
- queryRooms();
- lastCalendarUpdate = now;
- lastRoomUpdate = now;
- }
mainUpdateLoop();
setInterval(mainUpdateLoop, 10000);
setInterval(updateHeaders, globalConfig.eco ? 10000 : 1000);
@@ -1150,10 +1149,11 @@ optional:
* @param room Room
*/
function SetFreeSeats(room) {
- // if room has no allowed value, set text in the box to -
if (!room.numPcs) {
+ // If room has no PCs, empty the counter-box
room.$.seatsCounter.text('\u00A0');
} else if (!room.state.free) {
+ // If room has ongoing event, box text is "-"
room.$.seatsCounter.text('\u2013');
} else {
room.$.seatsCounter.text(room.freePcs);
@@ -1525,14 +1525,19 @@ optional:
return;
}
var freePcs = 0;
+ var numPcs = 0;
for (var i = 0; i < update.length; i++) {
var $div = $("#pc_" + room.id + "_" + update[i].id);
// Pc free
if (room.config.roomplanner === true) {
- if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY") && !isNaN(update[i].x) && !isNaN(update[i].y)) {
- freePcs++;
+ if (!isNaN(update[i].x) && !isNaN(update[i].y)) {
+ numPcs++;
+ if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY")) {
+ freePcs++;
+ }
}
} else {
+ numPcs++;
if ((update[i].pcState === "IDLE" || update[i].pcState === "OFFLINE" || update[i].pcState === "STANDBY")) {
freePcs++;
}
@@ -1541,7 +1546,7 @@ optional:
$div.removeClass('BROKEN OFFLINE IDLE OCCUPIED STANDBY'.replace(update[i].pcState, '')).addClass(update[i].pcState);
}
room.freePcs = freePcs;
- room.numPcs = update.length;
+ room.numPcs = numPcs;
UpdateRoomHeader(room);
}
--
cgit v1.2.3-55-g7522