olap-view 0.0.21 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42cf2ed179c16cadadb5ffc35422f581ffa2969a
-  data.tar.gz: 6e23d51d68b9eb6cd785d8d94c9f3ca4fda8f0ae
+  metadata.gz: ab079a9aa47a78b5e3c495888dc5a75b9cc80440
+  data.tar.gz: 793d42771b30c7e89742a806196672b09a12d661
 SHA512:
-  metadata.gz: bdc3a45a8120f7df90bf285491dc7f73f6f0ed81958dfe53a9f729d694bee246d47f4999905139a2b31d3bce452af8e3417a65b3d772a2dc7d2edd945b9c9d9c
-  data.tar.gz: e863c64321a5b76e94cbb1f9160a3249b026c56fb970d35d879000238004473adc1753f67ea15ad27cf4727365f56cfb48680a63493e1fa0e202247a39bf039e
+  metadata.gz: 0ad013868584ad147fd947aa1924bcbed79cc3bed68ac4ee8af65197eabc45f701d775ad5e6219d4bb61e266d8209a0a7a46febd51e40d8a75aa97cc640d5e5f
+  data.tar.gz: e3232799296db86062532c3d51e93392ec8d0aaecca651720da7080fe003775bf91cd5cd273f129eb9949a242654ed4a058ae8e96d0919d5ef04bef85032f4f0

data/app/helpers/olap_view_helper.rb

@@ -40,15 +40,21 @@
       }.join(',').html_safe
     end
 
-    def olap_view_filling_table data, dimension = nil, measures = []
+    def olap_view_filling_table data, dimension = nil, measures = [], merge_dimension = false
       html = ''
-      data.dimensions_caption(dimension).each do |d|
-        html += "data.addColumn({type: 'string', label: '#{escape_javascript d[:caption]}', id: '#{escape_javascript d[:name]}', p:{'type': 'dimension'}});\n"
+
+      if merge_dimension
+        d_caption = data.dimensions_caption(dimension).collect{|d| d[:caption]}.join(', ')
+        html += "data.addColumn({type: 'string', label: '#{escape_javascript d_caption}', id: 'merge_dimension', p:{'type': 'dimension'}});\n"
+      else
+        data.dimensions_caption(dimension).each do |d|
+          html += "data.addColumn({type: 'string', label: '#{escape_javascript d[:caption]}', id: '#{escape_javascript d[:name]}', p:{'type': 'dimension'}});\n"
+        end
       end
       data.measures_caption(measures).each do |m|
         html += "data.addColumn({type: 'number', label: '#{escape_javascript m[:caption]}', id: '#{escape_javascript m[:name]}', p:{'type': 'measure'}});\n"
       end
-      data.table(dimension, measures).each do |row|
+      data.table(dimension, measures, merge_dimension).each do |row|
         html += "data.addRow([#{olap_view_render_row row}]);\n"
       end
       html.html_safe

data/app/views/olap-view/_barchart.js.erb

@@ -0,0 +1,51 @@
+(function(){
+    function draw<%= id %>() {
+        var name = 'barchart';
+        var data = new google.visualization.DataTable();
+
+        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []), properties[:merge_dimensions] %>
+
+        var measures_sum = [];
+        for (var i = 0; i < data.getNumberOfColumns(); i++) {
+            if (data.getColumnProperties(i).type == "measure") {
+                var sum = 0;
+                for (var j = 0; j < data.getNumberOfRows(); j++) {
+                    sum += data.getValue(j, i);
+                }
+                measures_sum[measures_sum.length] = sum;
+            }
+        }
+
+        if (measures_sum[0] > 0) {
+            var chart = new google.visualization.BarChart(document.getElementById('<%= id %>'));
+
+            var title_indexes = [];
+            for (var i = 0; i < data.getNumberOfColumns(); i++) {
+                if (data.getColumnProperties(i).type == "measure") {
+                    title_indexes.push(i);
+                }
+            }
+
+            var default_options = {
+                allowHtml: true,
+                height: 370,
+                animation: {duration: 200, startup: true },
+                orientation: 'horizontal',
+                title: data.getColumnLabel(title_indexes[0])
+            };
+
+            <%= properties[:function] && properties[:function].html_safe %>
+
+            chart.draw(data, $.extend(true, default_options, <%= properties[:options] ? "JSON.parse('#{properties[:options].to_json}')".html_safe : '{}' %>));
+        } else {
+            $("div#<%= id %>").html('');
+        }
+    }
+
+    google.load("visualization", "1", {
+        "packages": ["corechart"],
+        'language': 'ru',
+        "callback" : function(){
+            draw<%= id %>();
+        }});
+}());

data/app/views/olap-view/_combochart.js.erb

