Changeset 5722

Timestamp:

Sep 7, 2011, 11:26:07 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1597: Subtypes of items

Update the "Move biomaterial" plate event wizard to use item subtypes when possible.

Display item subtype for biomaterials in tooltip on the single-item page for plates.

Location:

trunk/www

Files:

• biomaterials/bioplates/view_bioplate.jsp (modified) (3 diffs)
• biomaterials/bioplates/wells/ajax.jsp (modified) (3 diffs)
• biomaterials/events/index.jsp (modified) (1 diff)
• biomaterials/wizards/index.jsp (modified) (2 diffs)
• biomaterials/wizards/move_biomaterial.jsp (modified) (11 diffs)
• include/scripts/main.js (modified) (1 diff)

trunk/www/biomaterials/bioplates/view_bioplate.jsp

@@ -187 +187 @@
       var pos = Main.getElementPosition(wellTd);
       wellInfo.style.left = (pos.left + pos.width - 5) + 'px';
-      wellInfo.style.top = (pos.top + 15) + 'px';
+      wellInfo.style.top = (pos.top + 10) + 'px';
       Main.show('wellInfo');
 
@@ -210 +210 @@
           var id = bioMaterial.id;
           var type = bioMaterial.type;
-          html = '<b>' + type + '</b>: ';
-          html += Main.linkItem('<%=ID%>', type, id, bioMaterial.editable, bioMaterial.name);
+          var subtype = bioMaterial.subtype;
+          html = Main.linkItem('<%=ID%>', type, id, bioMaterial.editable, bioMaterial.name);
+          html += ': <b>' + type + '</b>';
+          if (subtype) html += ' <span class="itemsubtype">[' + subtype.name + ']</span>';
           html += '<br>'+bioMaterial.description;
         }
@@ -523 +525 @@
         %>
         </table>
-        <div class="postit" id="wellInfo" style="display:none; width: 300px;" onmouseout="event.cancelBubble=true"></div>
+        <div class="postit" id="wellInfo" style="display:none; width: 300px; min-height: 30px;" onmouseout="event.cancelBubble=true"></div>
       </base:section>
       <jsp:include page="../../common/anytoany/list_anytoany.jsp">

trunk/www/biomaterials/bioplates/wells/ajax.jsp

@@ -28 +28 @@
   import="net.sf.basedb.core.BioWell"
   import="net.sf.basedb.core.MeasuredBioMaterial"
+  import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.InvalidDataException"
   import="net.sf.basedb.core.PermissionDeniedException"
@@ -72 +73 @@
         jsonBioMaterial.put("description", encodeStrings ? HTML.niceFormat(bioMaterial.getDescription()) : bioMaterial.getDescription());
         jsonBioMaterial.put("editable", bioMaterial.hasPermission(Permission.WRITE));
+        ItemSubtype subtype = bioMaterial.getItemSubtype();
+        if (subtype != null)
+        {
+          JSONObject jsonSubtype = new JSONObject();
+          jsonSubtype.put("id", subtype.getId());
+          jsonSubtype.put("name", HTML.encodeTags(subtype.getName()));
+          jsonBioMaterial.put("subtype", jsonSubtype);
+        }
       }
       catch (PermissionDeniedException ex)
@@ -79 +88 @@
       json.put("bioMaterial", jsonBioMaterial);
     }
