Changeset 4729 for trunk/www/biomaterials/samples/list_samples.jsp

Timestamp:

Jan 14, 2009, 4:22:59 PM (13 years ago)

Author:

Martin Svensson

Message:

References #979 Removed edit and view pages for biowells because they are not needed.
Added support to view/edit a sample's bioplate/biowell

File:

• trunk/www/biomaterials/samples/list_samples.jsp (modified) (3 diffs)

trunk/www/biomaterials/samples/list_samples.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Sample"
   import="net.sf.basedb.core.Extract"
+  import="net.sf.basedb.core.BioPlate"
   import="net.sf.basedb.core.BioSource"
   import="net.sf.basedb.core.BioMaterialEvent"
+  import="net.sf.basedb.core.BioWell"
   import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.AnnotationSet"
@@ -296 +298 @@
         exportable="true"
       />
+      <tbl:columndef 
+        id="bioPlate"
+        property="bioWell.bioPlate.name"
+        sortproperty="bioWell.bioPlate.name"
+        filterproperty="bioWell.bioPlate.name"
+        exportproperty="bioWell.bioPlate.name"
+        datatype="string"
+        title="Bioplate"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef 
+        id="bioWell"
+        property="bioWell.row"
+        sortproperty="bioWell.row"
+        filterproperty="bioWell.row"
+        exportproperty="bioWell.row"
+        datatype="string"
+        title="Biowell"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      
       <tbl:columndef 
         id="eventDate"
@@ -605 +632 @@
                     enablePropertyLink="<%=mode.hasPropertyLink()%>"
                   /></tbl:cell>
+                <%
+                BioWell well = item.getBioWell();
+                if (well != null)
+                {
+                  BioPlate plate = well.getPlate();
+                  %>
+                  <tbl:cell column="bioPlate">
+                    <%=Base.getLink(ID, plate.getName(), plate.getType(), plate.getId(), true)%>                    
+                  </tbl:cell>
+                  <tbl:cell column="bioWell">
+                    [<%=well.getRow()%>,<%=well.getColumn()%>]
+                  </tbl:cell>
+                  <%
+                }
+                else
+                {
+                  %>
+                  <tbl:cell column="bioPlate"><i>- none -</i></tbl:cell>
+                  <tbl:cell column="bioWell"><i>- none -</i></tbl:cell>
+                  <%
+                }
+                %>
                 <tbl:cell column="eventDate" value="<%=creationEvent.getEventDate()%>" />
                 <tbl:cell column="entryDate" value="<%=creationEvent.getEntryDate()%>" />