diff --git a/assets/pages/jquery.explore.js b/assets/pages/jquery.explore.js index 364add6..cac3523 100755 --- a/assets/pages/jquery.explore.js +++ b/assets/pages/jquery.explore.js @@ -265,12 +265,17 @@ function retrievePortPath(objID, objFace, partitionDepth, portID){ if($(response.error).size() > 0) { displayError(response.error); } else { + + // Display divergent path warning if necessary if(response.data.pathDiverges) { $('#warningPathDiverges').show(); } else { $('#warningPathDiverges').hide(); } + + // Render path diagram $('#containerFullPath').html(response.success); + makeCableConnectorsClickable(); drawPath(); } @@ -940,6 +945,8 @@ $( document ).ready(function() { return false; } + var tipObj = $(' '); + var modalTitle = $(this).attr('data-modalTitle'); var objectID = $(document).data('clickedObjID'); var objectFace = $(document).data('clickedObjFace'); @@ -950,6 +957,8 @@ $( document ).ready(function() { $('#objTree').jstree(true).refresh(); $('#alertMsgObjTree').empty(); $('#objectTreeModalLabel').html(modalTitle); + $('#objectTreeModalLabel').append(tipObj); + $('#objectTreeModalLabel').children().tooltip(); $('#objectTreeModal').modal('show'); }); diff --git a/assets/pages/jquery.scan.js b/assets/pages/jquery.scan.js index 6ebafe2..0e5c684 100755 --- a/assets/pages/jquery.scan.js +++ b/assets/pages/jquery.scan.js @@ -54,14 +54,24 @@ function destroyEditables(){ function buildFullPath(localConnectorCode39){ var data = {connectorCode39: localConnectorCode39}; data = JSON.stringify(data); - $.post('backend/retrieve_path_full.php', {'data':data}).done(function(response){ - var responseJSON = JSON.parse(response); - if (responseJSON.active == 'inactive'){ + $.post('backend/retrieve_path_full.php', {'data':data}).done(function(responseJSON){ + var response = JSON.parse(responseJSON); + if (response.active == 'inactive'){ window.location.replace('/app/login.php'); - } else if ($(responseJSON.error).size() > 0){ - displayError(responseJSON.error); + } else if ($(response.error).size() > 0){ + displayError(response.error); } 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(); $('.cableArrow').on('click', function(){ var data = {codeResult: {code: $(this).attr('data-Code39')}}; diff --git a/explore.php b/explore.php index fdbf2f2..0f912d0 100755 --- a/explore.php +++ b/explore.php @@ -11,6 +11,8 @@ $qls->Security->check_auth_page('user.php'); + + @@ -303,6 +305,9 @@ $qls->Security->check_auth_page('user.php'); + + + diff --git a/templates.php b/templates.php index 6c3362e..061c103 100755 --- a/templates.php +++ b/templates.php @@ -48,7 +48,7 @@ require_once './includes/content-templates.php';
- +