-    /*
-    String status = "Ok";
-    MeasuredBioMaterial bioMaterial = null;
-    if (isEmpty && !hasBeenUsed)
-    {
-      status = "Empty";
-    }
-    else
-    {
-      try
-      {
-        bm = isEmpty ? w.getOriginalBioMaterial() : w.getBioMaterial();
-      }
-      catch (PermissionDeniedException ex)
-      {
-        status = "Denied";
-        bm = null;
-      }
-    }
-    aw.ajaxPrintEntry("status", status);
-    aw.ajaxPrintEntry("id", w.getId());
-    json.put("id", well.getId());
-    
-    if (bm != null)
-    {
-      aw.ajaxPrintEntry("bm.id", bm.getId());
-      aw.ajaxPrintEntry("bm.type", bm.getType().name());
-      aw.ajaxPrintEntry("bm.editable", bm.hasPermission(Permission.WRITE) ? "1" : "0");
-      aw.ajaxPrintEntry("bm.name", encodeStrings ? HTML.encodeTags(bm.getName()) : bm.getName());
-      aw.ajaxPrintEntry("bm.description", encodeStrings ? HTML.niceFormat(bm.getDescription()) : bm.getDescription());
-    }
-    aw.ajaxEndRecord();
-    */
     dc.close();
   }

trunk/www/biomaterials/events/index.jsp

@@ -55 +55 @@
 <%@ taglib prefix="tbl" uri="/WEB-INF/table.tld" %>
 <%!
-  private static final ItemContext defaultContext = Base.createDefaultContext("entryDate", "type,entryDate,eventDate,quantity,protocol,comment");
+  private static final ItemContext defaultContext = Base.createDefaultContext("entryDate", "type,bioPlateEvent,entryDate,eventDate,quantity,protocol,comment");
   private static final Item itemType = Item.BIOMATERIALEVENT;
 %>

trunk/www/biomaterials/wizards/index.jsp

@@ -22 +22 @@
   @author Nicklas
 --%>
-<%@page import="net.sf.basedb.core.BioMaterialEventSource"%>
 <%@ page pageEncoding="UTF-8" session="false"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.BioMaterial"
   import="net.sf.basedb.core.BioMaterialEvent"
+  import="net.sf.basedb.core.BioMaterialEventSource"
   import="net.sf.basedb.core.BioPlate"
   import="net.sf.basedb.core.BioPlateType"
