Changeset 5710

Timestamp:

Aug 29, 2011, 2:41:51 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1597: Subtypes of items

The place-on-plate wizard now uses item subtypes when selecting plate, protocol and hardware if all selected items are of the same subtype.

Location:

trunk/www

Files:

• biomaterials/wizards/place_on_plate.jsp (modified) (7 diffs)
• include/styles/main.css (modified) (1 diff)

trunk/www/biomaterials/wizards/place_on_plate.jsp

@@ -28 +28 @@
   import="net.sf.basedb.core.Hardware"
   import="net.sf.basedb.core.Protocol"
+  import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.SystemItems"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.ItemContext"
@@ -64 +66 @@
   ItemQuery<MeasuredBioMaterial> query = (ItemQuery<MeasuredBioMaterial>)cc.getQuery();
   List<MeasuredBioMaterial> bioMaterial = Collections.emptyList();
+  ItemSubtype commonSubtype = null;
   if (query != null)
   {
@@ -106 +109 @@
       itemList = new ItemList('itemlist');
       <%
+      boolean first = true;
       for (MeasuredBioMaterial bm : bioMaterial)
       {
         String itemId = Integer.toString(bm.getId());
+        if (first)
+        {
+          commonSubtype = bm.getItemSubtype();
+          first = false;
+        }
+        else if (commonSubtype != null)
+        {
+          if (!commonSubtype.equals(bm.getItemSubtype()))
+          {
+            commonSubtype = null;
+          }
+        }
         %>
         itemList.addItem(<%=itemId%>, '<%=HTML.javaScriptEncode(bm.getName())%>');
@@ -390 +406 @@
       var url = '../bioplates/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone&callback=setBioPlateCallback';
       url += '&resetTemporary=1&tmpfilter:INT:bioPlateType.bioMaterialType=|<%=itemType.getValue()%>'
+      <%
+      if (commonSubtype != null)
+      {
+        %>
+        url += '&tmpfilter:INT:bioPlateType.itemSubtype=|<%=commonSubtype.getId()%>'
+        <%
+      }
+      %>
       Main.openPopup(url, 'SelectBioPlate', 1000, 700);
     }
@@ -535 +559 @@
       }
       url += '&resetTemporary=1';
+      <%
+      if (commonSubtype != null)
+      {
+        ItemSubtype hardwareType = commonSubtype.getRelatedSubtype(Item.HARDWARE);
+        if (hardwareType != null)
+        {
+          %>
+          url += '&tmpfilter:INT:itemSubtype=<%=hardwareType.getId()%>';
+          <%
+        }
+      }
+      %>
       Main.openPopup(url, 'SelectHardware', 1000, 700); 
     }
@@ -560 +596 @@
       }
       url += '&resetTemporary=1';
+      <%
+      ItemSubtype protocolType = null;
+      if (commonSubtype != null)
+      {
+        protocolType = commonSubtype.getRelatedSubtype(Item.PROTOCOL);
+      }
+      if (protocolType == null)
+      {
+        String defaultId = Protocol.getDefaultSystemId(itemType);
+        if (defaultId != null) protocolType = ItemSubtype.getById(dc, SystemItems.getId(defaultId));
+      }
+      if (protocolType != null)
+      {
+        %>
+        url += '&tmpfilter:INT:itemSubtype=<%=protocolType.getId()%>';
+        <%
+      }
+      %>
       Main.openPopup(url, 'SelectProtocol', 1000, 700); 
     }
@@ -698 +752 @@
       <tr valign="top">
         <td style="width: 280px;">
-          <b>Items to place</b>
+          <b>Items to place</b> <%=commonSubtype != null ? "<span class=\"itemsubtype\">[" + HTML.encodeTags(commonSubtype.getName()) + "]</span>" : "" %>
           <div id="itemlist" class="biomateriallist" style="height: <%=(int)(scale*320)%>px; width:270px;" onscroll="onItemListScroll()">
           <table border="0" cellspacing="0" cellpadding="0" width="100%">

trunk/www/include/styles/main.css

@@ -471 +471 @@
 }
 
+.itemsubtype {
+  font-size: 10px;
+  color: #777777;
+}
+