From 4bd1c3e7260994db4f3ab36cc6bbc3b4ad49cc41 Mon Sep 17 00:00:00 2001
From: Alexandre <146840804+alex001x@users.noreply.github.com>
Date: Wed, 29 Oct 2025 12:02:59 +0100
Subject: [PATCH 1/4] =?UTF-8?q?Add=20feature:=20filtre=20du=20tableau=20?=
 =?UTF-8?q?=C3=A9lectrique=20par=20salle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devices.php | 191 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 139 insertions(+), 52 deletions(-)

diff --git a/devices.php b/devices.php
index 26d2e822d..c1f69d2e5 100644
--- a/devices.php
+++ b/devices.php
@@ -2174,25 +2174,65 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 	</div>
 	<br><span>*'.__("Polling is disabled after three consecutive failures.").'</span>
 </fieldset>
-<fieldset id="cdu" class="hide">
-	<legend>'.__("Power Specifications").'</legend>
-	<div class="table">
-		<div>
-			<div><label for="PanelID">',__("Source Panel"),'</label></div>
-			<div>
-				<select name="PanelID" id="PanelID" >
-					<option value=0>',__("Select Panel"),'</option>';
-
-		$Panel=new PowerPanel();
-		$PanelList=$Panel->getPanelList();
-		foreach($PanelList as $key=>$value){
-			$selected=($value->PanelID == $pdu->PanelID)?' selected':"";
-			print "\n\t\t\t\t\t<option value=\"$value->PanelID\"$selected>$value->PanelLabel</option>\n"; 
-		}
-
-		echo '
-				</select>
-			</div>';
+	<fieldset id="cdu" class="hide">
+		<legend>'.__("Power Specifications").'</legend>
+		<div class="table">
+				<div>
+					<div><label for="PanelFilterScope">',__("Filter Source Panels"),'</label></div>
+					<div>
+						<select id="PanelFilterScope">
+							<option value="all">',__("All Sources"),'</option>
+							<option value="container">',__("Sources in Container"),'</option>
+							<option value="dc">',__("Sources in Data Center"),'</option>
+						</select>
+					</div>
+				</div>
+			<div>
+				<div><label for="PanelID">',__("Source Panel"),'</label></div>
+				<div>
+					<select name="PanelID" id="PanelID" >
+						<option value=0>',__("Select Panel"),'</option>';
+
+			$Panel=new PowerPanel();
+			$PanelList=$Panel->getPanelList();
+			
+			// Build filtered lists for Data Center and Container scopes
+			$PanelDCList=array();
+			$PanelContainerList=array();
+			if(isset($cab) && isset($cab->DataCenterID) && intval($cab->DataCenterID)>0){
+				// Panels associated to this device's Data Center
+				$PanelDCList=$Panel->getPanelsByDataCenter($cab->DataCenterID);
+				
+				// Panels associated to all Data Centers in the same Container
+				$dc=new DataCenter();
+				$dc->DataCenterID=$cab->DataCenterID;
+				if($dc->GetDataCenter()){
+					$containerID=intval($dc->ContainerID);
+					if($containerID>0){
+						$cont=new Container();
+						$cont->ContainerID=$containerID;
+						$dcList=$cont->GetChildDCList();
+						$seen=array(); // de-dup panels by PanelID
+						foreach($dcList as $dcrow){
+							$plist=$Panel->getPanelsByDataCenter($dcrow->DataCenterID);
+							foreach($plist as $pp){
+								if(!isset($seen[$pp->PanelID])){
+									$PanelContainerList[]=$pp;
+									$seen[$pp->PanelID]=true;
+								}
+							}
+						}
+					}
+				}
+			}
+			foreach($PanelList as $key=>$value){
+				$selected=($value->PanelID == $pdu->PanelID)?' selected':"";
+				print "\n\t\t\t\t\t<option value=\"$value->PanelID\"$selected>$value->PanelLabel</option>\n"; 
+			}
+
+			echo '
+					</select>
+				</div>';
 		if($pdu->PanelID >0){
 			print "<div><a href=\"power_panel.php?PanelID=$pdu->PanelID\">[ ".__("Goto Panel")." ]</a></div>\n";
 		}	
@@ -2264,39 +2304,86 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 			<div id="lastread">',$LastRead,'</div>
 		</div>';
 		}
-		echo '
-		<div class="caption">
-			<fieldset class="noborder">
-				<legend>',__("Automatic Transfer Switch"),'</legend>
-				<div class="table centermargin border">
-					<div>
-						<div><label for="failsafe">',__("Fail Safe Switch?"),'</label></div>
-						<div><input type="checkbox" name="failsafe" id="failsafe"',(($pdu->FailSafe)?" checked":""),'></div>
-					</div>
-					<div>
-						<div><label for="PanelID2">',__("Source Panel (Secondary Source)"),'</label></div>
-						<div>
-							<select name="PanelID2" id="PanelID2">
-								<option value=0>',__("Select Panel"),'</option>';
-
-				foreach($PanelList as $key=>$value){
-					if($value->PanelID==$pdu->PanelID2){$selected=" selected";}else{$selected="";}
-					print "\n\t\t\t\t\t\t<option value=$value->PanelID$selected>$value->PanelLabel</option>";
-				}
-
-			echo '
-							</select>
-						</div>
-					</div>
-					<div>
-						<div><label for="PanelPole2">',__("Panel Pole Number (Secondary Source)"),'</label></div>
-						<div><input type="text" name="PanelPole2" id="PanelPole2" size=4 value="',$pdu->PanelPole2,'"></div>
-					</div>
-				</div>
-			</fieldset>
-		</div>
-	</div>
-</fieldset>
+			echo '
+				<div class="caption">
+					<fieldset class="noborder">
+						<legend>',__("Automatic Transfer Switch"),'</legend>
+						<div class="table centermargin border">
+							<div>
+								<div><label for="failsafe">',__("Fail Safe Switch?"),'</label></div>
+								<div><input type="checkbox" name="failsafe" id="failsafe"',(($pdu->FailSafe)?" checked":""),'></div>
+							</div>
+							<div>
+								<div><label for="PanelID2">',__("Source Panel (Secondary Source)"),'</label></div>
+								<div>
+									<select name="PanelID2" id="PanelID2">
+										<option value=0>',__("Select Panel"),'</option>';
+
+					foreach($PanelList as $key=>$value){
+						if($value->PanelID==$pdu->PanelID2){$selected=" selected";}else{$selected="";}
+						print "\n\t\t\t\t\t\t<option value=$value->PanelID$selected>$value->PanelLabel</option>";
+					}
+
+				echo '
+								</select>
+							</div>
+						</div>
+						<div>
+							<div><label for="PanelPole2">',__("Panel Pole Number (Secondary Source)"),'</label></div>
+							<div><input type="text" name="PanelPole2" id="PanelPole2" size=4 value="',$pdu->PanelPole2,'"></div>
+						</div>
+					</div>
+				</fieldset>
+			</div>
+				<div id="paneltemplates" class="hide">
+					<select id="allPanelsTemplate">';
+						foreach($PanelList as $key=>$value){
+							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+						}
+				echo '
+					</select>
+					<select id="containerPanelsTemplate">';
+						foreach($PanelContainerList as $key=>$value){
+							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+						}
+				echo '
+					</select>
+					<select id="dcPanelsTemplate">';
+						foreach($PanelDCList as $key=>$value){
+							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+						}
+				echo '
+					</select>
+				</div>
+				<script>
+				jQuery(function($){
+					function refillSelect(sel, tpl){
+						var current=$(sel).val();
+						var $tmpl=$(tpl);
+						var $sel=$(sel);
+						var defaultText=$('#PanelID option:first').text() || 'Select Panel';
+						$sel.empty();
+						$sel.append($('<option>').attr('value',0).text(defaultText));
+						$sel.append($tmpl.children().clone());
+						if(current && $sel.find('option[value="'+current+'"]').length){
+							$sel.val(current);
+						}else{
+							$sel.val('0');
+						}
+					}
+					// Scope selection: All / Container / Data Center
+					$('#PanelFilterScope').change(function(){
+						var scope=$(this).val();
+						var tpl='#allPanelsTemplate';
+						if(scope==='container'){ tpl='#containerPanelsTemplate'; }
+						if(scope==='dc'){ tpl='#dcPanelsTemplate'; }
+						refillSelect('#PanelID', tpl);
+						refillSelect('#PanelID2', tpl);
+					}).trigger('change');
+				});
+				</script>
+		</div>
+	</fieldset>
 <fieldset id="firstport" class="hide">
 	<legend>'.__("Switch SNMP").'</legend>
 	<div><p>'.__("Use these buttons to set the first port for the switch, check the status of the ports again, or attempt to load the Port Name Labels from the switch device.").'</p><button type="button" name="firstport">'.__("Set First Port").'</button><button type="button" name="refresh">'.__("Refresh Status").'</button><button type="button" name="name">'.__("Refresh Port Names").'</button><button type="button" name="Notes">'.__("Refresh Port Notes").'</button></div>

From f17fa8831a5c8986eb3cb289ee763430e2ecaf34 Mon Sep 17 00:00:00 2001
From: Alexandre <146840804+alex001x@users.noreply.github.com>
Date: Wed, 29 Oct 2025 16:13:55 +0100
Subject: [PATCH 2/4] =?UTF-8?q?Add=20feature:=20filtre=20du=20tableau=20?=
 =?UTF-8?q?=C3=A9lectrique=20par=20salle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 before_block.txt | 27 +++++++++++++++++++++++++++
 devices.php      | 28 ++++++++++++++--------------
 temp_snippet.txt | 19 +++++++++++++++++++
 3 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 before_block.txt
 create mode 100644 temp_snippet.txt

diff --git a/before_block.txt b/before_block.txt
new file mode 100644
index 000000000..6b822775a
--- /dev/null
+++ b/before_block.txt
@@ -0,0 +1,27 @@
+				jQuery(function($){
+					function refillSelect(sel, tpl){
+						var current=$(sel).val();
+						var $tmpl=$(tpl);
+						var $sel=$(sel);
+						var defaultText=$('#PanelID option:first').text() || 'Select Panel';
+						$sel.empty();
+						$sel.append($('<option>').attr('value',0).text(defaultText));
+						$sel.append($tmpl.children().clone());
+						if(current && $sel.find('option[value="'+current+'"]').length){
+							$sel.val(current);
+						}else{
+							$sel.val('0');
+						}
+					}
+					// Scope selection: All / Container / Data Center
+					$('#PanelFilterScope').change(function(){
+						var scope=$(this).val();
+						var tpl='#allPanelsTemplate';
+						if(scope==='container'){ tpl='#containerPanelsTemplate'; }
+						if(scope==='dc'){ tpl='#dcPanelsTemplate'; }
+						refillSelect('#PanelID', tpl);
+						refillSelect('#PanelID2', tpl);
+					}).trigger('change');
+				});
+				</script>
+		</div>
diff --git a/devices.php b/devices.php
index c1f69d2e5..9574ab8e6 100644
--- a/devices.php
+++ b/devices.php
@@ -2360,26 +2360,26 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 					function refillSelect(sel, tpl){
 						var current=$(sel).val();
 						var $tmpl=$(tpl);
-						var $sel=$(sel);
-						var defaultText=$('#PanelID option:first').text() || 'Select Panel';
-						$sel.empty();
-						$sel.append($('<option>').attr('value',0).text(defaultText));
-						$sel.append($tmpl.children().clone());
-						if(current && $sel.find('option[value="'+current+'"]').length){
+							var $sel=$(sel);
+							var defaultText=$("#PanelID option:first").text() || "Select Panel";
+							$sel.empty();
+							$sel.append($("<option>").attr("value",0).text(defaultText));
+							$sel.append($tmpl.children().clone());
+							if(current && $sel.find("option[value=\""+current+"\"]").length){
 							$sel.val(current);
 						}else{
-							$sel.val('0');
+								$sel.val("0");
 						}
 					}
 					// Scope selection: All / Container / Data Center
-					$('#PanelFilterScope').change(function(){
+						$("#PanelFilterScope").change(function(){
 						var scope=$(this).val();
-						var tpl='#allPanelsTemplate';
-						if(scope==='container'){ tpl='#containerPanelsTemplate'; }
-						if(scope==='dc'){ tpl='#dcPanelsTemplate'; }
-						refillSelect('#PanelID', tpl);
-						refillSelect('#PanelID2', tpl);
-					}).trigger('change');
+							var tpl="#allPanelsTemplate";
+							if(scope==="container"){ tpl="#containerPanelsTemplate"; }
+							if(scope==="dc"){ tpl="#dcPanelsTemplate"; }
+							refillSelect("#PanelID", tpl);
+							refillSelect("#PanelID2", tpl);
+						}).trigger("change");
 				});
 				</script>
 		</div>
diff --git a/temp_snippet.txt b/temp_snippet.txt
new file mode 100644
index 000000000..8f25ac37b
--- /dev/null
+++ b/temp_snippet.txt
@@ -0,0 +1,19 @@
+						$sel.empty();
+						$sel.append($('<option>').attr('value',0).text(defaultText));
+						$sel.append($tmpl.children().clone());
+						if(current && $sel.find('option[value="'+current+'"]').length){
+							$sel.val(current);
+						}else{
+							$sel.val('0');
+						}
+					}
+					// Scope selection: All / Container / Data Center
+					$('#PanelFilterScope').change(function(){
+						var scope=$(this).val();
+						var tpl='#allPanelsTemplate';
+						if(scope==='container'){ tpl='#containerPanelsTemplate'; }
+						if(scope==='dc'){ tpl='#dcPanelsTemplate'; }
+						refillSelect('#PanelID', tpl);
+						refillSelect('#PanelID2', tpl);
+					}).trigger('change');
+				});

From e301de098670c72253b9cfcca313afd5871e8ca3 Mon Sep 17 00:00:00 2001
From: Alexandre <146840804+alex001x@users.noreply.github.com>
Date: Wed, 29 Oct 2025 16:53:26 +0100
Subject: [PATCH 3/4] =?UTF-8?q?Add=20feature:=20filtre=20du=20tableau=20?=
 =?UTF-8?q?=C3=A9lectrique=20par=20salle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devices.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devices.php b/devices.php
index 9574ab8e6..961723332 100644
--- a/devices.php
+++ b/devices.php
@@ -2200,8 +2200,8 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 			$PanelDCList=array();
 			$PanelContainerList=array();
 			if(isset($cab) && isset($cab->DataCenterID) && intval($cab->DataCenterID)>0){
-				// Panels associated to this device's Data Center
-				$PanelDCList=$Panel->getPanelsByDataCenter($cab->DataCenterID);
+					// Panels associated to this device's Data Center (by MapDataCenterID)
+					$PanelDCList=$Panel->getPanelsForMap($cab->DataCenterID);
 				
 				// Panels associated to all Data Centers in the same Container
 				$dc=new DataCenter();
@@ -2214,7 +2214,7 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 						$dcList=$cont->GetChildDCList();
 						$seen=array(); // de-dup panels by PanelID
 						foreach($dcList as $dcrow){
-							$plist=$Panel->getPanelsByDataCenter($dcrow->DataCenterID);
+							$plist=$Panel->getPanelsForMap($dcrow->DataCenterID);
 							foreach($plist as $pp){
 								if(!isset($seen[$pp->PanelID])){
 									$PanelContainerList[]=$pp;

From f6f405a41a33e1d171c70306b8e159cd9bc00d59 Mon Sep 17 00:00:00 2001
From: Alexandre <146840804+alex001x@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:18:37 +0100
Subject: [PATCH 4/4] =?UTF-8?q?Add=20feature:=20filtre=20du=20tableau=20?=
 =?UTF-8?q?=C3=A9lectrique=20par=20salle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 devices.php | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/devices.php b/devices.php
index 961723332..b136a29ee 100644
--- a/devices.php
+++ b/devices.php
@@ -2225,10 +2225,13 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 					}
 				}
 			}
-			foreach($PanelList as $key=>$value){
-				$selected=($value->PanelID == $pdu->PanelID)?' selected':"";
-				print "\n\t\t\t\t\t<option value=\"$value->PanelID\"$selected>$value->PanelLabel</option>\n"; 
-			}
+				foreach($PanelList as $key=>$value){
+					$label=trim($value->PanelLabel);
+					if(intval($value->PanelID)>0 && $label!=''){
+						$selected=($value->PanelID == $pdu->PanelID)?' selected':"";
+						print "\n\t\t\t\t\t<option value=\"$value->PanelID\"$selected>$value->PanelLabel</option>\n"; 
+					}
+				}
 
 			echo '
 					</select>
@@ -2320,8 +2323,11 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 										<option value=0>',__("Select Panel"),'</option>';
 
 					foreach($PanelList as $key=>$value){
-						if($value->PanelID==$pdu->PanelID2){$selected=" selected";}else{$selected="";}
-						print "\n\t\t\t\t\t\t<option value=$value->PanelID$selected>$value->PanelLabel</option>";
+						$label=trim($value->PanelLabel);
+						if(intval($value->PanelID)>0 && $label!=''){
+							if($value->PanelID==$pdu->PanelID2){$selected=" selected";}else{$selected="";}
+							print "\n\t\t\t\t\t\t<option value=$value->PanelID$selected>$value->PanelLabel</option>";
+						}
 					}
 
 				echo '
@@ -2338,19 +2344,28 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 				<div id="paneltemplates" class="hide">
 					<select id="allPanelsTemplate">';
 						foreach($PanelList as $key=>$value){
-							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							$label=trim($value->PanelLabel);
+							if(intval($value->PanelID)>0 && $label!=''){
+								print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							}
 						}
 				echo '
 					</select>
 					<select id="containerPanelsTemplate">';
 						foreach($PanelContainerList as $key=>$value){
-							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							$label=trim($value->PanelLabel);
+							if(intval($value->PanelID)>0 && $label!=''){
+								print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							}
 						}
 				echo '
 					</select>
 					<select id="dcPanelsTemplate">';
 						foreach($PanelDCList as $key=>$value){
-							print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							$label=trim($value->PanelLabel);
+							if(intval($value->PanelID)>0 && $label!=''){
+								print "\n\t\t\t\t\t\t<option value=\"$value->PanelID\">$value->PanelLabel</option>";
+							}
 						}
 				echo '
 					</select>