From 99ae0bdb3b663b2a3c222b7a6413c742f0151dd3 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 6 Dec 2016 19:19:28 +0100 Subject: [roomplanner] Show if PC is already placed in another room --- modules-available/roomplanner/clientscript.js | 13 +++++++++---- modules-available/roomplanner/inc/pvsgenerator.inc.php | 3 +++ modules-available/roomplanner/page.inc.php | 16 ++++++++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js index 4380b16c..cc149392 100644 --- a/modules-available/roomplanner/clientscript.js +++ b/modules-available/roomplanner/clientscript.js @@ -20,14 +20,19 @@ function renderMachineEntry(item, escape) { // console.log(placedMachines); var isUsed = $.inArray(item.machineuuid, placedMachines) > -1; - var extra = isUsed ? ' used ' : ''; + var extraClass = ''; + var extraText = ''; if (isUsed) { - console.log('rendering used'); + extraText = ' (already placed)'; + extraClass = 'used'; + } else if (item.otherroom) { + extraText = ' (in ' + item.otherroom + ')'; + extraClass = 'used'; } - return '
UUID: | ' + escape(item.machineuuid) + ' |
MAC: | ' + escape(item.macaddr) + ' |