From 81cca94787b4ac1f240fc446317a7acfa8fa7d25 Mon Sep 17 00:00:00 2001
From: Garrett <garrett.kelly@patchcablemgr.com>
Date: Mon, 28 Dec 2020 04:37:52 +0000
Subject: [PATCH] 0.3.12 - inventoryArray rework complete

---
 assets/pages/jquery.explore.js    | 41 +++----------------------------
 backend/retrieve_port_details.php | 14 +++++++----
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/assets/pages/jquery.explore.js b/assets/pages/jquery.explore.js
index 7adfaab..938dbc5 100755
--- a/assets/pages/jquery.explore.js
+++ b/assets/pages/jquery.explore.js
@@ -303,7 +303,7 @@ function retrievePortOptions(objID, objFace, partitionDepth, portID){
 				$('#checkboxPopulated').prop("disabled", true);
 			}
 			
-			$(document).data('peerPortID', responseJSON.success.peerPortID);
+			$(document).data('peerPortArray', responseJSON.success.peerPortArray);
 		}
 	});
 }
@@ -336,39 +336,6 @@ function processPortSelection(){
 		}
 	});
 	
-	
-	
-/* 	// Retrieve the selected port details
-	$.post('backend/retrieve_port_details.php', {data:data}, function(response){
-		var responseJSON = JSON.parse(response);
-		if($(responseJSON.error).size() > 0) {
-			displayError(responseJSON.error);
-		} else {
-			$('#checkboxPopulated').prop("checked", responseJSON.success.populatedChecked);
-			$('#checkboxPopulated').prop("disabled", responseJSON.success.populatedDisabled);
-		
-			$('#selectPort').html(responseJSON.success.portOptions);
-			
-			if(responseJSON.success.portOptions != '') {
-				$('#selectPort').prop("disabled", false);
-				$('#selectPort').off('change');
-				$('#selectPort').on('change', function(){
-					var portID = parseInt($(this).children('option:selected').val(), 10);
-					$(document).data('clickedObjPortID', portID);
-					processPortSelection();
-					$(document).data('portClickedFlag', true);
-					handlePathFindButton();
-				});
-			} else {
-				$('#selectPort').prop("disabled", true);
-				$('#checkboxPopulated').prop("checked", false);
-				$('#checkboxPopulated').prop("disabled", true);
-			}
-			
-			$(document).data('peerPortID', responseJSON.success.peerPortID);
-		}
-	}); */
-	
 	// Clear selected object data for pathFinder remote object
 	var data = {
 		objID: 0,
@@ -727,7 +694,7 @@ function postProcessCable(){
 			$('#objTree').jstree('deselect_all');
 			$('#objectTreeModal').modal('hide');
 			
-			$(document).data('peerPortID', value);
+			$(document).data('peerPortArray', value);
 		}
 	});
 }
@@ -1180,10 +1147,10 @@ $( document ).ready(function() {
 		}
 	})
 	.on('refresh.jstree', function(){
-		var peerPortID = $(document).data('peerPortID');
+		var peerPortArray = $(document).data('peerPortArray');
 		
 		$('#objTree').jstree('deselect_all');
-		$('#objTree').jstree('select_node', peerPortID);
+		$('#objTree').jstree('select_node', peerPortArray);
 		
 		var selectedNodes = $('#objTree').jstree('get_selected');
 		if(selectedNodes.length) {
diff --git a/backend/retrieve_port_details.php b/backend/retrieve_port_details.php
index 3a5cfba..d11314f 100755
--- a/backend/retrieve_port_details.php
+++ b/backend/retrieve_port_details.php
@@ -27,11 +27,15 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
 		$objType = $template['templateType'];
 		$objFunction = $template['templateFunction'];
 		
+		$peerPortArray = array();
+		
 		// Retrieve peer port ID
-		if($peerData = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort]) {
-			$peerPortID = '4-'.$peerData['id'].'-'.$peerData['face'].'-'.$peerData['depth'].'-'.$peerData['port'];
-		} else {
-			$peerPortID = '';
+		if(isset($qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort])) {
+			$port = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort];
+			foreach($port as $connection) {
+				$peerPortID = '4-'.$connection['id'].'-'.$connection['face'].'-'.$connection['depth'].'-'.$connection['port'];
+				array_push($peerPortArray, $peerPortID);
+			}
 		}
 		
 		// Retrieve trunked state
@@ -86,7 +90,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
 		// Compile response data
 		$returnData = array(
 			'portOptions' => $portOptions,
-			'peerPortID' => $peerPortID,
+			'peerPortArray' => $peerPortArray,
 			'populatedChecked' => $populatedChecked,
 			'populatedDisabled' => $populatedDisabled
 		);