Changeset 2073

Timestamp:

Oct 16, 2013, 9:33:55 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #517: Ensure that the "Failure" option is not selected by mistake

Added a checkbox that is displayed next to the "Register" button when the "Failure" option is selected. The "Register" button is disabled until the checkbox is selected.

Location:

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

Files:

• cdna_registration.jsp (modified) (3 diffs)
• flowcell_registration.jsp (modified) (5 diffs)
• lib_registration.jsp (modified) (4 diffs)
• mrna_registration.jsp (modified) (4 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/cdna_registration.jsp

@@ -141 +141 @@
   }
 
+  if (document.getElementById('outcomeFailed').checked)
+  {
+    setInnerHTML('gonext.message', '<input type="checkbox" name="verifyFailure" onclick="verifyFailureOnClick()"> Check to verify registration of failure');
+    Main.addClass(document.getElementById('goregister'), 'disabled');
+  }
+
   frm.synthesisDate.focus();
 }
@@ -219 +225 @@
 function step2IsValid()
 {
+  var frm = document.forms['reggie'];
   if (!commentsIsValid) return false;
   
   if (dateIsValid['synthesisDate'] == false) return false;
+  if (document.getElementById('outcomeFailed').checked && !frm.verifyFailure.checked) return false;
   
   return true;
+}
+
+function verifyFailureOnClick()
+{
+  var frm = document.forms['reggie'];
+  var checked = frm.verifyFailure.checked;
+  Main.addOrRemoveClass(document.getElementById('goregister'), 'disabled', !checked);
 }
 
@@ -234 +249 @@
   Main.hide('goregister');
   Main.hide('gocancel');
+  Main.hide('gonext.message');
   Main.addClass(document.getElementById('step.2.section'), 'disabled');
 

extensions/net.sf.basedb.reggie/trunk/resources/libprep/flowcell_registration.jsp

@@ -122 +122 @@
   var frm = document.forms['reggie'];
   var failed = frm.outcome[1].checked;
+  if (failed && !frm.verifyFailure.checked) return false;
   
   var index = 0;
@@ -139 +140 @@
 }
 
+function verifyFailureOnClick()
+{
+  var frm = document.forms['reggie'];
+  var checked = frm.verifyFailure.checked;
+  Main.addOrRemoveClass(document.getElementById('goregister'), 'disabled', !checked);
+}
+
 function step3IsValid()
 {
@@ -207 +215 @@
     Main.show('goregister');
     Main.hide('step.3.box');
+    
+    setInnerHTML('gonext.message', '<input type="checkbox" name="verifyFailure" onclick="verifyFailureOnClick()"> Check to verify registration of failure');
+    Main.addClass(document.getElementById('goregister'), 'disabled');
   }
 
@@ -518 +529 @@
   }
   
-
   Main.hide('goregister');
   Main.hide('gocancel');
+  Main.hide('gonext.message');
   
   var submitInfo = {};
@@ -692 +703 @@
           <input type="radio" name="outcome" id="outcomeSuccess" 
             onchange="outcomeOnChange()" checked><label for="outcomeSuccess">Success</label> - sequencing has started<br>
-          <input type="radio" name="outcome" id="outcomeFailed" disabled
-            onchange="outcomeOnChange()"><label for="outcomeFailed" class="disabled">Failure</label> - no sequencing (TODO)
+          <input type="radio" name="outcome" id="outcomeFailed" 
+            onchange="outcomeOnChange()"><label for="outcomeFailed">Failure</label> - no sequencing
         </td>
         <td class="status"></td>

extensions/net.sf.basedb.reggie/trunk/resources/libprep/lib_registration.jsp

@@ -195 +195 @@
     frm.libProtocol[0] = new Option('- none -', '');
   }
+  
+  if (document.getElementById('outcomeFailed').checked)
+  {
+    setInnerHTML('gonext.message', '<input type="checkbox" name="verifyFailure" onclick="verifyFailureOnClick()"> Check to verify registration of failure');
+    Main.addClass(document.getElementById('goregister'), 'disabled');
+  }
+
 }
 
@@ -443 +450 @@
 function step2IsValid()
 {
+  var frm = document.forms['reggie'];
   if (dateIsValid['amplificationDate'] == false) return false;
   if (dateIsValid['cleanupDate'] == false) return false;
@@ -449 +457 @@
   if (failed)
   {
+    if (!frm.verifyFailure.checked) return false;
     return libCommentsIsValid;
   }
@@ -457 +466 @@
 }
 
+function verifyFailureOnClick()
+{
+  var frm = document.forms['reggie'];
+  var checked = frm.verifyFailure.checked;
+  Main.addOrRemoveClass(document.getElementById('goregister'), 'disabled', !checked);
+}
+
 function goRegister()
 {
   if (!step2IsValid()) return;
-  
+
   Main.hide('messages');
   Main.hide('goregister');
   Main.hide('gocancel');
+  Main.hide('gonext.message');
 
   var frm = document.forms['reggie'];

extensions/net.sf.basedb.reggie/trunk/resources/libprep/mrna_registration.jsp

@@ -147 +147 @@
   }
 
+  if (document.getElementById('outcomeFailed').checked)
+  {
+    setInnerHTML('gonext.message', '<input type="checkbox" name="verifyFailure" onclick="verifyFailureOnClick()"> Check to verify registration of failure');
+    Main.addClass(document.getElementById('goregister'), 'disabled');
+  }
+  
   frm.dilutionDate.focus();
 }
@@ -299 +305 @@
 function step2IsValid()
 {
+  var frm = document.forms['reggie'];
   if (!pdfIsValid || !commentsIsValid) return false;
   
@@ -306 +313 @@
   if (dateIsValid['cleanupDate'] == false) return false;
   
+  if (document.getElementById('outcomeFailed').checked && !frm.verifyFailure.checked) return false;
+  
   return true;
+}
+
+function verifyFailureOnClick()
+{
+  var frm = document.forms['reggie'];
+  var checked = frm.verifyFailure.checked;
+  Main.addOrRemoveClass(document.getElementById('goregister'), 'disabled', !checked);
 }
 
@@ -318 +334 @@
   Main.hide('goregister');
   Main.hide('gocancel');
+  Main.hide('gonext.message');
   Main.addClass(document.getElementById('step.2.section'), 'disabled');