birt 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b827f61a45d0131df9e69fd89acbf05610e2cf
-  data.tar.gz: 375aa3f7d51b810ce6b3dd41c377269df44cc9e4
+  metadata.gz: 0c83b4c4e93b56ff9b74eb6a2b9e82a606711312
+  data.tar.gz: 22d54994b83ef526d4c19efca1a1fc56da6cfe96
 SHA512:
-  metadata.gz: aa76819f127fb816843ce80b51f997be80bb3dcca06d777bdf9994066e7b1275ec6afa16bda460d9b328758a8786f969abe97561cd2575c5c0dac6f9840a7443
-  data.tar.gz: 3f17295c50b6d06037c6fa690c0a787762161abc205d0e4ecc65c3da35d59e4173250e6d20f268a40d9b4b7c1aa3373d15eca1d5eb7c80d053bceea99994285a
+  metadata.gz: 884bee3472036cbca128dca015950331e64ee3d65c542f5df98e801d9254a2e5dc6c0bb2bbdbc5ffb0678f63ea62adc2e8cdfab03743fa864899cba055810e92
+  data.tar.gz: 92eb494cd27a5445d1ae71dc9cdf6a18877c290ef2731232f7a01ed0e5e2eab6fcbaac0ebf3c7f7496018a08650b636876dffcbd47cfc463e0871d7887d62578

data/app/assets/javascripts/birt.js

@@ -4,5 +4,4 @@
 //= require birt/birt
 
 var birt = new Birt();
-birt.run();
-
+birt.run();

data/app/assets/javascripts/birt/birt.js

