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

Timestamp:

May 8, 2013, 11:10:06 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #473: Register library processing results

Swithced order of file selection so that the Qubit file is selected first. This makes it possible to validate that file at the same time the Caliper Well Table file is validated.

File:

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

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

@@ -258 +258 @@
   {
     qubitCsvFileOnChange();
-    frm.libProtocol.focus();
   }
   else
@@ -310 +309 @@
   Main.addClass(document.body, 'please-wait');
   setInputStatus('welltable', 'Checking...', 'checking');
-  var url = '../LibPrep.servlet?ID=<%=ID%>&cmd=PreValidateCaliperWellTable&csv='+csvId+'&bioplate='+frm.bioplate.value;
+  var qubitCsv = frm['qubitcsv.id'].value;
+  var url = '../LibPrep.servlet?ID=<%=ID%>&cmd=PreValidateCaliperWellTable&csv='+csvId+'&bioplate='+frm.bioplate.value+'&qubit='+qubitCsv;
   
   var request = Ajax.getXmlHttpRequest();
@@ -633 +633 @@
         <td class="input">
           <input type="text" class="required" name="libDate" value="" size="12" maxlength="10"
-            onblur="libDateOnChange()" onkeypress="focusOnEnter(event, 'welltable.path')">
+            onblur="libDateOnChange()" onkeypress="focusOnEnter(event, 'qubitcsv.path')">
         </td>
         <td class="status" id="libDate.status"></td>
@@ -641 +641 @@
       </tr>
       <tbody id="filesSection">
+      <tr>
+        <td class="prompt">Qubit files</td>
+        <td class="input"></td>
+        <td class="status"></td>
+        <td class="help"></td>
+      </tr>
+      <tr valign="top">
+        <td class="subprompt">Conc. CSV</td>
+        <td class="input">
+          <input type="hidden" name="qubitcsv.id" value="">
+          <table>
+          <tr>
+          <td><input class="text required" type="text" 
+            name="qubitcsv.path" value=""
+            size="50" onkeypress="doOnEnter(event, function(){document.getElementById('btnQubitCsv').click()})"
+            onblur="qubitCsvFileOnChange()"
+            ></td>
+          <td style="padding-left: 4px;"><base:button 
+              title="Browse&hellip;"
+              onclick="browseOnClick('qubitcsv', 'csv')"
+              id="btnQubitCsv"
+              />
+          </td>
+          </tr>
+          </table>
+        </td>
+        <td class="status" id="qubitcsv.status"></td>
+        <td class="help"><span id="qubitcsv.message" class="message" style="display: none;"></span>
+          Select the <b>Qubit CSV</b> file that contains the table with concentration
+          measurements.
+        </td>
+      </tr>
       <tr>
         <td class="prompt">Caliper files</td>
@@ -722 +754 @@
         </td>
       </tr>
-      <tr>
-        <td class="prompt">Qubit files</td>
-        <td class="input"></td>
-        <td class="status"></td>
-        <td class="help"></td>
-      </tr>
-      <tr valign="top">
-        <td class="subprompt">Conc. CSV</td>
-        <td class="input">
-          <input type="hidden" name="qubitcsv.id" value="">
-          <table>
-          <tr>
-          <td><input class="text required" type="text" 
-            name="qubitcsv.path" value=""
-            size="50" onkeypress="doOnEnter(event, function(){document.getElementById('btnQubitCsv').click()})"
-            onblur="qubitCsvFileOnChange()"
-            ></td>
-          <td style="padding-left: 4px;"><base:button 
-              title="Browse&hellip;"
-              onclick="browseOnClick('qubitcsv', 'csv')"
-              id="btnQubitCsv"
-              />
-          </td>
-          </tr>
-          </table>
-        </td>
-        <td class="status" id="qubitcsv.status"></td>
-        <td class="help"><span id="qubitcsv.message" class="message" style="display: none;"></span>
-          Select the <b>Qubit CSV</b> file that contains the table with concentration
-          measurements.
-        </td>
-      </tr>
       </tbody>
       <tr valign="top">