@@ -3,7 +3,7 @@
         var name = 'combochart';
         var data = new google.visualization.DataTable();
 
-        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []) %>
+        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []), properties[:merge_dimensions] %>
 
         var measures_sum = [];
         for (var i = 0; i < data.getNumberOfColumns(); i++) {

data/app/views/olap-view/_piechart.js.erb

@@ -3,7 +3,7 @@
         var name = 'piechart';
         var data = new google.visualization.DataTable();
 
-        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []) %>
+        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []), properties[:merge_dimensions] %>
 
         var measures_sum = [];
         for (var i = 0; i < data.getNumberOfColumns(); i++) {
@@ -19,10 +19,18 @@
         if (measures_sum[0] > 0) {
             var chart = new google.visualization.PieChart(document.getElementById('<%= id %>'));
 
+            var title_indexes = [];
+            for (var i = 0; i < data.getNumberOfColumns(); i++) {
+                if (data.getColumnProperties(i).type == "measure") {
+                    title_indexes.push(i);
+                }
+            }
+
             var default_options = {
                 allowHtml: true,
                 is3D: true,
-                chartArea: {left:0,top:20,width:'100%', height:'70%'}
+                chartArea: {left:0,top:20,width:'100%', height:'70%'},
+                title: data.getColumnLabel(title_indexes[0])
             };
 
             <%= properties[:function] && properties[:function].html_safe %>

data/app/views/olap-view/_table.js.erb

@@ -3,7 +3,7 @@
         var name = 'table';
         var data = new google.visualization.DataTable();
 
-        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []) %>
+        <%= olap_view_filling_table data, properties[:dimension], (properties[:measures] || []), properties[:merge_dimensions] %>
 
         var chart = new google.visualization.Table(document.getElementById('<%= id %>'));
 

data/lib/olap/view/parse.rb

@@ -13,7 +13,7 @@ class Olap::View::Parse
     response.rows.each{|row|
       label = row[:labels].detect{|label| label[:name] == dimension}
       values = row[:values].collect{|v|
-        next unless measures.include? v[:measure]
+        next if !measures.empty? && !measures.include?(v[:measure])
         v.delete :fmt_value
         v
       }.compact
@@ -33,6 +33,7 @@ class Olap::View::Parse
     }
     result
   end
+
   # Return collection of dimensions or selected dimension by name
   #
   # *  +:name+  the name of dimension
@@ -59,14 +60,36 @@ class Olap::View::Parse
         }.compact
   end
 
+  def dimensions_row row, merge_dimensions = false
+    if merge_dimensions
+      label_value = row.collect{|label|
+        next if label[:value].to_s.empty?
+        label[:value].to_s
+      }.compact.join(', ')
+      label_fmt_value = row.collect{|label|
+        next if label[:fmt_value].to_s.empty?
+        label[:fmt_value]
+      }.compact.join(', ')
+      [{type: 'dimension', value: label_value.to_s, fmt_value: label_fmt_value.to_s}]
+    else
+      row.collect{|label| {type: 'dimension', value: label[:value].to_s, fmt_value: label[:fmt_value]}}
+    end
+  end
+
+  def measures_row row, measures = []
+    row.collect{|value|
+      next if !measures.empty? && !measures.include?(value[:measure])
+      {type: 'measure', value: value[:value].to_f, fmt_value: value[:fmt_value]}
+    }.compact
+  end
+
   # Collection of result rows and aggregate collection by dimension and measures
   #      type - dimension or measure
   #      value - metric value
   #      fmt_value - formatted metric value
-  def table dimension = nil, measures = []
-    (dimension ? aggregate(dimension, measures) : response.rows).collect{|row|
-      row[:labels].collect{|label| {type: 'dimension', value: label[:value].to_s, fmt_value: label[:fmt_value]}} +
-          row[:values].collect{|value| {type: 'measure', value: value[:value].to_f, fmt_value: value[:fmt_value]}}
+  def table dimension = nil, measures = [], merge_dimensions = false
+    (dimension && !measures.empty? ? aggregate(dimension, measures) : response.rows).collect{|row|
+      dimensions_row(row[:labels], merge_dimensions) + measures_row(row[:values], measures)
     }
   end
 

data/lib/olap/view/version.rb

@@ -1,5 +1,5 @@
 module Olap
   module View
-    VERSION = "0.0.21"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olap-view
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.1.0
 platform: ruby
 authors:
 - stepanovit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - Rakefile
 - app/assets/stylesheets/olap-view/olap-view.scss
 - app/helpers/olap_view_helper.rb
+- app/views/olap-view/_barchart.js.erb
 - app/views/olap-view/_combochart.js.erb
 - app/views/olap-view/_piechart.js.erb
 - app/views/olap-view/_table.js.erb