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

Timestamp:

Feb 8, 2008, 11:54:05 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #868: Support for chips with multiple arrays

Fixed some input problems on Labeled extracts tab

File:

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

trunk/www/views/hybridizations/edit_hybridization.jsp

@@ -134 +134 @@
     name = Values.getString(cc.getPropertyValue("name"), "New hybridization");
     eventDate = (Date)cc.getPropertyObject("creationEvent.eventDate");
+    
+    if (Values.getBoolean(request.getParameter("useParents")))
+    {
+      labeledExtractsQuery = LabeledExtract.getQuery();
+      labeledExtractsQuery.include(Include.ALL);
+      labeledExtractsQuery.order(Orders.asc(Hql.property("name")));
+    }
+    
   }
   else
@@ -393 +401 @@
       {
         var i = item.value.indexOf(':');
-        frm.used_quantity.value = i > 0 ? item.value.substring(0, i) : item.value;
+        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();
@@ -451 +459 @@
         frm.name.select();
         <%
-        if (Values.getBoolean(request.getParameter("useParents")))
-        {
-          ItemContext lc = sc.getCurrentContext(Item.LABELEDEXTRACT);
-          for (int id : lc.getSelected())
-          {
-            LabeledExtract e = LabeledExtract.getById(dc, id);
-            %>
-            Link.addItem(labeledExtracts, new Item('L', <%=e.getId()%>, '1: <%=HTML.javaScriptEncode(e.getName())%> [-]', '', ''));
-            <%
-          }
-        }
-      }
-      else
+      }
+      if (labeledExtractsQuery != null)
       {
         ItemResultList<LabeledExtract> labeledExtracts = labeledExtractsQuery.list(dc);
         for (LabeledExtract le : labeledExtracts)
         {
-          String usedQuantity = Values.formatNumber(creationEvent.getUsedQuantity(le), -1);
-          int arrayIndex = creationEvent.getSourceGroup(le);
-          %>
-          Link.addNewItem(labeledExtracts, new Item('L', <%=le.getId()%>, '<%=arrayIndex + ": " + HTML.javaScriptEncode(le.getName())%> [<%=usedQuantity%> µg]', '<%=usedQuantity%>:<%=arrayIndex%>'));
-          <%
+          if (hyb == null)
+          {
+            %>
+            Link.addItem(labeledExtracts, new Item('L', <%=le.getId()%>, '1: <%=HTML.javaScriptEncode(le.getName())%> [-]', ':1'));
+            <%
+          }
+          else
+          {
+            Float used = creationEvent.getUsedQuantity(le);
+            String usedQuantity = Values.formatNumber(used, -1);
+            String usedWithUnit = used == null ? "-" : usedQuantity + " µg";
+            int arrayIndex = creationEvent.getSourceGroup(le);
+            %>
+            Link.addNewItem(labeledExtracts, new Item('L', <%=le.getId()%>, '<%=arrayIndex + ": " + HTML.javaScriptEncode(le.getName())%> [<%=usedWithUnit%>]', '<%=usedQuantity%>:<%=arrayIndex%>'));
+            <%
+          }
         }
       }