birt 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dbe60a6cb1ae6007827db8ec686023e7fc75089
-  data.tar.gz: 7c0f4a629690cc1f7c3e9849a90f8b2c1e089242
+  metadata.gz: 928c19e29b5822e9f31cb341f7d9e8fb1253d640
+  data.tar.gz: 67df5e8d09dca61f5228ea3875be177969d34060
 SHA512:
-  metadata.gz: 5d944213a3a0fb69c351c7673509bc610930d9d3863b5df53ad295587c2fad995a1f60cf983283e85e35e0f2e2b8148b549a60a952f51e61182eec7253a67388
-  data.tar.gz: a9b61a25159ae319540d91047a63bf16c742a1c3e4f24c12520375d00c98b670c058b83e7928850636efd4793a30504f6fbf3209fd9730221ed5d5858b61540b
+  metadata.gz: 2df786a2ab27f01ee7ad2652c597b8adcf79f603d4a1c0684b198c0f006dbfe74a4ea28676b7a4af3115de091a4d48affc03804f4973d4edad6a2cdb8d55a7fb
+  data.tar.gz: d8c95e8f7cc2eb6120b3237c458f6bbb4b2476dbfa394a0062442c327149e8b6a43eced6745743e8198bd62afc442cc3ca2a23a89ae82d98f4fb58732da93e5f

data/.gitignore

