ACT-1593: adding process instance overview chart (fixes)

modules/activiti-explorer/src/main/java/org/activiti/explorer/ui/reports/RunReportsPage.java

@@ -19,10 +19,12 @@ import org.activiti.explorer.navigation.ActiveProcessDefinitionNavigator;
 import org.activiti.explorer.navigation.SuspendedProcessDefinitionNavigator;
 import org.activiti.explorer.navigation.UriFragment;
 import org.activiti.explorer.ui.AbstractTablePage;
+import org.activiti.explorer.ui.Images;
 import org.activiti.explorer.ui.custom.ToolBar;
 import org.activiti.explorer.ui.management.processdefinition.SuspendedProcessDefinitionDetailPanel;
 import org.activiti.explorer.ui.management.processdefinition.SuspendedProcessDefinitionListQuery;
 import org.activiti.explorer.ui.management.processdefinition.SuspendedProcessDefinitionPage;
+import org.activiti.explorer.ui.util.ThemeImageColumnGenerator;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
@@ -49,6 +51,9 @@ public class RunReportsPage extends AbstractTablePage {
     reportTable.setContainerDataSource(reportListContainer);
     
     // Column headers
+    reportTable.addGeneratedColumn("icon", new ThemeImageColumnGenerator(Images.REPORT_22));
+    reportTable.setColumnWidth("icon", 22);
+    
     reportTable.addContainerProperty("name", String.class, null);
     reportTable.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN);
             

modules/activiti-webapp-explorer2/src/main/resources/org/activiti/explorer/demo/process/reports/processInstanceOverview.bpmn20.xml

@@ -18,7 +18,7 @@
                importPackage(java.lang);
                importPackage(org.activiti.explorer.reporting);
                
-               var result = ReportingUtil.executeSelectSqlQuery("SELECT PROC_DEF_ID_, count(*) FROM ACT_HI_PROCINST group by PROC_DEF_ID_");
+               var result = ReportingUtil.executeSelectSqlQuery("SELECT PD.NAME_, PD.VERSION_ , count(*) FROM ACT_HI_PROCINST PI inner join ACT_RE_PROCDEF PD on PI.PROC_DEF_ID_ = PD.ID_ group by PROC_DEF_ID_");
             
                var reportData = {};
                reportData.type = "pieChart";
@@ -27,8 +27,9 @@
             
                while (result.next()) { // process results one row at a time
                  var name = result.getString(1);
-                 var val = result.getLong(2);
-                 reportData.data[name] = val;
+                 var version = result.getLong(2)
+                 var count = result.getLong(2);
+                 reportData.data[name + " (v" + version + ")"] = count;
                }
                
                // Limitation! Cannot store / retrieve native json variables over multiple steps! TODO: discuss!