[jbpm-commits] JBoss JBPM SVN: r4935 - in projects/gwt-console/trunk/gui: profiles/jbpm/src/main/resources/org/jboss/bpm/console/public and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-05-28 08:59:30 -0400 (Thu, 28 May 2009) New Revision: 4935 Modified: projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java Log: Rename report templates and parameters Modified: projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js =================================================================== --- projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-28 12:41:13 UTC (rev 4934) +++ projects/gwt-console/trunk/gui/profiles/drools/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-28 12:59:30 UTC (rev 4935) @@ -2,7 +2,7 @@ profileName: "DroolsFlow Console", logo: "drools_logo.png", serverWebContext: "/gwt-console-server", - overviewReportFile: "process_activity.rptdesign", - definitionReportFile: "definition_report.rptdesign", - instanceReportFile: "instance_report.rptdesign" + overallReportFile: "overall_activity.rptdesign", + processSummaryReportFile: "process_summary.rptdesign", + instanceSummaryReportFile: "instance_summary.rptdesign" }; \ No newline at end of file Modified: projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js =================================================================== --- projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-28 12:41:13 UTC (rev 4934) +++ projects/gwt-console/trunk/gui/profiles/jbpm/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-05-28 12:59:30 UTC (rev 4935) @@ -2,7 +2,7 @@ profileName: "jBPM Console", logo: "jbpm_logo.png", serverWebContext: "/gwt-console-server", - overviewReportFile: "process_activity.rptdesign", - definitionReportFile: "definition_report.rptdesign", - instanceReportFile: "instance_report.rptdesign" + overallReportFile: "overall_activity.rptdesign", + processSummaryReportFile: "process_summary.rptdesign", + instanceSummaryReportFile: "instance_summary.rptdesign" }; \ No newline at end of file Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-05-28 12:41:13 UTC (rev 4934) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2009-05-28 12:59:30 UTC (rev 4935) @@ -24,6 +24,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.Widget; @@ -43,7 +44,6 @@ import org.jboss.bpm.console.client.search.SearchDelegate; import org.jboss.bpm.console.client.search.SearchWindow; import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction; -import org.jboss.bpm.console.client.util.ConsoleLog; import java.util.Date; @@ -95,7 +95,7 @@ { public void handleResult(String procDefId) { - String reportUrl = appContext.getUrlBuilder().getDefinitionReportUrl(procDefId); + String reportUrl = appContext.getUrlBuilder().getProcessSummaryReportUrl(procDefId); // load report controller.handleEvent( @@ -153,7 +153,7 @@ controller.handleEvent( new Event(RenderReportAction.ID, new RenderDispatchEvent( - ReportView.ID, appContext.getUrlBuilder().getOverviewReportUrl() + ReportView.ID, appContext.getUrlBuilder().getOverallReportUrl() ) ) ); @@ -178,14 +178,14 @@ // Make a command that we will execute from all menu items. Command cmd1 = new Command() { public void execute() { - setFrameUrl(appContext.getUrlBuilder().getOverviewReportUrl()); + setFrameUrl(appContext.getUrlBuilder().getOverallReportUrl()); } }; Command cmd2 = new Command() { public void execute() { - SearchWindow sw = new SearchWindow("Open execution report", search); + SearchWindow sw = new SearchWindow("Open process summary report", search); sw.center(); controller.handleEvent( @@ -199,8 +199,8 @@ }; PopupMenu menuBtnMenu = new PopupMenu(); - menuBtnMenu.addItem("Process Activity", cmd1); - menuBtnMenu.addItem("Execution Details", cmd2); + menuBtnMenu.addItem("Overall System Activity", cmd1); + menuBtnMenu.addItem("Process Summary", cmd2); menuButton.setMenu(menuBtnMenu); @@ -223,35 +223,6 @@ } - /** - * Create the menu bar. - */ - private MenuBar createMenuBar() { - // Create a command that will execute on menu item selection - Command menuCommand = new Command() - { - public void execute() { - - } - }; - - // Create a menu bar - MenuBar menu = new MenuBar(); - menu.setAnimationEnabled(true); - - // Create a sub menu of recent documents - MenuBar reportMenu = new MenuBar(true); - reportMenu.addItem("Process Activity Report", menuCommand); - reportMenu.addItem("Execution Report", menuCommand); - - - // Create the help menu - MenuBar helpMenu = new MenuBar(true); - menu.addSeparator(); - - return menu; - } - public void update(String reportUrl) { setFrameUrl(reportUrl); @@ -259,6 +230,24 @@ void setLoading(boolean b) { - loadingPanel.setVisible(b); + loadingPanel.setVisible(b); + if(!b) + { + Timer t = new Timer() + { + + public void run() + { + frame.setVisible(true); + appContext.refreshView(); + } + }; + + t.schedule(1500); + } + else + { + frame.setVisible(false); + } } } Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java =================================================================== --- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-05-28 12:41:13 UTC (rev 4934) +++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java 2009-05-28 12:59:30 UTC (rev 4935) @@ -40,9 +40,9 @@ { private String serverWebContext; - private String overviewReportFile; - private String definitionReportFile; - private String instanceReportFile; + private String overallReportFile; + private String processSummaryReportFile; + private String instanceSummaryReportFile; private String profileName; private String logo; @@ -57,9 +57,9 @@ serverWebContext = theme.get("serverWebContext"); - overviewReportFile = theme.get("overviewReportFile"); - definitionReportFile = theme.get("definitionReportFile"); - instanceReportFile = theme.get("instanceReportFile"); + overallReportFile = theme.get("overallReportFile"); + processSummaryReportFile = theme.get("processSummaryReportFile"); + instanceSummaryReportFile = theme.get("instanceSummaryReportFile"); } public String getProfileName() @@ -94,33 +94,33 @@ this.serverWebContext = serverWebContext; } - public String getOverviewReportFile() + public String getOverallReportFile() { - return overviewReportFile; + return overallReportFile; } - public void setOverviewReportFile(String overviewReportFile) + public void setOverallReportFile(String overallReportFile) { - this.overviewReportFile = overviewReportFile; + this.overallReportFile = overallReportFile; } - public String getDefinitionReportFile() + public String getProcessSummaryReportFile() { - return definitionReportFile; + return processSummaryReportFile; } - public void setDefinitionReportFile(String definitionReportFile) + public void setProcessSummaryReportFile(String processSummaryReportFile) { - this.definitionReportFile = definitionReportFile; + this.processSummaryReportFile = processSummaryReportFile; } - public String getInstanceReportFile() + public String getInstanceSummaryReportFile() { - return instanceReportFile; + return instanceSummaryReportFile; } - public void setInstanceReportFile(String instanceReportFile) + public void setInstanceSummaryReportFile(String instanceSummaryReportFile) { - this.instanceReportFile = instanceReportFile; + this.instanceSummaryReportFile = instanceSummaryReportFile; } } Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-05-28 12:41:13 UTC (rev 4934) +++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-05-28 12:59:30 UTC (rev 4935) @@ -173,20 +173,20 @@ return config.getConsoleServerUrl() + "/rs/test/undeploy/harness"; } - public String getOverviewReportUrl() + public String getOverallReportUrl() { - String name = URL.encode(config.getOverviewReportFile()); + String name = URL.encode(config.getOverallReportFile()); String url = config.getConsoleServerUrl() + "/rs/report/view/" + name; if (!GWT.isScript()) url += "?id=birt"; return url; } - public String getDefinitionReportUrl(String name) + public String getProcessSummaryReportUrl(String defintionId) { - String reportName = URL.encode(name); - String reportFileName = URL.encode(config.getDefinitionReportFile()); - String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName + "?name=" + reportName; + String encId = URL.encode(defintionId); + String reportFileName = URL.encode(config.getProcessSummaryReportFile()); + String url = config.getConsoleServerUrl() + "/rs/report/view/" + reportFileName + "?procId=" + encId; if (!GWT.isScript()) url += "&id=birt"; return url;