Merge pull request #34 from ivylabs/0.0.4

0.0.4

README.md

@@ -6,16 +6,12 @@ This is a plugin for Pentaho platform with custom CDE Components to use in your
 ![Ivy DC](http://www.ivy-is.co.uk/wp-content/uploads/2014/04/ivydc_samples.png)
 ![Ivy DC](http://www.ivy-is.co.uk/wp-content/uploads/2014/04/ivydc_docs1.png)
 
-#Some of the features in this 0.0.3 release:
-* Summary Component
-* Export Data
+#Some of the features in this 0.0.4 release:
+* Comparison / Pyramid Chart
+* Funnel Chart
 * Features and bugs fixed on others components
 
-
 #What is the road map for the next version?
-* Summary Component
-* d3js Neighborhood chart
-* d3js Zoomable Pack chart
 * ...
 
 We dare you to improve this plugin with ideias, starts, pull request, ...
@@ -24,6 +20,16 @@ We dare you to improve this plugin with ideias, starts, pull request, ...
 
 #Old Realeases
 
+###0.0.3 release:
+
+
+* Summary Component
+* Export Data
+* Features and bugs fixed on others components
+
+
+
+
 ###0.0.2 release:
 
 

dashboards/main.cda

@@ -5,6 +5,14 @@
          <Initscript></Initscript>
          <Language>beanshell</Language>
       </Connection>
+      <Connection id="FUNNEL_QUERY_SAMPLE" type="scripting.scripting">
+         <Initscript></Initscript>
+         <Language>beanshell</Language>
+      </Connection>
+      <Connection id="PYRAMID_QUERY_SAMPLE" type="scripting.scripting">
+         <Initscript></Initscript>
+         <Language>beanshell</Language>
+      </Connection>
       <Connection id="MAP_QUERY_SAMPLE" type="scripting.scripting">
          <Initscript></Initscript>
          <Language>beanshell</Language>
@@ -28,6 +36,49 @@ TypedTableModel model = new TypedTableModel(columnNames, columnTypes);
 
  model.addRow(new Object[] {"Gauge Title", 320});
 
+return model;</Query>
+   </DataAccess>
+   <DataAccess access="public" cache="true" cacheDuration="3600"
+               connection="FUNNEL_QUERY_SAMPLE"
+               id="FUNNEL_QUERY_SAMPLE"
+               type="scriptable">
+      <Columns/>
+      <Parameters/>
+      <Query>import org.pentaho.reporting.engine.classic.core.util.TypedTableModel;
+String [] columnNames = {"Title","Value"};
+Class[] columnTypes = {String.class, Integer.class};
+TypedTableModel model = new TypedTableModel(columnNames, columnTypes);
+
+
+ model.addRow(new Object[] {"CTO", 34534});
+ model.addRow(new Object[] {"CEO", 34435});
+ model.addRow(new Object[] {"CCO", 43545});
+ model.addRow(new Object[] {"CAO", 32543});
+ model.addRow(new Object[] {"CDO", 36652});
+ model.addRow(new Object[] {"CDO", 32567});
+ model.addRow(new Object[] {"CKO", 32462});
+
+return model;</Query>
+   </DataAccess>
+   <DataAccess access="public" cache="true" cacheDuration="3600"
+               connection="PYRAMID_QUERY_SAMPLE"
+               id="PYRAMID_QUERY_SAMPLE"
+               type="scriptable">
+      <Columns/>
+      <Parameters/>
+      <Query>import org.pentaho.reporting.engine.classic.core.util.TypedTableModel;
+String [] columnNames = {"Title","Value1","Value2"};
+Class[] columnTypes = {String.class, Integer.class, Integer.class};
+TypedTableModel model = new TypedTableModel(columnNames, columnTypes);
+
+
+ model.addRow(new Object[] {"CTO", 43545, 36652});
+ model.addRow(new Object[] {"CDO", 36652, 34435});
+ model.addRow(new Object[] {"CEO", 34435, 32462});
+ model.addRow(new Object[] {"CKO", 32462, 32567});
+ model.addRow(new Object[] {"CDO", 32567, 32543});
+ model.addRow(new Object[] {"CAO", 32543, 30242});
+
 return model;</Query>
    </DataAccess>
    <DataAccess access="public" cache="true" cacheDuration="3600" connection="MAP_QUERY_SAMPLE"