Changeset 5727 for trunk/www/views/derivedbioassays/view_bioassay.jsp

Timestamp:

Sep 8, 2011, 2:04:19 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1153: Handling short read transcript sequence data

Display job and plug-in information for derived bioassays. Added 'Run analysis plug-in' to toolbar on single-item page (derived bioassay).

File:

• trunk/www/views/derivedbioassays/view_bioassay.jsp (modified) (6 diffs)

trunk/www/views/derivedbioassays/view_bioassay.jsp

@@ -21 +21 @@
 
 --%>
-<%@page import="net.sf.basedb.core.RawBioAssay"%>
 <%@ page pageEncoding="UTF-8" session="false"
   import="net.sf.basedb.core.SessionControl"
@@ -40 +39 @@
   import="net.sf.basedb.core.PluginDefinition"
   import="net.sf.basedb.core.ParameterInfo"
+  import="net.sf.basedb.core.RawBioAssay"
   import="net.sf.basedb.core.RawDataType"
   import="net.sf.basedb.core.BasicItem"
@@ -280 +280 @@
         visible="<%=pluginCount.containsKey(Plugin.MainType.OTHER)%>"
       />
+      <tbl:button 
+        image="runplugin.gif" 
+        onclick="runItemPlugin('RunAnalysisPlugin')"
+        title="Run analysis&hellip;" 
+        tooltip="Run an analysis plugin with data from this bioassay"
+        visible="<%=pluginCount.containsKey(Plugin.MainType.ANALYZE)%>"
+      />
       <ext:render extensions="<%=toolbarInvoker%>" context="<%=jspContext%>" 
         wrapper="<%=new PrefixSuffixRenderer(jspContext, "<td>", "</td>") %>"/>
@@ -358 +365 @@
         </tr>
         </table>
-        
+      </td>
+      <td width="50%">
+        <h4>Job &amp; Plug-in parameters</h4>
+        <table class="form" cellspacing=0>
+        <tr>
+          <td class="prompt">Job</td>
+          <td><%=Base.getLinkedName(ID, job, !readJob, false)%></td>
+        </tr>
+        <tr>
+          <td class="prompt">Plugin</td>
+          <td><%=Base.getLinkedName(ID, plugin, 
+              !readPlugin, plugin != null && plugin.hasPermission(Permission.WRITE))%></td>
+        </tr>
+        <tr>
+          <td class="prompt">Plugin configuration</td>
+          <td><%=Base.getLinkedName(ID, configuration, !readConfiguration, 
+            configuration != null && configuration.hasPermission(Permission.WRITE))%></td>
+        </tr>
         <%
         if (job != null)
         {
           %>
-          <h4>Job</h4>
-          <table class="form" cellspacing=0>
-  
-          <tr>
-            <td class="prompt">Job</td>
-            <td><%=Base.getLinkedName(ID, job, !readJob, false)%></td>
-          </tr>
           <tr valign=top>
             <td class="prompt">Started</td>
             <td>
-              <%=dateTimeFormatter.format(job.getStarted())%>
+              <%=job == null ? "" : dateTimeFormatter.format(job.getStarted())%>
             </td>
           </tr>
@@ -379 +396 @@
             <td class="prompt">Ended</td>
             <td>
-              <%=dateTimeFormatter.format(job.getEnded())%>
+              <%=job == null ? "" : dateTimeFormatter.format(job.getEnded())%>
             </td>
           </tr>
@@ -388 +405 @@
             </td>
           </tr>
-          <tr>
-            <td class="prompt">Description</td>
-            <td><%=HTML.niceFormat(job.getDescription())%></td>
-          </tr>
-          </table>
           <%
-        }
-        %>
-      </td>
-      <td width="50%">
-        <h4>Plugin &amp; parameters</h4>
-        <table class="form" cellspacing=0>
-        <tr>
-          <td class="prompt">Plugin</td>
-          <td><%=Base.getLinkedName(ID, plugin, 
-              !readPlugin, plugin != null && plugin.hasPermission(Permission.WRITE))%></td>
-        </tr>
-        <tr>
-          <td class="prompt">Plugin configuration</td>
-          <td><%=Base.getLinkedName(ID, configuration, !readConfiguration, 
-            configuration != null && configuration.hasPermission(Permission.WRITE))%></td>
-        </tr>
-        <%
-        if (job != null)
-        {
           for (String name : job.getParameterNames())
           {