Changeset 1738

Timestamp:

Jan 9, 2006, 12:12:47 PM (18 years ago)

Author:

Nicklas Nordborg

Message:

View / Reporters should now be more or less functional

Location:

trunk/www

Files:

• include/scripts/table.js (modified) (1 diff)
• include/styles/main.css (modified) (1 diff)
• views/reporters/edit_reporter.jsp (modified) (2 diffs)
• views/reporters/index.jsp (modified) (9 diffs)
• views/reporters/list_reporters.jsp (modified) (5 diffs)
• views/reporters/view_reporter.jsp (modified) (4 diffs)

trunk/www/include/scripts/table.js

@@ -153 +153 @@
   {
     Main.openPopup(getRoot()+'common/filter/configure.jsp?ID='+ID+'&table_id='+tableId+'&item_type='+itemType, 'ConfigureFilter', 500, 400);
+  }
+  
+  this.submitToPopup = function(tableId, cmd, width, height)
+  {
+    var target = tableId+cmd;
+    Main.openPopup('', target, width, height);
+    var frm = document.forms[tableId];
+    var oldCmd = frm.cmd.value;
+    frm.cmd.value = cmd;
+    frm.target = target;
+    frm.submit();
+    frm.target = window.name;
+    frm.cmd.value = oldCmd;
   }
   

trunk/www/include/styles/main.css

@@ -73 +73 @@
 
 a {
+  color: #0000CC;
   text-decoration: none;
 }
 
 a:hover {
+  text-decoration: underline;
+}
+
+.link {
+  color: #0000CC;
+  cursor: pointer;
+}
+
+.link:hover {
   text-decoration: underline;
 }

trunk/www/views/reporters/edit_reporter.jsp

@@ -212 +212 @@
         <td class="prompt">Type</td>
         <td>
-          <select name="reportertype_id" <%=!readCurrentReporterType ? "disabled readonly class=\"disabled\"" : "class=\"required\""%>>
+          <select name="reportertype_id" <%=!readCurrentReporterType ? "disabled readonly class=\"disabled\"" : ""%>>
           <%
           if (!readCurrentReporterType)
@@ -254 +254 @@
           <a href="javascript:Main.zoom('Description', 'reporter', 'description')" title="Edit in larger window"><base:icon image="zoom.gif" /></a>
         </td>
-      </tr>
-      <tr>
-        <td class="prompt">Last update</td>
-        <td><%=Values.formatDate(reporter == null ? new Date() : reporter.getLastUpdate())%></td>
       </tr>
       </table>

trunk/www/views/reporters/index.jsp

