Changeset 2484

Timestamp:

Aug 3, 2006, 8:41:17 AM (17 years ago)

Author:

Martin Svensson

Message:

Refrences #173 A hardware can now be attach to a Hybridization in the GUI.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/HardwareType.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Item.java (modified) (1 diff)
• www/views/hybridizations/edit_hybridization.jsp (modified) (6 diffs)
• www/views/hybridizations/index.jsp (modified) (2 diffs)
• www/views/hybridizations/list_hybridizations.jsp (modified) (2 diffs)
• www/views/hybridizations/view_hybridization.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/HardwareType.java

@@ -62 +62 @@
   */
   public static final String PRINT_ROBOT = "net.sf.basedb.core.HardwareType.PRINT_ROBOT";
+  
+  /**
+    The id for the <code>HardwareType</code> object representing a 
+    hybridization station.
+  */
+  public static final String HYBRIDIZATION_STATION = "net.sf.basedb.core.HarwareType.HYBRIDIZATION_STATION";
+  
+  /**
+    Create a new <code>HardwareType</code> item.
+  
+    @param dc The <code>DbControl</code> which will be used for
+      permission checking and database access
+    @return The new <code>HardwareType</code> item
+    @throws BaseException If there is an error
+  */
+  public static HardwareType getNew(DbControl dc)
+    throws BaseException
+  {
+    HardwareType hwt = dc.newItem(HardwareType.class);
+    hwt.setName("New hardware type");
+    return hwt;
+  }
   
   /**

trunk/src/core/net/sf/basedb/core/Install.java

@@ -382 +382 @@
       HardwareTypeData scanner = createHardwareType(HardwareType.SCANNER, "Scanner", "Scans the microarray images.");
       HardwareTypeData robot = createHardwareType(HardwareType.PRINT_ROBOT, "Print robot", "Spot the probe on the array.");
-      
+      HardwareTypeData hybStation = createHardwareType(HardwareType.HYBRIDIZATION_STATION, "Hybridization station", "Automate the hybridization of microarrays on slides.");
 
       // Hardware 

trunk/src/core/net/sf/basedb/core/Item.java

@@ -160 +160 @@
     The item is a {@link HardwareType}.
   */
