Changeset 1359

Timestamp:

May 13, 2011, 10:44:34 AM (11 years ago)

Author:

Martin Svensson

Message:

Fixes #316 Add support for 'YYYYMMDD' date format in the 'Consent form registration wizard'. Support for short-input formats 'YYMMDD' and 'MMDD' are also added. The changes also apply to the Personal information registration wizard.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/consentform.jsp (modified) (3 diffs)
• resources/persinfo.jsp (modified) (7 diffs)
• resources/reggie.js (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java (modified) (2 diffs)
• src/net/sf/basedb/reggie/servlet/PersonalRegistrationServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/consentform.jsp

@@ -134 +134 @@
     // This wizard will only allow 'Yes' option on the consent form
     enableConsentOption('consent.yes', true);
-    setInputStatus('consent', 'This case is already exists.', 'valid');
+    setInputStatus('consent', 'This case already exists.', 'valid');
     Main.showInline('morehelp.yes');
     Main.show('gocancel');
@@ -254 +254 @@
   else
   {
-    if (!Dates.isDate(consentDate, 'yyyy-MM-dd'))
+    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.    
+    consentDate = autoFillDate(consentDate);
+    frm.consentDate.value = consentDate;
+  
+    if (!Dates.isDate(consentDate, 'yyyyMMdd'))
     {
       setInputStatus('consentDate', 'Not a valid date', 'invalid');
@@ -353 +357 @@
         <td class="status" id="consentDate.status"></td>
         <td class="help">
-          <span id="consentDate.message" class="message" style="display: none;"></span>(YYYY-MM-DD)
+          <span id="consentDate.message" class="message" style="display: none;"></span>(YYYYMMDD or MMDD)
         </td>
       </tr>

extensions/net.sf.basedb.reggie/trunk/resources/persinfo.jsp

@@ -304 +304 @@
   if (samplingDate != '' || samplingTime != '')
   {
-    if (!Dates.isDate(samplingDate, 'yyyy-MM-dd'))
+    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
+    samplingDate = autoFillDate(samplingDate);
+    frm.samplingDate.value = samplingDate;
+
+    samplingTime = autoFillTime(samplingTime);
+    frm.samplingTime.value = samplingTime;
+    
+    if (!Dates.isDate(samplingDate, 'yyyyMMdd'))
     {
       setInputStatus('samplingDate', 'Not a valid date', 'invalid');
@@ -311 +318 @@
     if (frm.rnaLaterDate.value == '') frm.rnaLaterDate.value = samplingDate;
     
-    if (!Dates.isDate(samplingDate + ' ' + samplingTime, 'yyyy-MM-dd HH:mm'))
+    if (!Dates.isDate(samplingDate + ' ' + samplingTime, 'yyyyMMdd HHmm'))
     {
       if (samplingDate != '') setInputStatus('samplingDate', 'Not a valid time', 'invalid');
@@ -333 +340 @@
   if (rnaLaterDate != '' || rnaLaterTime != '')
   {
-    if (!Dates.isDate(rnaLaterDate, 'yyyy-MM-dd'))
+    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
+    rnaLaterDate = autoFillDate(rnaLaterDate);
+    frm.rnaLaterDate.value = rnaLaterDate;
+
+    rnaLaterTime = autoFillTime(rnaLaterTime);
+    frm.rnaLaterTime.value = rnaLaterTime;
+    
+    if (!Dates.isDate(rnaLaterDate, 'yyyyMMdd'))
     {
       setInputStatus('rnaLaterDate', 'Not a valid date', 'invalid');
       return;
     }
-    rnaLaterTimestamp = Dates.parseString(rnaLaterDate + ' ' + rnaLaterTime, 'yyyy-MM-dd HH:mm');
+    rnaLaterTimestamp = Dates.parseString(rnaLaterDate + ' ' + rnaLaterTime, 'yyyyMMdd HHmm');
     if (rnaLaterTimestamp == null)
     {
@@ -351 +365 @@
   if (samplingDateIsValid && rnaLaterTimestamp)
   {
-    var samplingTimestamp = Dates.parseString(frm.samplingDate.value + ' ' + frm.samplingTime.value, 'yyyy-MM-dd HH:mm');
+    var samplingTimestamp = Dates.parseString(frm.samplingDate.value + ' ' + frm.samplingTime.value, 'yyyyMMdd Hmm');
     if (samplingTimestamp && rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
     {
@@ -526 +540 @@
     if (thisCaseSamplingDate != null)
     {
-      frm.samplingDate.value = thisCaseSamplingDate.substring(0, 10);
-      frm.samplingTime.value = thisCaseSamplingDate.substring(11, 16);
+      frm.samplingDate.value = thisCaseSamplingDate.substring(0, 8);
+      frm.samplingTime.value = thisCaseSamplingDate.substring(9, 13);
       samplingDateTimeOnChange();
     }
     if (thisCaseRNALaterDate != null)
     {
-      frm.rnaLaterDate.value = thisCaseRNALaterDate.substring(0, 10);
-      frm.rnaLaterTime.value = thisCaseRNALaterDate.substring(11, 16);
+      frm.rnaLaterDate.value = thisCaseRNALaterDate.substring(0, 8);
+      frm.rnaLaterTime.value = thisCaseRNALaterDate.substring(9, 13);
       rnaLaterDateTimeOnChange();
     }
@@ -936 +950 @@
             onkeypress="focusOnEnter(event, 'rnaLaterDate')" onblur="samplingDateTimeOnChange()"></td>
         <td class="status" id="samplingDate.status"></td>
-        <td class="help"><span id="samplingDate.message" class="message" style="display: none;"></span>Date+time of surgical removal (YYYY-MM-DD, HH:MM)</td>
+        <td class="help"><span id="samplingDate.message" class="message" style="display: none;"></span>Date+time of surgical removal (YYYYMMDD, HHMM)</td>
       </tr>
       <tr id="rnaLaterDateSection" valign="top">
@@ -945 +959 @@
             onblur="rnaLaterDateTimeOnChange()"></td>
         <td class="status" id="rnaLaterDate.status"></td>
-        <td class="help"><span id="rnaLaterDate.message" class="message" style="display: none;"></span>Date+time of pathology handling (YYYY-MM-DD, HH:MM)</td>
+        <td class="help"><span id="rnaLaterDate.message" class="message" style="display: none;"></span>Date+time of pathology handling (YYYYMMDD, HHMM)</td>
       </tr>
       <tr id="reasonIfNoSpecimenSection" valign="top">

extensions/net.sf.basedb.reggie/trunk/resources/reggie.js

@@ -133 +133 @@
   location.href = location.href;
 }
+
+/**
+  Autofill a date-string.
+  The supplemented date-string will have the format yyyyMMdd when it's returned.
+  If the short-date in format MMdd is larger the current date, the year before will be used.
+  
+  @param shortDate Date in format 'MMdd' or in 'yyMMdd'
+*/
+function autoFillDate(shortDate)
+{
+  var fullDateString = shortDate;
+  
+  var currentDate = new Date();
+  var currentYear = currentDate.getFullYear();
+  if (shortDate.length == 4 && Dates.isDate(shortDate, 'MMdd'))
+  {
+    var month = parseInt(shortDate.substring(0,2));
+    var date = parseInt(shortDate.substring(2));
+    if ((month > (currentDate.getMonth()+1))  ||
+        ( (month == (currentDate.getMonth()+1)) && (date > currentDate.getDate())) )
+    {
+      currentYear--;
+    }
+    fullDateString = currentYear+shortDate;
+  }
+  else if (shortDate.length == 6 && Dates.isDate(shortDate, 'yyMMdd'))
+  {
+    var year = parseInt(shortDate.substring(0,2));    
+    fullDateString = ((2000+year)>currentYear ? "19" : "20") + fullDateString;
+  } 
+  return fullDateString;  
+}
+
+function autoFillTime(shortTime)
+{
+  
+  var fullTimeString = shortTime;
+  if (shortTime.length==3) 
+  {
+    fullTimeString = "0"+shortTime;
+  }
+  return fullTimeString;
+}

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/ConsentFormServlet.java

@@ -79 +79 @@
           // ... case annotations
           theCase.loadAnnotations(dc, "consent", Reggie.ANNOTATION_CONSENT, null);
-          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyy-MM-dd"));
+          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd"));
           theCase.loadAnnotations(dc, "consentDate", Reggie.ANNOTATION_CONSENT_DATE, dateConverter);
           
@@ -151 +151 @@
         Number caseId = (Number)jsonCase.get("id");
         String consent = Values.getStringOrNull((String)jsonCase.get("consent"));
-        StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyy-MM-dd"));
+        StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd"));
         Date consentDate = dateConverter.convert((String)jsonCase.get("consentDate"));
         AnnotationType consentType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_CONSENT, true);

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PersonalRegistrationServlet.java

@@ -129 +129 @@
           AnnotationType samplingDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_SAMPLING_DATETIME, true);
           AnnotationType rnaLaterDateType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
-          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyy-MM-dd HH:mm"));
+          DateToStringConverter dateConverter = new DateToStringConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
           for (SpecimenTube tube : specimenTubes)
           {
@@ -351 +351 @@
           AnnotationType rnaLaterType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
           
-          StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyy-MM-dd HH:mm"));
+          StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
           Date samplingDate = dateConverter.convert((String)jsonCase.get("samplingDate"));
           Date rnaLaterDate = dateConverter.convert((String)jsonCase.get("rnaLaterDate"));
@@ -422 +422 @@
           AnnotationType rnaLaterType = Reggie.findAnnotationType(dc, Item.SAMPLE, Reggie.ANNOTATION_RNALATER_DATETIME, true);
           
-          StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyy-MM-dd HH:mm"));
+          StringToDateConverter dateConverter = new StringToDateConverter(new SimpleDateFormat("yyyyMMdd HHmm"));
           Date samplingDate = dateConverter.convert((String)jsonCase.get("samplingDate"));
           Date rnaLaterDate = dateConverter.convert((String)jsonCase.get("rnaLaterDate"));