adjustments to prior commit

openemr · Feb 2, 2018 · 9a194f5 · 9a194f5
1 parent d514ec4
commit 9a194f5
Show file tree

Hide file tree

Showing 21 changed files with 188 additions and 125 deletions.
diff --git a/custom/import_xml.php b/custom/import_xml.php
@@ -11,11 +11,11 @@
  * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
 */
 
- include_once("../interface/globals.php");
- include_once("$srcdir/patient.inc");
- include_once("$srcdir/acl.inc");
+require_once("../interface/globals.php");
+require_once("$srcdir/patient.inc");
+require_once("$srcdir/acl.inc");
 
- use OpenEMR\Core\Header;
+use OpenEMR\Core\Header;
 
 function setInsurance($pid, $ainsurance, $asubscriber, $seq)
 {
@@ -131,7 +131,7 @@ function setInsurance($pid, $ainsurance, $asubscriber, $seq)
         $apatient['lname'],
         $apatient['mname'],
         $apatient['sex'],
-        $apatient['dob'],
+        fixDate($apatient['dob']),
         $apatient['street'],
         $apatient['zip'],
         $apatient['city'],

diff --git a/interface/cmsportal/history_form.php b/interface/cmsportal/history_form.php
@@ -113,14 +113,14 @@ function validate() {
     $('.datepicker').datetimepicker({
         <?php $datetimepicker_timepicker = false; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
     $('.datetimepicker').datetimepicker({
         <?php $datetimepicker_timepicker = true; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });

diff --git a/interface/cmsportal/insurance_form.php b/interface/cmsportal/insurance_form.php
@@ -174,7 +174,7 @@
         $newdata['subscriber_fname'],
         $newdata['subscriber_relationship'],
         '',                                    // subscriber_ss
-        fixDate($newdata['subscriber_DOB']),
+        $newdata['subscriber_DOB'],
         $newdata['subscriber_street'],
         $newdata['subscriber_postal_code'],
         $newdata['subscriber_city'],
@@ -189,7 +189,7 @@
         '',                                    // subscriber_employer_country
         '',                                    // copay
         $newdata['subscriber_sex'],
-        fixDate($newdata['date']),
+        $newdata['date'],
         'TRUE',                                // accept_assignment
         ''                                     // policy_type
     );
@@ -271,14 +271,14 @@ function validate() {
     $('.datepicker').datetimepicker({
         <?php $datetimepicker_timepicker = false; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
     $('.datetimepicker').datetimepicker({
         <?php $datetimepicker_timepicker = true; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
@@ -379,4 +379,3 @@ function validate() {
 </center>
 </body>
 </html>
-
diff --git a/interface/cmsportal/issue_form.php b/interface/cmsportal/issue_form.php
@@ -218,14 +218,14 @@ function validate() {
     $('.datepicker').datetimepicker({
         <?php $datetimepicker_timepicker = false; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
     $('.datetimepicker').datetimepicker({
         <?php $datetimepicker_timepicker = true; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
@@ -332,4 +332,3 @@ function validate() {
 </center>
 </body>
 </html>
-
diff --git a/interface/cmsportal/lbf_form.php b/interface/cmsportal/lbf_form.php
@@ -72,14 +72,14 @@ function openPatient() {
     $('.datepicker').datetimepicker({
         <?php $datetimepicker_timepicker = false; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
     $('.datetimepicker').datetimepicker({
         <?php $datetimepicker_timepicker = true; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
@@ -142,4 +142,3 @@ function openPatient() {
 </center>
 </body>
 </html>
-
diff --git a/interface/cmsportal/patient_form.php b/interface/cmsportal/patient_form.php
@@ -186,14 +186,14 @@ function validate() {
     $('.datepicker').datetimepicker({
         <?php $datetimepicker_timepicker = false; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });
     $('.datetimepicker').datetimepicker({
         <?php $datetimepicker_timepicker = true; ?>
         <?php $datetimepicker_showseconds = false; ?>
-        <?php $datetimepicker_formatInput = false; ?>
+        <?php $datetimepicker_formatInput = true; ?>
         <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
         <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
     });

diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php
@@ -415,14 +415,14 @@ function verifyCancel() {
             $('.datepicker').datetimepicker({
                 <?php $datetimepicker_timepicker = false; ?>
                 <?php $datetimepicker_showseconds = false; ?>
-                <?php $datetimepicker_formatInput = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
                 <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
                 <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
             });
             $('.datetimepicker').datetimepicker({
                 <?php $datetimepicker_timepicker = true; ?>
                 <?php $datetimepicker_showseconds = false; ?>
-                <?php $datetimepicker_formatInput = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
                 <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
                 <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
             });

diff --git a/interface/forms/newpatient/common.php b/interface/forms/newpatient/common.php
@@ -411,7 +411,7 @@ function cancelClickedOld() {
      <td class='bold' nowrap><?php echo xlt('Date of Service:'); ?></td>
      <td class='text' nowrap>
       <input type='text' size='10' class='datepicker input-sm' name='form_date' id='form_date' <?php echo $disabled ?>
-       value='<?php echo $viewmode ? oeFormatShortDate(substr($result['date'], 0, 10)) : oeFormatShortDate(date('Y-m-d')); ?>'
+       value='<?php echo $viewmode ? attr(oeFormatShortDate(substr($result['date'], 0, 10))) : oeFormatShortDate(date('Y-m-d')); ?>'
        title='<?php echo xla('Date of service'); ?>' />
      </td>
     </tr>

diff --git a/interface/main/calendar/find_patient_popup.php b/interface/main/calendar/find_patient_popup.php
@@ -33,7 +33,7 @@
     } elseif ($searchby == "ID") {
         $result = getPatientId("$searchparm", "*");
     } elseif ($searchby == "DOB") {
-        $result = getPatientDOB("$searchparm", "*");
+        $result = getPatientDOB(DateToYYYYMMDD($searchparm), "*");
     } elseif ($searchby == "SSN") {
         $result = getPatientSSN("$searchparm", "*");
     }

diff --git a/interface/main/finder/patient_select.php b/interface/main/finder/patient_select.php
@@ -127,7 +127,7 @@ function submitList(offset) {
 
 //the maximum number of patient records to display:
 $sqllimit = $MAXSHOW;
-$given = "*, DATE_FORMAT(DOB,'%m/%d/%Y') as DOB_TS";
+$given = "*";
 $orderby = "lname ASC, fname ASC";
 
 $search_service_code = trim($_POST['search_service_code']);
@@ -235,7 +235,7 @@ function submitList(offset) {
     } else if ($findBy == "ID") {
         $result = getPatientId("$patient", $given, "id ASC, ".$orderby, $sqllimit, $fstart);
     } else if ($findBy == "DOB") {
-        $result = getPatientDOB("$patient", $given, "DOB ASC, ".$orderby, $sqllimit, $fstart);
+        $result = getPatientDOB(DateToYYYYMMDD($patient), $given, "DOB ASC, ".$orderby, $sqllimit, $fstart);
     } else if ($findBy == "SSN") {
         $result = getPatientSSN("$patient", $given, "ss ASC, ".$orderby, $sqllimit, $fstart);
     } elseif ($findBy == "Phone") {                  //(CHEMED) Search by phone number
@@ -417,7 +417,7 @@ function submitList(offset) {
 
         echo "<td class='srSS'>" . htmlspecialchars($iter['ss'], ENT_NOQUOTES) . "</td>";
         if ($iter{"DOB"} != "0000-00-00 00:00:00") {
-            echo "<td class='srDOB'>" . htmlspecialchars($iter['DOB_TS'], ENT_NOQUOTES) . "</td>";
+            echo "<td class='srDOB'>" . text(oeFormatShortDate($iter['DOB'])) . "</td>";
         } else {
             echo "<td class='srDOB'>&nbsp;</td>";
         }
@@ -435,11 +435,11 @@ function submitList(offset) {
             $pid = '';
 
           // calculate date differences based on date of last encounter with billing entries
-            $query = "select DATE_FORMAT(max(form_encounter.date),'%m/%d/%y') as mydate," .
+            $query = "select max(form_encounter.date) as mydate," .
                   " (to_days(current_date())-to_days(max(form_encounter.date))) as day_diff," .
-                  " DATE_FORMAT(max(form_encounter.date) + interval " .
+                  " (max(form_encounter.date) + interval " .
               add_escape_custom($add_days) .
-                  " day,'%m/%d/%y') as next_appt, dayname(max(form_encounter.date) + interval " .
+                  " day) as next_appt, dayname(max(form_encounter.date) + interval " .
                   add_escape_custom($add_days) .
               " day) as next_appt_day from form_encounter " .
                   "join billing on billing.encounter = form_encounter.encounter and " .
@@ -450,23 +450,23 @@ function submitList(offset) {
             if ($results = sqlFetchArray($statement)) {
                 $last_date_seen = $results['mydate'];
                 $day_diff = $results['day_diff'];
-                $next_appt_date= xl($results['next_appt_day']).', '.$results['next_appt'];
+                $next_appt_date= xl($results['next_appt_day']).', '.oeFormatShortDate($results['next_appt']);
             }
 
           // calculate date differences based on date of last encounter regardless of billing
-            $query = "select DATE_FORMAT(max(form_encounter.date),'%m/%d/%y') as mydate," .
+            $query = "select max(form_encounter.date) as mydate," .
                   " (to_days(current_date())-to_days(max(form_encounter.date))) as day_diff," .
-                  " DATE_FORMAT(max(form_encounter.date) + interval " .
+                  " (max(form_encounter.date) + interval " .
               add_escape_custom($add_days) .
-                  " day,'%m/%d/%y') as next_appt, dayname(max(form_encounter.date) + interval " .
+                  " day) as next_appt, dayname(max(form_encounter.date) + interval " .
                   add_escape_custom($add_days) .
               " day) as next_appt_day from form_encounter " .
                   " where form_encounter.pid = ?";
             $statement= sqlStatement($query, array($iter{"pid"}));
             if ($results = sqlFetchArray($statement)) {
                 $last_date_seen = $results['mydate'];
                 $day_diff = $results['day_diff'];
-                $next_appt_date= xl($results['next_appt_day']).', '.$results['next_appt'];
+                $next_appt_date= xl($results['next_appt_day']).', '.oeFormatShortDate($results['next_appt']);
             }
 
           //calculate count of encounters by distinct billing dates with cpt4
@@ -491,8 +491,8 @@ function submitList(offset) {
 
             echo "<td class='srNumEnc'>" . htmlspecialchars($encounter_count, ENT_NOQUOTES) . "</td>\n";
             echo "<td class='srNumDay'>" . htmlspecialchars($day_diff, ENT_NOQUOTES) . "</td>\n";
-            echo "<td class='srDateLast'>" . htmlspecialchars($last_date_seen, ENT_NOQUOTES) . "</td>\n";
-            echo "<td class='srDateNext'>" . htmlspecialchars($next_appt_date, ENT_NOQUOTES) . "</td>\n";
+            echo "<td class='srDateLast'>" . text(oeFormatShortDate($last_date_seen)) . "</td>\n";
+            echo "<td class='srDateNext'>" . text($next_appt_date) . "</td>\n";
         } else { // alternate search results style
             foreach ($extracols as $field_id => $frow) {
                 echo "<td class='srMisc'>";

diff --git a/interface/new/new_comprehensive_save.php b/interface/new/new_comprehensive_save.php
@@ -77,6 +77,7 @@
 updateEmployerData($pid, $newdata['employer_data'], true);
 
 $i1dob = DateToYYYYMMDD(filter_input(INPUT_POST, "i1subscriber_DOB"));
+$i1date = DateToYYYYMMDD(filter_input(INPUT_POST, "i1effective_date"));
 
 // sqlStatement("unlock tables");
 // end table lock
@@ -115,6 +116,7 @@
 
 
 $i2dob = DateToYYYYMMDD(filter_input(INPUT_POST, "i2subscriber_DOB"));
+$i2date = DateToYYYYMMDD(filter_input(INPUT_POST, "i2effective_date"));
 
 newInsuranceData(
     $pid,
@@ -148,6 +150,7 @@
 );
 
 $i3dob  = DateToYYYYMMDD(filter_input(INPUT_POST, "i3subscriber_DOB"));
+$i3date = DateToYYYYMMDD(filter_input(INPUT_POST, "i3effective_date"));
 
 newInsuranceData(
     $pid,

diff --git a/interface/new/new_patient_save.php b/interface/new/new_patient_save.php
@@ -59,6 +59,7 @@
     $form_city              = '' ;
     $form_postcode          = '' ;
     $form_countrycode       = '' ;
+    $form_regdate           = DateToYYYYMMDD(trim($_POST['regdate']));
   // EOS DBC
   // ===================
 
@@ -109,7 +110,7 @@
         "", // $drivers_license = "",
         "", // $hipaa_notice = "",
         "", // $hipaa_message = "",
-        $_POST['regdate']
+        $form_regdate
     );
 
     newEmployerData($pid);