Changeset 2093

Timestamp:

Oct 21, 2013, 1:33:16 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

References #502: Design flow cells

Only display pool name (not libplate names) in the layout section in the second step.
Rearranged the input fields for sequencing cycles.

File:

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

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

@@ -83 +83 @@
       var option = new Option(name, pool.id, poolNo < 4);
       option.title = title;
+      option.pool = pool;
       
       poolsList[poolsList.length] = option;
@@ -229 +230 @@
 
   var option = new Option(name, id, true, true);
+  option.pool = {'id': id, 'name': name };
   poolsList[poolsList.length] = option;
   poolsOnChange();
@@ -275 +277 @@
     if (frm.pools[i].selected)
     {
-      var pool = {};
-      pool.id = parseInt(frm.pools[i].value, 10);
-      pool.name = frm.pools[i].text;
+      var pool = frm.pools[i].pool;
       var index = selectedPools.length;
       selectedPools[index] = pool;
@@ -576 +576 @@
 }
 
-.plate .header th.lane
-{
-  padding: 0.5em;
-}
-
 .well
 {
@@ -597 +592 @@
 {
   border-right: 1px solid #A0A0A0;
+  width: 3em;
 }
 
@@ -729 +725 @@
     <td class="stepfields">
 
-      <table>
+      <table style="border-collapse: collapse;">
       <tr valign="top">
         <td class="prompt">Sequencing cycles</td>
-        <td class="input">(planned)</td>
-        <td class="status"></td>
-        <td class="help" rowspan="4">
+        <td colspan="2">Read 1</td>
+        <td colspan="2">Index</td>
+        <td colspan="2">Read 2</td>
+        <td class="help" rowspan="3">
           Planned number of sequencing cycles. The actual numbers used may be changed in the
-          registration wizard.<br>
+          registration wizard.
         </td>
       </tr>
       <tr valign="top">
-        <td class="subprompt">Read 1</td>
-        <td class="input">
+        <td class="subprompt"></td>
+        <td>
           <input type="text" class="required" name="read1" value="<%=DEFAULT_READ_1 %>" 
-            size="10" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_1 %>)">
-            <span id="read1.message" class="message" style="display: none;"></span>
+            size="8" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_1 %>)">
         </td>
         <td class="status" id="read1.status"></td>
-      </tr>
-      <tr valign="top">
-        <td class="subprompt">Index read</td>
-        <td class="input">
+        <td>
           <input type="text" class="required" name="indexRead" value="<%=DEFAULT_READ_INDEX %>" 
-            size="10" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_INDEX %>)">
-            <span id="indexRead.message" class="message" style="display: none;"></span>
+            size="8" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_INDEX %>)">
         </td>
         <td class="status" id="indexRead.status"></td>
-      </tr>
-      <tr valign="top">
-        <td class="subprompt">Read 2</td>
-        <td class="input">
+        <td>
           <input type="text" class="required" name="read2" value="<%=DEFAULT_READ_2 %>" 
-            size="10" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_2 %>)">
-            <span id="read2.message" class="message" style="display: none;"></span>
+            size="8" onkeypress="return Numbers.integerOnly(event)" onblur="readOnBlur(this.name, <%=DEFAULT_READ_2 %>)">
+            
         </td>
         <td class="status" id="read2.status"></td>
       </tr>
       <tr valign="top">
+        <td class="prompt"></td>
+        <td colspan="2"><span id="read1.message" class="message" style="display: none;"></span></td>
+        <td colspan="2"><span id="indexRead.message" class="message" style="display: none;"></span></td>
+        <td colspan="2"><span id="read2.message" class="message" style="display: none;"></span></td>
+      </tr>
+      <tr valign="top" style="border-top: 1em solid transparent;">
         <td class="prompt">Flow cell layout</td>
-        <td class="input">
-          <table class="plate" id="plate" style="margin: 1em 0 1em 0;">
+        <td class="input" colspan="5">
+          <table class="plate" id="plate" style="margin-bottom: 1em;">
           <thead>
           <tr class="header">
@@ -814 +809 @@
       <tr valign="top">
         <td class="prompt">Comments</td>
-        <td class="input"></td>
+        <td class="input" colspan="5"></td>
         <td class="status" id="comments.status"></td>
         <td class="help"><span id="comments.message" class="message" style="display: none;"></span>Comments about the flow cells.</td>
@@ -825 +820 @@
           <tr valign="top" id="comments.<%=fcNo%>">
           <td class="subprompt" id="comments.<%=fcNo%>.name">FlowCell<%=fcNo%></td>
-          <td class="input"><textarea rows="3" cols="50" style="width: 90%;" name="comments.<%=fcNo%>" value=""></textarea></td>
+          <td class="input" colspan="5"><textarea rows="3" cols="50" style="width: 90%;" name="comments.<%=fcNo%>" value=""></textarea></td>
           <td class="status"></td>
           <td class="help"></td>