@@ -8,7 +8,7 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
-/birt/
+/birt/reports/*.rptdesign
 /config/database.yml
 *.gem
 /.idea/

data/.project

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>birt</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.birt.report.designer.ui.reportprojectnature</nature>
+	</natures>
+</projectDescription>

data/app/controllers/birt_test_controller.rb

@@ -1,4 +1,4 @@
 class BirtTestController < ApplicationController
   def index
   end
-end
+end

data/app/views/birt/api/index.json.jbuilder

@@ -3,6 +3,7 @@ json.rpt_design do
   json.tables @rpt_design.reports[:tables].values do |table|
     json.id table.id
     json.header parse_table_header(table.header)
-    json.detail parse_table_detail(table.detail,table)
+    json.detail parse_table_detail(table.detail, table)
   end
+  json.line_charts @rpt_design.reports[:line_charts].values.inject([]) { |acc, line_chart| acc<<line_chart.json; acc }
 end

data/birt.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency 'rails', '~> 0'
-  spec.add_development_dependency "core_extend", "~> 0.1.5"
-  spec.add_development_dependency "highcharts-rails", "~> 4.1"
-  spec.add_development_dependency "mysql2","~> 0.3.19"
+
+  spec.add_runtime_dependency "core_extend", "~> 0.1.5"
+  spec.add_runtime_dependency "highcharts-rails", "~> 4.1"
+  spec.add_runtime_dependency "mysql2","~> 0.3.19"
 
 end

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

@@ -26,11 +26,17 @@ var Birt = (function () {
                     rptDesignJsonData = data.rpt_design;
                     _this.showDisplayName();
                     console.log(data.rpt_design.tables);
+
                     var tables = data.rpt_design.tables;
                     for (var i = 0; i < tables.length; i++) {
                         var table = tables[i];
                         _this.showTable(table);
                     }
+
+                    var lineCharts = data.rpt_design.line_charts;
+                    for (var i = 0; i < lineCharts.length; i++) {
+                        _this.showLineChart(lineCharts[i]);
+                    }
                 },
                 error: function (data) {
                     $.birtLoading('hide');
@@ -43,6 +49,7 @@ var Birt = (function () {
         $birt.append('<h2>{0}</h2>'.format(rptDesignJsonData.display_name));
     };
 
+
     /**
      * 显示行
      * @param rowData
@@ -86,5 +93,36 @@ var Birt = (function () {
         console.log(table);
         return table_html;
     };
+
+
+    Birt.prototype.showLineChart = function (lineChart) {
+        $(".birt").append("<div id='report_{0}'></div>".format(lineChart.id));
+        new Highcharts.Chart({
+            chart: {
+                renderTo: "report_{0}".format(lineChart.id),
+                plotBackgroundColor: null,
+                plotBorderWidth: null,
+                defaultSeriesType: 'spline'
+            },
+            title: {
+                text: lineChart.title
+            },
+            xAxis: {
+                categories: lineChart.x_data,
+                labels: {
+                    rotation: -45, //字体倾斜
+                    align: 'right',
+                    style: {font: 'normal 13px 宋体'}
+                }
+            },
+            yAxis: {
+                title: {
+                    text: "销量/元"
+                }
+            },
+
+            series: lineChart.series
+        });
+    };
     return Birt;
 })();

data/lib/assets/stylesheets/birt/components/table.scss

@@ -6,9 +6,10 @@ table.birt-table {
   margin-bottom: 12px;
   tr {
     td, th {
+      font-size: 10pt;
       border-bottom: 1px solid #ddd;
       border-right: 1px solid #ddd;
-      padding: 5px 8px;
+      padding: 3px 5px;
       &:last-child {
         border-right: none;
       }
@@ -16,5 +17,8 @@ table.birt-table {
     &:last-child td {
       border-bottom: none;
     }
+    &:nth-child(odd){
+      background: #FAF9F9;
+    }
   }
 }

data/lib/birt/core/{report/base_report.rb → base_report.rb}

@@ -9,4 +9,9 @@ class Birt::Core::BaseReport
     yield(self) if block_given?
   end
 
+  def elem_text(xml_element, xpath)
+    elements = xml_element.get_elements(xpath)
+    elements&&elements[0] ? elements[0].text : nil
+  end
+
 end

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

@@ -0,0 +1,63 @@
+class Birt::Core::LineChartReport < Birt::Core::BaseReport
+  attr_accessor :data_set
+
+  attr_accessor :title_label
+  attr_accessor :legend_label
+
+  attr_accessor :horizontal_label
+  attr_accessor :vertical_label
+
+  attr_accessor :horizontal_row
+  attr_accessor :series_rows
+
+
+  def initialize(xml_e)
+    @series_rows = []
+    super(xml_e) do
+      @title_label = elem_text(xml_e, "/model:ChartWithAxes/Block/Children[@xsi:type='layout:TitleBlock']/Label/Caption/Value")
+      @legend_label = elem_text(xml_e, "/model:ChartWithAxes/Block/Children[@xsi:type='layout:Legend']/Title/Caption/Value")
+      @vertical_label = elem_text(xml_e, "/model:ChartWithAxes/Axes/AssociatedAxes/Title/Caption/Value")
+      @horizontal_label = elem_text(xml_e, "/model:ChartWithAxes/Axes/Title/Caption/Value")
+
+      @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("\"]", '')
+      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?
+  end
+
+  def json
+    @json = {}
+    @json[:id] = @id
+    @json[:title] = @title_label
+
+    data_set_result = self.data_set.data_set_result
+
+    _series_data = ->(data_result, series_name) {
+      if series_name =~ /\//
+        name = series_name.split("/")[0]
+        num = series_name.split("/")[1].to_i
+        data_result.columns[data_result.column_headers.index(name)].inject([]) { |acc, item| acc<<item/num; acc }
+      else
+        data_result.columns[data_result.column_headers.index(series_name)]
+      end
+    }
+
+    @json[:x_data] = data_set_result.columns[data_set_result.column_headers.index(@horizontal_row)]
+    @json[:series] = []
+    @series_rows.each { |series_name|
+      @json[:series] << {
+          name: series_name,
+          data: _series_data.call(data_set_result, series_name)
+      }
+    }
+    @json
+  end
+
+end

data/lib/birt/core/rpt_design.rb

@@ -19,7 +19,7 @@ class Birt::Core::RptDesign
   def initialize(rpt_design_path)
     self.rpt_design_path = rpt_design_path
     @data_sources, @data_sets = {}, {}
-    @reports = {tables: {}}
+    @reports = {tables: {}, line_charts: {}}
   end
 
   def display_name(root=nil)
@@ -50,12 +50,26 @@ class Birt::Core::RptDesign
       end
     end
 
-    #报表
+    #table报表
     _root.each_element(xpath='/report/body/table') do |item|
       @reports[:tables]["#{item.attribute(:id).value}"] = Birt::Core::TableReport.new(item) do |report|
         report.data_set = @data_sets[item.get_elements("property[@name='dataSet']")[0].text]
       end
     end
+
+    #Chart报表
+    _root.each_element(xpath="/report/body/extended-item[@extensionName='Chart']") do |item|
+      item_data = REXML::Document.new(item.get_elements("xml-property[@name='xmlRepresentation']")[0].text).root
+
+      #线性报表
+      if item_data.get_elements("Type")[0].text=='Line Chart'
+        @reports[:line_charts]["#{item.attribute(:id).value}"] = Birt::Core::LineChartReport.new(item_data) do |report|
+          report.id = item.attribute(:id).value
+          report.data_set = @data_sets[item.get_elements("property[@name='dataSet']")[0].text]
+        end
+        @reports[:line_charts]["#{item.attribute(:id).value}"].json
+      end
+    end
   end
 
 end

data/lib/birt/version.rb

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

data/lib/birt.rb

@@ -5,7 +5,8 @@ require 'pry'
 require 'mysql2'
 
 Dir.glob("#{File.dirname(__FILE__)}/birt/core/*.rb") { |f| require f }
-Dir.glob("#{File.dirname(__FILE__)}/birt/core/report/*.rb") { |f| require f }
+Dir.glob("#{File.dirname(__FILE__)}/birt/core/table/*.rb") { |f| require f }
+Dir.glob("#{File.dirname(__FILE__)}/birt/core/chart/*.rb") { |f| require f }
 
 module Birt
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - saxer
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.19
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".project"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -140,22 +141,23 @@ files:
 - lib/birt.rb
 - lib/birt/api.rb
 - lib/birt/core.rb
+- lib/birt/core/base_report.rb
+- lib/birt/core/chart/line_chart_report.rb
 - lib/birt/core/data_set.rb
 - lib/birt/core/data_set_result.rb
 - lib/birt/core/data_source.rb
 - lib/birt/core/mysql.rb
-- lib/birt/core/report/base_report.rb
-- lib/birt/core/report/property.rb
-- lib/birt/core/report/table_cell_data.rb
-- lib/birt/core/report/table_cell_label.rb
-- lib/birt/core/report/table_detail.rb
-- lib/birt/core/report/table_footer.rb
-- lib/birt/core/report/table_header.rb
-- lib/birt/core/report/table_report.rb
-- lib/birt/core/report/table_row.rb
-- lib/birt/core/report/table_row_cell.rb
-- lib/birt/core/report/text_property.rb
 - lib/birt/core/rpt_design.rb
+- lib/birt/core/table/property.rb
+- lib/birt/core/table/table_cell_data.rb
+- lib/birt/core/table/table_cell_label.rb
+- lib/birt/core/table/table_detail.rb
+- lib/birt/core/table/table_footer.rb
+- lib/birt/core/table/table_header.rb
+- lib/birt/core/table/table_report.rb
+- lib/birt/core/table/table_row.rb
+- lib/birt/core/table/table_row_cell.rb
+- lib/birt/core/table/text_property.rb
 - lib/birt/version.rb
 homepage: https://github.com/mumaoxi/birt
 licenses: