Added in the new fields for the linked list of panels and updated the…

… input screen. Leaving the Power Source in for now since we won't have time to remove all elements of that before 4.0-release. Also wrote a conversion script to create panels that match the existing sources and set the ParentPanelID on all of the children to point that way. In the next release we'll drop the column from the db and remove the table for PowerSource. #553
opendcim · Mar 28, 2015 · cc6ffc0 · cc6ffc0
1 parent eaf1bee
commit cc6ffc0
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/panelconversion.php b/panelconversion.php
@@ -0,0 +1,15 @@
+<?php
+	require_once( "db.inc.php" );
+	require_once( "facilities.inc.php" );
+
+	$ss = $dbh->prepare( "select * from fac_PowerSource" );
+	$ss->setFetchMode( PDO::FETCH_CLASS, "PowerSource" );
+	$ss->execute();
+
+	$ps = $dbh->prepare( "insert into fac_PowerPanel set PanelLabel=:PanelLabel" );
+	$us = $dbh->prepare( "update fac_PowerPanel set ParentPanelID=:PanelID where PowerSourceID=:SourceID" );
+	while ( $row = $ss->fetch() ) {
+		$ps->execute( array( ":PanelLabel"=>$row->SourceName ));
+		$us->execute( array( ":PanelID"=>$dbh->LastInsertId(), ":SourceID"=>$row->PowerSourceID ) );
+	}
+?>
diff --git a/power.inc.php b/power.inc.php
@@ -1318,7 +1318,7 @@ function MakeSafe(){
 		$this->PanelVoltage=intval($this->PanelVoltage);
 		$this->NumberScheme=($this->NumberScheme=='Sequential')?$this->NumberScheme:'Odd/Even';
 		$this->ParentPanelID=intval($this->ParentPanelID);
-		$this->ParentBreakerID=sanitize($this->ParentBreakerID;
+		$this->ParentBreakerID=sanitize($this->ParentBreakerID);
 	}
 
 	function MakeDisplay(){
@@ -1432,7 +1432,7 @@ function CreatePanel(){
 			":NumberOfPoles"=>$this->NumberOfPoles,
 			":MainBreakerSize"=>$this->MainBreakerSize,
 			":PanelVoltage"=>$this->PanelVoltage,
-			":NumberScheme"=>this->NumberScheme,
+			":NumberScheme"=>$this->NumberScheme,
 			":ParentPanelID"=>$this->ParentPanelID,
 			":ParentBreakerID"=>$this->ParentBreakerID ))){
 			$this->PanelID=$dbh->lastInsertId();

diff --git a/power_panel.php b/power_panel.php
@@ -38,6 +38,8 @@
 		$panel->MainBreakerSize=$_POST["mainbreakersize"];
 		$panel->PanelVoltage=$_POST["panelvoltage"];
 		$panel->NumberScheme=$_POST["numberscheme"];
+		$panel->ParentPanelID=$_POST["parentpanelid"];
+		$panel->ParentBreakerID=$_POST["parentbreakerid"];
 
 		if($_POST["action"]=="Create"){
 			$panel->CreatePanel();
@@ -156,6 +158,24 @@
    </select>
    </div>
 </div>
+<div>
+	<div label for="parentpanelid"><?php print __("Parent Panel"); ?></label></div>
+	<div><select name="parentpanelid" id="parentpanelid">
+<?php
+	foreach ( $panelList as $pnl ) {
+		$selected = $pnl->PanelID == $panel->ParentPanelID ? "selected" : "";
+		// Avoid making medieval royalty - panels that are children of themselves
+		if ( $panel->PanelID != $pnl->PanelID ) {
+			print "<option value='$pnl->PanelID' $selected>$pnl->PanelLabel</option>\n";
+		}
+	}
+?>
+	</select></div>
+</div>
+<div>
+	<div label for="parentbreakerid"><?php print __("Parent Breaker ID"); ?></label></div>
+	<div><input type="text" name="parentbreakerid" id="parentbreakerid" size="40" value="<?php print $panel->ParentBreakerID; ?>"></div>
+</div>	
 <div class="caption">
 <?php
 	if($panel->PanelID >0){

diff --git a/unauthorized.php b/unauthorized.php
@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>Unauthorized</title>
+</head>
+<body>
+<h1>UserID not found in the database for authorized access.  Please contact your site administrator if this is in error.</h1>
+</body>
+</html>