@@ -310 +310 @@
               {
                 child = Extract.getNew(dc, destParticipant);
-                if (!pooled) ((Extract)child).setSample((Sample)parent).setUsedQuantity(usedQuantity);
+                //if (!pooled) ((Extract)child).setSample((Sample)parent).setUsedQuantity(usedQuantity);
               }
               /*

trunk/www/biomaterials/wizards/move_biomaterial.jsp

@@ -28 +28 @@
   import="net.sf.basedb.core.BioPlateEventType"
   import="net.sf.basedb.core.MeasuredBioMaterial"
+  import="net.sf.basedb.core.BioWell"
+  import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.Hardware"
   import="net.sf.basedb.core.Protocol"
@@ -71 +73 @@
   catch (PermissionDeniedException ex)
   {}
+  ItemSubtype commonSubtype = null;
+  boolean first = true;
+  for (BioWell well : sourcePlate.getBioWells().list(dc))
+  {
+    try
+    {
+      if (!well.isEmpty())
+      {
+        ItemSubtype subtype = well.getBioMaterial().getItemSubtype();
+        if (first)
+        {
+          commonSubtype = subtype;
+          first = false;
+        }
+        else
+        {
+          if (subtype == null || !subtype.equals(commonSubtype))
+          {
+            commonSubtype = null;
+            break;
+          }
+        }
+      }
+    }
+    catch (PermissionDeniedException ex)
+    {}
+  }
+  if (commonSubtype != null && itemType == null)
+  {
+    itemType = commonSubtype.getMainItemType();
+  }
   
   final String clazz = "class=\"text\"";
@@ -368 +401 @@
       var url = '../bioplates/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone&callback=setBioPlateCallback';
       url += '&resetTemporary=1&tmpfilter:INT:bioPlateType.bioMaterialType=<%=itemType == null ? "=" : "|" + itemType.getValue()%>'
+      <%
+      if (commonSubtype != null)
+      {
+        %>
+        url += '&tmpfilter:INT:bioPlateType.itemSubtype=|<%=commonSubtype.getId()%>'
+        <%
+      }
+      %>
       url += '&exclude='+sourcePlate.id;
       Main.openPopup(url, 'SelectBioPlate', 1000, 700);
@@ -374 +415 @@
     function setBioPlateCallback(bioPlateId, name, isSourcePlate)
     {
+      var win = Main.getWindow('SelectBioPlate');
       if (!isSourcePlate && bioPlateId == sourcePlate.id)
       {
-        alert('It is not possible to use the same plate as both source and destination plate.');
+        win.alert('It is not possible to use the same plate as both source and destination plate.');
         return;
       }
@@ -388 +430 @@
       if (plateInfo.status != 'ok')
       {
-        alert(plateInfo.message);
-        return false;
+        win.alert(plateInfo.message);
+        return;
       }
 
@@ -556 +598 @@
       }
       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); 
     }
@@ -581 +635 @@
       }
       url += '&resetTemporary=1';
+      <%
+      ItemSubtype protocolType = null;
+      if (commonSubtype != null)
+      {
+        protocolType = commonSubtype.getRelatedSubtype(Item.PROTOCOL);
+        if (protocolType != null)
+        {
+          %>
+          url += '&tmpfilter:INT:itemSubtype=<%=protocolType.getId()%>';
+          <%
+        }
+      }
+      %>
       Main.openPopup(url, 'SelectProtocol', 1000, 700); 
     }
@@ -621 +688 @@
       request.send(null);
       var mappingInfo = Ajax.parseJsonResponse(request.responseText);
+      var win = Main.getWindow('SelectPlateMapping');
       if (mappingInfo.status != 'ok')
       {
-        alert(mappingInfo.message);
+        win.alert(mappingInfo.message);
         return false;
       }
@@ -629 +697 @@
       if (mappingInfo.sourcePlates != 1 || mappingInfo.sourceRows != sourcePlate.rows || mappingInfo.sourceColumns != sourcePlate.columns)
       {
-        if (!confirm("The selected mapping doesn't match the geometry of the source plate.\nContinue mapping overlapping positions?")) return;
+        if (!win.confirm("The selected mapping doesn't match the geometry of the source plate.\nContinue mapping overlapping positions?")) return;
       }
       else if (mappingInfo.destinationPlates != 1 || mappingInfo.destinationRows != destPlate.rows || mappingInfo.destinationColumns != destPlate.columns)
       {
-        if (!confirm("The selected mapping doesn't match the geometry of the destination plate.\nContinue mapping overlapping positions?")) return;
+        if (!win.confirm("The selected mapping doesn't match the geometry of the destination plate.\nContinue mapping overlapping positions?")) return;
       }
       
@@ -662 +730 @@
   <base:body onload="init()">
     <div id="canvas"></div>
-    <h3>Move biomaterial to plate</h3>
+    <h3>Move biomaterial to plate <base:help helpid="bioplateevent.move" /></h3>
     <div class="boxedbottom" style="height: <%=(int)(scale*500)%>px; padding: 0px;">
       <form name="main" action="index.jsp" method="post">
@@ -776 +844 @@
           <div style="max-height: <%=(int)(scale*350)%>px; overflow: auto;">
             <b>Source plate:</b> <span id="plate.src.name"></span>
+            <%=commonSubtype != null ? "<span class=\"itemsubtype\">[" + HTML.encodeTags(commonSubtype.getName()) + "]</span>" : "" %>
             <div id="plate.src"></div>
           </div>

trunk/www/include/scripts/main.js

@@ -156 +156 @@
     var win = this.getPageValue('open.windows', windowName);
     if (win) win.focus();
+  }
+  
+  /**
+    Get a reference to a named window. If the window
+    doesn't exists or if it is closed, a reference to
+    the current window is returned.
+   */
+  this.getWindow = function(windowName)
+  {
+    var win = this.getPageValue('open.windows', windowName);
+    if (!win || win.closed) win = window;
+    return win;
   }