From 9a95f5dc3731045249b5451a81d26f0e2d94c52d Mon Sep 17 00:00:00 2001 From: stephen waite Date: Mon, 27 May 2024 09:25:51 -0500 Subject: [PATCH] fix: use getTimeFormat for encounter date of service datetime picker (#7203) * fix: use getTimeFormat for encounter date of service datetime picker * php warning * revert weno php warning * forget formatTime just use format * need time in format: too * fix step * validate on blur false prevents weirdness exiting picker * fix work/school note * fix other uses and some misc php styling * php styling * fixes from review * misc php warning * turn time off --- interface/forms/note/new.php | 10 +++---- interface/forms/note/print.php | 7 +---- interface/forms/note/report.php | 2 ++ interface/forms/note/save.php | 4 ++- interface/forms/note/view.php | 27 +++++++++---------- interface/reports/amc_full_report.php | 6 ++--- interface/reports/amc_tracking.php | 4 +-- interface/reports/audit_log_tamper_report.php | 4 +-- interface/reports/cdr_log.php | 4 +-- interface/reports/clinical_reports.php | 4 +-- interface/reports/cqm.php | 12 ++++----- interface/reports/inventory_list.php | 6 ++--- interface/reports/report_results.php | 4 +-- library/forms.inc.php | 2 +- .../js/xl/jquery-datetimepicker-2-5-4.js.php | 19 ++++++++----- 15 files changed, 59 insertions(+), 56 deletions(-) diff --git a/interface/forms/note/new.php b/interface/forms/note/new.php index afa1bf76e1f..860fddc67a2 100644 --- a/interface/forms/note/new.php +++ b/interface/forms/note/new.php @@ -36,8 +36,8 @@ $(function () { $('.datepicker').datetimepicker({ - - + + @@ -83,9 +83,9 @@ - ' - title='' /> + ' + title='' /> diff --git a/interface/forms/note/print.php b/interface/forms/note/print.php index 4f20ac599cc..87fc10d708f 100644 --- a/interface/forms/note/print.php +++ b/interface/forms/note/print.php @@ -29,11 +29,6 @@ $obj = formFetch("form_" . $form_name, $_GET["id"]); } -/* remove the time-of-day from the date fields */ -if ($obj['date_of_signature'] != "") { - $dateparts = explode(" ", $obj['date_of_signature']); - $obj['date_of_signature'] = $dateparts[0]; -} ?> <?php echo "Form: note"?> @@ -67,7 +62,7 @@ ' + value='' /> diff --git a/interface/forms/note/report.php b/interface/forms/note/report.php index da08aa1669f..7b3953884c5 100644 --- a/interface/forms/note/report.php +++ b/interface/forms/note/report.php @@ -47,6 +47,8 @@ function note_report($pid, $encounter, $cols, $id) print("\n"); if ($key == "Note Type") { print "" . xlt($key) . ": " . xlt($value) . ""; + } elseif ($key == "Date Of Signature") { + print "" . xlt($key) . ": " . oeFormatShortDate($value) . ""; } else { print "" . xlt($key) . ": " . text($value) . ""; } diff --git a/interface/forms/note/save.php b/interface/forms/note/save.php index c9be03c925a..c9992263b66 100644 --- a/interface/forms/note/save.php +++ b/interface/forms/note/save.php @@ -32,8 +32,10 @@ $encounter = date("Ymd"); } +$_POST['date_of_signature'] = DateToYYYYMMDD($_POST['date_of_signature']); + if ($_GET["mode"] == "new") { - $newid = formSubmit($table_name, $_POST, $_GET["id"], $userauthorized); + $newid = formSubmit($table_name, $_POST, $_GET["id"] ?? '', $userauthorized); addForm($encounter, "Work/School Note", $newid, "note", $pid, $userauthorized); } elseif ($_GET["mode"] == "update") { $success = formUpdate($table_name, $_POST, $_GET["id"], $userauthorized); diff --git a/interface/forms/note/view.php b/interface/forms/note/view.php index 9191befd058..ba66cbe38c7 100644 --- a/interface/forms/note/view.php +++ b/interface/forms/note/view.php @@ -32,11 +32,6 @@ $obj = formFetch("form_" . $form_name, $_GET["id"]); } -/* remove the time-of-day from the date fields */ -if ($obj['date_of_signature'] != "") { - $dateparts = explode(" ", $obj['date_of_signature']); - $obj['date_of_signature'] = $dateparts[0]; -} ?> @@ -46,6 +41,16 @@ // required for textbox date verification var mypcc = ; +$(function () { + $('.datepicker').datetimepicker({ + + + + + + }); + }); + function PrintForm() { newwin = window.open(,"mywin"); } @@ -86,8 +91,8 @@ function PrintForm() { ' - title='' /> + value='' + title='' /> @@ -116,14 +121,6 @@ function PrintForm() { $("input").keydown(function() { $(".printform").attr("disabled","disabled"); }); $("select").change(function() { $(".printform").attr("disabled","disabled"); }); $("textarea").keydown(function() { $(".printform").attr("disabled","disabled"); }); - - $('.datepicker').datetimepicker({ - - - - - - }); }); diff --git a/interface/reports/amc_full_report.php b/interface/reports/amc_full_report.php index e749a7c9c46..1ccd3c604f6 100644 --- a/interface/reports/amc_full_report.php +++ b/interface/reports/amc_full_report.php @@ -46,12 +46,12 @@ function formatPatientReportData($report_id, &$data, $type_report, $amc_report_t $failed_items = $row['pass_filter'] - $row['pass_target'] - $row['excluded']; } $row['display_field_sub'] = ($displayFieldSubHeader != "") ? "($displayFieldSubHeader)" : null; - } else if (isset($row['is_sub'])) { + } elseif (isset($row['is_sub'])) { $row['display_field'] = generate_display_field(array('data_type' => '1', 'list_id' => 'rule_action_category'), $row['action_category']) . ': ' . generate_display_field(array('data_type' => '1', 'list_id' => 'rule_action'), $row['action_item']); // Excluded is not part of denominator in standard rules so do not use in calculation $failed_items = $main_pass_filter - $row['pass_target']; - } else if (isset($row['is_plan'])) { + } elseif (isset($row['is_plan'])) { $row['display_field'] = generate_display_field(array('data_type' => '1', 'list_id' => 'clinical_plans'), $row['id']); } @@ -201,7 +201,7 @@ function getRuleObjectForId($ruleId) $subTitle = ''; if ($report_view['provider'] == "group_calculation") { $subTitle = xl("Group Calculation Method"); - } else if (is_numeric($report_view['provider'])) { + } elseif (is_numeric($report_view['provider'])) { // grab the provider $userService = new \OpenEMR\Services\UserService(); $provider = $userService->getUser($report_view['provider']); diff --git a/interface/reports/amc_tracking.php b/interface/reports/amc_tracking.php index 3599e6f1737..926911a3990 100644 --- a/interface/reports/amc_tracking.php +++ b/interface/reports/amc_tracking.php @@ -202,7 +202,7 @@ function provide_sum_pat(patient_id,encounter_id) { : - + @@ -211,7 +211,7 @@ function provide_sum_pat(patient_id,encounter_id) { : - + diff --git a/interface/reports/audit_log_tamper_report.php b/interface/reports/audit_log_tamper_report.php index 9b1d35c3c59..d818292d261 100644 --- a/interface/reports/audit_log_tamper_report.php +++ b/interface/reports/audit_log_tamper_report.php @@ -142,12 +142,12 @@ function setpatient(pid, lname, fname, dob) { : - + : - + diff --git a/interface/reports/cdr_log.php b/interface/reports/cdr_log.php index c208f98338f..32bd513aef9 100644 --- a/interface/reports/cdr_log.php +++ b/interface/reports/cdr_log.php @@ -105,7 +105,7 @@ : - @@ -115,7 +115,7 @@ class='datepicker form-control'> : - diff --git a/interface/reports/clinical_reports.php b/interface/reports/clinical_reports.php index 7882a5f46e1..19b8741d7d7 100644 --- a/interface/reports/clinical_reports.php +++ b/interface/reports/clinical_reports.php @@ -238,13 +238,13 @@ function submitForm() { : : - + : ' value='' size='10' maxlength='20' /> : - + : diff --git a/interface/reports/cqm.php b/interface/reports/cqm.php index 7e104b2ca4f..67fd7f0ba0b 100644 --- a/interface/reports/cqm.php +++ b/interface/reports/cqm.php @@ -104,13 +104,13 @@ $show_help = false; if ($type_report == "standard") { $heading_title = xl('Standard Measures'); -} else if ($type_report == "cqm") { +} elseif ($type_report == "cqm") { $heading_title = xl('Clinical Quality Measures (CQM)'); -} else if ($type_report == 'cqm_2011') { +} elseif ($type_report == 'cqm_2011') { $heading_title = 'Clinical Quality Measures (CQM) - 2011'; -} else if ($type_report == "cqm_2014") { +} elseif ($type_report == "cqm_2014") { $heading_title = 'Clinical Quality Measures (CQM) - 2014'; -} else if ($is_amc_report) { +} elseif ($is_amc_report) { $heading_title = $amc_report_types[$type_report]['title']; $show_help = true; $help_file_name = "cqm_amc_help.php"; @@ -179,7 +179,7 @@ ,['value' => 'cqm_2011', 'selected' => $plan_filter == 'cqm_2011', 'label' => xl('2011 Official Clinical Quality Measures (CQM) Measure Groups')] ,['value' => 'cqm_2014', 'selected' => $plan_filter == 'cqm_2014', 'label' => xl('2014 Official Clinical Quality Measures (CQM) Measure Groups')] ]; -} else if ($is_amc_report) { +} elseif ($is_amc_report) { // latest AMC doesn't have collate options if (empty($report_id)) { // truncate to just the first option @@ -205,7 +205,7 @@ } $formData['providerReportOptions'][] = ['value' => 'group_calculation', 'selected' => $provider == 'group_calculation' , 'label' => xl('All EP/EC Group Calculation')]; -} else if ($type_report == 'standard') { +} elseif ($type_report == 'standard') { $formData['rule_filters'] = [ ['value' => 'passive_alert', 'selected' => $type_report == 'passive_alert', 'label' => xl('Passive Alert Rules')] ,['value' => 'active_alert', 'selected' => $type_report == 'active_alert', 'label' => xl('Active Alert Rules')] diff --git a/interface/reports/inventory_list.php b/interface/reports/inventory_list.php index 220ca40c11d..3093ff4ae7c 100644 --- a/interface/reports/inventory_list.php +++ b/interface/reports/inventory_list.php @@ -286,7 +286,7 @@ function write_report_line(&$row) "s.sale_date > DATE_SUB(NOW(), INTERVAL " . escape_limit($form_days) . " DAY) " . "AND s.pid != 0 $fwcond"; $srow = sqlQuery($query, array_merge(array($drug_id, $facility_id), $fwbind)); - } else if ($form_details == 2) { // warehouse details + } elseif ($form_details == 2) { // warehouse details $query = "SELECT " . "SUM(s.quantity) AS sale_quantity " . "FROM drug_sales AS s " . @@ -428,7 +428,7 @@ function write_report_line(&$row) $expdays = (int) ((strtotime($irow['expiration']) - time()) / (60 * 60 * 24)); if ($expdays <= 0) { addWarning(xl('Lot') . " '$lotno' " . xl('has expired')); - } else if ($expdays <= $gbl_expired_lot_warning_days) { + } elseif ($expdays <= $gbl_expired_lot_warning_days) { addWarning(xl('Lot') . " '$lotno' " . xl('expires in') . " $expdays " . xl('days')); } } @@ -621,7 +621,7 @@ function write_report_line(&$row) "pw.pw_warehouse = di.warehouse_id " . "WHERE 1 = 1 $fwcond $actcond " . "GROUP BY d.name, d.drug_id, lo.option_value ORDER BY $orderby, lo.option_value"; -} else if ($form_details == 2) { +} elseif ($form_details == 2) { // Query for the main loop if warehouse/lot details are wanted. $query = "SELECT d.*, di.on_hand, di.inventory_id, di.lot_number, " . "di.expiration, di.warehouse_id, lo.title, fac.name AS facname, " . diff --git a/interface/reports/report_results.php b/interface/reports/report_results.php index 03a1c63fa02..2041dd417dc 100644 --- a/interface/reports/report_results.php +++ b/interface/reports/report_results.php @@ -108,7 +108,7 @@ : - @@ -118,7 +118,7 @@ class='datepicker form-control' /> : - diff --git a/library/forms.inc.php b/library/forms.inc.php index 7b05bf6672d..1fa906963c6 100644 --- a/library/forms.inc.php +++ b/library/forms.inc.php @@ -43,7 +43,7 @@ function addForm( } //print_r($_SESSION['therapy_group']);die; - $arraySqlBind = array(); + $arraySqlBind = array(); $sql = "insert into forms (date, encounter, form_name, form_id, pid, " . "user, groupname, authorized, formdir, therapy_group_id) values ("; if ($date == "NOW()") { diff --git a/library/js/xl/jquery-datetimepicker-2-5-4.js.php b/library/js/xl/jquery-datetimepicker-2-5-4.js.php index a92400c16d8..4b3f2b74999 100644 --- a/library/js/xl/jquery-datetimepicker-2-5-4.js.php +++ b/library/js/xl/jquery-datetimepicker-2-5-4.js.php @@ -41,6 +41,8 @@ * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 */ +use OpenEMR\Services\Utils\DateFormatterUtils; + ?> i18n:{ en: { @@ -85,22 +87,27 @@ - - format: ' H:i:s', + + format: '', + formatTime: '', + validateOnBlur: false, format: 'Y-m-d H:i:s', + formatTime: 'H:i:s', - - format: ' g:i a', - formatTime:'g:i a', + + format: '', + formatTime: '', validateOnBlur: false, format: 'Y-m-d H:i', timepicker:true, - step: '30' + step: 30 format: '',