From 7f92123a09140f67b590cfc5ba241022e56d9ff3 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Tue, 7 Feb 2017 02:30:54 -0800
Subject: [PATCH] new datetimepicker incorporated into calendar module

---
 interface/main/calendar/add_edit_event.php         | 105 ++++++++++++---------
 .../pntemplates/default/user/ajax_search.html      |  35 ++++---
 2 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/interface/main/calendar/add_edit_event.php b/interface/main/calendar/add_edit_event.php
index 61c492e0e..54fe122c9 100644
--- a/interface/main/calendar/add_edit_event.php
+++ b/interface/main/calendar/add_edit_event.php
@@ -1,36 +1,46 @@
 <?php
-
-/**
+/*
  * Add or edit an event in the calendar.
  *
  * Can be displayed as a popup window, or as an iframe via
  * fancybox.
  *
+ *
+ * The event editor looks something like this:
+ *
+ * //------------------------------------------------------------//
+ * // Category __________________V   O All day event             //
+ * // Date     _____________ [?]     O Time     ___:___ __V      //
+ * // Title    ___________________     duration ____ minutes     //
+ * // Patient  _(Click_to_select)_                               //
+ * // Provider __________________V   X Repeats  ______V ______V  //
+ * // Status   __________________V     until    __________ [?]   //
+ * // Comments ________________________________________________  //
+ * //                                                            //
+ * //       [Save]  [Find Available]  [Delete]  [Cancel]         //
+ * //------------------------------------------------------------//
+ *
+ *
  * Copyright (C) 2005-2013 Rod Roark <rod@sunsetsystems.com>
+ * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
  *
- * This program is free software; you can redistribute it and/or
+ * 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 2
+ * 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 <http://opensource.org/licenses/gpl-license.php>;.
  *
  * @package OpenEMR
- * @author  Rod Roark <rod@sunsetsystems.com>
- * @link    http://www.open-emr.org
+ * @author Rod Roark <rod@sunsetsystems.com>
+ * @author Brady Miller <brady.g.miller@gmail.com>
+ * @link http://www.open-emr.org
  */
 
- // The event editor looks something like this:
-
- //------------------------------------------------------------//
- // Category __________________V   O All day event             //
- // Date     _____________ [?]     O Time     ___:___ __V      //
- // Title    ___________________     duration ____ minutes     //
- // Patient  _(Click_to_select)_                               //
- // Provider __________________V   X Repeats  ______V ______V  //
- // Status   __________________V     until    __________ [?]   //
- // Comments ________________________________________________  //
- //                                                            //
- //       [Save]  [Find Available]  [Delete]  [Cancel]         //
- //------------------------------------------------------------//
 
  $fake_register_globals=false;
  $sanitize_all_escapes=true;
@@ -78,8 +88,8 @@ require_once($GLOBALS['incdir']."/main/holidays/Holidays_Controller.php");
  $info_msg = "";
 
  ?>
- <script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js"></script>
- <script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative'] ?>/jquery-min-1-9-1/index.js"></script>
+ <script type="text/javascript" src="<?php echo $webroot ?>/interface/main/tabs/js/include_opener.js?v=<?php echo $v_js_includes; ?>"></script>
+ <script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative'] ?>/jquery-min-3-1-1/index.js"></script>
 
 <!-- validation library -->
 <!--//Not lbf forms use the new validation, please make sure you have the corresponding values in the list Page validation-->
@@ -896,18 +906,16 @@ if ($_POST['form_action'] == "save") {
 <?php html_header_show(); ?>
 <title><?php echo $eid ? xlt('Edit') : xlt('Add New') ?> <?php echo xlt('Event');?></title>
 <link rel="stylesheet" href='<?php echo $css_header ?>' type='text/css'>
+<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.min.css">
 
 <style>
 td { font-size:0.8em; }
 </style>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<script type="text/javascript" src="../../../library/topdialog.js"></script>
+<script type="text/javascript" src="../../../library/topdialog.js?v=<?php echo $v_js_includes; ?>"></script>
 <script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></script>
-<script type="text/javascript" src="../../../library/textformat.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar.js"></script>
-<?php include_once("{$GLOBALS['srcdir']}/dynarch_calendar_en.inc.php"); ?>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
+<script type="text/javascript" src="../../../library/textformat.js?v=<?php echo $v_js_includes; ?>"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <script language="JavaScript">
 
@@ -1062,7 +1070,6 @@ td { font-size:0.8em; }
   f.form_enddate.disabled = isdisabled;
   document.getElementById('tdrepeat1').style.color = mycolor;
   document.getElementById('tdrepeat2').style.color = mycolor;
-  document.getElementById('img_enddate').style.visibility = myvisibility;
  }
 
  // Event when days_every_week is checked.
@@ -1078,7 +1085,6 @@ td { font-size:0.8em; }
          //enable end_date setting
          document.getElementById('tdrepeat2').style.color = '#000000';
          f.form_enddate.disabled = false;
-         document.getElementById('img_enddate').style.visibility = 'visible';
 
          var isdisabled = false;
          var mycolor = '#000000';
@@ -1102,7 +1108,6 @@ td { font-size:0.8em; }
          //disable end_date setting
          document.getElementById('tdrepeat2').style.color = mycolor;
          f.form_enddate.disabled = isdisabled;
-         document.getElementById('img_enddate').style.visibility = myvisibility;
      }
 
 
@@ -1116,12 +1121,22 @@ td { font-size:0.8em; }
   '<?php echo xls("4th"); ?>'
  );
 
+var weekDays = new Array(
+  '<?php echo xls("Sunday"); ?>',
+  '<?php echo xls("Monday"); ?>',
+  '<?php echo xls("Tuesday"); ?>',
+  '<?php echo xls("Wednesday"); ?>',
+  '<?php echo xls("Thursday"); ?>',
+  '<?php echo xls("Friday"); ?>',
+  '<?php echo xls("Saturday"); ?>'
+ );
+
  // Monitor start date changes to adjust repeat type options.
  function dateChanged() {
   var f = document.forms[0];
   if (!f.form_date.value) return;
   var d = new Date(f.form_date.value);
-  var downame = Calendar._DN[d.getUTCDay()];
+  var downame = weekDays[d.getUTCDay()];
   var nthtext = '';
   var occur = Math.floor((d.getUTCDate() - 1) / 7);
   if (occur < 4) { // 5th is not allowed
@@ -1276,13 +1291,10 @@ $classpati='';
             <b><?php echo xlt('Date'); ?>:</b>
         </td>
         <td nowrap>
-            <input type='text' size='10' name='form_date' id='form_date'
+            <input type='text' size='10' class='datepicker' name='form_date' id='form_date'
                     value='<?php echo attr($date) ?>'
                     title='<?php echo xla('yyyy-mm-dd event date or starting date'); ?>'
-                    onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' onchange='dateChanged()' />
-            <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-                    id='img_date' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-                    title='<?php echo xla('Click here to choose a date'); ?>'>
+                    onchange='dateChanged()' />
         </td>
         <td nowrap>
             &nbsp;&nbsp;
@@ -1629,10 +1641,7 @@ generate_form_field(array('data_type'=>1,'field_id'=>'apptstatus','list_id'=>'ap
   <td nowrap id='tdrepeat2'><?php echo xlt('until'); ?>
   </td>
   <td nowrap>
-   <input type='text' size='10' name='form_enddate' id='form_enddate' value='<?php echo attr($row['pc_endDate']) ?>' onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' title='<?php echo xla('yyyy-mm-dd last date of this event');?>' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_enddate' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php echo xla('Click here to choose a date');?>'>
+   <input type='text' size='10' class='datepicker' name='form_enddate' id='form_enddate' value='<?php echo attr($row['pc_endDate']) ?>' title='<?php echo xla('yyyy-mm-dd last date of this event');?>' />
 <?php
 if ($repeatexdate != "") {
     $tmptitle = "The following dates are excluded from the repeating series";
@@ -1684,10 +1693,7 @@ if ($repeatexdate != "") {
    <b><font color='red'><?php echo xlt('DOB is missing, please enter if possible'); ?>:</font></b>
   </td>
   <td nowrap>
-   <input type='text' size='10' name='form_dob' id='form_dob' title='<?php echo xla('yyyy-mm-dd date of birth');?>' onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_dob' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php echo xla('Click here to choose a date');?>'>
+   <input type='text' size='10' class='datepicker' name='form_dob' id='form_dob' title='<?php echo xla('yyyy-mm-dd date of birth');?>' />
   </td>
  </tr>
 
@@ -1736,9 +1742,6 @@ if ($repeatexdate != "") {
  set_repeat();
  set_days_every_week();
 
- Calendar.setup({inputField:"form_date", ifFormat:"%Y-%m-%d", button:"img_date"});
- Calendar.setup({inputField:"form_enddate", ifFormat:"%Y-%m-%d", button:"img_enddate"});
- Calendar.setup({inputField:"form_dob", ifFormat:"%Y-%m-%d", button:"img_dob"});
 </script>
 
 <script language="javascript">
@@ -1759,6 +1762,14 @@ $(document).ready(function(){
 
     // Initialize repeat options.
     dateChanged();
+
+    $('.datepicker').datetimepicker({
+        <?php $datetimepicker_timepicker = false; ?>
+        <?php $datetimepicker_formatInput = false; ?>
+        <?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 ?>
+    });
+
 });
 
 function are_days_checked(){
diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html
index 2d35e78b3..bc32ef6ad 100644
--- a/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html
+++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/user/ajax_search.html
@@ -3,8 +3,10 @@
 
 [-* we want to include our stylesheet for this view*-]
 <link rel="stylesheet" href="[-$TPL_STYLE_PATH-]/ajax_search.css" type="text/css">
+<link rel="stylesheet" href="[-php-] echo $GLOBALS['assets_static_relative'] [-/php-]/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.min.css" type="text/css">
 
-<script type="text/javascript" src="[-php-] echo $GLOBALS['assets_static_relative'] [-/php-]/jquery-min-1-2-2/index.js"></script>
+<script type="text/javascript" src="[-php-] echo $GLOBALS['assets_static_relative'] [-/php-]/jquery-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="[-php-] echo $GLOBALS['assets_static_relative'] [-/php-]/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <!-- js for the popup window -->
 <script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/dialog.js?v=[-php-] echo $v_js_includes; [-/php-]"></script>
@@ -39,12 +41,9 @@
 </select>
 [-/if-]
 <br>
-[-php-] xl('between','e'); [-/php-] 
-<input type="text" name="start" id="start" value="[-$DATE_START-]" size="10"/>
-<img src='[-php-] echo $GLOBALS['webroot'] [-/php-]/interface/pic/show_calendar.gif' align='absbottom' width='24' height='22' id='img_from_date' border='0' alt='[?]' style='cursor:pointer' title='[-php-] xl('Click here to choose a date','e'); [-/php-]'>
-[-php-] xl('and','e'); [-/php-] 
-<input type="text" name="end" id="end" value="[-$DATE_END-]" size="10"/>
-<img src='[-php-] echo $GLOBALS['webroot'] [-/php-]/interface/pic/show_calendar.gif' align='absbottom' width='24' height='22' id='img_to_date' border='0' alt='[?]' style='cursor:pointer' title='[-php-] xl('Click here to choose a date','e'); [-/php-]'>
+[-php-] xl('between','e'); [-/php-]
+<input type="text" class='datepicker' name="start" id="start" value="[-$DATE_START-]" size="10"/>
+<input type="text" class='datepicker' name="end" id="end" value="[-$DATE_END-]" size="10"/>
 <br>
 [-php-] xl('for','e'); [-/php-]
 <select name="provider_id" id="provider_id">
@@ -108,7 +107,7 @@ foreach ($this->get_template_vars('A_EVENTS') as $eDate => $date_events) {
         $imgtitle .= $provinfo['phonew1']."\n".$provinfo['street']."\n".$provinfo['city']." ".$provinfo['state'];
         echo " <img class'provinfo' src='".$GLOBALS['webroot']."/images/info.png' title=\"".$imgtitle."\" />";
         echo "</td>";
-        
+
         // category
         echo "<td class='calsearch_category'>";
         echo $event['catname'];
@@ -146,16 +145,6 @@ if ($eventCount == 0) {
 
 [-/if-]  [-*end of SEARCH_PERFORMED*-]
 
-<!-- stuff for the popup calendar -->
-<style type="text/css">@import url([-php-] echo $GLOBALS['webroot'] [-/php-]/library/dynarch_calendar.css);</style>
-<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/dynarch_calendar.js"></script>
-[-php-] include_once("{$GLOBALS['srcdir']}/dynarch_calendar_en.inc.php"); [-/php-]
-<script type="text/javascript" src="[-php-] echo $GLOBALS['webroot'] [-/php-]/library/dynarch_calendar_setup.js"></script>
-<script language="Javascript">
- Calendar.setup({inputField:"start", ifFormat:"%m/%d/%Y", button:"img_from_date"});
- Calendar.setup({inputField:"end", ifFormat:"%m/%d/%Y", button:"img_to_date"});
-</script>
-
 <script language="javascript">
 // jQuery stuff to make the page a little easier to use
 
@@ -165,6 +154,14 @@ $(document).ready(function(){
     $(".calsearch_event").mouseover(function() { $(this).toggleClass("highlight"); });
     $(".calsearch_event").mouseout(function() { $(this).toggleClass("highlight"); });
     $(".calsearch_event").click(function() { EditEvent(this); });
+
+    $('.datepicker').datetimepicker({
+        [-php-] $datetimepicker_timepicker = false; [-/php-]
+        [-php-] $datetimepicker_formatInput = false; [-/php-]
+        [-php-] require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); [-/php-]
+        [-php-] // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma [-/php-]
+        ,format: 'm/d/Y'
+    });
 });
 
 // open a pop up to edit the event
@@ -186,7 +183,7 @@ function goPid(pid) {
     top.restoreSession();
     [-php-]
            echo "top.RTop.location = '../../patient_file/summary/demographics.php' " .
-           			 "+ '?set_pid=' + pid;\n";         	
+           			 "+ '?set_pid=' + pid;\n";
     [-/php-]
  }
 </script>
-- 
2.11.4.GIT