Changeset 2162
- Timestamp:
- Dec 9, 2013, 11:03:27 AM (8 years ago)
- Location:
- extensions/net.sf.basedb.reggie/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/net.sf.basedb.reggie/trunk/resources/personal/bloodform.jsp
r2148 r2162 42 42 var patientInfo = null; 43 43 var bloodInfo = null; 44 var siteInfo = null; 44 45 var consentInfo = null; 45 46 … … 269 270 var samplingTime = frm.samplingTime.value; 270 271 272 var isUppsala = siteInfo && siteInfo.prefix == '88'; 273 271 274 if (samplingDate != '' || samplingTime != '') 272 275 { … … 276 279 277 280 samplingTime = autoFillTime(samplingTime); 281 // Set sampling time to 0000 for Uppsala since it is not known 282 if (!samplingTime && isUppsala) samplingTime = '0000'; 278 283 frm.samplingTime.value = samplingTime; 279 284 … … 283 288 return; 284 289 } 285 if (frm.freezerDate.value == '') frm.freezerDate.value = samplingDate; 290 291 // Automatically fill in freezer date except for Uppsala since it is not known 292 if (frm.freezerDate.value == '' && !isUppsala) 293 { 294 frm.freezerDate.value = samplingDate; 295 } 286 296 287 297 if (!Dates.isDate(samplingDate + ' ' + samplingTime, 'yyyyMMdd HHmm')) … … 364 374 patientInfo = response.patientInfo; 365 375 consentInfo = response.consentInfo; 376 siteInfo = response.siteInfo; 366 377 367 378 if (patientInfo) … … 495 506 Main.show("copyConsentSection"); 496 507 } 508 } 509 510 // Special case for Uppsala 511 if (siteInfo && siteInfo.prefix == '88') 512 { 513 // Plasm/serum check box should not be selected 514 frm.serum.checked = false; 497 515 } 498 516 -
extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/BloodRegistrationServlet.java
r2161 r2162 73 73 String caseName = req.getParameter("caseName"); 74 74 Site site = Site.findByCaseName(caseName); 75 json.put("siteInfo", site.asJSONObject()); 76 75 77 Blood blood = Blood.findByCaseName(dc, caseName, site.useCaseSuffixForPreNeoForms()); 76 78 Patient patient = null;
Note: See TracChangeset
for help on using the changeset viewer.