Changeset 2070

Timestamp:

Oct 15, 2013, 1:03:03 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #481: Register prepared flow cells

Duplicate the entered 'Flow cell ID' values on the third step to avoid registration mistakes. Check that the same 'Flow cell ID' is not entered into both fields.

File:

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

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

@@ -130 +130 @@
       var fc = frm.flowcells[i].flowCell;
       //Main.debug(fc.name + ':'+ fc.id + ':' + flowCellIsValid['fc.'+fc.id+'.id'] + ':' + flowCellIsValid['fc.'+fc.id+'.readString']);
-      if (flowCellIdIsValid['fc-'+index+'.id'] != true) return false;
+      if (flowCellIdIsValid['fc-'+index+'.externalId'] != true) return false;
       if (commentsIsValid['fc-'+index+'.comments'] != true) return false;
       index++;
@@ -232 +232 @@
       frm[prefix+'.comments'].value = fc.comments;
       commentsOnChange(prefix+'.comments');
-      frm[prefix+'.id'].value = fc.externalId;
-      flowCellIdOnBlur(prefix+'.id');
+      frm[prefix+'.externalId'].value = fc.externalId;
+      flowCellIdOnBlur(prefix+'.externalId');
       index++;
     }
@@ -256 +256 @@
   frm.clusterOperator.disabled = true;
   frm.clusterProtocol.disabled = true;
-  frm['fc-0.id'].disabled = true;
+  frm['fc-0.externalId'].disabled = true;
   frm['fc-0.comments'].disabled = true;
-  frm['fc-1.id'].disabled = true;
+  frm['fc-1.externalId'].disabled = true;
   frm['fc-1.comments'].disabled = true;
 
@@ -309 +309 @@
       var prefix = 'fc-'+index;
       setInnerHTML(prefix+'.name.s', fc.name);
+      setInnerHTML(prefix+'.externalId', '<b>ID:</b> ' + frm[prefix+'.externalId'].value);
       frm[prefix+'.readString'].value = fc.ReadString;
       readStringOnBlur(prefix+'.readString');
@@ -454 +455 @@
     setInputStatus(idField, 'ID is a required value', 'invalid');
     return;
+  }
+  
+  if (idField == 'fc-1.externalId')
+  {
+    if (id == frm['fc-0.externalId'].value)
+    {
+      setInputStatus(idField, 'ID must be different', 'invalid');
+      return;
+    }
+  }
+  else
+  {
+    flowCellIdOnBlur('fc-1.externalId');
   }
   
@@ -534 +548 @@
       var fc = frm.flowcells[i].flowCell;
       frm['fc-'+index+'.readString'].disabled = true;
-      fc.externalId = frm['fc-'+index+'.id'].value;
+      fc.externalId = frm['fc-'+index+'.externalId'].value;
       fc.comments = frm['fc-'+index+'.comments'].value;
       if (!failed)
@@ -615 +629 @@
 #step\.3\.section.hide-fc-1  .fc-1
 {
-  visibility: hidden;
+  display: none;
 }
 
@@ -652 +666 @@
 
   <form name="reggie" onsubmit="return false;">
-    <input type="hidden" name="pdf.id" value="">
   
   <div id="step.1.section">
@@ -735 +748 @@
         <td class="prompt">Protocol</td>
         <td class="input"><select style="width:90%" name="clusterProtocol" id="clusterProtocol" 
-          onkeypress="focusOnEnter(event, 'fc-0.id')"></select></td>
+          onkeypress="focusOnEnter(event, 'fc-0.externalId')"></select></td>
         <td class="status" id="clusterProtocol.status"></td>
         <td class="help"><span id="clusterProtocol.message" class="message" style="display: none;"></span>
@@ -750 +763 @@
       <tr valign="top">
         <td class="subprompt">ID</td>
-        <td><input type="text" class="required" name="fc-0.id" onblur="flowCellIdOnBlur(this.name)" onkeypress="focusOnEnter(event, 'fc-0.comments')"></td>
-        <td class="status" id="fc-0.id.status"></td>
-        <td class="help"><span id="fc-0.id.message" class="message"></span></td>
+        <td><input type="text" class="required" name="fc-0.externalId" onblur="flowCellIdOnBlur(this.name)" onkeypress="focusOnEnter(event, 'fc-0.comments')"></td>
+        <td class="status" id="fc-0.externalId.status"></td>
+        <td class="help"><span id="fc-0.externalId.message" class="message"></span></td>
       </tr>
       <tr valign="top">
@@ -772 +785 @@
       <tr valign="top">
         <td class="subprompt">ID</td>
-        <td><input type="text" class="required" name="fc-1.id" onblur="flowCellIdOnBlur(this.name)" onkeypress="focusOnEnter(event, 'fc-1.comments')"></td>
-        <td class="status" id="fc-1.id.status"></td>
-        <td class="help"><span id="fc-1.id.message" class="message"></span></td>
+        <td><input type="text" class="required" name="fc-1.externalId" onblur="flowCellIdOnBlur(this.name)" onkeypress="focusOnEnter(event, 'fc-1.comments')"></td>
+        <td class="status" id="fc-1.externalId.status"></td>
+        <td class="help"><span id="fc-1.externalId.message" class="message"></span></td>
       </tr>
       <tr valign="top">
@@ -864 +877 @@
         <td><input type="text" class="required" name="fc-0.readString" onblur="readStringOnBlur(this.name)"></td>
         <td class="status" id="fc-0.readString.status"></td>
-        <td class="help"><span id="fc-0.readString.message" class="message"></span></td>
+        <td class="help"><span id="fc-0.readString.message" class="message"></span><span id="fc-0.externalId"></span></td>
       </tr>
       <tr valign="top" class="fc-1">
@@ -875 +888 @@
         <td><input type="text" class="required" name="fc-1.readString" onblur="readStringOnBlur(this.name)"></td>
         <td class="status" id="fc-1.readString.status"></td>
-        <td class="help"><span id="fc-1.readString.message" class="message"></span></td>
+        <td class="help"><span id="fc-1.readString.message" class="message"></span><span id="fc-1.externalId"></span></td>
       </tr>