-  HARDWARETYPE(122, "Hardware type", "htp", HardwareType.class, HardwareTypeData.class, DefinedPermissions.write),
+  HARDWARETYPE(122, "Hardware type", "htp", HardwareType.class, HardwareTypeData.class, DefinedPermissions.basic),
   /**
     The item is a {@link Software}.

trunk/www/views/hybridizations/edit_hybridization.jsp

@@ -34 +34 @@
   import="net.sf.basedb.core.Permission"
   import="net.sf.basedb.core.Include"
+  import="net.sf.basedb.core.Hardware"
+  import="net.sf.basedb.core.HardwareType"
   import="net.sf.basedb.core.Hybridization"
   import="net.sf.basedb.core.BioMaterialEvent"
@@ -78 +80 @@
   boolean readCurrentProtocol = true;
   Protocol currentProtocol = null;
+  
+  boolean readCurrentHybStation = true;
+  Hardware currentHybStation = null;
 
   if (itemId == 0)
@@ -86 +91 @@
     {
       currentProtocol = Base.getFirstMatching(dc, Protocol.getQuery(), "name", cc.getPropertyFilter("creationEvent.protocol.name"));
+    }
+    if (cc.getPropertyFilter("creationEvent.hardware.name") != null)
+    {
+      currentHybStation = Base.getFirstMatching(dc, Hardware.getQuery(), "name", cc.getPropertyFilter("creationEvent.hardware.name"));
     }
     if (cc.getPropertyFilter("arraySlide.name") != null)
@@ -124 +133 @@
     {
       readCurrentProtocol = false;
+    }
+    try
+    {
+      currentHybStation = creationEvent.getHardware();
+    }
+    catch (PermissionDeniedException ex)
+    {
+      readCurrentHybStation = false;
     }
     
@@ -217 +234 @@
       frm.protocol_id[1].text = name;
       frm.protocol_id.selectedIndex = 1;
+    }
+    
+    
+    
+    function selectHybStationOnClick()
+    {
+      var frm = document.forms['hybridization'];
+      var url = '../../admin/hardware/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone&callback=setHybStationCallback';
+      if (frm.hardware_id.length > 1)
+      {
+        var id = Math.abs(parseInt(frm.hardware_id[1].value));        
+        url += '&item_id='+id;
+      }
+      url += '&filter:INT:hardwareType=<%=SystemItems.getId(HardwareType.HYBRIDIZATION_STATION)%>';
+      Main.openPopup(url, 'SelectHybStation', 1000, 700);
+    }
+    function setHybStationCallback(hybStationId, name)
+    {
+      var frm = document.forms['hybridization'];
+      if (frm.hardware_id.length < 2) // >
+      {
+        frm.hardware_id[frm.hardware_id.length] = new Option();
+      }
+      frm.hardware_id[1].value = hybStationId;
+      frm.hardware_id[1].text = name;
+      frm.hardware_id.selectedIndex = 1;
     }
     
@@ -414 +457 @@
       </tr>
       <tr>
+        <td class="prompt">Hardware</td>
+        <td>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+          <td>
+            <select name="hardware_id" size="1" 
+              <%=!readCurrentHybStation ? "disabled readonly class=\"disabled\"" : ""%>
+              style="width: 20em;">
+            <%
+            if (!readCurrentHybStation)
+            {
+              %>
+              <option value="-1">- denied -
+              <%
+            }
+            else
+            {
+              %>
+              <option value="0">- none -
+              <%
+              if (currentHybStation != null)
+              {
+                %>
+                <option value="<%=hyb == null ? currentHybStation.getId() : -currentHybStation.getId()%>"
+                  selected><%=HTML.encodeTags(currentHybStation.getName())%>
+                <%
+              }
+            }
+            %>
+            </select>
+            &nbsp;
+          </td>
+          <td><base:button onclick="selectHybStationOnClick()" 
+            title="Select&hellip;" disabled="<%=!readCurrentHybStation%>" /></td>
+          </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
         <td class="prompt">Array slide</td>
         <td>

trunk/www/views/hybridizations/index.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.LabeledExtract"
   import="net.sf.basedb.core.Protocol"
+  import="net.sf.basedb.core.Hardware"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultIterator"
@@ -163 +164 @@
     }
     
+    //Hybridization station
+    int hybStationId = Values.getInt(request.getParameter("hardware_id"), -1);
+    if (hybStationId >= 0) // < 0 denied or unchanged
+    {
+      Hardware hw = hybStationId == 0 ? null : Hardware.getById(dc, hybStationId);
+      creationEvent.setHardware(hw);
+    }
+    
     // Labeled extracts
     String[] modifiedLabeledExtracts = Values.getString(request.getParameter("modifiedLabeledExtracts")).split(",");

trunk/www/views/hybridizations/list_hybridizations.jsp

@@ -256 +256 @@
         exportable="true"
         show="<%=mode.isCompact() ? "never" : "auto"%>" 
+      />
+      <tbl:columndef
+        id="hybStation"
+        property="creationEvent.hardware"
+        datatype="string"
+        title="Hardware"
+        sortable="true"
+        filterable="true"
+        exportable="true"
+        show="<%=mode.isCompact() ? "never" : "auto"%>"       
       />
       <tbl:columndef 
@@ -569 +579 @@
                     enablePropertyLink="<%=mode.hasPropertyLink()%>"
                   /></tbl:cell>
+                <tbl:cell column="hybStation"
+                  ><base:propertyvalue 
+                    item="<%=creationEvent%>"
+                    property="hardware"
+                    enableEditLink="<%=mode.hasEditLink()%>" 
+                    enablePropertyLink="<%=mode.hasPropertyLink()%>"
+                  /></tbl:cell>
                 <tbl:cell column="eventDate"><%=Values.formatDate(creationEvent.getEventDate())%></tbl:cell>
                 <tbl:cell column="entryDate"><%=Values.formatDate(creationEvent.getEntryDate())%></tbl:cell>

trunk/www/views/hybridizations/view_hybridization.jsp

@@ -235 +235 @@
       </tr>
       <tr>
+        <td class="prompt">Hardware</td>
+        <td><base:propertyvalue item="<%=creationEvent%>" property="hardware" /></td>
+      </tr>
+      <tr>
         <td class="prompt">Owner</td>
         <td><base:propertyvalue item="<%=hyb%>" property="owner" /></td>