Changeset 1369

Timestamp:

May 23, 2011, 2:45:37 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #322: Select multiple "not asked" sub-options

File:

• extensions/net.sf.basedb.reggie/trunk/resources/consentform.jsp (modified) (6 diffs)

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

@@ -185 +185 @@
   if (caseInfo.consent == 'Not asked')
   {
-    var selectedReasonIfNotAsked = Forms.getCheckedRadio(frm.reasonIfNotAsked);
-    if (selectedReasonIfNotAsked)
+    var reasonIfNotAsked = '';
+    for (var i = 0; i < frm.reasonIfNotAsked.length; i++)
     {
-      if (selectedReasonIfNotAsked.id == 'notAsked.other')
+      var option = frm.reasonIfNotAsked[i];
+      if (option.checked)
       {
-        caseInfo.reasonIfNotAsked = frm.otherReasonIfNotAsked.value;
-      }
-      else
-      {
-        var label = document.getElementById(selectedReasonIfNotAsked.id + '.label');
-        caseInfo.reasonIfNotAsked = label.innerHTML;
+        if (option.id == 'notAsked.other')
+        {
+          reasonIfNotAsked += frm.otherReasonIfNotAsked.value;
+        }
+        else
+        {
+          var label = document.getElementById(option.id + '.label');
+          reasonIfNotAsked += label.innerHTML + '\n';
+        }
       }
     }
+    caseInfo.reasonIfNotAsked = reasonIfNotAsked;
   }
   
@@ -393 +398 @@
           <tr valign="baseline">
             <td><img src="../../images/joust/joinbottom.gif"></td>
-            <td><input id="notAsked.forgot" type="radio" name="reasonIfNotAsked" disabled></td>
+            <td><input id="notAsked.forgot" type="checkbox" name="reasonIfNotAsked" disabled></td>
             <td><label id="notAsked.forgot.label" for="notAsked.forgot" class="disabled">Forgot to ask the patient</label></td>
           </tr>
@@ -399 +404 @@
           <tr valign="baseline">
             <td></td>
-            <td><input id="notAsked.language" type="radio" name="reasonIfNotAsked" disabled></td>
+            <td><input id="notAsked.language" type="checkbox" name="reasonIfNotAsked" disabled></td>
             <td><label id="notAsked.language.label" for="notAsked.language" class="disabled">Language problems</label></td>
           </tr>
@@ -405 +410 @@
           <tr valign="baseline">
             <td></td>
-            <td><input id="notAsked.condition" type="radio" name="reasonIfNotAsked" disabled></td>
+            <td><input id="notAsked.condition" type="checkbox" name="reasonIfNotAsked" disabled></td>
             <td><label id="notAsked.condition.label" for="notAsked.condition" class="disabled">Patient can't decide due to physical and/or mental condition</label></td>
           </tr>
@@ -411 +416 @@
           <tr valign="baseline">
             <td></td>
-            <td><input id="notAsked.other" type="radio" name="reasonIfNotAsked" disabled></td>
+            <td><input id="notAsked.other" type="checkbox" name="reasonIfNotAsked" disabled></td>
             <td><label id="notAsked.other.label" for="notAsked.other" class="disabled">Other:</label></td>
           </tr>
@@ -419 +424 @@
             <td colspan="2">
             <textarea name="otherReasonIfNotAsked" rows="3" cols="30" disabled
-              onfocus="document.forms['reggie'].reasonIfNotAsked[3].click()"></textarea>
+              onfocus="document.forms['reggie'].reasonIfNotAsked[3].checked = true"></textarea>
             </td>
           </tr>