Changeset 2162

Timestamp:

Dec 9, 2013, 11:03:27 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #543: Different default values in 'Blood registration wizard' depending on site

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/personal/bloodform.jsp (modified) (6 diffs)
• src/net/sf/basedb/reggie/servlet/BloodRegistrationServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/resources/personal/bloodform.jsp

@@ -42 +42 @@
 var patientInfo = null;
 var bloodInfo = null;
+var siteInfo = null;
 var consentInfo = null;
 
@@ -269 +270 @@
   var samplingTime = frm.samplingTime.value;
   
+  var isUppsala = siteInfo && siteInfo.prefix == '88';
+  
   if (samplingDate != '' || samplingTime != '')
   {
@@ -276 +279 @@
 
     samplingTime = autoFillTime(samplingTime);
+    // Set sampling time to 0000 for Uppsala since it is not known
+    if (!samplingTime && isUppsala) samplingTime = '0000';
     frm.samplingTime.value = samplingTime;
     
@@ -283 +288 @@
       return;
     }
-    if (frm.freezerDate.value == '') frm.freezerDate.value = samplingDate;
+    
+    // Automatically fill in freezer date except for Uppsala since it is not known
+    if (frm.freezerDate.value == '' && !isUppsala)
+    {
+      frm.freezerDate.value = samplingDate;
+    }
     
     if (!Dates.isDate(samplingDate + ' ' + samplingTime, 'yyyyMMdd HHmm'))
@@ -364 +374 @@
   patientInfo = response.patientInfo;
   consentInfo = response.consentInfo;
+  siteInfo = response.siteInfo;
   
   if (patientInfo)
@@ -495 +506 @@
       Main.show("copyConsentSection");
     }
+  }
+  
+  // Special case for Uppsala
+  if (siteInfo && siteInfo.prefix == '88')
+  {
+    // Plasm/serum check box should not be selected
+    frm.serum.checked = false;
   }
   

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

@@ -73 +73 @@
         String caseName = req.getParameter("caseName");
         Site site = Site.findByCaseName(caseName);
+        json.put("siteInfo", site.asJSONObject());
+        
         Blood blood = Blood.findByCaseName(dc, caseName, site.useCaseSuffixForPreNeoForms());
         Patient patient = null;