Changeset 7307

Timestamp:

Mar 7, 2017, 3:30:59 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2060: The active project should be displayed in the job list and view dialog

It should also work when exporting.

Location:

trunk

Files:

• src/core/net/sf/basedb/util/Enumeration.java (modified) (2 diffs)
• www/views/jobs/index.jsp (modified) (5 diffs)
• www/views/jobs/list_jobs.jsp (modified) (4 diffs)
• www/views/jobs/view_job.jsp (modified) (3 diffs)

trunk/src/core/net/sf/basedb/util/Enumeration.java

@@ -55 +55 @@
   public static Enumeration<String, String> fromItems(Collection<? extends Nameable> items, String noneOption)
   {
+    return fromItems(items, noneOption, "");
+  }
+
+  /**
+    Create a new enumeration from a list of basic items.
+    The key of the enumeration is the id of each item
+    and the value is the name.
+    @param items A collection with items
+    @param noneOption If not null, this options will be inserted first in the
+      enumeration with an empty string as the key
+    @param noneValue Value for the 'none' option (empty string by default)
+    @since 3.11
+  */
+  public static Enumeration<String, String> fromItems(Collection<? extends Nameable> items, String noneOption, String noneValue)
+  {
     Enumeration<String, String> e = new Enumeration<String, String>();
     if (noneOption != null)
     {
-      e.add("", noneOption);
+      e.add(noneValue == null ? "" : noneValue, noneOption);
     }
     for (Nameable item : items)
@@ -68 +83 @@
   }
 
-  
   private final List<Entry<K, V>> entries;
   private boolean locked;

trunk/www/views/jobs/index.jsp

@@ -30 +30 @@
   import="net.sf.basedb.core.Include"
   import="net.sf.basedb.core.Job"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultIterator"
@@ -46 +47 @@
   import="net.sf.basedb.clients.web.WebException"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.util.formatter.NameableFormatter"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.core.plugin.GuiContext"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
+  import="net.sf.basedb.clients.web.plugins.ExportedProperty"
+  import="net.sf.basedb.clients.web.plugins.DataLoader"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
   import="net.sf.basedb.clients.web.extensions.JspContext"
@@ -63 +67 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%!
+
+  private static void registerExportUtils(ItemContext cc)
+  {
+    // Register formatters
+    cc.setObject("export.formatter.activeProjectId", new NameableFormatter());
+    
+    // Register dataloaders
+    cc.setObject("export.dataloader.activeProjectId", 
+      new DataLoader<Job>()
+      {
+        @Override
+        public Object getData(DbControl dc, ExportedProperty exportedProperty, Job job)
+        {
+          Project p = null;
+          if (job.getActiveProjectId() != 0)
+          {
+            try
+            {
+              p = Project.getById(dc, job.getActiveProjectId());
+            }
+            catch (Exception ex)
+            {}
+          }
+          return p;
+        }
+      }
+    );
+  }
+
   private static final ItemContext defaultContext = Base.createDefaultContext("scheduled", "name,pluginType,scheduled,percentComplete,status,statusMessage,description");
   {
@@ -221 +254 @@
     dc = sc.newDbControl();
     cc.configureQuery(dc, query, true);
+    registerExportUtils(cc);
     cc.setQuery(query);
     JspContext jspContext = ExtensionsControl.createContext(dc, pageContext, GuiContext.list(itemType), null);
@@ -232 +266 @@
     // Run an export plugin in single-item context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    registerExportUtils(cc);
     redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+job";
   }

trunk/www/views/jobs/list_jobs.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.PluginDefinition"
+  import="net.sf.basedb.core.Project"
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.query.Hql"
@@ -120 +121 @@
   typeQuery.order(Orders.asc(Hql.property("name")));
   typeQuery.setCacheResult(true);
+  
+  // Load projects
+  final ItemQuery<Project> projectQuery = Project.getQuery();
+  projectQuery.setIncludes(cc.getInclude());
+  projectQuery.order(Orders.asc(Hql.property("name")));
+  projectQuery.setCacheResult(true);
 
   Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
@@ -359 +366 @@
         title="Type"
         enumeration="<%=pluginTypes%>"
+        sortable="true" 
+        filterable="true"
+        exportable="true"
+      />
+      <tbl:columndef 
+        id="activeProject"
+        property="activeProjectId"
+        datatype="int"
+        title="Active project"
+        enumeration="<%=Enumeration.fromItems(projectQuery.list(dc), "-none-", "0")%>"
         sortable="true" 
         filterable="true"
@@ -743 +760 @@
                   %>
                 </tbl:cell>
+                <tbl:cell column="activeProject">
+                  <%
+                  if (item.getActiveProjectId() == 0)
+                  {
+                    %>
+                    <i>- none -</i>
+                    <%
+                  }
+                  else
+                  {
+                    try
+                    {
+                      Project p = Project.getById(dc, item.getActiveProjectId());
+                      %>
+                      <%=HTML.encodeTags(p.getName())%>
+                      <%
+                    }
+                    catch (RuntimeException ex)
+                    {
+                      %>
+                      <i>- denied -</i>
+                      <%
+                    }
+                  }
+                  %>
+                </tbl:cell>
                 <tbl:cell column="experiment"
                   ><base:propertyvalue 

trunk/www/views/jobs/view_job.jsp

@@ -34 +34 @@
   import="net.sf.basedb.core.Job"
   import="net.sf.basedb.core.JobAgent"
-  import="net.sf.basedb.core.BasicItem"
+  import="net.sf.basedb.core.Project"
+  import="net.sf.basedb.core.BasicItem"
   import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.File"
@@ -143 +144 @@
     readAgent = false;
   }
+  boolean readActiveProject = true;
+  Project activeProject = null;
+  try
+  {
+    if (job.getActiveProjectId() != 0) 
+    {
+      activeProject = Project.getById(dc, job.getActiveProjectId());
+    }
+  }
+  catch (PermissionDeniedException ex)
+  {
+    readActiveProject = false;
+  }
+  catch (Exception ex)
+  {
+    // Some other problem (for example, no longer exists)
+  }
 
   int parameterVersion = job.getParameterVersion();
@@ -280 +298 @@
         <td>
           <base:propertyvalue item="<%=job%>" property="owner.name" />
+        </td>
+      </tr>
+      <tr>
+        <th>Active project</th>
+        <td>
+          <%=activeProject == null ? (readActiveProject ? "<i>- none -</i>" : "<i>- denied -</i>") : HTML.encodeTags(activeProject.getName()) %>
         </td>
       </tr>