Changeset 2148


Ignore:
Timestamp:
Nov 19, 2013, 1:16:34 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

Merge changes from Reggie/2.13-stable development branch back to trunk.

Location:
extensions/net.sf.basedb.reggie/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/net.sf.basedb.reggie/trunk

  • extensions/net.sf.basedb.reggie/trunk/resources/personal/bloodfollowupform.jsp

    r2023 r2148  
    153153    if (step1InputOk)
    154154    {
     155      frm.rccidNumber.disabled = true;
     156      frm.personalNumber.disabled = true;
     157      // Check if patient exists with input personal number
    155158      getPatientInfo();
    156159      if (patientInfo != null && patientInfo.id)
     
    287290  if (pnrIsValid)
    288291  {
     292    // Check if patient exists with input personal number
    289293    getPatientInfo();
    290294    if (patientInfo == null || !patientInfo.id)
     
    302306{
    303307  // Check entered pnr with AJAX
    304   var frm = document.forms['reggie'];
    305   frm.rccidNumber.disabled = true;
    306   frm.personalNumber.disabled = true;
    307   //currentStep = 1;
    308  
     308  var frm = document.forms['reggie'];
    309309  var pnr = frm.personalNumber.value;
    310310  if (pnr.length == 10 && pnrIsValid)
     
    358358  {
    359359    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
    360     samplingDate = autoFillDate(samplingDate);
     360    samplingDate = autoFillDate(samplingDate, true);
    361361    frm.samplingDate.value = samplingDate;
    362362
     
    394394  {
    395395    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
    396     freezerDate = autoFillDate(freezerDate);
     396    freezerDate = autoFillDate(freezerDate, true);
    397397    frm.freezerDate.value = freezerDate;
    398398
  • extensions/net.sf.basedb.reggie/trunk/resources/personal/bloodform.jsp

    r1915 r2148  
    272272  {
    273273    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
    274     samplingDate = autoFillDate(samplingDate);
     274    samplingDate = autoFillDate(samplingDate, true);
    275275    frm.samplingDate.value = samplingDate;
    276276
     
    308308  {
    309309    // Auto-fill the date if it's only given with 4(MMdd) or 6(yyMMdd) digits.
    310     freezerDate = autoFillDate(freezerDate);
     310    freezerDate = autoFillDate(freezerDate, true);
    311311    frm.freezerDate.value = freezerDate;
    312312
Note: See TracChangeset for help on using the changeset viewer.