[jbpm-commits] JBoss JBPM SVN: r1950 - in jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client: process and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Aug 21 04:42:59 EDT 2008


Author: heiko.braun at jboss.com
Date: 2008-08-21 04:42:58 -0400 (Thu, 21 Aug 2008)
New Revision: 1950

Modified:
   jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java
   jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
   jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
   jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java
Log:
Process instances details form added

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java	2008-08-21 08:28:04 UTC (rev 1949)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/metric/DefinitionMetricView.java	2008-08-21 08:42:58 UTC (rev 1950)
@@ -25,7 +25,7 @@
 import com.gwtext.client.widgets.form.FieldSet;
 import com.gwtext.client.widgets.form.FormPanel;
 import com.gwtext.client.widgets.form.TextField;
-import com.googlecode.gchart.client.GChart;
+import com.gwtext.client.core.Position;
 import org.jboss.bpm.console.client.ConsoleView;
 import org.jboss.bpm.console.client.model.DAOFactory;
 import org.jboss.bpm.console.client.model.ProcessDefinition;
@@ -81,18 +81,20 @@
 
       //create the form
       FormPanel formPanel = new FormPanel();
+      formPanel.setLabelAlign(Position.LEFT);
+      formPanel.setWidth(UIConstants.MAIN_EDITOR_PANEL_WIDTH);
       formPanel.setHeader(false);
       formPanel.setFrame(false);
       formPanel.setPaddings(5, 5, 5, 0);
-      formPanel.setWidth(450);
-      formPanel.setLabelWidth(120);      
+      formPanel.setLabelWidth(120);
 
       //create first collapsible fieldset with checkbox
       FieldSet fieldSet = new FieldSet();
       fieldSet.setCheckboxToggle(false);
-      fieldSet.setFrame(true);
       fieldSet.setTitle("Process metrics");
       fieldSet.setCollapsed(false);
+      fieldSet.setAutoHeight(true);
+      fieldSet.setBorder(false);
 
       //add fields to the User FieldSet
       TextField name = new TextField("Process Definition Name", "name", 210);
@@ -134,7 +136,7 @@
    private double[] deriveFixture(ProcessInstancePerformance perf)
    {
       double avg = -1;
-      double min= 0;
+      double min= -1;
       double max = -1;
       double sum = -1;
 
@@ -145,10 +147,11 @@
       {
          Long k = (Long)keys.next();
          Double v = (Double)metrics.get(k);
+         
+         if(min==-1) min = v.longValue();
 
          if(v.longValue()>max) max = v.longValue();
          else if(v.longValue()<=min) min = v.longValue();
-         else if(min==-1) min = v.longValue();
 
          sum += v.longValue();
 

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java	2008-08-21 08:28:04 UTC (rev 1949)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java	2008-08-21 08:42:58 UTC (rev 1950)
@@ -24,6 +24,19 @@
 import org.jboss.bpm.console.client.ConsoleView;
 import org.jboss.bpm.console.client.model.ProcessDefinition;
 import org.jboss.bpm.console.client.widgets.EditorView;
+import org.jboss.bpm.console.client.widgets.UIConstants;
+import com.gwtext.client.widgets.form.FieldSet;
+import com.gwtext.client.widgets.form.TextField;
+import com.gwtext.client.widgets.form.DateField;
+import com.gwtext.client.widgets.form.FormPanel;
+import com.gwtext.client.widgets.PaddedPanel;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.grid.RowSelectionModel;
+import com.gwtext.client.widgets.grid.event.RowSelectionListenerAdapter;
+import com.gwtext.client.widgets.layout.ColumnLayoutData;
+import com.gwtext.client.core.Position;
+import com.gwtext.client.core.Function;
+import com.gwtext.client.data.Record;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -41,10 +54,78 @@
       this.setId(ProcessInstanceEditor.ID+"."+proc.getName());
       
       parent = proc;
+
+      // ---------------
+
       ProcessInstanceList list = new ProcessInstanceList(
         proc, "Process Instances", view
       );
-      this.add( list );
+
+      this.add(list);
+
+      // ---------------
+
+      Panel panel = new Panel();
+      panel.setBorder(false);
+      panel.setFrame(false);
+      panel.setPaddings(10);
+
+      // ---------------
+
+      final FormPanel formPanel = new FormPanel();
+      formPanel.setLabelAlign(Position.LEFT);
+      formPanel.setWidth(UIConstants.MAIN_EDITOR_PANEL_WIDTH);
+      formPanel.setHeader(false);
+      formPanel.setFrame(false);
+      formPanel.setPaddings(5, 5, 5, 0);
+      formPanel.setLabelWidth(120);
+
+      // ---------------
+
+      FieldSet fieldSet = new FieldSet();
+      fieldSet.setLabelWidth(90);
+      fieldSet.setTitle("Process Instance Details");
+      fieldSet.setAutoHeight(true);
+      fieldSet.setBorder(false);
+      
+      // ---------------
+      //the field names must match the data field values from the Store
+      fieldSet.add(new TextField("Id", "instanceId", 230));
+      fieldSet.add(new TextField("Key", "key", 230));
+      fieldSet.add(new TextField("Status", "status", 230));
+      fieldSet.add(new DateField("Start Date", "start", 230));
+      fieldSet.add(new DateField("End Date", "end", 230));
+      Panel inner = new PaddedPanel(fieldSet, 0, 10, 0, 0);
+
+      formPanel.add(inner);
+
+      // ----------------
+
+      final RowSelectionModel sm = new RowSelectionModel(true);
+      sm.addListener(
+        new RowSelectionListenerAdapter()
+        {
+           public void onRowSelect(RowSelectionModel sm, int rowIndex, Record record)
+           {
+              formPanel.getForm().loadRecord(record);
+           }
+        }
+      );
+      list.getGrid().setSelectionModel(sm);
+
+      //select the first row after a little delay so that the rows are rendered
+      list.getGrid().doOnRender(
+        new Function()
+        {
+           public void execute() {
+              sm.selectFirstRow();
+           }
+        }, 10);
+
+
+      panel.add(formPanel);
+      this.add(panel);
+      
    }
 
 
@@ -64,3 +145,4 @@
       return "bpm-instance-icon";
    }
 }
+

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java	2008-08-21 08:28:04 UTC (rev 1949)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/BarChart.java	2008-08-21 08:42:58 UTC (rev 1950)
@@ -59,7 +59,7 @@
            labels[iCurve]  + " value=${y}"
          );
 
-         getCurve().getSymbol().setModelWidth(1.02);
+         getCurve().getSymbol().setModelWidth(0.8);
          getCurve().getSymbol().setBorderColor("black");
          getCurve().getSymbol().setBorderWidth(1);
          for (int jGroup=0; jGroup < groupLabels.length; jGroup++)

Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java	2008-08-21 08:28:04 UTC (rev 1949)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/widgets/ListView.java	2008-08-21 08:42:58 UTC (rev 1950)
@@ -129,5 +129,10 @@
    protected abstract void onExamine(final Integer row);
 
    protected abstract void onDelete(final Integer row);
-     
+
+
+   public GridPanel getGrid()
+   {
+      return grid;
+   }
 }




More information about the jbpm-commits mailing list