From bebf35f7e2e20163e4daf4a98875085421823a03 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Sat, 11 Mar 2017 21:52:39 -0800
Subject: [PATCH] added new datepicker to forms in contrib

---
 contrib/forms/example2/new.php                     |  75 ++++++++-------
 contrib/forms/example2/view.php                    |  84 +++++++++--------
 contrib/forms/formmaker/formscript.pl              |  78 +++++++++-------
 .../psychiatrySet/brief_aan_verwijzer/new.php      |  96 +++++++++++--------
 .../psychiatrySet/brief_aan_verwijzer/view.php     |  76 +++++++++------
 contrib/forms/psychiatrySet/intakeverslag/new.php  |  97 ++++++++++---------
 contrib/forms/psychiatrySet/intakeverslag/view.php |  93 ++++++++++---------
 .../psychiatrySet/psychiatrisch_onderzoek/new.php  | 103 +++++++++++----------
 .../psychiatrySet/psychiatrisch_onderzoek/view.php |  96 ++++++++++---------
 interface/orders/orders_results.php                |  38 ++++----
 10 files changed, 462 insertions(+), 374 deletions(-)

diff --git a/contrib/forms/example2/new.php b/contrib/forms/example2/new.php
index 5bd0131ec..8593a7b36 100644
--- a/contrib/forms/example2/new.php
+++ b/contrib/forms/example2/new.php
@@ -1,6 +1,21 @@
 <?php
 /*
  * The page shown when the user requests a new form
+ *
+ * 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
+ * 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    Brady Miller <brady.g.miller@gmail.com>
+ * @link      http://www.open-emr.org
  */
 
 include_once("../../globals.php");
@@ -21,18 +36,14 @@ $returnurl = 'encounter_top.php';
 <?php html_header_show();?>
 
 <!-- other supporting javascript code -->
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/textformat.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/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>
 
 <!-- page styles -->
 <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" href="../../forms/<?php echo $form_folder; ?>/style.css" type="text/css">
-
-<!-- pop up calendar -->
-<style type="text/css">@import url(<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar.css);</style>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar_setup.js"></script>
+<link rel="stylesheet" href="../../forms/<?php echo $form_folder; ?>/style.css?v=<?php echo $v_js_includes; ?>" type="text/css">
+<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.min.css">
 
 <script language="JavaScript">
 // this line is to assist the calendar text boxes
@@ -49,8 +60,8 @@ var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
 <span class="title"><?php xl($form_name, 'e'); ?></span><br>
 
 <!-- Save/Cancel buttons -->
-<input type="button" class="save" value="<?php xl('Save','e'); ?>"> &nbsp; 
-<input type="button" class="dontsave" value="<?php xl('Don\'t Save','e'); ?>"> &nbsp; 
+<input type="button" class="save" value="<?php xl('Save','e'); ?>"> &nbsp;
+<input type="button" class="dontsave" value="<?php xl('Don\'t Save','e'); ?>"> &nbsp;
 
 <!-- container for the main body of the form -->
 <div id="form_container">
@@ -58,25 +69,17 @@ var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
 <div id="general">
 <table>
 <tr><td>
-Date: 
-   <input type='text' size='10' name='form_date' id='form_date'
+Date:
+   <input type='text' size='10' class='datepicker' name='form_date' id='form_date'
     value='<?php echo date('Y-m-d', time()); ?>'
-    title='<?php xl('yyyy-mm-dd','e'); ?>'
-    onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_form_date' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php xl('Click here to choose a date','e'); ?>'>
+    title='<?php xl('yyyy-mm-dd','e'); ?>' />
 </td></tr>
 <tr><td>
 Name: <input id="name" name="name" type="text" size="50" maxlength="250">
 Date of Birth:
-   <input type='text' size='10' name='dob' id='dob'
+   <input type='text' size='10' class='datepicker' name='dob' id='dob'
     value='<?php echo $date ?>'
-    title='<?php xl('yyyy-mm-dd Date of Birth','e'); ?>'
-    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 xl('Click here to choose a date','e'); ?>'>
+    title='<?php xl('yyyy-mm-dd Date of Birth','e'); ?>' />
 </td></tr>
 <tr><td>
 Phone: <input name="phone" id="phone" type="text" size="15" maxlength="15">
@@ -98,36 +101,36 @@ Signature?
 <input type="radio" id="sig" name="sig" value="n">No
 &nbsp;&nbsp;
 Date of signature:
-   <input type='text' size='10' name='sig_date' id='sig_date'
+   <input type='text' size='10' class='datepicker' name='sig_date' id='sig_date'
     value='<?php echo date('Y-m-d', time()); ?>'
-    title='<?php xl('yyyy-mm-dd','e'); ?>'
-    onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_sig_date' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php xl('Click here to choose a date','e'); ?>'>
+    title='<?php xl('yyyy-mm-dd','e'); ?>' />
 </div>
 </div>
 
 </div> <!-- end form_container -->
 
 <!-- Save/Cancel buttons -->
-<input type="button" class="save" value="<?php xl('Save','e'); ?>"> &nbsp; 
-<input type="button" class="dontsave" value="<?php xl('Don\'t Save','e'); ?>"> &nbsp; 
+<input type="button" class="save" value="<?php xl('Save','e'); ?>"> &nbsp;
+<input type="button" class="dontsave" value="<?php xl('Don\'t Save','e'); ?>"> &nbsp;
 </form>
 
 </body>
 
 <script language="javascript">
-/* required for popup calendar */
-Calendar.setup({inputField:"dob", ifFormat:"%Y-%m-%d", button:"img_dob"});
-Calendar.setup({inputField:"form_date", ifFormat:"%Y-%m-%d", button:"img_form_date"});
-Calendar.setup({inputField:"sig_date", ifFormat:"%Y-%m-%d", button:"img_sig_date"});
 
 // jQuery stuff to make the page a little easier to use
 
 $(document).ready(function(){
     $(".save").click(function() { top.restoreSession(); document.my_form.submit(); });
     $(".dontsave").click(function() { location.href='<?php echo "$rootdir/patient_file/encounter/$returnurl";?>'; });
+
+    $('.datepicker').datetimepicker({
+        <?php $datetimepicker_timepicker = false; ?>
+        <?php $datetimepicker_showseconds = 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 ?>
+    });
 });
 </script>
 
diff --git a/contrib/forms/example2/view.php b/contrib/forms/example2/view.php
index 7d46c8713..5b761f618 100644
--- a/contrib/forms/example2/view.php
+++ b/contrib/forms/example2/view.php
@@ -1,8 +1,25 @@
 <?php
 /*
- * Sports Physical Form created by Jason Morrill: January 2009
+ * Sports Physical Form
+ *
+ * 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
+ * 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    Jason Morrill
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @link      http://www.open-emr.org
  */
 
+
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
 
