Changeset 4131 for trunk/www/views/hybridizations/edit_hybridization.jsp

Timestamp:

Feb 8, 2008, 9:55:48 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #868: Support for chips with multiple arrays

File:

• trunk/www/views/hybridizations/edit_hybridization.jsp (modified) (12 diffs)

trunk/www/views/hybridizations/edit_hybridization.jsp

@@ -197 +197 @@
         return false;
       }
+      else if (!Numbers.isInteger(frm.numArrays.value))
+      {
+        alert("'" + frm.numArrays.value + "' is not a valid number");
+        frm.numArrays.focus();
+        return false;
+      }
+      else if (parseInt(frm.numArrays.value) <= 0)
+      {
+        alert("Number of arrays must be > 0");
+        frm.numArrays.focus();
+        return false;
+      }
       return true;
     }
@@ -369 +381 @@
     {
       var item = Link.getItem('L', labeledExtractId);
-      if (!item) item = new Item('L', labeledExtractId, name+' [-]', '', '');
+      if (!item) item = new Item('L', labeledExtractId, '1: '+name+' [-]', '', '');
       Link.addItem(document.forms['hybridization'].labeled_extracts, item);
       parentsChanged = true;
+      labeledExtractsOnChange();
     }
     function labeledExtractsOnChange()
@@ -379 +392 @@
       if (item && item.id)
       {
-        frm.used_quantity.value = item.value;
+        var i = item.value.indexOf(':');
+        frm.used_quantity.value = i > 0 ? item.value.substring(0, i) : item.value;
+        frm.array_index.value = i > 0 ? item.value.substring(i+1) : '1';
         frm.used_quantity.focus();
       }
@@ -385 +400 @@
       {
         frm.used_quantity.value = '';
+        frm.array_index.value = '1';
       }
     }
@@ -391 +407 @@
       var frm = document.forms['hybridization'];
       var usedQuantity = frm.used_quantity.value;
+      var arrayIndex = frm.array_index.value;
+      var numArrays = parseInt(frm.numArrays.value);
+      if (arrayIndex != '' && (arrayIndex > numArrays || arrayIndex <= 0))
+      {
+        alert('Array index must be between 1 and ' + numArrays);
+        return;
+      }
+      if (arrayIndex == '') arrayIndex = 1;
       var displayQuantity = usedQuantity == '' ? '-' : usedQuantity+' µg';
       for (var i = 0; i < frm.labeled_extracts.length; i++) // >
@@ -397 +421 @@
         if (option.selected && option.item.id)
         {
-          option.item.value = usedQuantity;
+          option.item.value = usedQuantity + ':' + arrayIndex;
           var text = option.text.replace(/\[.*\]/, '['+displayQuantity+']');
+          text = text.replace(/\d*\:/, arrayIndex + ':');
           option.text = text; 
         }
       }
+    }
+    function arrayIndexOnBlur()
+    {
+      usedQuantityOnBlur();
     }
 
@@ -429 +458 @@
             LabeledExtract e = LabeledExtract.getById(dc, id);
             %>
-            Link.addItem(labeledExtracts, new Item('L', <%=e.getId()%>, '<%=HTML.javaScriptEncode(e.getName())%> [-]', '', ''));
+            Link.addItem(labeledExtracts, new Item('L', <%=e.getId()%>, '1: <%=HTML.javaScriptEncode(e.getName())%> [-]', '', ''));
             <%
           }
@@ -440 +469 @@
         {
           String usedQuantity = Values.formatNumber(creationEvent.getUsedQuantity(le), -1);
+          int arrayIndex = creationEvent.getSourceGroup(le);
           %>
-          Link.addNewItem(labeledExtracts, new Item('L', <%=le.getId()%>, '<%=HTML.javaScriptEncode(le.getName())%> [<%=usedQuantity%> µg]', '<%=usedQuantity%>'));
+          Link.addNewItem(labeledExtracts, new Item('L', <%=le.getId()%>, '<%=arrayIndex + ": " + HTML.javaScriptEncode(le.getName())%> [<%=usedQuantity%> µg]', '<%=usedQuantity%>:<%=arrayIndex%>'));
           <%
         }
@@ -464 +494 @@
           value="<%=name%>" 
           size="40" maxlength="<%=Hybridization.MAX_NAME_LENGTH%>"></td>
+      </tr>
+      <tr>
+        <td class="prompt">Arrays</td>
+        <td><input <%=requiredClazz%> type="text" name="numArrays" 
+          value="<%=hyb == null ? Values.getString(cc.getPropertyValue("numArrays"), "1") : hyb.getNumArrays()%>" 
+          size="12" maxlength="10" onkeypress="return Numbers.integerOnly(event)"></td>
       </tr>
       <tr>
@@ -553 +589 @@
     
     <t:tab id="labeledExtracts" title="Labeled extracts" helpid="hybridization.labeledextracts">
+      <input type="hidden" name="modifiedLabeledExtracts" value="">
+      <input type="hidden" name="removedLabeledExtracts" value="">
     
       <table class="form" cellspacing=0>
@@ -564 +602 @@
               onchange="labeledExtractsOnChange()">
             </select>&nbsp;<br>
-            Used
-            <input <%=clazz%> type="text" name="used_quantity" value=""
-              size="12" maxlength="10" onkeypress="return Numbers.numberOnly(event)"
-              onkeyup="usedQuantityOnBlur()"
-            > (µg)
-            <input type="hidden" name="modifiedLabeledExtracts" value="">
-            <input type="hidden" name="removedLabeledExtracts" value="">
-          
           </td>
           <td>
@@ -591 +621 @@
         </td>
       </tr>
+      
+      <tr>
+        <td style="text-align: right; padding-right: 5px;">- used quantity</td>
+        <td>
+            <input <%=clazz%> type="text" name="used_quantity" value=""
+              size="12" maxlength="10" onkeypress="return Numbers.numberOnly(event)"
+              onkeyup="usedQuantityOnBlur()"
+            > (µg)
+        </td>
+      </tr>
+
+      <tr>
+        <td style="text-align: right; padding-right: 5px;">- array index</td>
+        <td>
+            <input <%=clazz%> type="text" name="array_index" value=""
+              size="12" maxlength="10" onkeypress="return Numbers.numberOnly(event)"
+              onkeyup="arrayIndexOnBlur()"
+            >
+        </td>
+      </tr>
+
       </table>
     </t:tab>