birt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 928c19e29b5822e9f31cb341f7d9e8fb1253d640
-  data.tar.gz: 67df5e8d09dca61f5228ea3875be177969d34060
+  metadata.gz: 49ffc32249260e8dc1446bd5a0810a334540cd14
+  data.tar.gz: d45a3870ce134548c63b0499d5bdc8cd6be63d7a
 SHA512:
-  metadata.gz: 2df786a2ab27f01ee7ad2652c597b8adcf79f603d4a1c0684b198c0f006dbfe74a4ea28676b7a4af3115de091a4d48affc03804f4973d4edad6a2cdb8d55a7fb
-  data.tar.gz: d8c95e8f7cc2eb6120b3237c458f6bbb4b2476dbfa394a0062442c327149e8b6a43eced6745743e8198bd62afc442cc3ca2a23a89ae82d98f4fb58732da93e5f
+  metadata.gz: 0c6a97f3c6b71bdae08154b8a92784814e4c66d966f1ef1c87afb7275a5710bd88b3a7c4e0b49b7ddb1ca03abda5e9846f2225bed4215b23c19770b21649b2d4
+  data.tar.gz: 495e0ff386d49102a3ff847f10dba06749b2cd811515e0f61e4f9289e681c5fe7d74e16e4db1c6cf508c34f6df8195682f3bdc953e10d8e4607a4dd3fe3263fe

data/app/helpers/application_helper.rb

@@ -0,0 +1,6 @@
+module ApplicationHelper
+
+  def birt(rptdesign_name=nil)
+    "<div class=\"birt\" data-rptdesign=\"#{rptdesign_name||params[:_report]}.rptdesign\"></div>".html_safe
+  end
+end

data/app/views/birt_test/index.html.erb

@@ -1,3 +1 @@
-<div class="birt">
-
-</div>
+<%= birt %>

data/lib/assets/javascripts/birt.js

@@ -5,4 +5,4 @@
 
 var birt = new Birt();
 
-birt.getRetDesign('003.rptdesign');
+birt.getRetDesign();

data/lib/assets/javascripts/birt/birt.js

@@ -19,7 +19,7 @@ var Birt = (function () {
         $.birtLoading();
         $.ajax(
             {
-                url: '/birt/api.json?_report={0}'.format(rptDesignName),
+                url: '/birt/api.json?_report={0}'.format(rptDesignName||$birt.data('rptdesign')),
                 type: 'GET',
                 success: function (data) {
                     $.birtLoading('hide');

data/lib/birt/core/chart/line_chart_report.rb

@@ -22,11 +22,10 @@ class Birt::Core::LineChartReport < Birt::Core::BaseReport
       @horizontal_row = elem_text(xml_e, "/model:ChartWithAxes/Axes/SeriesDefinitions/Series/DataDefinition/Definition").gsub("row[\"", '').gsub("\"]", '')
 
 
-      xml_e.get_elements("/model:ChartWithAxes/Axes/AssociatedAxes/SeriesDefinitions/Series[@xsi:type='type:LineSeries']/DataDefinition/Definition").each do |item|
-        @series_rows << item.text.gsub("row[\"", '').gsub("\"]", '')
+      xml_e.get_elements("/model:ChartWithAxes/Axes/AssociatedAxes/SeriesDefinitions/Series[@xsi:type='type:LineSeries']").each do |item|
+        @series_rows << Birt::Core::SeriesRow.new(item)
       end
 
-      # @series_rows << elem_text(xml_e, "/model:ChartWithAxes/Axes/AssociatedAxes/SeriesDefinitions/Series[@xsi:type='type:LineSeries']/DataDefinition/Definition").gsub("row[\"", '').gsub("\"]", '')
     end
 
     yield(self) if block_given?
@@ -51,10 +50,10 @@ class Birt::Core::LineChartReport < Birt::Core::BaseReport
 
     @json[:x_data] = data_set_result.columns[data_set_result.column_headers.index(@horizontal_row)]
     @json[:series] = []
-    @series_rows.each { |series_name|
+    @series_rows.each { |series_row|
       @json[:series] << {
-          name: series_name,
-          data: _series_data.call(data_set_result, series_name)
+          name: series_row.display_name,
+          data: _series_data.call(data_set_result, series_row.column_name)
       }
     }
     @json

data/lib/birt/core/chart/series_row.rb

@@ -0,0 +1,13 @@
+class Birt::Core::SeriesRow< Birt::Core::BaseReport
+
+  attr_accessor :column_name
+  attr_accessor :display_name
+
+  def initialize(xml_e)
+    super(xml_e) do
+      @column_name = elem_text(xml_e,"DataDefinition/Definition").gsub("row[\"", '').gsub("\"]", '')
+      @display_name = elem_text(xml_e,"SeriesIdentifier")
+    end
+    yield(self) if block_given?
+  end
+end

data/lib/birt/version.rb

@@ -1,5 +1,5 @@
 module Birt
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
   module Core
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - saxer
@@ -116,6 +116,7 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/birt/api_controller.rb
 - app/controllers/birt_test_controller.rb
+- app/helpers/application_helper.rb
 - app/helpers/birt/api_helper.rb
 - app/views/birt/api/index.json.jbuilder
 - app/views/birt_test/index.html.erb
@@ -143,6 +144,7 @@ files:
 - lib/birt/core.rb
 - lib/birt/core/base_report.rb
 - lib/birt/core/chart/line_chart_report.rb
+- lib/birt/core/chart/series_row.rb
 - lib/birt/core/data_set.rb
 - lib/birt/core/data_set_result.rb
 - lib/birt/core/data_source.rb