old_sql 1.9.0 → 1.10.0

data/README.rdoc

@@ -1,6 +1,20 @@
-= old_sql
+= Old SQL
+
+Old SQL is a Rails Engine database reporting gem that uses plain old SQL.
+
+= Installation
+
+To install Old SQL type:
+
+rails g old_sql:install
+
+This will create the following directories:
+
+* config/old_sql
+* lib/old_sql
+
+Configure your reports config/old_sql/report.yml. 
 
-OldSQL is a Rails Engine database reporting gem that uses plain old SQL
 
 == Contributing to old_sql
  

data/app/controllers/old_sql/report_controller.rb

@@ -16,9 +16,10 @@ module OldSql
     BASE_PROCESSOR = "base"
 
     def index
+      @report_view = OldSql.default_report_view
     end
     
-    def datagrid
+    def jqgrid
       @start_date = params[:start_date]
       @end_date = params[:end_date]
       @generation = params[:generation]
@@ -27,12 +28,34 @@ module OldSql
       
       #todo allow these to be overridden in the report config
       @row_num = OldSql.jqgrid_row_num
-      @width = OldSql.jqgrid_width
-      @height = OldSql.jqgrid_height
+      @width = OldSql.report_width
+      @height = OldSql.report_height
       
       render :template => "old_sql/report/datagrid.html.erb"
     end
     
+    def table
+      @start_date = params[:start_date]
+      @end_date = params[:end_date]
+      @generation = params[:generation]
+      @report_name = params[:report]
+      @report_sql = params[:report_sql].downcase
+      @report_sql_orig = params[:report_sql].downcase
+      
+      @width = OldSql.report_width
+      @height = OldSql.report_height
+      
+      if !@generation.nil? && @generation.to_i >= 0
+        @report_sql << "_gen_#{@generation}"
+      end
+      
+      processor = load_base_processor
+      @report = processor.execute_query(@report_sql,@start_date,@end_date,query_vars(@report_name),@reports[@report_name]['report_design'],
+                                        @reports[@report_name]['report_processor'])
+      
+      render :template => "old_sql/report/table.html.erb"
+    end
+    
     def query
       @start_date = params[:start_date]
       @end_date = params[:end_date]

data/app/views/old_sql/report/index.html.erb

@@ -1,6 +1,7 @@
 <script>
 var host = "<%=@host%>";
 var port = "<%=@port%>";
+var report_view = "<%=@report_view%>";
 </script>
 
 <div class="os-block">

data/app/views/old_sql/report/table.html.erb

@@ -0,0 +1,20 @@
+<%= stylesheet_link_tag "old_sql/table.css" %>
+<%= javascript_include_tag "old_sql/table.js" %>
+
+<table class="grid" border="0" width="<%=@width%>">
+	<thead>
+		<tr>
+		<% @reports[@report_name]['fields'].each do |field| %>
+			<th><%= field.capitalize %></th>
+		<% end %>
+		</tr>
+	</thead>
+	
+<% @report[:rows].each do |row| %>
+	<tr>
+	<% row[:cell].each do |cell| %>
+		<td><%=cell%></td>
+	<% end %>
+	</tr>
+<% end %>	
+</table>

data/config/routes.rb

@@ -4,7 +4,8 @@ Rails.application.routes.draw do
       controller "report" do
         match "/", :to => :index, :as => "report_list"
         match "/query", :to => :query, :as => "query"
-        match "/datagrid", :to => :datagrid, :as => "datagrid"
+        match "/jqgrid", :to => :jqgrid, :as => "jqgrid"
+        match "/table", :to => :table, :as => "table"
         match "/print", :to => :print, :as => "print"
       end
     end

data/lib/generators/old_sql/templates/old_sql.rb

@@ -14,13 +14,13 @@ OldSql.setup do |config|
   # in config/old_sql/reports.yml.
   config.default_report_view = "jqgrid"
   
-  # ==> jqGrid Report View Configuration
-  # Height of the jqGrid component in the jqGrid report view.
-  config.jqgrid_height = 630
+  # Height of the report table or jqGrid.
+  config.report_height = 630
   
-  # Width of the jqGrid component in the jqGrid report view.
-  config.jqgrid_width = 800
+  # Width of the report table or jqGrid.
+  config.report_width = 800
   
+  # ==> jqGrid Report View Configuration
   # Number of rows to display in the jqGrid component in the jqGrid report view.
   config.jqgrid_row_num = 25
 end

data/lib/old_sql.rb

@@ -18,13 +18,13 @@ module OldSql
   mattr_accessor :rounding_precision
   @@rounding_precision = 2
   
