Changeset 2486

Timestamp:

Aug 3, 2006, 5:20:10 PM (17 years ago)

Author:

Martin Svensson

Message:

References #173. Possible to attach a hardware to a PlateEvent? in the GUI

Location:

trunk/www/lims/plates/events

Files:

• edit_event.jsp (modified) (7 diffs)
• index.jsp (modified) (2 diffs)
• list_events.jsp (modified) (2 diffs)
• view_event.jsp (modified) (2 diffs)

trunk/www/lims/plates/events/edit_event.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.SystemItems"
   import="net.sf.basedb.core.Permission"
+  import="net.sf.basedb.core.Hardware"
+  import="net.sf.basedb.core.HardwareType"
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.Plate"
@@ -79 +81 @@
   ProtocolType currentProtocolType = null;
   boolean readCurrentProtocolType = true;
+  Hardware currentHardware = null;
+  boolean readCurrentHardware = true;
 
   ItemResultList<PlateEventType> eventTypes = null;
@@ -97 +101 @@
       throw new WebException("popup", "No more event types can be created", 
         "One event of each event type has already been created for this plate.");
-    }
-    
+    }   
     
     if (cc.getPropertyFilter("protocolType.name") != null)
@@ -126 +129 @@
     {
       readCurrentProtocolType = false;
+    }
+    try
+    {
+      currentHardware = event.getHardware();
+    }
+    catch(PermissionDeniedException ex)
+    {
+      readCurrentHardware = false;
     }
   }
@@ -157 +168 @@
     }
     
-    var protocolTypeFilter = <%=currentProtocolType != null ? currentProtocolType.getId() : 0%>;
+    var protocolTypeFilter = <%=currentProtocolType != null ? currentProtocolType.getId() : 0%>;    
     function selectProtocolOnClick()
     {
@@ -183 +194 @@
       frm.protocol_id[1].text = name;
       frm.protocol_id.selectedIndex = 1;
+    }
+    function selectHardwareOnClick()
+    {
+      var frm = document.forms['event'];
+      var url = '../../../admin/hardware/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone&callback=setHardwareCallback';
+      if (frm.hardware_id.length > 1)
+      {
+        var id = Math.abs(parseInt(frm.hardware_id[1].value));
+        url += '&item_id='+id;
+      }
+      Main.openPopup(url, 'SelectHardware', 1000, 700);
+    }
+    function setHardwareCallback(hardwareId, name)
+    {
+      var frm = document.forms['event'];
+      if (frm.hardware_id.length < 2)
+      {
+        frm.hardware_id[frm.hardware_id.length] = new Option();
+      }
+      frm.hardware_id[1].value = hardwareId;
+      frm.hardware_id[1].text = name;
+      frm.hardware_id.selectedIndex = 1;
     }
 
@@ -329 +362 @@
         </td>
       </tr>
+      <tr>
+        <td class="prompt">Hardware</td>
+        <td>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr>
+          <td>
+            <select name="hardware_id" size="1"
+              <%=!readCurrentHardware ? "disabled readonly class=\"disabled\"" : ""%>
+              style="width: 20em;">
+            <%
+            if (!readCurrentHardware)
+            {
+              %>
+              <option value="-1">- denied -
+              <%
+            }
+            else
+            {
+              %>
+              <option value="0">- none -
+              <%
+              if (currentHardware != null)
+              {
+                %>
+                <option value="<%=event == null ? currentHardware.getId() : -currentHardware.getId()%>"
+                  selected><%=HTML.encodeTags(currentHardware.getName())%>
+                <%                
+              }
+            }
+            %>
+            </select>
+            &nbsp;
+          </td>
+          <td><base:button onclick="selectHardwareOnClick()"
+            title="Select&hellip;" disabled="<%=!readCurrentHardware%>"/></td>
+          </tr>
+          </table>
+        </td>
+      </tr>
       <tr valign=top>
         <td class="prompt">Comment</td>

trunk/www/lims/plates/events/index.jsp

@@ -28 +28 @@
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.Hardware"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.ItemContext"
@@ -146 +147 @@
       event.setProtocol(pt);
     }
+    int hardwareId = Values.getInt(request.getParameter("hardware_id"), -1);
+    if (hardwareId >= 0) // < 0 = denied or unchanged
+    {
+      Hardware hw = hardwareId == 0 ? null : Hardware.getById(dc, hardwareId);
+      event.setHardware(hw);
+    }
     dc.commit();
     cc.removeObject("item");

trunk/www/lims/plates/events/list_events.jsp

@@ -260 +260 @@
         title="Protocol"
         sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef
+        id="hardware"
+        property="hardware.name"
+        datatype="string"
+        title="Hardware"
+        sortable="true"
         filterable="true"
         exportable="true"
@@ -419 +428 @@
                     enablePropertyLink="<%=mode.hasPropertyLink()%>"
                   /></tbl:cell>
+                <tbl:cell column="hardware"
+                  ><base:propertyvalue 
+                    item="<%=item%>"
+                    property="hardware"
+                    enableEditLink="<%=mode.hasEditLink()%>"
+                    enablePropertyLink="<%=mode.hasPropertyLink()%>"
+                  /></tbl:cell>
                 <tbl:cell column="entryDate"><%=Values.formatDate(item.getEntryDate())%></tbl:cell>
                 <tbl:cell column="eventDate"><%=Values.formatDate(item.getEventDate())%></tbl:cell>

trunk/www/lims/plates/events/view_event.jsp

@@ -82 +82 @@
     readCurrentEventType = false;
   }
-  Protocol currentProtocol = null;
-  boolean readCurrentProtocol = true;
-  try
-  {
-    currentProtocol = event.getProtocol();
-  }
-  catch (PermissionDeniedException ex)
-  {
-    readCurrentProtocol = false;
-  }
   
   final boolean writePermission = event.hasPermission(Permission.WRITE);
@@ -202 +192 @@
       </tr>
       <tr>
+        <td class="prompt">Hardware</td>
+        <td><base:propertyvalue item="<%=event%>" property="hardware" /></td>
+      </tr>
+      <tr>
         <td class="prompt">Comment</td>
         <td><%=HTML.niceFormat(event.getComment())%></td>