@@ -40,18 +57,14 @@ if ($record['sig_date'] != "") {
 <?php html_header_show();?>
 
 <!-- supporting javascript code -->
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/textformat.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/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>
 
 <!-- page styles -->
 <link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
-<link rel="stylesheet" href="../../forms/<?php echo $form_folder; ?>/style.css" type="text/css">
-
-<!-- pop up calendar -->
-<style type="text/css">@import url(<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar.css);</style>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="<?php echo $GLOBALS['webroot'] ?>/library/dynarch_calendar_setup.js"></script>
+<link rel="stylesheet" href="../../forms/<?php echo $form_folder; ?>/style.css?v=<?php echo $v_js_includes; ?>" type="text/css">
+<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.min.css">
 
 <script language="JavaScript">
 // this line is to assist the calendar text boxes
@@ -72,9 +85,9 @@ function PrintForm() {
 <span class="title"><?php xl($form_name,'e'); ?></span><br>
 
 <!-- Save/Cancel links -->
-<input type="button" class="save" value="<?php xl('Save Changes','e'); ?>"> &nbsp; 
-<input type="button" class="dontsave" value="<?php xl('Don\'t Save Changes','e'); ?>"> &nbsp; 
-<input type="button" class="printform" value="<?php xl('Print','e'); ?>"> &nbsp; 
+<input type="button" class="save" value="<?php xl('Save Changes','e'); ?>"> &nbsp;
+<input type="button" class="dontsave" value="<?php xl('Don\'t Save Changes','e'); ?>"> &nbsp;
+<input type="button" class="printform" value="<?php xl('Print','e'); ?>"> &nbsp;
 
 <!-- container for the main body of the form -->
 <div id="form_container">
@@ -83,25 +96,17 @@ function PrintForm() {
 <table>
 <tr><td>
 Date:
-   <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 stripslashes($record['form_date']);?>'
-    title='<?php xl('yyyy-mm-dd','e'); ?>'
-    onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_form_date' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php xl('Click here to choose a date','e'); ?>'>
+    title='<?php xl('yyyy-mm-dd','e'); ?>' />
 </td></tr>
 <tr><td>
 Name: <input id="name" name="name" type="text" size="50" maxlength="250" value="<?php echo stripslashes($record['name']);?>">
 Date of Birth:
-   <input type='text' size='10' name='dob' id='dob'
+   <input type='text' size='10' class='datepicker' name='dob' id='dob'
     value='<?php echo stripslashes($record['dob']);?>'
     title='<?php xl('yyyy-mm-dd Date of Birth','e'); ?>'
-    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 xl('Click here to choose a date','e'); ?>'>
 </td></tr>
 <tr><td>
 Phone: <input name="phone" id="phone" type="text" size="15" maxlength="15" value="<?php echo stripslashes($record['phone']);?>">
@@ -117,44 +122,43 @@ Use this space to express notes <br>
 <textarea name="notes" id="notes" cols="80" rows="4"><?php echo stripslashes($record['notes']);?></textarea>
 <br><br>
 <div style="text-align:right;">
-Signature? 
+Signature?
 <input type="radio" id="sig" name="sig" value="y" <?php if ($record["sig"] == 'y') echo "CHECKED"; ?>>Yes
 /
 <input type="radio" id="sig" name="sig" value="n" <?php if ($record["sig"] == 'n') echo "CHECKED"; ?>>No
 &nbsp;&nbsp;
-Date of signature: 
-   <input type='text' size='10' name='sig_date' id='sig_date'
+Date of signature:
+   <input type='text' size='10' class='datepicker' name='sig_date' id='sig_date'
     value='<?php echo stripslashes($record['sig_date']);?>'
-    title='<?php xl('yyyy-mm-dd','e'); ?>'
-    onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' />
-   <img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-    id='img_sig_date' border='0' alt='[?]' style='cursor:pointer;cursor:hand'
-    title='<?php xl('Click here to choose a date','e'); ?>'>
+    title='<?php xl('yyyy-mm-dd','e'); ?>' />
 </div>
 </div>
 
 </div> <!-- end form_container -->
 
-<input type="button" class="save" value="<?php xl('Save Changes','e'); ?>"> &nbsp; 
-<input type="button" class="dontsave" value="<?php xl('Don\'t Save Changes','e'); ?>"> &nbsp; 
-<input type="button" class="printform" value="<?php xl('Print','e'); ?>"> &nbsp; 
+<input type="button" class="save" value="<?php xl('Save Changes','e'); ?>"> &nbsp;
+<input type="button" class="dontsave" value="<?php xl('Don\'t Save Changes','e'); ?>"> &nbsp;
+<input type="button" class="printform" value="<?php xl('Print','e'); ?>"> &nbsp;
 
 </form>
 
 </body>
 
 <script language="javascript">
-/* required for popup calendar */
-Calendar.setup({inputField:"dob", ifFormat:"%Y-%m-%d", button:"img_dob"});
-Calendar.setup({inputField:"form_date", ifFormat:"%Y-%m-%d", button:"img_form_date"});
-Calendar.setup({inputField:"sig_date", ifFormat:"%Y-%m-%d", button:"img_sig_date"});
-
 // jQuery stuff to make the page a little easier to use
 
 $(document).ready(function(){
     $(".save").click(function() { top.restoreSession(); document.my_form.submit(); });
     $(".dontsave").click(function() { location.href='<?php echo "$rootdir/patient_file/encounter/$returnurl";?>'; });
     $(".printform").click(function() { PrintForm(); });
+
+    $('.datepicker').datetimepicker({
+        <?php $datetimepicker_timepicker = false; ?>
+        <?php $datetimepicker_showseconds = 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 ?>
+    });
 });
 
 </script>
diff --git a/contrib/forms/formmaker/formscript.pl b/contrib/forms/formmaker/formscript.pl
index 8d62d0b1e..5916f2af6 100755
--- a/contrib/forms/formmaker/formscript.pl
+++ b/contrib/forms/formmaker/formscript.pl
@@ -48,10 +48,10 @@ for the sql database field name.  If you use a SQL reserved word, the form gener
 will fail and this program will notify you of the word(s) you used.
 
 The '::' is the standard delimiter that I use between items.  The second item on the line
-is the form widget type.  You can choose from: 
+is the form widget type.  You can choose from:
 
 textfield
-textarea 
+textarea
 checkbox
 checkbox_group
 radio_group
@@ -70,7 +70,7 @@ have the following line entered:
 
 chest pain, shortness of breath.  Negative for palpitations.
 
-The remaining items after the fieldname and the widget type  are the names for 
+The remaining items after the fieldname and the widget type  are the names for
 checkboxes or radio buttons or default text
 for a textfield or text area.  You can also start a line with a '#' as the first character and this
 will be an ignored comment line.  If you put html tags on their own lines, they will be integrated
@@ -93,7 +93,7 @@ Please send feedback to drleeds@gmail.com.
 
 START
 
-#info.txt 
+#info.txt
 my $info_txt=<<'START';
 FORM_NAME
 START
@@ -103,13 +103,24 @@ START
 #for the popup javascript calendar
 my $date_field_exists = 0;
 my $date_header =<<'START';
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
+
 <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-min-3-1-1/index.js"></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'> var mypcc = '1'; </script>
+<script language='JavaScript'>
+$(document).ready(function(){
+    $('.datepicker').datetimepicker({
+        <?php $datetimepicker_timepicker = false; ?>
+        <?php $datetimepicker_showseconds = 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 ?>
+    });
+});
+</script>
 START
 
 #new.php
@@ -122,6 +133,7 @@ $returnurl = 'encounter_top.php';
 ?>
 <html><head>
 <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">
 </head>
 <body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 DATE_HEADER
@@ -191,7 +203,7 @@ print "</tr><tr>\n";
 }
 print "</tr></table><hr>";
 }
-?> 
+?>
 START
 
 #save.php
@@ -220,7 +232,7 @@ foreach($field_names as $key=>$val)
 	{
 		if (array_key_exists($key,$negatives)) #a field requests reporting of negatives
 		{
-                  if ($_POST[$key]) 
+                  if ($_POST[$key])
                   {
 			foreach($_POST[$key] as $var) #check positives against list
 			{
@@ -230,17 +242,17 @@ foreach($field_names as $key=>$val)
 				}
 			}
                   }
-			if (is_array($negatives[$key]) && count($negatives[$key])>0) 
+			if (is_array($negatives[$key]) && count($negatives[$key])>0)
 			{
 				$neg = "Negative for ".implode(', ',$negatives[$key]).'.';
 			}
 		}
-		if (is_array($_POST[$key]) && count($_POST[$key])>0) 
+		if (is_array($_POST[$key]) && count($_POST[$key])>0)
 		{
 			$pos = implode(', ',$_POST[$key]);
 		}
 		if($pos) {$pos = 'Positive for '.$pos.'.  ';}
-		$field_names[$key] = $pos.$neg;	
+		$field_names[$key] = $pos.$neg;
 	}
 	else
 	{
@@ -250,7 +262,7 @@ foreach($field_names as $key=>$val)
         {
 //          $field_names[$key] .= '.';
           $field_names[$key] = preg_replace('/\s*,\s*([^,]+)\./',' and $1.',$field_names[$key]); // replace last comma with 'and' and ending period
-        } 
+        }
 }
 
 //end special processing
@@ -342,7 +354,7 @@ START
 my $preview_html =<<'START';
 <html><head>
 </head>
-<body> 
+<body>
 <form>
 <hr>
 <h1> FORM_NAME </h1>
@@ -424,7 +436,7 @@ my %negatives;               #key=field name: these are the fields that require
 my @reserved_used;
 #strip outer spaces from field names and field types and change inner spaces to underscores
 #and check field names for SQL reserved words now
-for (@field_data) 
+for (@field_data)
 {
 	if ($_->[0] and $_->[1])	#$_->[0] is field name and $_->[1] is field type.  IE:  @field_data[4]->[0] and @field_data[4]->[1]
 	{
@@ -558,15 +570,15 @@ sub replace_save_php #a special case
 		{
 			push @fields, "'$_->[0]' => '$_->[1]'";
 			if ($negatives{$_->[0]})
-			{	
+			{
 				my @temp;
 				my $count = 3;
 				while ($count < scalar(@$_))
 				{
-					push @temp, "'$_->[$count]' => '$_->[$count]'"; 
+					push @temp, "'$_->[$count]' => '$_->[$count]'";
 					$count++;
 				}
-				push @negatives, "'$_->[0]' => array(".join(',', @temp).")";	
+				push @negatives, "'$_->[0]' => array(".join(',', @temp).")";
 			}
 		}
 	}
@@ -581,7 +593,7 @@ sub replace_sql #a special case
 {
 	my $text = shift;
 	my $replace = '';
-        for (grep{$_->[0] and $_->[1]} @_) 
+        for (grep{$_->[0] and $_->[1]} @_)
         {
 	  next if $_->[0] eq 'redirect';
 	  $replace .= $_->[0]." TEXT,\n" if $_->[1] !~ /^date$/;
@@ -605,15 +617,15 @@ sub replace_view_php           #a special case  (They're all special cases aren'
 			  $selname = $1;
 			  goto go;
 			}
-	
+
 	  goto go if $_ =~ s/(<textarea\sname=")([\w\s]+)("[\w\s="]*>)/$1$2$3<?php \$result = chkdata_Txt(\$obj,"$2"); echo \$result;?>/;  #TEXTAREA
-		 
+
 	  goto go if $_ =~ s/(<input\stype="text"\s)(name=")([\w\s]+)(")([^>]*)/$1$2$3$4 value="<?php \$result = chkdata_Txt(\$obj,"$3"); echo \$result;?>"/;               #TEXT
-		 
+
 	  goto go if $_ =~ s/(<input\stype="checkbox"\sname=")([\w\s]+)(\[\])("\svalue=")([\w\s]+)(")([^>]*)/$1$2$3$4$5$6 <?php \$result = chkdata_CB(\$obj,"$2","$5"); echo \$result;?>/;   #CHECKBOX-GROUP
-		 
+
 	  goto go if $_ =~ s/(<input\stype="checkbox"\sname=")([\w\s]+)("\svalue=")([\w\s]+)(")([^>]*)/$1$2$3$4$5 <?php \$result = chkdata_CB(\$obj,"$2","$4"); echo \$result;?>/; #CHECKBOX
-		 
+
 	  goto go if $_ =~ s/(<input\stype="radio"\sname=")([\w\s]+)("\svalue=")([\w\s]+)(")([^>]*)/$1$2$3$4$5 <?php \$result = chkdata_Radio(\$obj,"$2","$4"); echo \$result;?>/; #RADIO-GROUP
 
 	  goto go if $_ =~ s/(<option value=")([\w\s]+)(")/$1$2$3 <?php \$result = chkdata_PopOrScroll(\$obj,"$selname","$2"); echo \$result;?>/g; #SCROLLING-LISTS-BOTH & POPUP-MENU
@@ -708,7 +720,7 @@ START
 				my $mainfield = shift(@redirect);
 				my $field_constants;
 				if (@redirect) {
-					my %temp = @redirect;	
+					my %temp = @redirect;
 					foreach(keys %temp) {
 						$field_constants .= "'$_' => '".$temp{$_}."', ";
 					}
@@ -749,11 +761,11 @@ START
 			    $return .= '<br>'."\n";
 			  }
 
-			  $return .= $_->[0]."\n";	
-			  
-			  
+			  $return .= $_->[0]."\n";
+
+
 		}
-	}		
+	}
 	$return .= "<table>" if not $bigtable;
 	$return .= "</table>";
 	$return .= submit(-name=>'submit form');
@@ -777,13 +789,13 @@ sub xl_fix #make compliant with translation feature
 {
 	my $string = shift;
 	return $string if $noxl;
-	$string =~ s/(>{1,2})([^\s][^<>]+?)<\//$1 <\?php xl("$2",'e') \?> <\//gs; 
+	$string =~ s/(>{1,2})([^\s][^<>]+?)<\//$1 <\?php xl("$2",'e') \?> <\//gs;
         return $string;
 }
 sub xl_fix2 #make compliant with translation feature for report.php
 {
 	my $string = shift;
 	return $string if $noxl;
-	$string =~ s/\.(\$\w+)\./\.xl("$1")\./gs; 
+	$string =~ s/\.(\$\w+)\./\.xl("$1")\./gs;
         return $string;
 }
diff --git a/contrib/forms/psychiatrySet/brief_aan_verwijzer/new.php b/contrib/forms/psychiatrySet/brief_aan_verwijzer/new.php
index d5f36cfb3..fc72e013e 100644
--- a/contrib/forms/psychiatrySet/brief_aan_verwijzer/new.php
+++ b/contrib/forms/psychiatrySet/brief_aan_verwijzer/new.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	brief_aan_verwijzer
-// Package:	letter to verwijzer - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 30-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * brief_aan_verwijzer
+ * letter to verwijzer - Dutch specific form
+ * Version: 1.0 - 30-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -21,12 +35,12 @@ $provider_results = sqlQuery("select * from users where username='" . $_SESSION{
 function getPatientDateOfLastEncounter( $nPid )
 {
   // get date of last encounter no codes
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -37,21 +51,21 @@ function getPatientDateOfLastEncounter( $nPid )
 $m_strEventDate = getPatientDateOfLastEncounter( $result['pid'] );
 
 // get last saved id for intakeverslag
-$vectIntakeverslagQuery = sqlQuery( "SELECT id FROM form_intakeverslag 
+$vectIntakeverslagQuery = sqlQuery( "SELECT id FROM form_intakeverslag
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=0 
+                            AND autosave_flag=0
                             ORDER by id DESC limit 1" );
 
 // get autosave id for Psychiatrisch Onderzoek
-$vectPO = sqlQuery( "SELECT id FROM form_psychiatrisch_onderzoek 
+$vectPO = sqlQuery( "SELECT id FROM form_psychiatrisch_onderzoek
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=0 
+                            AND autosave_flag=0
                             ORDER by id DESC limit 1" );
 
 // get autosave id for Psychiatrisch Onderzoek
@@ -60,7 +74,7 @@ $vectAutosaveBAV = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM f
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 //fetch data from INTAKE-VERSLAG
@@ -80,14 +94,14 @@ if( $obj_bav['introductie'] != '' )
 else
   $obj['introductie'] = xl("Since","",""," ") . $m_strEventDate . xl("we have seen your above patient for evaluation and treatment at our outpatient psychiatry clinic. Thank you for this referral.",""," ");
 
-// Reden van aanmelding 
+// Reden van aanmelding
 if( $obj_bav['reden_van_aanmelding'] != '' )
   $obj['reden_van_aanmelding'] = $obj_bav['reden_van_aanmelding'];
 elseif( $obj_iv['reden_van_aanmelding'] != '' )
   $obj['reden_van_aanmelding'] = $obj_iv['reden_van_aanmelding'];
 else
   $obj['reden_van_aanmelding'] = '';
-  
+
 // Anamnese
 if( $obj_bav['anamnese'] != '' )
   $obj['anamnese'] = $obj_bav['anamnese'];
@@ -96,7 +110,7 @@ elseif( $obj_iv['klachten_probleemgebieden'] != '' )
 else
   $obj['anamnese'] = '';
 
-// Psychiatrisch onderzoek 
+// Psychiatrisch onderzoek
 if( $obj_bav['psychiatrisch_onderzoek'] != '' )
   $obj['psychiatrisch_onderzoek'] = $obj_bav['psychiatrisch_onderzoek'];
 elseif( $obj_po['psychiatrisch_onderzoek'] != '' )
@@ -104,14 +118,14 @@ elseif( $obj_po['psychiatrisch_onderzoek'] != '' )
 else
   $obj['psychiatrisch_onderzoek'] = '';
 
-// Beschrijvend conclusie 
+// Beschrijvend conclusie
 if( $obj_bav['beschrijvend_conclusie'] != '' )
   $obj['beschrijvend_conclusie'] = $obj_bav['beschrijvend_conclusie'];
 elseif( $obj_po['beschrijvende_conclusie'] != '' )
   $obj['beschrijvend_conclusie'] = $obj_po['beschrijvende_conclusie'];
 else
   $obj['beschrijvend_conclusie'] = '';
-  
+
 // Advies/beleid
 if( $obj_bav['advies_beleid'] != '' )
   $obj['advies_beleid'] = $obj_bav['advies_beleid'];
@@ -126,13 +140,12 @@ else
 <html>
 <head>
     <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">
 </head>
 
-                               
 
-<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
+<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
@@ -141,15 +154,11 @@ else
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -162,6 +171,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 delete_autosave( )
@@ -172,7 +188,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/brief_aan_verwijzer/delete_autosave.php",
-              data: "id=" + <?php echo $brief_aan_verwijzer_id ?>  
+              data: "id=" + <?php echo $brief_aan_verwijzer_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -181,7 +197,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -192,21 +208,21 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_introductie = $("#introductie").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_anamnese = $("#anamnese").val();
   var a_psychiatrisch_onderzoek = $("#psychiatrisch_onderzoek").val();
   var a_beschrijvend_conclusie = $("#beschrijvend_conclusie").val();
   var a_advies_beleid = $("#advies_beleid").val();
-    
+
   if( a_introductie.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/brief_aan_verwijzer/autosave.php",
-              data: "id=" + <?php echo $brief_aan_verwijzer_id ?> + 
+              data: "id=" + <?php echo $brief_aan_verwijzer_id ?> +
                         "&introductie=" + $("#introductie").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&anamnese=" + a_anamnese +
@@ -225,7 +241,7 @@ function autosave( )
 }
 
 </script>
-        
+
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 <form method=post action="<?php echo $rootdir;?>/forms/brief_aan_verwijzer/save.php?mode=new&saveid=<?php echo $brief_aan_verwijzer_id; ?>" name="my_form">
 <span class="title"><?php xl('Psychiatric Brief Letter','e'); ?></span><br><br>
@@ -246,8 +262,8 @@ function autosave( )
 
 <table><tr>
 
-<?php 
-// here we fill in the header above with patient name etc ? ??? - move above 
+<?php
+// here we fill in the header above with patient name etc ? ??? - move above
 
 ?>
 </tr></table>
diff --git a/contrib/forms/psychiatrySet/brief_aan_verwijzer/view.php b/contrib/forms/psychiatrySet/brief_aan_verwijzer/view.php
index e0b64602f..e433ff060 100644
--- a/contrib/forms/psychiatrySet/brief_aan_verwijzer/view.php
+++ b/contrib/forms/psychiatrySet/brief_aan_verwijzer/view.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	form_brief_aan_verwijzer
-// Package:	letter to ... - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 30-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * brief_aan_verwijzer
+ * letter to ... - Dutch specific form
+ * Version: 1.0 - 30-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -20,12 +34,12 @@ $provider_results = sqlQuery("select * from users where username='" . $_SESSION{
 function getPatientDateOfLastEncounter( $nPid )
 {
   // get date of last encounter no codes
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -41,13 +55,13 @@ $vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 if( $vectAutosave['id'] && $vectAutosave['id'] != "" && $vectAutosave['id'] > 0 )
 {
   $obj = formFetch("form_brief_aan_verwijzer", $vectAutosave['id']);
-  
+
 } else
 {
   $obj = formFetch("form_brief_aan_verwijzer", (int)$_GET["id"] );
@@ -58,12 +72,11 @@ if( $vectAutosave['id'] && $vectAutosave['id'] != "" && $vectAutosave['id'] > 0
 <html>
     <head>
         <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">
     </head>
 
 <body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
   .dehead    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:bold;
@@ -71,15 +84,11 @@ if( $vectAutosave['id'] && $vectAutosave['id'] != "" && $vectAutosave['id'] > 0
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -92,6 +101,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 delete_autosave( )
@@ -102,7 +118,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/brief_aan_verwijzer/delete_autosave.php",
-              data: "id=" + <?php echo $brief_aan_verwijzer_id ?>  
+              data: "id=" + <?php echo $brief_aan_verwijzer_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -111,7 +127,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -122,28 +138,28 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_introductie = $("#introductie").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_anamnese = $("#anamnese").val();
   var a_psychiatrisch_onderzoek = $("#psychiatrisch_onderzoek").val();
   var a_beschrijvend_conclusie = $("#beschrijvend_conclusie").val();
   var a_advies_beleid = $("#advies_beleid").val();
-    
+
   if( a_introductie.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/brief_aan_verwijzer/autosave.php",
-              data: "id=" + <?php echo $brief_aan_verwijzer_id ?> + 
+              data: "id=" + <?php echo $brief_aan_verwijzer_id ?> +
                         "&introductie=" + $("#introductie").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&anamnese=" + a_anamnese +
                         "&psychiatrisch_onderzoek=" + a_psychiatrisch_onderzoek +
                         "&beschrijvend_conclusie=" + a_beschrijvend_conclusie +
                         "&advies_beleid=" + a_advies_beleid +
-                        "&mode=update" 
+                        "&mode=update"
                         ,
                                 cache: false,
                                 success: function( message )
@@ -180,7 +196,7 @@ include_once("$srcdir/api.inc");
 <textarea cols=80 rows=5 wrap=virtual name="advies_beleid" id="advies_beleid"><?php echo stripslashes($obj{"advies_beleid"});?></textarea><br>
 
 <table><tr>
-<?php 
+<?php
 // this to be used/moved above for form header with patient name/etc
 ?>
 </tr></table>
diff --git a/contrib/forms/psychiatrySet/intakeverslag/new.php b/contrib/forms/psychiatrySet/intakeverslag/new.php
index bfe033a1a..df332fe6a 100644
--- a/contrib/forms/psychiatrySet/intakeverslag/new.php
+++ b/contrib/forms/psychiatrySet/intakeverslag/new.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	Intakeverslag
-// Package:	Report of First visit - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 27-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * Intakeverslag
+ * Report of First visit - Dutch specific form
+ * Version: 1.0 - 27-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -21,13 +35,13 @@ $age = getPatientAge($result["DOB_YMD"]);
 // Function:	getPatientDateOfLastEncounter
 function getPatientDateOfLastEncounter( $nPid )
 {
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
-                  AND ( pc_catid = 12 OR pc_catid = 16 ) 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
+                  AND ( pc_catid = 12 OR pc_catid = 16 )
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -38,12 +52,12 @@ function getPatientDateOfLastEncounter( $nPid )
 $m_strEventDate = getPatientDateOfLastEncounter( $result['pid'] );
 
 // get autosave id
-$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_intakeverslag 
+$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_intakeverslag
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 $obj = formFetch("form_intakeverslag", $vectAutosave['id']);
@@ -56,13 +70,12 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
 <html>
 <head>
     <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">
 </head>
 
-                               
 
-<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
+<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
@@ -71,15 +84,11 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -92,6 +101,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 delete_autosave( )
@@ -102,7 +118,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/intakeverslag/delete_autosave.php",
-              data: "id=" + <?php echo $intakeverslag_id ?>  
+              data: "id=" + <?php echo $intakeverslag_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -111,7 +127,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -122,7 +138,7 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_intakedatum = $("#intakedatum").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_klachten_probleemgebieden = $("#klachten_probleemgebieden").val();
@@ -140,14 +156,14 @@ function autosave( )
   var a_indruk_observaties = $("#indruk_observaties").val();
   var a_beschrijvende_conclusie = $("#beschrijvende_conclusie").val();
   var a_behandelvoorstel = $("#behandelvoorstel").val();
-  
+
   if( a_intakedatum.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/intakeverslag/autosave.php",
-              data: "id=" + <?php echo $intakeverslag_id ?> + 
+              data: "id=" + <?php echo $intakeverslag_id ?> +
                         "&intakedatum=" + $("#intakedatum").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&klachten_probleemgebieden=" + a_klachten_probleemgebieden +
@@ -177,7 +193,7 @@ function autosave( )
 }
 
 </script>
-        
+
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 <form method=post action="<?php echo $rootdir;?>/forms/intakeverslag/save.php?mode=new&saveid=<?php echo $intakeverslag_id; ?>" name="my_form">
 <span class="title"><?php xl('Psychiatric Intake','e'); ?></span><br><br>
@@ -185,14 +201,11 @@ function autosave( )
 <table>
 <tr>
 <td><?php xl('Intake Date','e'); ?>:</td><td>
-<input type='text' name='intakedatum' id='intakedatum' size='10' value='<?php echo $m_strEventDate ?>'
-          onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' title='<?php xl('Intake Date','e'); ?>: yyyy-mm-dd'></input>
-<img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-          id='img_last_encounter' border='0' alt='[?]' style='cursor:pointer'
-          title='<?php xl('Click here to choose a date','e'); ?>'>
+<input type='text' class='datepicker' name='intakedatum' id='intakedatum' size='10' value='<?php echo $m_strEventDate ?>'
+          title='<?php xl('Intake Date','e'); ?>: yyyy-mm-dd'></input>
+
 
-                     
-<?php 
+<?php
 
 ?></td>
 </tr>
@@ -245,8 +258,8 @@ function autosave( )
 
 <table><tr>
 
-<?php 
-// here we fill in the header above with patient name etc ? ??? - move above 
+<?php
+// here we fill in the header above with patient name etc ? ??? - move above
 
 ?>
 </tr></table>
@@ -257,10 +270,6 @@ function autosave( )
 <a href="<?php echo "$rootdir/patient_file/encounter/$returnurl";?>" class="link_submit" onclick="delete_autosave();top.restoreSession()">[<?php xl('Don\'t Save','e'); ?>]</a>
 </form>
 
-<script language='JavaScript'>
- Calendar.setup({inputField:"intakedatum", ifFormat:"%Y-%m-%d", button:"img_last_encounter"});
-</script>
-
 <div id="timestamp"></div>
 
 <?php
diff --git a/contrib/forms/psychiatrySet/intakeverslag/view.php b/contrib/forms/psychiatrySet/intakeverslag/view.php
index 3e96dd882..319e06681 100644
--- a/contrib/forms/psychiatrySet/intakeverslag/view.php
+++ b/contrib/forms/psychiatrySet/intakeverslag/view.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	Intakeverslag - view
-// Package:	Report of First visit - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 27-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * Intakeverslag - view
+ * Report of First visit - Dutch specific form
+ * Version: 1.0 - 27-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -20,13 +34,13 @@ $age = getPatientAge($result["DOB_YMD"]);
 // Function:	getPatientDateOfLastEncounter
 function getPatientDateOfLastEncounter( $nPid )
 {
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
-                  AND ( pc_catid = 12 OR pc_catid = 16 ) 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
+                  AND ( pc_catid = 12 OR pc_catid = 16 )
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -37,12 +51,12 @@ function getPatientDateOfLastEncounter( $nPid )
 $m_strEventDate = getPatientDateOfLastEncounter( $result['pid'] );
 
 // get autosave id
-$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_intakeverslag 
+$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_intakeverslag
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 //$obj = formFetch("form_intakeverslag", $vectAutosave['id']);
@@ -50,7 +64,7 @@ $vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form
 if( $vectAutosave['id'] && $vectAutosave['id'] != "" && $vectAutosave['id'] > 0 )
 {
   $obj = formFetch("form_intakeverslag", $vectAutosave['id']);
-  
+
 } else
 {
   $obj = formFetch("form_intakeverslag", (int)$_GET["id"] );
@@ -64,6 +78,7 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
 <html>
     <head>
         <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">
     </head>
 
 <body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
@@ -72,8 +87,6 @@ include_once("$srcdir/api.inc");
 //$obj = formFetch("form_intakeverslag", (int)$_GET["id"]);
 ?>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
   .dehead    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:bold;
@@ -81,15 +94,11 @@ include_once("$srcdir/api.inc");
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -102,6 +111,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 delete_autosave( )
@@ -112,7 +128,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/intakeverslag/delete_autosave.php",
-              data: "id=" + <?php echo $intakeverslag_id ?>  
+              data: "id=" + <?php echo $intakeverslag_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -121,7 +137,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -132,7 +148,7 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_intakedatum = $("#intakedatum").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_klachten_probleemgebieden = $("#klachten_probleemgebieden").val();
@@ -150,14 +166,14 @@ function autosave( )
   var a_indruk_observaties = $("#indruk_observaties").val();
   var a_beschrijvende_conclusie = $("#beschrijvende_conclusie").val();
   var a_behandelvoorstel = $("#behandelvoorstel").val();
-  
+
   if( a_intakedatum.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/intakeverslag/autosave.php",
-              data: "id=" + <?php echo $intakeverslag_id ?> + 
+              data: "id=" + <?php echo $intakeverslag_id ?> +
                         "&intakedatum=" + $("#intakedatum").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&klachten_probleemgebieden=" + a_klachten_probleemgebieden +
@@ -196,14 +212,11 @@ function autosave( )
 <table>
 <tr>
 <td><?php xl('Intake Date','e'); ?>:</td><td>
-<input type='text' name='intakedatum' id='intakedatum' size='10' value='<?php echo $m_strEventDate ?>'
-          onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' title='<?php xl('Intake Date','e'); ?>: yyyy-mm-dd'></input>
-<img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-          id='img_last_encounter' border='0' alt='[?]' style='cursor:pointer'
-          title='<?php xl('Click here to choose a date','e'); ?>'>
+<input type='text' class='datepicker' name='intakedatum' id='intakedatum' size='10' value='<?php echo $m_strEventDate ?>'
+          title='<?php xl('Intake Date','e'); ?>: yyyy-mm-dd'></input>
 
-                     
-<?php 
+
+<?php
 
 ?></td>
 </tr>
@@ -255,7 +268,7 @@ function autosave( )
 <textarea cols=80 rows=5 wrap=virtual name="behandelvoorstel" id="behandelvoorstel"><?php echo stripslashes($obj{"behandelvoorstel"});?></textarea><br>
 
 <table><tr>
-<?php 
+<?php
 // this to be used/moved above for form header with patient name/etc
 ?>
 </tr></table>
@@ -267,10 +280,6 @@ function autosave( )
  onclick="top.restoreSession()">[<?php xl('Don\'t Save Changes','e'); ?>]</a>
 </form>
 
-<script language='JavaScript'>
- Calendar.setup({inputField:"intakedatum", ifFormat:"%Y-%m-%d", button:"img_last_encounter"});
-</script>
-
 <div id="timestamp"></div>
 
 <?php
diff --git a/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/new.php b/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/new.php
index 129cfd883..ba7d25281 100644
--- a/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/new.php
+++ b/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/new.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	PSYCHIATRISCH ONDERZOEK
-// Package:	Research psihiatric - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 29-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * PSYCHIATRISCH ONDERZOEK
+ * Report of Research psihiatric - Dutch specific form
+ * Version: 1.0 - 29-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -20,13 +34,13 @@ $provider_results = sqlQuery("select * from users where username='" . $_SESSION{
 function getPatientDateOfLastEncounter( $nPid )
 {
   // get date of last encounter F103 or F153
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
-                  AND ( pc_catid = 17 OR pc_catid = 25 OR pc_catid = 13 OR pc_catid = 26 ) 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
+                  AND ( pc_catid = 17 OR pc_catid = 25 OR pc_catid = 13 OR pc_catid = 26 )
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -37,21 +51,21 @@ function getPatientDateOfLastEncounter( $nPid )
 $m_strEventDate = getPatientDateOfLastEncounter( $result['pid'] );
 
 // get last saved id for intakeverslag
-$vectIntakeverslagQuery = sqlQuery( "SELECT id FROM form_intakeverslag 
+$vectIntakeverslagQuery = sqlQuery( "SELECT id FROM form_intakeverslag
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=0 
+                            AND autosave_flag=0
                             ORDER by id DESC limit 1" );
 
 // get autosave id for Psychiatrisch Onderzoek
-$vectAutosavePO = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_psychiatrisch_onderzoek 
+$vectAutosavePO = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_psychiatrisch_onderzoek
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 //fetch data from INTAKE-VERSLAG
@@ -60,7 +74,7 @@ $obj_iv = formFetch("form_intakeverslag", $vectIntakeverslagQuery['id']);
 $obj_po = formFetch("form_psychiatrisch_onderzoek", $vectAutosavePO['id']);
 /////////////////
 // here we mix the data
-// Reden van aanmelding 
+// Reden van aanmelding
 if( $obj_po['reden_van_aanmelding'] != '' )
   $obj['reden_van_aanmelding'] = $obj_po['reden_van_aanmelding'];
 elseif( $obj_iv['reden_van_aanmelding'] != '' )
@@ -112,13 +126,12 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
 <html>
 <head>
     <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">
 </head>
 
-                               
 
-<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
+<body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
@@ -127,15 +140,11 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -148,6 +157,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 ?>
+        });
                         });
 
 
@@ -159,7 +175,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/psychiatrisch_onderzoek/delete_autosave.php",
-              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?>  
+              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -168,7 +184,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -180,7 +196,7 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_datum_onderzoek = $("#datum_onderzoek").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_conclusie_van_intake = $("#conclusie_van_intake").val();
@@ -189,14 +205,14 @@ function autosave( )
   var a_psychiatrisch_onderzoek = $("#psychiatrisch_onderzoek").val();
   var a_beschrijvende_conclusie = $("#beschrijvende_conclusie").val();
   var a_behandelvoorstel = $("#behandelvoorstel").val();
-    
+
   if( a_datum_onderzoek.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/psychiatrisch_onderzoek/autosave.php",
-              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?> + 
+              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?> +
                         "&datum_onderzoek=" + $("#datum_onderzoek").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&conclusie_van_intake=" + a_conclusie_van_intake +
@@ -217,7 +233,7 @@ function autosave( )
 }
 
 </script>
-        
+
 <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>
 <form method=post action="<?php echo $rootdir;?>/forms/psychiatrisch_onderzoek/save.php?mode=new&saveid=<?php echo $psychiatrisch_onderzoek_id; ?>" name="my_form">
 <span class="title"><?php xl('Psychiatric Examination','e'); ?></span><br><br>
@@ -225,14 +241,11 @@ function autosave( )
 <table>
 <tr>
 <td><?php xl('Examination Date','e'); ?>:</td><td>
-<input type='text' name='datum_onderzoek' id='datum_onderzoek' size='10' value='<?php echo $m_strEventDate ?>'
-          onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' title='<?php xl('Examination Date','e'); ?>: yyyy-mm-dd'></input>
-<img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-          id='img_last_encounter' border='0' alt='[?]' style='cursor:pointer'
-          title='<?php xl('Click here to choose a date','e'); ?>'>
+<input type='text' class='datepicker' name='datum_onderzoek' id='datum_onderzoek' size='10' value='<?php echo $m_strEventDate ?>'
+          title='<?php xl('Examination Date','e'); ?>: yyyy-mm-dd'></input>
+
 
-                     
-<?php 
+<?php
 
 ?></td>
 </tr>
@@ -259,8 +272,8 @@ function autosave( )
 
 <table><tr>
 
-<?php 
-// here we fill in the header above with patient name etc ? ??? - move above 
+<?php
+// here we fill in the header above with patient name etc ? ??? - move above
 
 ?>
 </tr></table>
@@ -271,10 +284,6 @@ function autosave( )
 <a href="<?php echo "$rootdir/patient_file/encounter/$returnurl";?>" class="link_submit" onclick="delete_autosave();top.restoreSession()">[<?php xl('Don\'t Save','e'); ?>]</a>
 </form>
 
-<script language='JavaScript'>
- Calendar.setup({inputField:"datum_onderzoek", ifFormat:"%Y-%m-%d", button:"img_last_encounter"});
-</script>
-
 <div id="timestamp"></div>
 
 <?php
diff --git a/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/view.php b/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/view.php
index 8df103f7a..6b71ef1d3 100644
--- a/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/view.php
+++ b/contrib/forms/psychiatrySet/psychiatrisch_onderzoek/view.php
@@ -1,10 +1,24 @@
 <?php
-////////////////////////////////////////////////////////////////////
-// Form:	Psychiatrisch Onderzoek
-// Package:	Psychiatric Research - Dutch specific form
-// Created by:	Larry Lart
-// Version:	1.0 - 29-03-2008
-////////////////////////////////////////////////////////////////////
+/*
+ * Psychiatrisch Onderzoek
+ * Report of Research psihiatric - Dutch specific form
+ * Version: 1.0 - 29-03-2008
+ *
+ * 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
+ * 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    Larry Lart
+ * @link      http://www.open-emr.org
+ */
 
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
@@ -20,13 +34,13 @@ $provider_results = sqlQuery("select * from users where username='" . $_SESSION{
 function getPatientDateOfLastEncounter( $nPid )
 {
   // get date of last encounter F103 or F153
-  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max 
-                  FROM openemr_postcalendar_events 
-                  WHERE pc_pid = $nPid 
-                  AND pc_apptstatus = '@' 
-                  AND ( pc_catid = 17 OR pc_catid = 25 OR pc_catid = 13 OR pc_catid = 26 ) 
+  $strEventDate = sqlQuery("SELECT MAX(pc_eventDate) AS max
+                  FROM openemr_postcalendar_events
+                  WHERE pc_pid = $nPid
+                  AND pc_apptstatus = '@'
+                  AND ( pc_catid = 17 OR pc_catid = 25 OR pc_catid = 13 OR pc_catid = 26 )
                   AND pc_eventDate >= '2007-01-01'");
-  
+
   // now check if there was a previous encounter
   if( $strEventDate['max'] != "" )
     return( $strEventDate['max'] );
@@ -37,24 +51,24 @@ function getPatientDateOfLastEncounter( $nPid )
 $m_strEventDate = getPatientDateOfLastEncounter( $result['pid'] );
 
 // get autosave id for Psychiatrisch Onderzoek
-$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_psychiatrisch_onderzoek 
+$vectAutosave = sqlQuery( "SELECT id, autosave_flag, autosave_datetime FROM form_psychiatrisch_onderzoek
                             WHERE pid = ".$_SESSION["pid"].
                             " AND groupname='".$_SESSION["authProvider"].
                             "' AND user='".$_SESSION["authUser"]."' AND
                             authorized=$userauthorized AND activity=1
-                            AND autosave_flag=1 
+                            AND autosave_flag=1
                             ORDER by id DESC limit 1" );
 
 
 if( $vectAutosave['id'] && $vectAutosave['id'] != "" && $vectAutosave['id'] > 0 )
 {
   $obj = formFetch("form_psychiatrisch_onderzoek", $vectAutosave['id']);
-  
+
 } else
 {
     $obj = formFetch("form_psychiatrisch_onderzoek", $_GET["id"] );
 }
-    
+
 $tmpDate = stripslashes($obj{"datum_onderzoek"});
 if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
 
@@ -63,11 +77,11 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
 <html>
     <head>
         <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">
     </head>
 
 <body <?php echo $top_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
 
 <style type="text/css">
  body       { font-family:sans-serif; font-size:10pt; font-weight:normal }
@@ -76,15 +90,11 @@ if( $tmpDate && $tmpDate != '0000-00-00 00:00:00' ) $m_strEventDate = $tmpDate;
                  .detail    { color:#000000; font-family:sans-serif; font-size:10pt; font-weight:normal;
                                padding-left:3px; padding-right:3px; }
 </style>
-                               
-<style type="text/css">@import url(../../../library/dynarch_calendar.css);</style>
-<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>
-<script type="text/javascript" src="../../../library/dynarch_calendar_en.js"></script>
-<script type="text/javascript" src="../../../library/dynarch_calendar_setup.js"></script>
 
-<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-min-1-2-1/index.js"></script>
+<script type="text/javascript" src="../../../library/dialog.js?v=<?php echo $v_js_includes; ?>"></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-min-3-1-1/index.js"></script>
+<script type="text/javascript" src="<?php echo $GLOBALS['assets_static_relative']; ?>/jquery-datetimepicker-2-5-4/build/jquery.datetimepicker.full.min.js"></script>
 
 <?php
 
@@ -97,6 +107,13 @@ else
 <script type="text/javascript">
 $(document).ready(function(){
         autosave();
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = 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 ?>
+        });
                         });
 
 
@@ -108,7 +125,7 @@ function delete_autosave( )
             {
               type: "POST",
               url: "../../forms/psychiatrisch_onderzoek/delete_autosave.php",
-              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?>  
+              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?>
                         ,
                                 cache: false,
                                 success: function( message )
@@ -117,7 +134,7 @@ function delete_autosave( )
                 }
             });
     return true;
-    
+
   } else
   {
     return false;
@@ -129,7 +146,7 @@ function delete_autosave( )
 function autosave( )
 {
   var t = setTimeout("autosave()", 20000);
-  
+
   var a_datum_onderzoek = $("#datum_onderzoek").val();
   var a_reden_van_aanmelding = $("#reden_van_aanmelding").val();
   var a_conclusie_van_intake = $("#conclusie_van_intake").val();
@@ -138,14 +155,14 @@ function autosave( )
   var a_psychiatrisch_onderzoek = $("#psychiatrisch_onderzoek").val();
   var a_beschrijvende_conclusie = $("#beschrijvende_conclusie").val();
   var a_behandelvoorstel = $("#behandelvoorstel").val();
-    
+
   if( a_datum_onderzoek.length > 0 || a_reden_van_aanmelding.length > 0 )
   {
     $.ajax(
             {
               type: "POST",
               url: "../../forms/psychiatrisch_onderzoek/autosave.php",
-              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?> + 
+              data: "id=" + <?php echo $psychiatrisch_onderzoek_id ?> +
                         "&datum_onderzoek=" + $("#datum_onderzoek").val() +
                         "&reden_van_aanmelding=" + a_reden_van_aanmelding +
                         "&conclusie_van_intake=" + a_conclusie_van_intake +
@@ -154,7 +171,7 @@ function autosave( )
                         "&psychiatrisch_onderzoek=" + a_psychiatrisch_onderzoek +
                         "&beschrijvende_conclusie=" + a_beschrijvende_conclusie +
                         "&behandelvoorstel=" + a_behandelvoorstel +
-                        "&mode=update" 
+                        "&mode=update"
                         ,
                                 cache: false,
                                 success: function( message )
@@ -180,14 +197,11 @@ include_once("$srcdir/api.inc");
 <table>
 <tr>
 <td><?php xl('Examination Date','e'); ?>:</td><td>
-<input type='text' name='datum_onderzoek' id='datum_onderzoek' size='10' value='<?php echo $m_strEventDate ?>'
-          onkeyup='datekeyup(this,mypcc)' onblur='dateblur(this,mypcc)' title='<?php xl('Examination Date','e'); ?>: yyyy-mm-dd'></input>
-<img src='../../pic/show_calendar.gif' align='absbottom' width='24' height='22'
-          id='img_last_encounter' border='0' alt='[?]' style='cursor:pointer'
-          title='<?php xl('Click here to choose a date','e'); ?>'>
+<input type='text' class='datepicker' name='datum_onderzoek' id='datum_onderzoek' size='10' value='<?php echo $m_strEventDate ?>'
+          title='<?php xl('Examination Date','e'); ?>: yyyy-mm-dd'></input>
 
-                     
-<?php 
+
+<?php
 
 ?></td>
 </tr>
@@ -209,7 +223,7 @@ include_once("$srcdir/api.inc");
 <textarea cols=80 rows=5 wrap=virtual name="behandelvoorstel" id="behandelvoorstel"><?php echo stripslashes($obj{"behandelvoorstel"});?></textarea><br>
 
 <table><tr>
-<?php 
+<?php
 // this to be used/moved above for form header with patient name/etc
 ?>
 </tr></table>
@@ -221,10 +235,6 @@ include_once("$srcdir/api.inc");
  onclick="delete_autosave();top.restoreSession()">[<?php xl('Don\'t Save Changes','e'); ?>]</a>
 </form>
 
-<script language='JavaScript'>
- Calendar.setup({inputField:"datum_onderzoek", ifFormat:"%Y-%m-%d", button:"img_last_encounter"});
-</script>
-
 <div id="timestamp"></div>
 
 
diff --git a/interface/orders/orders_results.php b/interface/orders/orders_results.php
index 2304a4ad0..8fc20e650 100644
--- a/interface/orders/orders_results.php
+++ b/interface/orders/orders_results.php
@@ -1,24 +1,24 @@
 <?php
 /**
-* Copyright (C) 2010-2010 Rod Roark <rod@sunsetsystems.com>
-* Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
-*
-* 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
-* 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>
-* @author    Brady Miller <brady.g.miller@gmail.com>
-* @link      http://www.open-emr.org
-*/
+ * Copyright (C) 2010-2010 Rod Roark <rod@sunsetsystems.com>
+ * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
+ *
+ * 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
+ * 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>
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @link      http://www.open-emr.org
+ */
 
 require_once("../globals.php");
 require_once("$srcdir/acl.inc");
-- 
2.11.4.GIT