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

Timestamp:

Oct 7, 2013, 3:38:52 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #481: Register prepared flow cells

The wizard now creates a SequencingRunNNNN (derived bioassay) item and link the flow cells to it. The SequencingStartDate and SequencingOperator are added as annotation to the derived bioassay.

File:

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

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

@@ -226 +226 @@
   if (date == '')
   {
-    setInputStatus(dateField, 'Missing date', 'warning');
+    var required = frm[dateField].className.indexOf('required') != -1;
+    setInputStatus(dateField, 'Missing date', required ? 'invalid' : 'warning');
+    if (required) dateIsValid[dateField] = false;
     return;
   }
@@ -320 +322 @@
   
   if (dateIsValid['clusterDate'] == false) return false;
-  if (dateIsValid['sequenceStartDate'] == false) return false;
+  if (dateIsValid['sequencingStartDate'] != true) 
+  {
+    dateOnChange('sequencingStartDate');
+    return false;
+  }
   
   var frm = document.forms['reggie'];
@@ -348 +354 @@
   frm.clusterDate.disabled = true;
   frm.clusterOperator.disabled = true;
-  frm.sequenceStartDate.disabled = true;
-  frm.sequenceOperator.disabled = true;
+  frm.sequencingStartDate.disabled = true;
+  frm.sequencingOperator.disabled = true;
   frm.clusterProtocol.disabled = true;
   frm.comments.disabled = true;
@@ -370 +376 @@
   submitInfo.clusterDate = frm.clusterDate.value;
   submitInfo.clusterOperator = frm.clusterOperator.value;
-  submitInfo.sequenceStartDate = frm.sequenceStartDate.value;
-  submitInfo.sequenceOperator = frm.sequenceOperator.value;
+  submitInfo.sequencingStartDate = frm.sequencingStartDate.value;
+  submitInfo.sequencingOperator = frm.sequencingOperator.value;
   submitInfo.comments = frm.comments.value;
   
@@ -524 +530 @@
         <td>
           <input type="text" name="clusterOperator" value="<%=HTML.encodeTags(user.getName()) %>" 
-            style="width: 95%;" maxlength="255" onkeypress="focusOnEnter(event, 'sequenceStartDate')">
+            style="width: 95%;" maxlength="255" onkeypress="focusOnEnter(event, 'sequencingStartDate')">
         </td>
         <td class="status" id="clusterDate.status"></td>
       </tr>
       <tr>
-        <td class="subprompt">Sequence start</td>
+        <td class="subprompt">Sequencing start</td>
         <td>
-          <input type="text" name="sequenceStartDate" maxlength="10" style="width: 8em;"
-            onblur="dateOnChange('sequenceStartDate')" onkeypress="focusOnEnter(event, 'sequenceOperator')">
+          <input type="text" class="required" name="sequencingStartDate" maxlength="10" style="width: 8em;"
+            onblur="dateOnChange('sequencingStartDate')" onkeypress="focusOnEnter(event, 'sequencingOperator')">
             <base:icon 
-              onclick="Dates.selectDate('Sequence start date', 'reggie', 'sequenceStartDate', 'setDate', 'yyyyMMdd')"
+              onclick="Dates.selectDate('Sequence start date', 'reggie', 'sequencingStartDate', 'setDate', 'yyyyMMdd')"
               image="calendar.png" 
               tooltip="Select a date from a calendar" 
@@ -541 +547 @@
         </td>
         <td>
-          <input type="text" name="sequenceOperator" value="<%=HTML.encodeTags(user.getName()) %>" 
+          <input type="text" name="sequencingOperator" value="<%=HTML.encodeTags(user.getName()) %>" 
             style="width: 95%;" maxlength="255" onkeypress="focusOnEnter(event, 'clusterProtocol')">
         </td>
-        <td class="status" id="sequenceStartDate.status"></td>
+        <td class="status" id="sequencingStartDate.status"></td>
       </tr>
       <tr valign="top">