diff --git a/interface/main/calendar/find_patient_popup.php b/interface/main/calendar/find_patient_popup.php index fd457648432..ac33d032e39 100644 --- a/interface/main/calendar/find_patient_popup.php +++ b/interface/main/calendar/find_patient_popup.php @@ -22,8 +22,8 @@ $info_msg = ""; - // If we are searching, search. - // first set $result to empty +// If we are searching, search. +// first set $result to empty $result = ""; if (!empty($_REQUEST['searchby']) && !empty($_REQUEST['searchparm'])) { $searchby = $_REQUEST['searchby']; @@ -46,239 +46,254 @@ -<?php echo htmlspecialchars(xl('Patient Finder'), ENT_NOQUOTES); ?> + <?php echo text(xl('Patient Finder')); ?> - + #searchResults { + width: 100%; + border-collapse: collapse; + background-color: var(--white); + overflow: auto; + } - - + #searchResults tr { + cursor: hand; + cursor: pointer; + } + + #searchResults td { + /*font-size: 0.7em;*/ + border-bottom: 1px solid var(--light); + } + + .billing { + color: var(--danger); + font-weight: bold; + } + + /* for search results or 'searching' notification */ + #searchstatus { + font-weight: bold; + font-style: italic; + color: var(--black); + text-align: center; + } + + #searchspinner { + display: inline; + visibility: hidden; + } + + /* highlight for the mouse-over */ + .highlight { + background-color: #336699; + color: var(--white); + } + + + + // Pass the variable to parent hidden type and submit opener.document.theform.resname.value = "noresult"; opener.document.theform.submit(); // Close the window window.self.close(); -'; -} -?> - - + '; + } ?> + - -
-
-
'> -
- - - - ' title='' /> -
- ' /> -
-
-
-
-
- - -
- -
-
- - style="display: none;" - > - -
-= 100) : ?> -
- -
- - - - - - - - - - - - - - - +
+
'> +
+ + + + ' title='' /> +
+ ' /> +
+
+
+ +
- echo " "; - echo " \n"; - echo " \n"; //(CHEMED) Search by phone number - echo " \n"; - echo " \n"; - echo " \n"; - echo " "; - } - } - ?> - -
" . htmlspecialchars($iterlname . ", " . $iterfname . " " . $itermname, ENT_NOQUOTES); - if (!empty($iter['billing_note'])) { - echo "
" . htmlspecialchars($iter['billing_note'], ENT_NOQUOTES); - } + +
+ + + = 100) : ?> +
+ +
+ - echo "		" . htmlspecialchars($iter['phone_home'], ENT_NOQUOTES) . "" . htmlspecialchars($iter['ss'], ENT_NOQUOTES) . "" . htmlspecialchars($iter['DOB'], ENT_NOQUOTES) . "" . htmlspecialchars($iter['pubpid'], ENT_NOQUOTES) . "
- - - - + // another way to select a patient from the list of results + // parts[] ==> 0=PID, 1=LName, 2=FName, 3=DOB + var SelectPatient = function (eObj) { + objID = eObj.id; + var parts = objID.split("~"); + return selpid(parts[0], parts[1], parts[2], parts[3]); + } -
+ + + diff --git a/interface/main/messages/messages.php b/interface/main/messages/messages.php index ccbe183ed97..36ea0b7bae6 100644 --- a/interface/main/messages/messages.php +++ b/interface/main/messages/messages.php @@ -742,12 +742,14 @@ function selectAll() { // The two functions below are for managing row styles in Messages table. function selectRow(row) { + event.stopPropagation(); document.getElementById(row).style.background = "var(--gray200)"; } - function deselectRow(row) { + event.stopPropagation(); document.getElementById(row).style.background = "var(--light)"; } + function makeMessageRowsClickable() { let items = document.querySelectorAll(".messages-item-row"); items.forEach(function(item) { @@ -970,6 +972,7 @@ function makeMessageRowsClickable() { $("#new_note").submit(); } }; + var PrintNote = function () { top.restoreSession(); diff --git a/interface/modules/custom_modules/oe-module-faxsms/contact.php b/interface/modules/custom_modules/oe-module-faxsms/contact.php index 1735486931a..d18d0e18e4a 100644 --- a/interface/modules/custom_modules/oe-module-faxsms/contact.php +++ b/interface/modules/custom_modules/oe-module-faxsms/contact.php @@ -23,19 +23,26 @@ if (!$clientApp->verifyAcl()) { die("

" . xlt("Not Authorised!") . "

"); } +// this is a function that checks if the user is logged in and must be from clientApp based on serviceType $logged_in = $clientApp->authenticate(); if ($logged_in != 1) { die("

" . text($logged_in) . "

"); } -$isSMS = $clientApp->getRequest('isSMS', false); -$isEmail = $clientApp->getRequest('isEmail', false); +$isSMS = (int)$clientApp->getRequest('isSMS', false); +$isEmail = (int)$clientApp->getRequest('isEmail', false); $isForward = $isFax = 0; -$isForward = ($clientApp->getRequest('mode', '') == 'forward') ? 1 : 0; +$isForward = ($clientApp->getRequest('mode', false) == 'forward') ? 1 : 0; $isFax = ($serviceType == 'fax') ? 1 : 0; +$isUniversal = (int)$clientApp->getRequest('isUniversal', false); $isSMTP = !empty($GLOBALS['SMTP_PASS'] ?? null) && !empty($GLOBALS["SMTP_USER"] ?? null); +$isOnetime = (int)$clientApp->getRequest('isOnetime', false); + +if ($isUniversal) { + $isSMS = !empty($GLOBALS['oefax_enable_sms'] ?? 0); + $isEmail = !empty($GLOBALS['oe_enable_email'] ?? 0); +} -$isOnetime = $clientApp->getRequest('isOnetime', false); $service = $clientApp::getServiceType(); $default_message = ''; @@ -45,7 +52,7 @@ $file_name = ''; if (empty($isSMS)) { // fax contact form - $interface_pid = $clientApp->getRequest('pid'); + $interface_pid = $clientApp->getRequest('pid', ''); $the_file = $clientApp->getRequest('file'); $isContent = $clientApp->getRequest('isContent'); $the_docid = $clientApp->getRequest('docid', $clientApp->getRequest('template_id')); @@ -57,13 +64,13 @@ $template_name = $clientApp->getRequest('title'); } else { // SMS contact dialog. Passed in phone or select patient from popup. - $interface_pid = $clientApp->getRequest('pid'); + $interface_pid = $clientApp->getRequest('pid', ''); $portal_url = $GLOBALS['portal_onsite_two_address']; $details = json_decode($clientApp->getRequest('details', ''), true); $recipient_phone = $clientApp->getRequest('recipient', $details['phone'] ?? ''); $pid = $interface_pid; } - +$interface_pid = $interface_pid == 0 ? '' : $interface_pid; ?> @@ -71,19 +78,19 @@ <?php echo xlt('Contact') ?> var pid=" . js_escape($pid) . ";var isFax=" . js_escape($isFax) . ";var isOnetime=" . js_escape($isOnetime) . ";var isEmail=" . js_escape($isEmail) . ";var isSms=" . js_escape($isSMS) . ";var isForward=" . js_escape($isForward) . ";var recipient=" . js_escape($recipient_phone) . ";"; + echo ""; ?>