From 9829bf4e0b86d382730e992e40bf2c16ba9d081c Mon Sep 17 00:00:00 2001 From: Jerry Padgett Date: Wed, 27 Sep 2017 04:36:34 -0400 Subject: [PATCH] New Patient Registration/signup for Patient Portal Two (#1090) * Patient registration/signup added to patient portal two. * Email username and password after successful register. *Send message to patient provider of registering. *Addition to allow patients to reset their patient portal two credentials. * Add global to turn off/on credential rest. --- library/globals.inc.php | 23 +- .../jquery-datetimepicker-2-5-4-alternate.js.php | 4 + portal/_header.php | 8 +- portal/account/account.lib.php | 214 ++++++++ portal/account/account.php | 74 +++ portal/account/register.php | 554 +++++++++++++++++++++ portal/assets/css/base.css | 15 +- portal/assets/css/register.css | 73 +++ portal/get_patient_info.php | 447 +++++++++-------- portal/home.php | 17 +- portal/index.php | 389 ++++++++++----- .../patient/libs/Controller/PatientController.php | 14 +- portal/patient/libs/Reporter/PatientReporter.php | 10 +- portal/patient/scripts/app/patientdata.js | 45 +- portal/patient/scripts/model.js | 8 +- portal/patient/styles/style.css | 40 +- portal/patient/templates/PatientListView.tpl.php | 272 +++++----- portal/patient/templates/_modalFormHeader.tpl.php | 10 +- 18 files changed, 1699 insertions(+), 518 deletions(-) create mode 100644 portal/account/account.lib.php create mode 100644 portal/account/account.php create mode 100644 portal/account/register.php create mode 100644 portal/assets/css/register.css rewrite portal/get_patient_info.php (64%) diff --git a/library/globals.inc.php b/library/globals.inc.php index 17d090ff9..5fddc8cd7 100644 --- a/library/globals.inc.php +++ b/library/globals.inc.php @@ -2421,6 +2421,27 @@ $GLOBALS_METADATA = array( xl('Website link for the Version 2 Onsite Patient Portal.') ), + 'portal_onsite_two_register' => array( + xl('Allow Version 2 Onsite New Patient Registration Widget'), + 'bool', // data type + '1', + xl('Enable Version 2 Onsite Patient Portal new patient to self register.') + ), + + 'portal_two_payments' => array( + xl('Allow Version 2 Onsite Online Payments'), + 'bool', // data type + '0', + xl('Allow Version 2 Onsite Patient to make payments online.') + ), + + 'portal_two_pass_reset' => array( + xl('Allow Version 2 Patients to Reset Credentials'), + 'bool', // data type + '0', + xl('Patient may change their logon from portal login dialog.') + ), + 'portal_onsite_enable' => array( xl('Enable Version 1 Onsite Patient Portal'), 'bool', // data type @@ -2636,7 +2657,7 @@ $GLOBALS_METADATA = array( xl('Log all NewCrop eRx Requests and / or Responses.'), ), - 'weno_rx_enable' => array( + 'weno_rx_enable' => array( xl('Enable Weno eRx Service'), 'bool', '0', diff --git a/library/js/xl/jquery-datetimepicker-2-5-4-alternate.js.php b/library/js/xl/jquery-datetimepicker-2-5-4-alternate.js.php index 3be222117..bc4cb9970 100644 --- a/library/js/xl/jquery-datetimepicker-2-5-4-alternate.js.php +++ b/library/js/xl/jquery-datetimepicker-2-5-4-alternate.js.php @@ -67,6 +67,8 @@ var datepicker_xlDayofwk= ["", "; var datepicker_yearStart = '1900'; var datepicker_format = 'Y-m-d'; +var datepicker_scrollInput = false; +var datepicker_scrollMonth = false; //datetimepicker elements var datetimepicker_xlMonths = ["","", "", "", "", "", "", "", "", "", "", ""]; @@ -76,3 +78,5 @@ var datetimepicker_rtl = - + +
  • +
    • +
  • + * @copyright Copyright (c) 2017 Jerry Padgett + * @license https://www.gnu.org/licenses/agpl-3.0.en.html GNU Affero General Public License 3 + */ +/* Library functions for register*/ + +function notifyAdmin($pid, $provider) +{ + + $note = xlt("New patient registration received from patient portal. Reminder to check for possible new appointment"); + $title = xlt("New Patient"); + $user = sqlQueryNoLog("SELECT users.username FROM users WHERE authorized = 1 And id = ?", array($provider)); + + $rtn = addPnote($pid, $note, 1, 1, $title, $user['username'], '', 'New'); + + return $rtn; +} + +function isNew($dob = '', $lname = '', $fname = '', $email = '') +{ + $last = '%' . trim($lname) . '%'; + $first = '%' . trim($fname) . '%'; + $dob = '%' . trim($dob) . '%'; + $semail = '%' . trim($email) . '%'; + $sql = "select pid from patient_data Where patient_data.lname LIKE ? And patient_data.fname LIKE ? And patient_data.DOB LIKE ? order by date limit 0,1"; + $data = array( + $last, + $first, + $dob + ); + if ($email) { + $sql = "select pid from patient_data Where patient_data.lname LIKE ? And patient_data.fname LIKE ? And patient_data.DOB LIKE ? And patient_data.email LIKE ? order by date limit 0,1"; + $data = array( + $last, + $first, + $dob, + $semail + ); + } + $row = sqlQuery($sql, $data); + + return $row['pid'] ? $row['pid'] : 0; +} + +function saveInsurance($pid) +{ + newInsuranceData( + $pid = $pid, + $type = "primary", + $provider = "0", + $policy_number = $_REQUEST['policy_number'], + $group_number = $_REQUEST['group_number'], + $plan_name = $_REQUEST['provider'] . ' ' . $_REQUEST['plan_name'], + $subscriber_lname = "", + $subscriber_mname = "", + $subscriber_fname = "", + $subscriber_relationship = "", + $subscriber_ss = "", + $subscriber_DOB = "", + $subscriber_street = "", + $subscriber_postal_code = "", + $subscriber_city = "", + $subscriber_state = "", + $subscriber_country = "", + $subscriber_phone = "", + $subscriber_employer = "", + $subscriber_employer_street = "", + $subscriber_employer_city = "", + $subscriber_employer_postal_code = "", + $subscriber_employer_state = "", + $subscriber_employer_country = "", + $copay = $_REQUEST['copay'], + $subscriber_sex = "", + $effective_date = $_REQUEST['date'], + $accept_assignment = "TRUE", + $policy_type = "" + ); + newInsuranceData($pid, "secondary"); + newInsuranceData($pid, "tertiary"); +} + +function getNewPid() +{ + $result = sqlQuery("select max(pid)+1 as pid from patient_data"); + $newpid = 1; + if ($result['pid'] > 1) { + $newpid = $result['pid']; + } + if ($newpid == null) { + $newpid = 0; + } + return $newpid; +} + +function generatePassword($length = 8, $strength = 1) +{ + $consonants = 'bdghjmnpqrstvzacefiklowxy'; + $numbers = '0234561789'; + $specials = '@#$%'; + + $password = ''; + $alt = time() % 2; + for ($i = 0; $i < $length / 3; $i ++) { + if ($alt == 1) { + $password .= $consonants[(rand() % strlen($consonants))] . $numbers[(rand() % strlen($numbers))] . $specials[(rand() % strlen($specials))]; + $alt = 0; + } else { + $password .= $numbers[(rand() % strlen($numbers))] . $specials[(rand() % strlen($specials))] . $consonants[(rand() % strlen($consonants))]; + $alt = 1; + } + } + + return $password; +} + +function validEmail($email) +{ + if (preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/i", $email)) { + return true; + } + + return false; +} + +function messageCreate($uname, $pass) +{ + $message = htmlspecialchars(xl("Patient Portal Web Address"), ENT_NOQUOTES) . ":
    "; + + if ($GLOBALS['portal_onsite_enable']) { + $message .= "    " . + htmlspecialchars($GLOBALS['portal_onsite_address'], ENT_NOQUOTES) . "
    "; + } + + if ($GLOBALS['portal_onsite_two_enable']) { + $message .= "" . + htmlspecialchars($GLOBALS['portal_onsite_two_address'], ENT_NOQUOTES) . "
    "; + } + + $message .= "
    "; + + $message .= htmlspecialchars(xl("User Name"), ENT_NOQUOTES) . ": " . htmlspecialchars($uname, ENT_NOQUOTES) . + "

    " . htmlspecialchars(xl("Password"), ENT_NOQUOTES) . ": " . htmlspecialchars($pass, ENT_NOQUOTES) . "

    "; + + return $message; +} + +function doCredentials($pid) +{ + global $srcdir; + require_once("$srcdir/authentication/common_operations.php"); + + $newpd = sqlQuery("SELECT * FROM `patient_data` WHERE `pid`=?", array( + $pid + )); + + $clear_pass = generatePassword(); + + $uname = $newpd['fname'] . $newpd['id']; + + $res = sqlStatement("SELECT * FROM patient_access_onsite WHERE pid=?", array( + $pid + )); + $query_parameters = array( + $uname + ); + $salt_clause = ""; + // For onsite portal create a blowfish based hash and salt. + $new_salt = oemr_password_salt(); + $salt_clause = ",portal_salt=? "; + array_push($query_parameters, oemr_password_hash($clear_pass, $new_salt), $new_salt); + array_push($query_parameters, $pid); + if (sqlNumRows($res)) { + sqlStatement("UPDATE patient_access_onsite SET portal_username=?,portal_pwd=?,portal_pwd_status=0 " . $salt_clause . " WHERE pid=?", $query_parameters); + } else { + sqlStatement("INSERT INTO patient_access_onsite SET portal_username=?,portal_pwd=?,portal_pwd_status=0" . $salt_clause . " ,pid=?", $query_parameters); + } + + if (! (validEmail($newpd['email']))) { + $sent = false; + } + + $message = messageCreate($uname, $clear_pass); + + $mail = new MyMailer(); + $pt_name = $newpd['fname'] . ' ' . $newpd['lname']; + $pt_email = $newpd['email']; + $email_subject = xl('Access Your Patient Portal'); + $email_sender = $GLOBALS['patient_reminder_sender_email']; + $mail->AddReplyTo($email_sender, $email_sender); + $mail->SetFrom($email_sender, $email_sender); + $mail->AddAddress($pt_email, $pt_name); + $mail->Subject = $email_subject; + $mail->MsgHTML("
    " . $message . "
    "); + $mail->IsHTML(true); + $mail->AltBody = $message; + + if ($mail->Send()) { + $sent = true; + } else { + $email_status = $mail->ErrorInfo; + error_log("EMAIL ERROR: " . $email_status, 0); + $sent = false; + } + if ($sent) { + $sent = "User : " . $uname . " Password : " . $clear_pass; + } + return $sent; +} diff --git a/portal/account/account.php b/portal/account/account.php new file mode 100644 index 000000000..d40bf03b7 --- /dev/null +++ b/portal/account/account.php @@ -0,0 +1,74 @@ + + * @copyright Copyright (c) 2017 Jerry Padgett + * @license https://www.gnu.org/licenses/agpl-3.0.en.html GNU Affero General Public License 3 + */ + +session_start(); +if ($_SESSION['patient_portal_onsite_two'] && $_SESSION['pid']) { + $ignoreAuth_onsite_portal_two = true; +} + +require_once("../../interface/globals.php"); +require_once("$srcdir/patient.inc"); +require_once(dirname(__FILE__) . "/../lib/portal_mail.inc"); +require_once("$srcdir/pnotes.inc"); +require_once("./account.lib.php"); + +$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : ''; + +if ($action == 'set_lang') { + $_SESSION['language_choice'] = (int) $_REQUEST['value']; + echo 'okay'; + exit(); +} elseif ($action == 'get_newpid') { + $email = isset($_REQUEST['email']) ? $_REQUEST['email'] : ''; + $rtn = isNew($_REQUEST['dob'], $_REQUEST['last'], $_REQUEST['first'], $email); + if ((int) $rtn != 0) { + echo xlt("This account already exists.") . "\r\n\r\n" . xlt("If you are having troubles logging into your account.") . "\r\n" . xlt("Please contact your provider.") . "\r\n" . xlt("Reference this Account Id: ") . $rtn; + exit(); + } + $rtn = getNewPid(); + echo "$rtn"; + + exit(); +} elseif ($action == 'is_new') { + $email = isset($_REQUEST['email']) ? $_REQUEST['email'] : ''; + $rtn = isNew($_REQUEST['dob'], $_REQUEST['last'], $_REQUEST['first'], $email); + echo "$rtn"; + + exit(); +} elseif ($action == 'do_signup') { + $rtn = doCredentials($_REQUEST['pid']); + echo "$rtn"; + + exit(); +} elseif ($action == 'new_insurance') { + $pid = $_REQUEST['pid']; + saveInsurance($pid); + + exit(); +} elseif ($action == 'notify_admin') { + $pid = $_REQUEST['pid']; + $provider = $_REQUEST['provider']; + $rtn = notifyAdmin($pid, $provider); + echo "$rtn"; + + exit(); +} elseif ($action == 'cleanup') { + unset($_SESSION['patient_portal_onsite_two']); + unset($_SESSION['authUser']); + unset($_SESSION['pid']); + unset($_SESSION['site_id']); + unset($_SESSION['register']); + echo 'gone'; + session_destroy(); // I know, makes little sense. +} else { + exit(); +} +die(); //too be sure diff --git a/portal/account/register.php b/portal/account/register.php new file mode 100644 index 000000000..3cec127e4 --- /dev/null +++ b/portal/account/register.php @@ -0,0 +1,554 @@ + + * @copyright Copyright (c) 2017 Jerry Padgett + * @license https://www.gnu.org/licenses/agpl-3.0.en.html GNU Affero General Public License 3 + */ + +session_start(); +session_regenerate_id(true); + +unset($_SESSION['itsme']); +$_SESSION['patient_portal_onsite_two'] = true; +$_SESSION['authUser'] = 'portal-user'; +$_SESSION['pid'] = true; +$_SESSION['register'] = true; + +$_SESSION['site_id'] = isset($_SESSION['site_id']) ? $_SESSION['site_id'] : 'default'; +$landingpage = "index.php?site=" . $_SESSION['site_id']; + +$ignoreAuth_onsite_portal_two = true; + +require_once("../../interface/globals.php"); + +$res2 = sqlStatement("select * from lang_languages where lang_description = ?", array( + $GLOBALS['language_default'] +)); +for ($iter = 0; $row = sqlFetchArray($res2); $iter ++) { + $result2[$iter] = $row; +} +if (count($result2) == 1) { + $defaultLangID = $result2[0]{"lang_id"}; + $defaultLangName = $result2[0]{"lang_description"}; +} else { + // default to english if any problems + $defaultLangID = 1; + $defaultLangName = "English"; +} + +if (! isset($_SESSION['language_choice'])) { + $_SESSION['language_choice'] = $defaultLangID; +} +// collect languages if showing language menu +if ($GLOBALS['language_menu_login']) { + // sorting order of language titles depends on language translation options. + $mainLangID = empty($_SESSION['language_choice']) ? '1' : $_SESSION['language_choice']; + if ($mainLangID == '1' && ! empty($GLOBALS['skip_english_translation'])) { + $sql = "SELECT * FROM lang_languages ORDER BY lang_description, lang_id"; + $res3 = SqlStatement($sql); + } else { + // Use and sort by the translated language name. + $sql = "SELECT ll.lang_id, " . "IF(LENGTH(ld.definition),ld.definition,ll.lang_description) AS trans_lang_description, " . "ll.lang_description " . + "FROM lang_languages AS ll " . "LEFT JOIN lang_constants AS lc ON lc.constant_name = ll.lang_description " . + "LEFT JOIN lang_definitions AS ld ON ld.cons_id = lc.cons_id AND " . "ld.lang_id = ? " . + "ORDER BY IF(LENGTH(ld.definition),ld.definition,ll.lang_description), ll.lang_id"; + $res3 = SqlStatement($sql, array( + $mainLangID + )); + } + + for ($iter = 0; $row = sqlFetchArray($res3); $iter ++) { + $result3[$iter] = $row; + } + + if (count($result3) == 1) { + // default to english if only return one language + $hiddenLanguageField = "\n"; + } +} else { + $hiddenLanguageField = "\n"; +} + +?> + + + +<?php echo xlt('New Patient'); ?> | <?php echo xlt('Register'); ?> + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + 1 +

    +
    +
    + 2 +

    +
    +
    + 3 +

    +
    +
    + +

    +
    +
    +
    + +
    +
    +
    +
    + +
    + + +
    + + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    + +
    + +
    + +
    + + +
    + + diff --git a/portal/assets/css/base.css b/portal/assets/css/base.css index e26e56ebd..fcefba596 100644 --- a/portal/assets/css/base.css +++ b/portal/assets/css/base.css @@ -75,10 +75,9 @@ } #wrapper { - width: 400px; + width: 30%; background-color: white; padding: 20px; -/* padding-top: 0px;*/ position: absolute; -webkit-box-shadow: 0px 0px 17px 0.8px gray; -moz-box-shadow: 0px 0px 17px 0.8px gray; @@ -90,12 +89,12 @@ } .centerwrapper { - top: 50%; - margin-top: -120px; - left: 50%; - margin-left: -200px; - } - + top: 25%; + margin-top: -120px; + left: 45%; + margin-left: -200px; + } + .lefttop { margin-left: 75px; margin-top: 75px; diff --git a/portal/assets/css/register.css b/portal/assets/css/register.css new file mode 100644 index 000000000..b37611faf --- /dev/null +++ b/portal/assets/css/register.css @@ -0,0 +1,73 @@ +@CHARSET "UTF-8"; +body { + height: 100%; + margin-top: 20px; +} + +.stepwiz-step p { + margin-top: 10px; +} + +.stepwiz-row { + display: table-row; +} + +.stepwiz { + display: table; + width: 50%; + position: relative; +} + +.stepwiz-step button[disabled] { + opacity: 1 !important; + filter: alpha(opacity = 100) !important; +} + +.stepwiz-row:before { + top: 14px; + bottom: 0; + position: absolute; + content: " "; + width: 100%; + height: 1px; + background-color: #ccc; + z-order: 0; +} + +.stepwiz-step { + display: table-cell; + text-align: center; + position: relative; +} + +.btn-circle { + width: 35px; + height: 35px; + text-align: center; + padding: 6px 0; + font-size: 12px; + font-weight: bold; + line-height: 1.428571429; + border-radius: 16px; +} + +input[type=text], input[type=email], input[type=date],select, fieldset { + -webkit-appearance: none; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +input:required:invalid, input:focus:invalid { + background-image: + url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAeVJREFUeNqkU01oE1EQ/mazSTdRmqSxLVSJVKU9RYoHD8WfHr16kh5EFA8eSy6hXrwUPBSKZ6E9V1CU4tGf0DZWDEQrGkhprRDbCvlpavan3ezu+LLSUnADLZnHwHvzmJlvvpkhZkY7IqFNaTuAfPhhP/8Uo87SGSaDsP27hgYM/lUpy6lHdqsAtM+BPfvqKp3ufYKwcgmWCug6oKmrrG3PoaqngWjdd/922hOBs5C/jJA6x7AiUt8VYVUAVQXXShfIqCYRMZO8/N1N+B8H1sOUwivpSUSVCJ2MAjtVwBAIdv+AQkHQqbOgc+fBvorjyQENDcch16/BtkQdAlC4E6jrYHGgGU18Io3gmhzJuwub6/fQJYNi/YBpCifhbDaAPXFvCBVxXbvfbNGFeN8DkjogWAd8DljV3KRutcEAeHMN/HXZ4p9bhncJHCyhNx52R0Kv/XNuQvYBnM+CP7xddXL5KaJw0TMAF8qjnMvegeK/SLHubhpKDKIrJDlvXoMX3y9xcSMZyBQ+tpyk5hzsa2Ns7LGdfWdbL6fZvHn92d7dgROH/730YBLtiZmEdGPkFnhX4kxmjVe2xgPfCtrRd6GHRtEh9zsL8xVe+pwSzj+OtwvletZZ/wLeKD71L+ZeHHWZ/gowABkp7AwwnEjFAAAAAElFTkSuQmCC); + background-position: right top; + background-repeat: no-repeat; + -moz-box-shadow: none; +} + +input:required:valid { + background-image: + url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAepJREFUeNrEk79PFEEUx9/uDDd7v/AAQQnEQokmJCRGwc7/QeM/YGVxsZJQYI/EhCChICYmUJigNBSGzobQaI5SaYRw6imne0d2D/bYmZ3dGd+YQKEHYiyc5GUyb3Y+77vfeWNpreFfhvXfAWAAJtbKi7dff1rWK9vPHx3mThP2Iaipk5EzTg8Qmru38H7izmkFHAF4WH1R52654PR0Oamzj2dKxYt/Bbg1OPZuY3d9aU82VGem/5LtnJscLxWzfzRxaWNqWJP0XUadIbSzu5DuvUJpzq7sfYBKsP1GJeLB+PWpt8cCXm4+2+zLXx4guKiLXWA2Nc5ChOuacMEPv20FkT+dIawyenVi5VcAbcigWzXLeNiDRCdwId0LFm5IUMBIBgrp8wOEsFlfeCGm23/zoBZWn9a4C314A1nCoM1OAVccuGyCkPs/P+pIdVIOkG9pIh6YlyqCrwhRKD3GygK9PUBImIQQxRi4b2O+JcCLg8+e8NZiLVEygwCrWpYF0jQJziYU/ho2TUuCPTn8hHcQNuZy1/94sAMOzQHDeqaij7Cd8Dt8CatGhX3iWxgtFW/m29pnUjR7TSQcRCIAVW1FSr6KAVYdi+5Pj8yunviYHq7f72po3Y9dbi7CxzDO1+duzCXH9cEPAQYAhJELY/AqBtwAAAAASUVORK5CYII=); + background-position: right top; + background-repeat: no-repeat; +} diff --git a/portal/get_patient_info.php b/portal/get_patient_info.php dissimilarity index 64% index b5ae83046..aa29bd334 100644 --- a/portal/get_patient_info.php +++ b/portal/get_patient_info.php @@ -1,216 +1,231 @@ - - * Copyright (C) 2011 Cassian LUP - * - * LICENSE: This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see ;. - * - * @package OpenEMR - * @author Jerry Padgett - * @author Cassian LUP - * @author Jerry Padgett - * @link http://www.open-emr.org - * - */ - //starting the PHP session (also regenerating the session id to avoid session fixation attacks) - session_start(); - session_regenerate_id(true); - // - - //landing page definition -- where to go if something goes wrong - $landingpage = "index.php?site=".$_SESSION['site_id']; - // - - //checking whether the request comes from index.php -if (!isset($_SESSION['itsme'])) { - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; -} - - // -require_once(dirname(__FILE__)."/lib/appsql.class.php"); -$logit = new ApplicationTable(); - //some validation -if (!isset($_POST['uname']) || empty($_POST['uname'])) { - session_destroy(); - header('Location: '.$landingpage.'&w&c'); - exit; -} - -if (!isset($_POST['pass']) || empty($_POST['pass'])) { - session_destroy(); - header('Location: '.$landingpage.'&w&c'); - exit; -} - - // - - // set the language -if (!empty($_POST['languageChoice'])) { - $_SESSION['language_choice'] = (int)$_POST['languageChoice']; -} else if (empty($_SESSION['language_choice'])) { - // just in case both are empty, then use english - $_SESSION['language_choice'] = 1; -} else { - // keep the current session language token -} - - //Settings that will override globals.php - $ignoreAuth = 1; - // - - //Authentication - require_once('../interface/globals.php'); - require_once("$srcdir/authentication/common_operations.php"); - require_once("$srcdir/user.inc"); - $password_update=isset($_SESSION['password_update']); - unset($_SESSION['password_update']); - $plain_code= $_POST['pass']; - - $authorizedPortal=false; //flag - DEFINE("TBL_PAT_ACC_ON", "patient_access_onsite"); - DEFINE("COL_PID", "pid"); - DEFINE("COL_POR_PWD", "portal_pwd"); - DEFINE("COL_POR_USER", "portal_username"); - DEFINE("COL_POR_SALT", "portal_salt"); - DEFINE("COL_POR_PWD_STAT", "portal_pwd_status"); - $sql= "SELECT ".implode(",", array(COL_ID,COL_PID,COL_POR_PWD,COL_POR_SALT,COL_POR_PWD_STAT)) - ." FROM ".TBL_PAT_ACC_ON - ." WHERE ".COL_POR_USER."=?"; - $auth = privQuery($sql, array($_POST['uname'])); -if ($auth===false) { - $logit->portalLog('login attempt', '', ($_POST['uname'].':invalid username'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; -} - -if (empty($auth[COL_POR_SALT])) { - if (SHA1($plain_code)!=$auth[COL_POR_PWD]) { - $logit->portalLog('login attempt', '', ($_POST['uname'].':pass not salted'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } - - $new_salt=oemr_password_salt(); - $new_hash=oemr_password_hash($plain_code, $new_salt); - $sqlUpdatePwd= " UPDATE " . TBL_PAT_ACC_ON - ." SET " .COL_POR_PWD."=?, " - . COL_POR_SALT . "=? " - ." WHERE ".COL_ID."=?"; - privStatement($sqlUpdatePwd, array($new_hash,$new_salt,$auth[COL_ID])); -} else { - if (oemr_password_hash($plain_code, $auth[COL_POR_SALT])!=$auth[COL_POR_PWD]) { - $logit->portalLog('login attempt', '', ($_POST['uname'].':invalid password'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } -} - - $_SESSION['portal_username']=$_POST['uname']; - $sql = "SELECT * FROM `patient_data` WHERE `pid` = ?"; - -if ($userData = sqlQuery($sql, array($auth['pid']))) { // if query gets executed - - if (empty($userData)) { - $logit->portalLog('login attempt', '', ($_POST['uname'].':not active patient'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } - - if ($userData['email'] != $_POST['passaddon']) { - $logit->portalLog('login attempt', '', ($_POST['uname'].':invalid email'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } - - if ($userData['allow_patient_portal'] != "YES") { - // Patient has not authorized portal, so escape - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } - - if ($auth['pid'] != $userData['pid']) { - // Not sure if this is even possible, but should escape if this happens - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } - - if ($password_update) { - $code_new=$_POST['pass_new']; - $code_new_confirm=$_POST['pass_new_confirm']; - if (!(empty($_POST['pass_new'])) && !(empty($_POST['pass_new_confirm'])) && ($code_new == $code_new_confirm)) { - $new_salt=oemr_password_salt(); - $new_hash=oemr_password_hash($code_new, $new_salt); - - // Update the password and continue (patient is authorized) - privStatement("UPDATE ".TBL_PAT_ACC_ON - ." SET ".COL_POR_PWD."=?,".COL_POR_SALT."=?,".COL_POR_PWD_STAT."=1 WHERE id=?", array($new_hash,$new_salt,$auth['id'])); - $authorizedPortal = true; - $logit->portalLog('password update', $auth['pid'], ($_SESSION['portal_username'].': '.$_SESSION['ptName'].':success')); - } - } - - if ($auth['portal_pwd_status'] == 0) { - if (!$authorizedPortal) { - // Need to enter a new password in the index.php script - $_SESSION['password_update'] = 1; - header('Location: '.$landingpage); - exit; - } - } - - if ($auth['portal_pwd_status'] == 1) { - // continue (patient is authorized) - $authorizedPortal = true; - } - - if ($authorizedPortal) { - // patient is authorized (prepare the session variables) - unset($_SESSION['password_update']); // just being safe - unset($_SESSION['itsme']); // just being safe - $_SESSION['pid'] = $auth['pid']; - $_SESSION['patient_portal_onsite_two'] = 1; - - $tmp = getUserIDInfo($userData['providerID']); - $_SESSION['providerName'] = $tmp['fname'].' '.$tmp['lname']; - $_SESSION['providerUName'] = $tmp['username']; - $_SESSION['sessionUser'] = '-patient-'; //$_POST['uname']; - $_SESSION['providerId'] = $userData['providerID']?$userData['providerID']:'undefined'; - $_SESSION['ptName'] = $userData['fname'].' '.$userData['lname']; - - $logit->portalLog('login', $_SESSION['pid'], ($_SESSION['portal_username'].': '.$_SESSION['ptName'].':success')); - } else { - $logit->portalLog('login', '', ($_POST['uname'].':not authorized'), '', '0'); - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; - } -} else { //problem with query - session_destroy(); - header('Location: '.$landingpage.'&w'); - exit; -} - - //require_once('summary_pat_portal.php'); - - //require_once('home.php'); - header('Location: ./home.php'); - exit; + + * Copyright (C) 2011 Cassian LUP + * + * LICENSE: This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see ;. + * + * @package OpenEMR + * @author Cassian LUP + * @author Jerry Padgett + * @link http://www.open-emr.org + * + */ +// starting the PHP session (also regenerating the session id to avoid session fixation attacks) +session_start(); +session_regenerate_id(true); +// + +// landing page definition -- where to go if something goes wrong +$landingpage = "index.php?site=" . $_SESSION['site_id']; +// + +// checking whether the request comes from index.php +if (! isset($_SESSION['itsme'])) { + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); +} + +// some validation +if (! isset($_POST['uname']) || empty($_POST['uname'])) { + session_destroy(); + header('Location: ' . $landingpage . '&w&c'); + exit(); +} + +if (! isset($_POST['pass']) || empty($_POST['pass'])) { + session_destroy(); + header('Location: ' . $landingpage . '&w&c'); + exit(); +} + +require_once(dirname(__FILE__) . "/lib/appsql.class.php"); +$logit = new ApplicationTable(); + +// set the language +if (! empty($_POST['languageChoice'])) { + $_SESSION['language_choice'] = (int) $_POST['languageChoice']; +} else if (empty($_SESSION['language_choice'])) { + // just in case both are empty, then use english + $_SESSION['language_choice'] = 1; +} else { + // keep the current session language token +} + +// Settings that will override globals.php +$ignoreAuth = 1; +// + +// Authentication +require_once('../interface/globals.php'); +require_once("$srcdir/authentication/common_operations.php"); +require_once("$srcdir/user.inc"); +$password_update = isset($_SESSION['password_update']); +unset($_SESSION['password_update']); +$plain_code = $_POST['pass']; + +$authorizedPortal = false; // flag +DEFINE("TBL_PAT_ACC_ON", "patient_access_onsite"); +DEFINE("COL_PID", "pid"); +DEFINE("COL_POR_PWD", "portal_pwd"); +DEFINE("COL_POR_USER", "portal_username"); +DEFINE("COL_POR_SALT", "portal_salt"); +DEFINE("COL_POR_PWD_STAT", "portal_pwd_status"); +$sql = "SELECT " . implode(",", array( + COL_ID, + COL_PID, + COL_POR_PWD, + COL_POR_SALT, + COL_POR_PWD_STAT +)) . " FROM " . TBL_PAT_ACC_ON . " WHERE " . COL_POR_USER . "=?"; +$auth = privQuery($sql, array( + $_POST['uname'] +)); +if ($auth === false) { + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':invalid username'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w&u'); + exit(); +} + +if (empty($auth[COL_POR_SALT])) { + if (SHA1($plain_code) != $auth[COL_POR_PWD]) { + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':pass not salted'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w&p'); + exit(); + } + + $new_salt = oemr_password_salt(); + $new_hash = oemr_password_hash($plain_code, $new_salt); + $sqlUpdatePwd = " UPDATE " . TBL_PAT_ACC_ON . " SET " . COL_POR_PWD . "=?, " . COL_POR_SALT . "=? " . " WHERE " . COL_ID . "=?"; + privStatement($sqlUpdatePwd, array( + $new_hash, + $new_salt, + $auth[COL_ID] + )); +} else { + $tmp = oemr_password_hash($plain_code, $auth[COL_POR_SALT]); + if ($tmp != $auth[COL_POR_PWD]) { + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':invalid password'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w&p'); + exit(); + } +} + +$_SESSION['portal_username'] = $_POST['uname']; +$sql = "SELECT * FROM `patient_data` WHERE `pid` = ?"; + +if ($userData = sqlQuery($sql, array( + $auth['pid'] +))) { // if query gets executed + + if (empty($userData)) { + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':not active patient'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); + } + + if ($userData['email'] != $_POST['passaddon']) { + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':invalid email'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); + } + + if ($userData['allow_patient_portal'] != "YES") { + // Patient has not authorized portal, so escape + $logit->portalLog('login attempt', '', ($_POST['uname'] . ':allow portal turned off'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); + } + + if ($auth['pid'] != $userData['pid']) { + // Not sure if this is even possible, but should escape if this happens + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); + } + + if ($password_update) { + $code_new = $_POST['pass_new']; + $code_new_confirm = $_POST['pass_new_confirm']; + if (! (empty($_POST['pass_new'])) && ! (empty($_POST['pass_new_confirm'])) && ($code_new == $code_new_confirm)) { + $new_salt = oemr_password_salt(); + $new_hash = oemr_password_hash($code_new, $new_salt); + + // Update the password and continue (patient is authorized) + privStatement( + "UPDATE " . TBL_PAT_ACC_ON . " SET " . COL_POR_PWD . "=?," . COL_POR_SALT . "=?," . COL_POR_PWD_STAT . "=1 WHERE id=?", + array( + $new_hash, + $new_salt, + $auth['id'] + ) + ); + $authorizedPortal = true; + $logit->portalLog( + 'password update', + $auth['pid'], + ($_SESSION['portal_username'] . ': ' . $_SESSION['ptName'] . ':success') + ); + } + } + + if ($auth['portal_pwd_status'] == 0) { + if (! $authorizedPortal) { + // Need to enter a new password in the index.php script + $_SESSION['password_update'] = 1; + header('Location: ' . $landingpage); + exit(); + } + } + + if ($auth['portal_pwd_status'] == 1) { + // continue (patient is authorized) + $authorizedPortal = true; + } + + if ($authorizedPortal) { + // patient is authorized (prepare the session variables) + unset($_SESSION['password_update']); // just being safe + unset($_SESSION['itsme']); // just being safe + $_SESSION['pid'] = $auth['pid']; + $_SESSION['patient_portal_onsite_two'] = 1; + + $tmp = getUserIDInfo($userData['providerID']); + $_SESSION['providerName'] = $tmp['fname'] . ' ' . $tmp['lname']; + $_SESSION['providerUName'] = $tmp['username']; + $_SESSION['sessionUser'] = '-patient-'; // $_POST['uname']; + $_SESSION['providerId'] = $userData['providerID'] ? $userData['providerID'] : 'undefined'; + $_SESSION['ptName'] = $userData['fname'] . ' ' . $userData['lname']; + + $logit->portalLog('login', $_SESSION['pid'], ($_SESSION['portal_username'] . ': ' . $_SESSION['ptName'] . ':success')); + } else { + $logit->portalLog('login', '', ($_POST['uname'] . ':not authorized'), '', '0'); + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); + } +} else { // problem with query + session_destroy(); + header('Location: ' . $landingpage . '&w'); + exit(); +} + +header('Location: ./home.php'); +exit(); diff --git a/portal/home.php b/portal/home.php index d5ce380d5..fe8f412b2 100644 --- a/portal/home.php +++ b/portal/home.php @@ -24,6 +24,12 @@ require_once("$srcdir/patient.inc"); require_once("lib/portal_mail.inc"); +if ($_SESSION['register'] == true) { + session_destroy(); + header('Location: '.$landingpage.'&w'); + exit(); +} + if (!isset($_SESSION['portal_init'])) { $_SESSION['portal_init'] = true; } @@ -61,8 +67,9 @@ $(document).ready(function(){ }); $("#appointmentslist").load("./get_appointments.php", { 'embeddedScreen' : true }, function() { $("#reports").load("./report/portal_patient_report.php?pid=''", { 'embeddedScreen' : true }, function() { - /* $("#payment").load("./portal_payment.php", { 'embeddedScreen' : true }, function() { - }); */ + + $("#payment").load("./portal_payment.php", { 'embeddedScreen' : true }, function() { }); + }); }); $("#medicationlist").load("./get_medications.php", { 'embeddedScreen' : true }, function() { @@ -188,16 +195,18 @@ $(document).ready(function(){ +
    - +
    +
    diff --git a/portal/index.php b/portal/index.php index b18787534..8a0f2b60c 100644 --- a/portal/index.php +++ b/portal/index.php @@ -35,6 +35,8 @@ //includes require_once('../interface/globals.php'); + use OpenEMR\Core\Header; + ini_set("error_log", E_ERROR || ~E_NOTICE); //exit if portal is turned off if (!(isset($GLOBALS['portal_onsite_two_enable'])) || !($GLOBALS['portal_onsite_two_enable'])) { @@ -50,7 +52,7 @@ if (!(isset($GLOBALS['portal_onsite_two_enable'])) || !($GLOBALS['portal_onsite_ // Deal with language selection // // collect default language id (skip this if this is a password update) -if (!(isset($_SESSION['password_update']))) { +if (!(isset($_SESSION['password_update']) || isset($_GET['requestNew']))) { $res2 = sqlStatement("select * from lang_languages where lang_description = ?", array($GLOBALS['language_default'])); for ($iter = 0; $row = sqlFetchArray($res2); $iter++) { $result2[$iter] = $row; @@ -86,11 +88,9 @@ if (!(isset($_SESSION['password_update']))) { "ORDER BY IF(LENGTH(ld.definition),ld.definition,ll.lang_description), ll.lang_id"; $res3=SqlStatement($sql, array($mainLangID)); } - for ($iter = 0; $row = sqlFetchArray($res3); $iter++) { $result3[$iter] = $row; } - if (count($result3) == 1) { //default to english if only return one language $hiddenLanguageField = "\n"; @@ -99,27 +99,24 @@ if (!(isset($_SESSION['password_update']))) { $hiddenLanguageField = "\n"; } } - ?> - + <?php echo xlt('Patient Portal Login'); ?> - - + - + - - - - - + function validate_new_pass() { + var pass=true; + if (document.getElementById('uname').value == "") { + document.getElementById('uname').style.border = "1px solid red"; + pass=false; + } + if (document.getElementById('pass').value == "") { + document.getElementById('pass').style.border = "1px solid red"; + pass=false; + } + if (document.getElementById('pass_new').value == "") { + document.getElementById('pass_new').style.border = "1px solid red"; + pass=false; + } + if (document.getElementById('pass_new_confirm').value == "") { + document.getElementById('pass_new_confirm').style.border = "1px solid red"; + pass=false; + } + return pass; + } +

    -
    - - + -
    +

    - +
    - - - + + + - +
    + /> - +
    + />
    + />
    + + +


    -
    OpenEMR
    -
    - - -
    -

    -
    - - - - - - - - - - - - - - - - - - - - -
    - - -
    - + + +
    + +
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + + + + + + + + +
    + /login-logo.png'/> +
    +
    +
    +
    +

    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + + +
    + + -

    + +
    + +
    +
    + + + + + + + +
    + +
    +
    + echo $hiddenLanguageField; } ?> - -
    OpenEMR
    -
    /logo-full-con.png'/>
    - - - + + + - diff --git a/portal/patient/libs/Controller/PatientController.php b/portal/patient/libs/Controller/PatientController.php index 6fbb31492..d7b07eb0a 100644 --- a/portal/patient/libs/Controller/PatientController.php +++ b/portal/patient/libs/Controller/PatientController.php @@ -60,7 +60,9 @@ class PatientController extends AppBaseController */ public function ListView() { - $rid = $pid = $user = $encounter = 0; + + $rid = $pid = $user = $encounter = $register = 0; + if (isset($_GET['id'])) { $rid = ( int ) $_GET['id']; } @@ -77,10 +79,16 @@ class PatientController extends AppBaseController $encounter = $_GET['enc']; } + if (isset($_GET['register'])) { + $register = $_GET['register']; + } + $this->Assign('recid', $rid); $this->Assign('cpid', $pid); $this->Assign('cuser', $user); $this->Assign('encounter', $encounter); + $this->Assign('register', $register); + $trow = array(); $ptdata = $this->startupQuery($pid); foreach ($ptdata[0] as $key => $v) { $trow[lcfirst($key)] = $v; @@ -131,7 +139,7 @@ class PatientController extends AppBaseController $page = RequestUtil::Get('page'); // return all results - $patientdata = $this->Phreezer->Query('PatientReporter', $criteria); + $patientdata = $this->Phreezer->Query('Patient', $criteria); $output->rows = $patientdata->ToObjectArray(true, $this->SimpleObjectParams()); $output->totalResults = count($output->rows); $output->totalPages = 1; @@ -255,7 +263,7 @@ class PatientController extends AppBaseController $errors = $patient->GetValidationErrors(); if (count($errors) > 0) { - $this->RenderErrorJSON('Please check the form for errors', $errors); + $this->RenderErrorJSON('Please check the form for errors' . $errors, $errors); } else { $patient->Save(); $this->RenderJSON($patient, $this->JSONPCallback(), true, $this->SimpleObjectParams()); diff --git a/portal/patient/libs/Reporter/PatientReporter.php b/portal/patient/libs/Reporter/PatientReporter.php index aa536ac28..5ed5a8c48 100644 --- a/portal/patient/libs/Reporter/PatientReporter.php +++ b/portal/patient/libs/Reporter/PatientReporter.php @@ -41,9 +41,6 @@ class PatientReporter extends Reporter { // the properties in this class must match the columns returned by GetCustomQuery(). - // 'CustomFieldExample' is an example that is not part of the `patient_data` table - public $CustomFieldExample; - public $Id; public $Title; public $Language; @@ -147,8 +144,7 @@ class PatientReporter extends Reporter static function GetCustomQuery($criteria) { $sql = "select - 'custom value here...' as CustomFieldExample - ,`patient_data`.`id` as Id + `patient_data`.`id` as Id ,`patient_data`.`title` as Title ,`patient_data`.`language` as Language ,`patient_data`.`financial` as Financial @@ -246,6 +242,10 @@ class PatientReporter extends Reporter $sql .= $criteria->GetWhere(); $sql .= $criteria->GetOrder(); + if ($criteria->Pid_Equals == 0) { + $sql = "DESCRIBE patient_data"; + } + return $sql; } diff --git a/portal/patient/scripts/app/patientdata.js b/portal/patient/scripts/app/patientdata.js index d9164ee21..7794a15d8 100644 --- a/portal/patient/scripts/app/patientdata.js +++ b/portal/patient/scripts/app/patientdata.js @@ -79,8 +79,13 @@ var page = { this.collectionView.on('rendered',function(){ if(!page.isInitialized){ var m = page.patientData.first(); + m = (m === undefined) ? "" : m; + if(m){ + if(m.get('pid') < 1){ + m = ""; + } + } page.showDetailForm(m); - } page.isInitialized = true; page.isInitializing = false; @@ -97,7 +102,6 @@ var page = { this.modelView.templateEl = $("#patientModelTemplate"); this.modelView.on('rendered',function(){ // model rendered - $(function (){ $('.jquery-date-picker').datetimepicker({ i18n:{ @@ -110,6 +114,8 @@ var page = { yearStart: datepicker_yearStart, rtl: datepicker_rtl, format: datepicker_format, + scrollInput: datepicker_scrollInput, + scrollMonth: datepicker_scrollMonth, timepicker:false }); }); @@ -146,9 +152,7 @@ var page = { page.patient.get('refProviderid') == item.get( 'id') ));/**/ }); - //dd.combobox(); - //ddd.combobox(); - //dddd.combobox(); + if( page.portalpatient.get('pid') ){ $("#replaceAllButton").show(); page.isEdited = true; @@ -199,6 +203,8 @@ var page = { rtl: datetimepicker_rtl, format: datetimepicker_format, step: datetimepicker_step, + scrollInput: datepicker_scrollInput, + scrollMonth: datepicker_scrollMonth, timepicker:true }); }); @@ -238,12 +244,6 @@ var page = { $('#'+a+'InputContainer span.help-inline').html(''); $('#'+a+'InputContainer span.help-inline').html( ''+v+''); $('#'+a+'InputContainer span.help-inline').show(); - /*if( !$("#donePatientButton").is(":visible") ){ - $("#donePatientButton").show(); - } - if( !$("#savePatientButton").is(":visible") ){ - $('#savePatientButton').show(); - }*/ }, revertVal:function( el ){ var a = $(el).data('id'); @@ -387,8 +387,8 @@ var page = { app.showProgress('modelLoader'); -if( live != 1 ) - page.patient.urlRoot = 'api/portalpatient'; + if( live != 1 ) + page.patient.urlRoot = 'api/portalpatient'; page.patient.save({ 'title': $('select#title').val(), @@ -410,15 +410,15 @@ page.patient.save({ 'phoneBiz': $('input#phoneBiz').val(), 'phoneContact': $('input#phoneContact').val(), 'phoneCell': $('input#phoneCell').val(), - 'pharmacyId': $('input#pharmacyId').val(), + 'pharmacyId': $('input#pharmacyId').val() || 0, 'status': $('select#status').val(), 'contactRelationship': $('input#contactRelationship').val(), - 'date': $('input#date').val()+' '+$('input#date-time').val(), + 'date': $('input#date').val(), 'sex': $('select#sex').val(), 'referrer': $('input#referrer').val(), 'referrerid': $('input#referrerid').val(), 'providerid': $('select#providerid').val(), - 'refProviderid': $('select#refProviderid').val(), + 'refProviderid': $('select#refProviderid').val() || 0, 'email': $('input#email').val(), 'emailDirect': $('input#emailDirect').val(), 'ethnoracial': $('input#ethnoracial').val(), @@ -452,12 +452,12 @@ page.patient.save({ 'allowImmRegUse': $('input[name=allowImmRegUse]:checked').val(), 'allowImmInfoShare': $('input[name=allowImmInfoShare]:checked').val(), 'allowHealthInfoEx': $('input[name=allowHealthInfoEx]:checked').val(), - //'allowPatientPortal': $('input[name=allowPatientPortal]:checked').val(), + 'allowPatientPortal': $('input[name=allowPatientPortal]:checked').val(), //'deceasedDate': $('input#deceasedDate').val()+' '+$('input#deceasedDate-time').val(), //'deceasedReason': $('input#deceasedReason').val(), 'soapImportStatus': $('input#soapImportStatus').val(), //'cmsportalLogin': $('input#cmsportalLogin').val(), - 'careTeam': $('select#careTeam').val(), + 'careTeam': $('select#careTeam').val() || 0, 'county': $('input#county').val(), 'industry': $('textarea#industry').val(), 'note': $('textarea#note').val() @@ -467,10 +467,13 @@ page.patient.save({ if( live != 1){ setTimeout("app.appendAlert('Patient was sucessfully " + (isNew ? "inserted" : "updated") + "','alert-success',2000,'collectionAlert')",200); setTimeout("window.location.href ='"+webRoot+"/portal/home.php'",2500); - } - else + } + else if( live == 1 && register != '0'){ // for testing + //alert('Save Success') + } + else { eModal.close(true) - + } app.hideProgress('modelLoader'); if (isNew) { page.renderModelView(false); diff --git a/portal/patient/scripts/model.js b/portal/patient/scripts/model.js index 96689adda..df6a76233 100644 --- a/portal/patient/scripts/model.js +++ b/portal/patient/scripts/model.js @@ -433,7 +433,7 @@ model.PatientModel = Backbone.Model.extend({ 'pharmacyId': '', 'status': '', 'contactRelationship': '', - 'date': '', + 'date': new Date().toISOString().slice(0,10), 'sex': '', 'referrer': '', 'referrerid': '', @@ -464,7 +464,7 @@ model.PatientModel = Backbone.Model.extend({ 'fitness': '', 'referralSource': '', 'pricelevel': '', - 'regdate': '', + 'regdate': new Date().toISOString().slice(0,10), 'contrastart': '', 'completedAd': '', 'adReviewed': '', @@ -596,7 +596,7 @@ model.PortalPatientModel = Backbone.Model.extend({ 'pharmacyId': '', 'status': '', 'contactRelationship': '', - 'date': '', + 'date': new Date(), 'sex': '', 'referrer': '', 'referrerid': '', @@ -627,7 +627,7 @@ model.PortalPatientModel = Backbone.Model.extend({ 'fitness': '', 'referralSource': '', 'pricelevel': '', - 'regdate': '', + 'regdate': new Date(), 'contrastart': '', 'completedAd': '', 'adReviewed': '', diff --git a/portal/patient/styles/style.css b/portal/patient/styles/style.css index aace4a8ae..1624d5499 100644 --- a/portal/patient/styles/style.css +++ b/portal/patient/styles/style.css @@ -8,7 +8,7 @@ .modal.left .modal-dialog, .modal.right .modal-dialog { position: fixed; margin: auto; - width: 100%; // + width: 100%; height: 75%; -webkit-transform: translate3d(0%, 0, 0); -ms-transform: translate3d(0%, 0, 0); @@ -16,12 +16,12 @@ transform: translate3d(0%, 0, 0); } -.modal.left .modal-content, .modal.right .modal-content { // +.modal.left .modal-content, .modal.right .modal-content { height: 75%; overflow-y: auto; } -.modal.left .modal-body, .modal.right .modal-body { // +.modal.left .modal-body, .modal.right .modal-body { padding: 15px 15px 80px; } @@ -172,7 +172,7 @@ body { .signature { width: auto !important; height: 70px; - z-index: 5 !important; // + z-index: 5 !important; padding-top: 20px; } @@ -248,6 +248,7 @@ table.collection th:hover { padding-right: 10px; margin-top: 8px; } + #loader { position: absolute; left: 50%; @@ -265,14 +266,17 @@ table.collection th:hover { -webkit-animation: spin 2s linear infinite; animation: spin 2s linear infinite; } + @-webkit-keyframes spin { 0% { -webkit-transform: rotate(0deg); } 100% { -webkit-transform: rotate(360deg); } } + @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } } +/* I have use for this */ /* span.loader { margin: 0px; display: inline-block; @@ -283,10 +287,12 @@ span.loader .progress-bar { display: inline-block; width: 100%; height: 30px; -} */ -/* .popover{ +} + +.popover{ width: 600px; } */ + /* form controls */ span.help-inline { font-size: 1.1em; @@ -299,4 +305,24 @@ span.help-inline { /* fixes spacing glitch with combo-box followed by an empty inline help */ span.help-inline:empty { display: none; -} \ No newline at end of file +} + +input[type=text], input[type=email], input[type=date],select, fieldset { + -webkit-appearance: none; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +input:required:invalid, input:focus:invalid { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAeVJREFUeNqkU01oE1EQ/mazSTdRmqSxLVSJVKU9RYoHD8WfHr16kh5EFA8eSy6hXrwUPBSKZ6E9V1CU4tGf0DZWDEQrGkhprRDbCvlpavan3ezu+LLSUnADLZnHwHvzmJlvvpkhZkY7IqFNaTuAfPhhP/8Uo87SGSaDsP27hgYM/lUpy6lHdqsAtM+BPfvqKp3ufYKwcgmWCug6oKmrrG3PoaqngWjdd/922hOBs5C/jJA6x7AiUt8VYVUAVQXXShfIqCYRMZO8/N1N+B8H1sOUwivpSUSVCJ2MAjtVwBAIdv+AQkHQqbOgc+fBvorjyQENDcch16/BtkQdAlC4E6jrYHGgGU18Io3gmhzJuwub6/fQJYNi/YBpCifhbDaAPXFvCBVxXbvfbNGFeN8DkjogWAd8DljV3KRutcEAeHMN/HXZ4p9bhncJHCyhNx52R0Kv/XNuQvYBnM+CP7xddXL5KaJw0TMAF8qjnMvegeK/SLHubhpKDKIrJDlvXoMX3y9xcSMZyBQ+tpyk5hzsa2Ns7LGdfWdbL6fZvHn92d7dgROH/730YBLtiZmEdGPkFnhX4kxmjVe2xgPfCtrRd6GHRtEh9zsL8xVe+pwSzj+OtwvletZZ/wLeKD71L+ZeHHWZ/gowABkp7AwwnEjFAAAAAElFTkSuQmCC); + background-position: right top; + background-repeat: no-repeat; + -moz-box-shadow: none; + } + + input:required:valid { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAepJREFUeNrEk79PFEEUx9/uDDd7v/AAQQnEQokmJCRGwc7/QeM/YGVxsZJQYI/EhCChICYmUJigNBSGzobQaI5SaYRw6imne0d2D/bYmZ3dGd+YQKEHYiyc5GUyb3Y+77vfeWNpreFfhvXfAWAAJtbKi7dff1rWK9vPHx3mThP2Iaipk5EzTg8Qmru38H7izmkFHAF4WH1R52654PR0Oamzj2dKxYt/Bbg1OPZuY3d9aU82VGem/5LtnJscLxWzfzRxaWNqWJP0XUadIbSzu5DuvUJpzq7sfYBKsP1GJeLB+PWpt8cCXm4+2+zLXx4guKiLXWA2Nc5ChOuacMEPv20FkT+dIawyenVi5VcAbcigWzXLeNiDRCdwId0LFm5IUMBIBgrp8wOEsFlfeCGm23/zoBZWn9a4C314A1nCoM1OAVccuGyCkPs/P+pIdVIOkG9pIh6YlyqCrwhRKD3GygK9PUBImIQQxRi4b2O+JcCLg8+e8NZiLVEygwCrWpYF0jQJziYU/ho2TUuCPTn8hHcQNuZy1/94sAMOzQHDeqaij7Cd8Dt8CatGhX3iWxgtFW/m29pnUjR7TSQcRCIAVW1FSr6KAVYdi+5Pj8yunviYHq7f72po3Y9dbi7CxzDO1+duzCXH9cEPAQYAhJELY/AqBtwAAAAASUVORK5CYII=); + background-position: right top; + background-repeat: no-repeat; + } + \ No newline at end of file diff --git a/portal/patient/templates/PatientListView.tpl.php b/portal/patient/templates/PatientListView.tpl.php index 257ca8fed..c11391511 100644 --- a/portal/patient/templates/PatientListView.tpl.php +++ b/portal/patient/templates/PatientListView.tpl.php @@ -31,9 +31,11 @@ * $row['city'] or $row['postalCode'] e.t.c.. The keys do not match table columns ie postalCode here is postal_code in table. * */ $row = array(); +if ($this->trow) { $row = $this->trow; +} - echo ""; + echo ""; $_SESSION['whereto'] = 'profilepanel'; $this->display('_modalFormHeader.tpl.php'); @@ -54,16 +56,29 @@ },1000); }); - +register)) {?> + + +
    -
    @@ -451,13 +492,14 @@
    display('_Footer.tpl.php');?> - + + -