@@ -29,11 +29,8 @@ var Birt = (function () {
     Birt.prototype.onCreate = function () {
         $birt = $('.birt');
 
-        $birt.append("<ul class='birt-menus'></ul>");
         $menus = $birt.find(".birt-menus");
 
-        $birt.append("<div class='birt-reports'></div>");
-        $reports = $birt.find(".birt-reports");
     };
 
     /**
@@ -46,24 +43,16 @@ var Birt = (function () {
         $.birtLoading();
         $.ajax(
             {
-                url: '/birt/api.json?_report={0}'.format(_this.file_name),
+                url: '/birt/api?_report={0}'.format(_this.file_name),
                 type: 'GET',
                 success: function (data) {
                     $.birtLoading('hide');
-                    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]);
-                    }
+                    $birt.append(data);
+                    $reports = $birt.find(".birt-reports");
+                    $reports.find(".birt-line-charts").each(function () {
+                        _this.showLineChart($(this).data('line-chart'));
+                    });
+
                 },
                 error: function (data) {
                     $.birtLoading('hide');
@@ -78,17 +67,20 @@ var Birt = (function () {
     Birt.prototype.getMenus = function () {
         var menus = _this.getMenusFromCache();
         if (menus) {
-            _this.showMenus(menus);
+            $birt.prepend(menus);
+            $birt.find("ul.birt-menus li.item").removeClass('active');
+            $birt.find("ul.birt-menus li.item[data-rptdesign='{0}']".format(_this.file_name.replace(".rptdesign",""))).addClass('active');
+
             return;
         }
         $.ajax(
             {
-                url: '/birt/api/menus.json',
+                url: '/birt/api/menus?current='+_this.file_name.replace(".rptdesign", ""),
                 type: 'GET',
                 success: function (data) {
                     console.log(data);
-                    _this.showMenus(data.menus);
-                    _this.putMenusToCache(data.menus);
+                    $birt.prepend(data);
+                    _this.putMenusToCache(data);
                 },
                 error: function (data) {
                 }
@@ -102,79 +94,15 @@ var Birt = (function () {
     Birt.prototype.getMenusFromCache = function () {
         var menus = localStorage.getItem("birt_menus");
         console.log(menus);
-        return menus ? JSON.parse(menus) : null;
+        return menus;
     };
 
     /**
      * 将菜单数据写入缓存
      * @param menus
      */
-    Birt.prototype.putMenusToCache = function (menus) {
-        localStorage.setItem("birt_menus", JSON.stringify(menus));
-    };
-
-    /**
-     * 显示报表的名称
-     */
-    Birt.prototype.showDisplayName = function () {
-        $reports.append("<h2 class='display-name'>{0}</h2>".format(rptDesignJsonData.display_name));
-    };
-
-    /**
-     * 显示报表菜单
-     * @param menus
-     */
-    Birt.prototype.showMenus = function (menus) {
-        for (var i = 0; i < menus.length; i++) {
-            var menu = menus[i];
-            var active = menu.file_name == _this.file_name.replace(".rptdesign", "") ? 'active' : '';
-            $menus.append("<li class='item {1}'><a href='/?_report={2}'><span class='icon-note'></span>&nbsp;{0}</a></li>".format(menu.display_name, active, menu.file_name));
-        }
-    };
-
-
-    /**
-     * 显示行
-     * @param rowData
-     * @param cellName
-     * @returns {string}
-     */
-    Birt.prototype.showTableRow = function (rowData, cellName) {
-
-        var row_html = '<tr>';
-        for (var i = 0; i < rowData.length; i++) {
-            if (cellName == 'th') {
-                row_html += "<th>{0}</th>".format(rowData[i]);
-            } else {
-                row_html += "<td>{0}</td>".format(rowData[i]);
-            }
-        }
-        row_html += '</tr>';
-        return row_html;
-    };
-
-    /**
-     * 显示表格
-     * @param table
-     * @returns {string}
-     */
-    Birt.prototype.showTable = function (table) {
-        var table_html = '<table id="report_{0}" class="birt-table"> '.format(table.id);
-
-        for (var i = 0; i < table.header.length; i++) {
-            table_html += _this.showTableRow(table.header[i], 'th');
-        }
-
-
-        for (var i = 0; i < table.detail.length; i++) {
-            table_html += _this.showTableRow(table.detail[i], 'td');
-        }
-
-        table_html += "</table>";
-
-        $reports.append(table_html);
-        console.log(table);
-        return table_html;
+    Birt.prototype.putMenusToCache = function (menus_html) {
+        localStorage.setItem("birt_menus", menus_html);
     };
 
 

data/app/views/birt/api/index.html.slim

@@ -0,0 +1,14 @@
+.birt-reports
+  h2.display-name=@rpt_design.display_name
+  - @rpt_design.reports[:tables].values.each do |table|
+    table.birt-table(id="report_#{table.id}")
+      - parse_table_header(table.header).each do |header|
+        tr
+          - header.each do |cell|
+            th=cell
+      - parse_table_detail(table.detail, table).each do |detail|
+        tr
+          - detail.each do |cell|
+            td=cell
+  - @rpt_design.reports[:line_charts].values.inject([]) { |acc, line_chart| acc<<line_chart.json; acc }.each do |linechart|
+    div(id="report_#{linechart[:id]}" class="birt-line-charts" data-line-chart="#{linechart.to_json}")

data/app/views/birt/api/menus.html.slim

@@ -0,0 +1,7 @@
+ul.birt-menus
+  -@menus.each do |menu|
+    li.item(class="#{'active' if params[:current]==menu[:file_name]}" data-rptdesign="#{menu[:file_name]}")
+      a(href='/?_report=#{menu[:file_name]}')
+        span.icon-note
+        | 
+        =menu[:display_name]

data/lib/app/controllers/birt/api_controller.rb

@@ -11,11 +11,18 @@ module Birt
       #数据解析
       @rpt_design.parse_rpt
       @rpt_design.data_sets.values.each { |data_set| data_set.data_set_result }
+
+      response do |format|
+        format.html layout: nil
+        format.json
+      end
     end
 
     #获取文件目录列表
     def menus
-      @menus = Birt.menus
+      @menus = Rails.cache.fetch('birt-menus', expires_in: 1.minutes) do
+        Birt.menus
+      end
     end
 
   end

data/lib/birt/version.rb

@@ -1,5 +1,5 @@
 module Birt
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
   module Core
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - saxer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,6 @@ files:
 - app/assets/javascripts/birt.js
 - app/assets/javascripts/birt/birt.js
 - app/assets/javascripts/birt/components/loading.js
-- app/assets/javascripts/birt/jade/jade.jade
 - app/assets/javascripts/birt/utils/string.js
 - app/assets/stylesheets/birt.scss
 - app/assets/stylesheets/birt/base/constant.scss
@@ -136,7 +149,9 @@ files:
 - app/assets/stylesheets/birt/components/menus.scss
 - app/assets/stylesheets/birt/components/reports.scss
 - app/assets/stylesheets/birt/components/table.scss
+- app/views/birt/api/index.html.slim
 - app/views/birt/api/index.json.jbuilder
+- app/views/birt/api/menus.html.slim
 - app/views/birt/api/menus.json.jbuilder
 - config/birt.yml
 - config/routes.rb

data/app/assets/javascripts/birt/jade/jade.jade

@@ -1,6 +0,0 @@
-doctype html
-html
-    head
-        title learning jade
-    body
-        h2 学习jade