@@ -74 +74 @@
   if (cmd == null || "List".equals(cmd))
   {
+    // Display the list page without updatinging the current context
     Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     redirect = listPage;
@@ -79 +80 @@
   else if ("UpdateContext".equals(cmd))
   {
+    // Display the list page after updating the current context from the request parameters
     Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     redirect = listPage;
@@ -84 +86 @@
   else if ("LoadContext".equals(cmd))
   {
+    // Display the list page after loading a saved context
     int contextId = Values.getInt(request.getParameter("context"));
     sc.loadContext(contextId);
     redirect = listPage;
   }
-  else if ("DeleteItems".equals(cmd))
-  {
-    dc = sc.newDbControl();
-    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    ReporterBatcher batcher = ReporterBatcher.getNew(dc);
-    for (int reporterId : cc.getSelected())
-    {
-      batcher.delete(reporterId);
-    }
-    batcher.close();
-    dc.commit();
-    redirect = listPage;
-  }
-  else if ("DeleteItem".equals(cmd))
-  {
-    dc = sc.newDbControl();
-    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
-    ReporterBatcher batcher = ReporterBatcher.getNew(dc);
-    batcher.delete(cc.getId());
-    batcher.close();
-    dc.commit();
-    redirect = listPage;
-  }
+  
   else if ("ViewItem".equals(cmd))
   {
+    // Display the view page for a single item 
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     redirect = viewPage;
@@ -118 +100 @@
   else if ("EditItem".equals(cmd))
   {
+    // Display the edit page for a single item (should be opened in a popup)
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     redirect = editPage;
@@ -123 +106 @@
   else if ("NewItem".equals(cmd))
   {
+    // Display the edit page for a new item (should be opened in a popup)
     if (!sc.hasPermission(Permission.CREATE, itemType))
     {
@@ -133 +117 @@
   else if ("UpdateItem".equals(cmd))
   {
+    // Update the properties on an item (will close the popup)
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, defaultContext);
     dc = sc.newDbControl();
@@ -158 +143 @@
       reporter.setExtended(name, value);
     }
-
     ReporterBatcher batcher = ReporterBatcher.getNew(dc);
     if (reporter.getId() != 0)
@@ -174 +158 @@
     cc.removeObject("item");
   }
-  else if ("Export".equals(cmd))
-  {
+  else if ("DeleteItem".equals(cmd))
+  {
+    // Delete a single item and then return to the list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    ReporterBatcher batcher = ReporterBatcher.getNew(dc);
+    batcher.delete(cc.getId());
+    batcher.close();
+    dc.commit();
+    redirect = listPage;
+  }
+  else if ("DeleteItems".equals(cmd))
+  {
+    // Delete all selected items on the list page
+    dc = sc.newDbControl();
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    ReporterBatcher batcher = ReporterBatcher.getNew(dc);
+    for (int reporterId : cc.getSelected())
+    {
+      batcher.delete(reporterId);
+    }
+    batcher.close();
+    dc.commit();
+    redirect = listPage;
+  }
+  else if ("ExportItems".equals(cmd))
+  {
+    // Run an export plugin in a list context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     final DataQuery<ReporterData> query = Reporter.getQuery();
     cc.configureQuery(query, true);
     cc.setQuery(query);
-    forward = "../../common/export/configure.jsp";
-  }
-  else if ("Import".equals(cmd))
-  {
+    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+reporters";
+  }
+  else if ("ExportItem".equals(cmd))
+  {
+    // Run an export plugin in single-item context
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+reporter";
+  }
+  else if ("ImportItems".equals(cmd))
+  {
+    // Run an import plugin in a list context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     final DataQuery<ReporterData> query = Reporter.getQuery();
@@ -190 +207 @@
     redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Import+reporters";
   }
-  else if ("RunPlugin".equals(cmd))
-  {
+  else if ("ImportItem".equals(cmd))
+  {
+    // Run an import plugin in single-item context
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    redirect = "../../common/import/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Import+reporter";
+  }
+  else if ("RunListPlugin".equals(cmd))
+  {
+    // Run another plugin in a list context
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     final DataQuery<ReporterData> query = Reporter.getQuery();
     cc.configureQuery(query, true);
     cc.setQuery(query);
-    redirect = "TODO";
+    redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Run+plugin";
+  }
+  else if ("RunPlugin".equals(cmd))
+  {
+    // Run another plugin in single-item context
+    ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
+    redirect = "../../common/plugin/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Run+plugin";
   }
   else

trunk/www/views/reporters/list_reporters.jsp

@@ -83 +83 @@
   cc.configureQuery(query, true);
 
-  Map<Plugin.MainType, Integer> plugins = PluginDefinition.countPlugins(dc, guiContext);
+  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
   final ItemQuery<ReporterType> typeQuery = ReporterType.getQuery();
   typeQuery.order(Orders.asc(Hql.property("name")));
@@ -108 +108 @@
       location.href = 'index.jsp?ID=<%=ID%>&cmd=ViewItem&item_id='+itemId;
     }
+    function itemOnClick(evt, itemId)
+    {
+      if (evt && (evt.altKey || evt.ctrlKey || evt.shiftKey))
+      {
+        editItem(itemId);
+      }
+      else
+      {
+        viewItem(itemId);
+      }
+    }
     function deleteItems()
     {
@@ -145 +156 @@
       Table.configureColumns('<%=ID%>', formId, '<%=itemType.name()%>', '<%=(String)cc.getObject("defaultColumns")%>');
     }
-    function configureFilter()
-    {
-      Table.configureFilter('<%=ID%>', formId, '<%=itemType.name()%>');
-    }
-    function configureExport()
-    {
-      Table.configureExport(submitPage, '<%=ID%>', formId, '<%=itemType.name()%>', '<%=(String)cc.getObject("defaultColumns")%>');
-    }
-    function configureImport()
-    {
-      Main.openPopup('index.jsp?ID=<%=ID%>&cmd=Import', 'Import'+formId, 540, 460);
+    function runPlugin(cmd)
+    {
+      Table.submitToPopup(formId, cmd, 540, 460);
     }
     function returnSelected()
@@ -310 +313 @@
         <tbl:button 
           image="import.gif" 
-          onclick="configureImport()" 
+          onclick="runPlugin('ImportItems')" 
           title="Import&hellip;" 
           tooltip="Import data" 
-          visible="<%=plugins.containsKey(Plugin.MainType.IMPORT)%>"
+          visible="<%=pluginCount.containsKey(Plugin.MainType.IMPORT)%>"
         />
         <tbl:button 
           image="export.gif" 
-          onclick="configureExport()" 
+          onclick="runPlugin('ExportItems')" 
           title="Export&hellip;" 
-          tooltip="Export to XML or a tab-separated file" 
-          visible="<%=plugins.containsKey(Plugin.MainType.EXPORT)%>"
+          tooltip="Export data" 
+          visible="<%=pluginCount.containsKey(Plugin.MainType.EXPORT)%>"
         />
         <tbl:button 
           image="runplugin.gif" 
-          onclick="runPlugin()" 
+          onclick="runPlugin('RunListPlugin')" 
           title="Run plugin&hellip;" 
           tooltip="Run a plugin" 
-          visible="<%=plugins.containsKey(Plugin.MainType.OTHER)%>"
+          visible="<%=pluginCount.containsKey(Plugin.MainType.OTHER)%>"
         />
       </tbl:toolbar>
@@ -406 +409 @@
                 visible="<%=mode.hasIcons()%>"
                 >&nbsp;</tbl:header>
-              <tbl:cell column="name"><a href="javascript:viewItem(<%=itemId%>)" title="Edit this reporter type"><%=name%></a></tbl:cell>
+              <tbl:cell column="name"><div class="link" onclick="itemOnClick(event, <%=itemId%>)" title="View this reporter (use CTRL, ALT or SHIFT to edit)"><%=name%></div></tbl:cell>
               <tbl:cell column="externalId"><%=HTML.encodeTags(item.getExternalId())%></tbl:cell>
               <tbl:cell column="symbol"><%=HTML.encodeTags(item.getSymbol())%></tbl:cell>

trunk/www/views/reporters/view_reporter.jsp

@@ -42 +42 @@
   import="net.sf.basedb.core.ItemResultIterator"
   import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.PluginDefinition"
+  import="net.sf.basedb.core.plugin.GuiContext"
+  import="net.sf.basedb.core.plugin.Plugin"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
@@ -48 +51 @@
   import="net.sf.basedb.clients.web.util.Values"
   import="java.util.Date"
+  import="java.util.Map"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
 <%@ taglib prefix="tbl" uri="/WEB-INF/table.tld" %>
+<%!
+  private static final Item itemType = Item.REPORTER;
+  private static final GuiContext guiContext = new GuiContext(itemType, GuiContext.Type.ITEM);
+%>
 <%
-final Item itemType = Item.REPORTER;
 final SessionControl sc = Base.getExistingSessionControl(pageContext, true);
+final String ID = sc.getId();
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, null);
 final int itemId = cc.getId();
-final String ID = sc.getId();
 final float scale = Base.getScale(sc);
 final DbControl dc = sc.newDbControl();
 try
 {
+  Map<Plugin.MainType, Integer> pluginCount = PluginDefinition.countPlugins(dc, guiContext);
+
   String title = null;
   ReporterData reporter = Reporter.getById(dc, itemId);
@@ -94 +103 @@
       }
     }
+    function runPlugin(cmd)
+    {
+      Main.openPopup('index.jsp?ID=<%=ID%>&cmd='+cmd+'&item_id=<%=itemId%>', 'RunPlugin'+cmd, 540, 460);
+    }
     </script>
   </base:head>
@@ -118 +131 @@
         title="Delete&hellip;" 
         tooltip="<%=deletePermission ? "Delete this reporter" : "You do not have permission to delete this reporter"%>" 
+      />
+      <tbl:button 
+        image="import.gif" 
+        onclick="runPlugin('ImportItem')" 
+        title="Import&hellip;" 
+        tooltip="Import data" 
+        visible="<%=pluginCount.containsKey(Plugin.MainType.IMPORT)%>"
+      />
+      <tbl:button 
+        image="export.gif" 
+        onclick="runPlugin('ExportItem')" 
+        title="Export&hellip;" 
+        tooltip="Export data" 
+        visible="<%=pluginCount.containsKey(Plugin.MainType.EXPORT)%>"
+      />
+      <tbl:button 
+        image="runplugin.gif" 
+        onclick="runPlugin('RunPlugin')" 
+        title="Run plugin&hellip;" 
+        tooltip="Run a plugin" 
+        visible="<%=pluginCount.containsKey(Plugin.MainType.OTHER)%>"
       />
       </tbl:toolbar>