mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.14

Browse Source
This commit is contained in:
Garrett K 2021-03-19 03:54:20 +00:00
parent 9f4637b596
commit 587dc057c9
6 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/pages/jquery.explore.js
View File

@ -260,12 +260,17 @@ function retrievePortPath(objID, objFace, partitionDepth, portID){
data = JSON.stringify(data);
// Retrieve the selected port's path
$.post('backend/retrieve_path_full.php', {data:data}, function(response){
var responseJSON = JSON.parse(response);
if($(responseJSON.error).size() > 0) {
displayError(responseJSON.error);
$.post('backend/retrieve_path_full.php', {data:data}, function(responseJSON){
var response = JSON.parse(responseJSON);
if($(response.error).size() > 0) {
displayError(response.error);
} else {
$('#containerFullPath').html(responseJSON.success);
if(response.data.pathDiverges) {
$('#warningPathDiverges').show();
} else {
$('#warningPathDiverges').hide();
}
$('#containerFullPath').html(response.success);
makeCableConnectorsClickable();
drawPath();
}

10
backend/process_integration-data-upload.php
View File

@ -1727,7 +1727,7 @@ function validateImportedConnections(&$qls, &$importedConnectionArray, $portArra
}
} else {
$validOneToManyConnection = false;
//$validOneToManyConnection = false;
$port = $portArray[$portNameHash];
$objID = $port['objID'];
@ -1750,7 +1750,7 @@ function validateImportedConnections(&$qls, &$importedConnectionArray, $portArra
$peerTemplate = $qls->App->templateArray[$peerTemplateID];
$peerTemplateFunction = $peerTemplate['templateFunction'];
if($templateFunction == 'Endpoint' and $peerTemplateFunction == 'Endpoint') {
//if($templateFunction == 'Endpoint' and $peerTemplateFunction == 'Endpoint') {
$connection['objID'] = $objID;
$connection['face'] = $face;
$connection['depth'] = $depth;
@ -1759,14 +1759,16 @@ function validateImportedConnections(&$qls, &$importedConnectionArray, $portArra
$connection['peerFace'] = $peerFace;
$connection['peerDepth'] = $peerDepth;
$connection['peerPortID'] = $peerPortID;
$validOneToManyConnection = true;
}
//$validOneToManyConnection = true;
//}
}
/*
if(!$validOneToManyConnection) {
$errMsg = 'PortA on line '.$connection['line'].' of file "'.$connection['fileName'].'" is a duplicate.';
array_push($validate->returnData['error'], $errMsg);
}
*/
}
} else {
if($connection['code39']) {

2
debug-portArray.json
View File

File diff suppressed because one or more lines are too long

22
explore.php
View File

@ -289,27 +289,7 @@ $qls->Security->check_auth_page('user.php');
</blockquote>
</div>
</div>
<div id="pathCardBox" class="card">
<div class="card-header">Path
<span>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-custom dropdown-toggle waves-effect waves-light" data-toggle="dropdown" aria-expanded="false">Actions <span class="m-l-5"><i class="fa fa-cog"></i></span></button>
<div class="dropdown-menu">
<a id="printFullPath" class="dropdown-item" href="#"><i class="ion-map"></i> Print</a>
</div>
</div>
</span>
</div>
<div class="card-block">
<blockquote class="card-blockquote">
<div class="row">
<!-- Canvas for drawing cabinet connections -->
<canvas id="canvasPath" style="z-index:1000;position:absolute; pointer-events:none;"></canvas>
<div id="containerFullPath"></div>
</div>
</blockquote>
</div>
</div>
<?php require_once './includes/content-pathBox.php'; ?>
</div>
</div>
</div>

26
includes/content-pathBox.php Normal file
View File

@ -0,0 +1,26 @@
<div id="pathCardBox" class="card">
<div class="card-header">Path
<span>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-custom dropdown-toggle waves-effect waves-light" data-toggle="dropdown" aria-expanded="false">Actions <span class="m-l-5"><i class="fa fa-cog"></i></span></button>
<div class="dropdown-menu">
<a id="printFullPath" class="dropdown-item" href="#"><i class="ion-map"></i> Print</a>
</div>
</div>
</span>
</div>
<div class="card-block">
<blockquote class="card-blockquote">
<div class="row">
<div id="warningPathDiverges" class="alert alert-warning" style="display:none;" role="alert">
<strong>Warning!</strong> Path diverges in a way that cannot be depicted below. View full path in <a class="alert-link" href="diagram.php" target="_blank" rel="noopener noreferrer">Diagram</a>.
</div>
</div>
<div class="row">
<!-- Canvas for drawing cabinet connections -->
<canvas id="canvasPath" style="z-index:1000;position:absolute; pointer-events:none;"></canvas>
<div id="containerFullPath"></div>
</div>
</blockquote>
</div>
</div>

19
scan.php
View File

@ -128,24 +128,7 @@ $qls->Security->check_auth_page('operator.php');
</div>
<!-- Path -->
<div class="card">
<div class="card-header">Path
<span>
<div class="btn-group pull-right">
<button type="button" class="btn btn-sm btn-custom dropdown-toggle waves-effect waves-light" data-toggle="dropdown" aria-expanded="false">Actions <span class="m-l-5"><i class="fa fa-cog"></i></span></button>
<div class="dropdown-menu">
<a id="printFullPath" class="dropdown-item" href="#"><i class="ion-map"></i> Print</a>
</div>
</div>
</span>
</div>
<div class="card-block">
<blockquote class="card-blockquote">
<canvas id="canvasPath" style="z-index:1000;position:absolute; pointer-events:none;"></canvas>
<div id="containerFullPath"></div>
</blockquote>
</div>
</div>
<?php require_once './includes/content-pathBox.php'; ?>
</div>
</div><!-- end row -->
</div><!-- end card-box -->