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-22 03:45:36 +00:00
parent 587dc057c9
commit bb96ac583b
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,12 +265,17 @@ function retrievePortPath(objID, objFace, partitionDepth, portID){
if($(response.error).size() > 0) { if($(response.error).size() > 0) {
displayError(response.error); displayError(response.error);
} else { } else {
// Display divergent path warning if necessary
if(response.data.pathDiverges) { if(response.data.pathDiverges) {
$('#warningPathDiverges').show(); $('#warningPathDiverges').show();
} else { } else {
$('#warningPathDiverges').hide(); $('#warningPathDiverges').hide();
} }
// Render path diagram
$('#containerFullPath').html(response.success); $('#containerFullPath').html(response.success);
makeCableConnectorsClickable(); makeCableConnectorsClickable();
drawPath(); drawPath();
} }
@ -940,6 +945,8 @@ $( document ).ready(function() {
return false; return false;
} }
var tipObj = $('<span>&nbsp;</span><i class="ion-help-circled" data-toggle="tooltip" data-placement="right" title="Ctrl-Click or Shift-Click to select multiple ports when representing breakout cables."></i>');
var modalTitle = $(this).attr('data-modalTitle'); var modalTitle = $(this).attr('data-modalTitle');
var objectID = $(document).data('clickedObjID'); var objectID = $(document).data('clickedObjID');
var objectFace = $(document).data('clickedObjFace'); var objectFace = $(document).data('clickedObjFace');
@ -950,6 +957,8 @@ $( document ).ready(function() {
$('#objTree').jstree(true).refresh(); $('#objTree').jstree(true).refresh();
$('#alertMsgObjTree').empty(); $('#alertMsgObjTree').empty();
$('#objectTreeModalLabel').html(modalTitle); $('#objectTreeModalLabel').html(modalTitle);
$('#objectTreeModalLabel').append(tipObj);
$('#objectTreeModalLabel').children().tooltip();
$('#objectTreeModal').modal('show'); $('#objectTreeModal').modal('show');
}); });

22
assets/pages/jquery.scan.js
View File

@ -54,14 +54,24 @@ function destroyEditables(){
function buildFullPath(localConnectorCode39){ function buildFullPath(localConnectorCode39){
var data = {connectorCode39: localConnectorCode39}; var data = {connectorCode39: localConnectorCode39};
data = JSON.stringify(data); data = JSON.stringify(data);
$.post('backend/retrieve_path_full.php', {'data':data}).done(function(response){ $.post('backend/retrieve_path_full.php', {'data':data}).done(function(responseJSON){
var responseJSON = JSON.parse(response); var response = JSON.parse(responseJSON);
if (responseJSON.active == 'inactive'){ if (response.active == 'inactive'){
window.location.replace('/app/login.php'); window.location.replace('/app/login.php');
} else if ($(responseJSON.error).size() > 0){ } else if ($(response.error).size() > 0){
displayError(responseJSON.error); displayError(response.error);
} else { } else {
$('#containerFullPath').html(responseJSON.success);
// Display divergent path warning if necessary
if(response.data.pathDiverges) {
$('#warningPathDiverges').show();
} else {
$('#warningPathDiverges').hide();
}
// Render path diagram
$('#containerFullPath').html(response.success);
drawPath(); drawPath();
$('.cableArrow').on('click', function(){ $('.cableArrow').on('click', function(){
var data = {codeResult: {code: $(this).attr('data-Code39')}}; var data = {codeResult: {code: $(this).attr('data-Code39')}};

5
explore.php
View File

@ -12,6 +12,8 @@ $qls->Security->check_auth_page('user.php');
<link href="assets/css/style-object.css" rel="stylesheet" type="text/css"/> <link href="assets/css/style-object.css" rel="stylesheet" type="text/css"/>
<link href="assets/css/style-templates.css" rel="stylesheet" type="text/css"/> <link href="assets/css/style-templates.css" rel="stylesheet" type="text/css"/>
<link href="assets/plugins/bootstrap-tagsinput/css/bootstrap-tagsinput.css" rel="stylesheet"/>
<!-- X-editable css --> <!-- X-editable css -->
<link type="text/css" href="assets/plugins/x-editable/css/bootstrap-editable.css" rel="stylesheet"> <link type="text/css" href="assets/plugins/x-editable/css/bootstrap-editable.css" rel="stylesheet">
@ -303,6 +305,9 @@ $qls->Security->check_auth_page('user.php');
<script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.8/jstree.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jstree/3.3.8/jstree.min.js"></script>
<script src="assets/pages/jquery.explore.js"></script> <script src="assets/pages/jquery.explore.js"></script>
<!-- Tags Input -->
<script src="assets/plugins/bootstrap-tagsinput/js/bootstrap-tagsinput.js"></script>
<!-- XEditable Plugin --> <!-- XEditable Plugin -->
<script src="assets/plugins/moment/moment.js"></script> <script src="assets/plugins/moment/moment.js"></script>
<script type="text/javascript" src="assets/plugins/x-editable/js/bootstrap-editable.min.js"></script> <script type="text/javascript" src="assets/plugins/x-editable/js/bootstrap-editable.min.js"></script>

2
templates.php
View File

@ -48,7 +48,7 @@ require_once './includes/content-templates.php';
<!-- Category --> <!-- Category -->
<fieldset class="form-group"> <fieldset class="form-group">
<label>Category <i class="ion-help-circled" data-toggle="tooltip" data-placement="right" title="Group and color code objects."></i></label> <label>Category <i class="ion-help-circled" data-toggle="tooltip" data-placement="right" title="Group templates and assign color code."></i></label>
<div class="input-group" style="display:flex;"> <div class="input-group" style="display:flex;">
<!-- Category select input --> <!-- Category select input -->
<div> <div>