- -

- +

@@ -225,29 +235,40 @@ require_once("$srcdir/expand_contract_inc.php");

+ oeBelowContainerDiv();?> + + + diff --git a/interface/main/tabs/js/user_data_view_model.js b/interface/main/tabs/js/user_data_view_model.js index b32a7cca2..a7a6e6aaa 100644 --- a/interface/main/tabs/js/user_data_view_model.js +++ b/interface/main/tabs/js/user_data_view_model.js @@ -33,24 +33,37 @@ function user_data_view_model(username,fname,lname,authGrp) } -function viewPtFinder() +function viewPtFinder(myMessage, searchAnyType, event) { + event.stopImmediatePropagation; + event.preventDefault; + let srchBox = document.getElementById("anySearchBox"); + var searchAnyType = searchAnyType; + srchBox.focus(); + let finderUrl = webroot_url+"/interface/main/finder/dynamic_finder.php"; - let srchBox = document.getElementById("anySearchBox").value; - if (srchBox) { - finderUrl += "?search_any=" + encodeURIComponent(srchBox); + let srchBoxVal = srchBox.value.trim(); + let srchBoxWidth = srchBox.offsetWidth; + let srchBoxLength = srchBoxWidth < 50 ? 0 : srchBoxVal.length;// to let input box with values be displayed on mousedown on Smartphones + + if (srchBoxLength > 0 ) { + finderUrl += "?search_any=" + encodeURIComponent(srchBoxVal); + navigateTab(finderUrl,"fin", function () { + activateTabByName("fin",true); + }); + srchBox.blur(); + } else if (srchBoxLength == 0 && srchBoxWidth > 50) { + if (searchAnyType == 'dual') { + srchBox.blur(); + navigateTab(finderUrl,"fin", function () { + activateTabByName("fin",true); + }); + } else if (searchAnyType == 'comprehensive') { + alert(arguments[0]); + srchBox.focus(); + } } - navigateTab(finderUrl,"fin", function () { - activateTabByName("fin",true); - }); -} - -function doAnySearch(event) -{ - if (event.which === 13 || event.keyCode === 13) { - document.getElementById("searchFinder").click(); - } - return false; + } function viewTgFinder() diff --git a/interface/main/tabs/main.php b/interface/main/tabs/main.php index 75fa31a13..7d032cdd6 100644 --- a/interface/main/tabs/main.php +++ b/interface/main/tabs/main.php @@ -157,6 +157,7 @@ var jsGlobals = {}; + @@ -246,8 +247,6 @@ $GLOBALS['allow_issue_menu_link'] = ((acl_check('encounters', 'notes', '', 'writ @@ -333,9 +331,9 @@ if (isset($_SESSION['app1'])) {

- " rel="noopener" target="_blank">

+ " rel="noopener" target="_blank">

- +

@@ -343,7 +341,7 @@ if (isset($_SESSION['app1'])) {

- "> + ">

@@ -364,7 +362,6 @@ var displayViewModel = { winHeight: ko.observable(), winDevice: ko.observable(), objWidth: {} - }; displayViewModel.objWidth = ko.computed(function() { @@ -461,6 +458,8 @@ $(function() { }); ko.bindingHandlers['css2'] = ko.bindingHandlers.css; app_view_model.responsiveDisplay = displayViewModel; + + + + + + diff --git a/interface/main/tabs/templates/patient_data_template.php b/interface/main/tabs/templates/patient_data_template.php index 829231d2d..940d4dc32 100644 --- a/interface/main/tabs/templates/patient_data_template.php +++ b/interface/main/tabs/templates/patient_data_template.php @@ -8,13 +8,30 @@ * @author Brady Miller * @author Robert Down * @author Jerry Padgett + * @author Ranganath Pathak * @copyright Copyright (c) 2016 Kevin Yeh * @copyright Copyright (c) 2016 Brady Miller * @copyright Copyright (c) 2017 Robert Down * @copyright Copyright (c) 2018 Jerry Padgett + * @copyright Copyright (c) 2019 Ranganath Pathak * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 */ ?> +