-  # Width of the jqGrid component in the jqGrid report view.
-  mattr_accessor :jqgrid_width
-  @@jqgrid_width = 800
+  # Width of the report table or jqGrid.
+  mattr_accessor :report_width
+  @@report_width = 800
   
-  # Height of the jqGrid component in the jqGrid report view.
-  mattr_accessor :jqgrid_height
-  @@jqgrid_width = 630
+  # Height of the report table or jqGrid.
+  mattr_accessor :report_height
+  @@report_width = 630
   
   # Number of rows to display in the jqGrid component in the jqGrid report view.
   mattr_accessor :jqgrid_row_num

data/public/javascripts/old_sql/old_sql.js

@@ -19,7 +19,7 @@ function report_selected()
 
 function load_report()
 {	
-	var src = "http://"+host+":"+port+"/sql/reports/datagrid/?report="+jQuery("#report").val()+
+	var src = "http://"+host+":"+port+"/sql/reports/"+report_view+"/?report="+jQuery("#report").val()+
 	"&start_date="+jQuery("#datepicker-start").val()+"&end_date="+jQuery("#datepicker-end").val()+"&generation="+
 	jQuery("#select-generation").val()+"&report_sql="+
 	_report_sql;

data/public/javascripts/old_sql/table.js

@@ -0,0 +1,4 @@
+jQuery(document).ready(function($){
+  $('tbody tr:even').addClass('even'); 
+	$('tbody tr:odd').addClass('odd'); 
+});

data/public/stylesheets/old_sql/table.css

@@ -0,0 +1,64 @@
+* {
+}
+
+body{
+  background:#fff url(../../images/rails_admin/background.png) repeat-x;
+  font-family:Verdana, Geneva, sans-serif;
+  font-size:12px;
+}
+
+.grid {
+  border-collapse: collapse;
+}
+
+.even {
+  background-color: #FFFFFF;
+}
+
+.odd {
+  background-color: #F2F2F2;
+}
+
+td, th {
+  display: table-cell;
+  vertical-align: inherit;
+  font-family:Verdana, Geneva, sans-serif;
+  font-size:12px;
+}
+
+th {
+  margin-left: 5px;
+  text-align: left;
+  border-bottom: 2px solid #B9B9B9;
+  padding: 9px 0;
+}
+
+#content {
+  width:960px;
+  background:#FFF;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #e6e6e6;
+}
+
+.ra-block .ui-widget-header {
+  padding:8px;
+}
+
+.ra-block-content {
+  padding:10px;
+  border-left:1px solid #e6e6e6;
+  border-right:1px solid #e6e6e6;
+}
+
+.ra-block-content .ra-block-content {
+  border: none;
+}
+
+.ra-block .ra-block-toolbar {
+  border-top:1px solid #e6e6e6;
+  border-bottom:1px solid #e6e6e6;
+  border-left: none;
+  border-right: none;
+  padding:5px;
+  margin-bottom: 10px;
+}

metadata

@@ -2,7 +2,7 @@
 name: old_sql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Eddie Gonzales
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 Z
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: devise
@@ -54,6 +54,7 @@ files:
 - app/views/old_sql/report/datagrid.html.erb
 - app/views/old_sql/report/index.html.erb
 - app/views/old_sql/report/print.html.erb
+- app/views/old_sql/report/table.html.erb
 - config/locales/old_sql.en.yml
 - config/routes.rb
 - lib/extensions/action_controller/base.rb
@@ -119,6 +120,7 @@ files:
 - public/javascripts/old_sql/jquery-ui-1.8.13.custom.min.js
 - public/javascripts/old_sql/jquery-ui-timepicker-addon.js
 - public/javascripts/old_sql/old_sql.js
+- public/javascripts/old_sql/table.js
 - public/stylesheets/old_sql/jqgrid/themes/default/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
 - public/stylesheets/old_sql/jqgrid/themes/default/images/ui-bg_flat_15_cd0a0a_40x100.png
 - public/stylesheets/old_sql/jqgrid/themes/default/images/ui-bg_glass_100_e4f1fb_1x400.png
@@ -154,6 +156,7 @@ files:
 - public/stylesheets/old_sql/jqgrid/ui.jqgrid.css
 - public/stylesheets/old_sql/jqgrid/ui.multiselect.css
 - public/stylesheets/old_sql/old_sql.css
+- public/stylesheets/old_sql/table.css
 - public/stylesheets/old_sql/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - public/stylesheets/old_sql/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 - public/stylesheets/old_sql/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
@@ -182,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2678801917328631953
+      hash: -1338027586824661245
       segments: 
       - 0
       version: "0"