Changeset 1768

Timestamp:

Dec 4, 2012, 10:34:30 AM (10 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #437: Rules for comparing 'sampling date' and 'RNA later' date should be the same

Location:

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

Files:

• persinfo.jsp (modified) (1 diff)
• specimentube.jsp (modified) (1 diff)

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

@@ -453 +453 @@
   {
     var samplingTimestamp = Dates.parseString(frm.samplingDate.value + ' ' + frm.samplingTime.value, 'yyyyMMdd Hmm');
-    if (samplingTimestamp && rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
-    {
-      setInputStatus('rnaLaterDate', 'Sampling and RNA later dates are different', 'warning');
+    if (samplingTimestamp)
+    {
+      if (rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
+      {
+        setInputStatus('rnaLaterDate', 'Sampling and RNA later dates are different', 'warning');
+      }
+      else if (rnaLaterTimestamp.getTime() < samplingTimestamp.getTime())
+      {
+        setInputStatus('rnaLaterDate', 'RNA later time is before Sampling time', 'warning');
+      }
     }
   }

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

@@ -613 +613 @@
       if (samplingTimestamp)
       {
-        if (rnaLaterTimestamp.getDate() == samplingTimestamp.getDate() && rnaLaterTimestamp.getTime()<samplingTimestamp.getTime())
-        {
-          setInputStatus('rnaLaterDate', 'RNA-later date+time must later then Sampling date+time','invalid');
-          return;
-        }
         if (rnaLaterTimestamp.getDate() != samplingTimestamp.getDate())
         {
           setInputStatus('rnaLaterDate', 'Sampling and RNA later dates are different', 'invalid');
+          return;
+        }
+        if (rnaLaterTimestamp.getTime() < samplingTimestamp.getTime())
+        {
+          setInputStatus('rnaLaterDate', 'RNA later time must be later than Sampling time','invalid');
           return;
         }