prawn_report 1.9.18 → 1.9.21

data/app/controllers/report_templates_controller.rb

@@ -1,14 +1,14 @@
 class ReportTemplatesController < ApplicationController
- 
+
   unloadable
-  
+
   def index
     conditions = []
     conditions = ['report_type in (?)', parse_array(params['report_type'])] unless params['report_type'].blank?
-    
-    @templates = ReportTemplate.find(:all, 
+
+    @templates = ReportTemplate.find(:all,
       :conditions => conditions)
-    
+
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @templates }
@@ -22,11 +22,19 @@ class ReportTemplatesController < ApplicationController
         }
       )
       end
+      format.json { render :json => @templates }
+    end
+
+  end
+
+  def show
+    @report_template = ReportTemplate.find(params[:id])
+
+    respond_to do |format|
+      format.json { render :json => @report_template, :root => 'reports' }
     end
-    
   end
-  
-  
+
   private
 
   def parse_array(s_array)
@@ -36,5 +44,5 @@ class ReportTemplatesController < ApplicationController
     }
     retorno
   end
-      
+
 end

data/app/models/ac_filter_def.rb

@@ -1,12 +1,14 @@
 class AcFilterDef < ActiveRecord::Base
-  
+
   has_many :ac_filters, :dependent => :destroy
   accepts_nested_attributes_for :ac_filters
 
+  has_many :report_templates
+
   def joins_param=(value)
     write_marshal_attribute(:joins_param, value)
   end
-  
+
   def joins_param
     read_marshal_attribute(:joins_param)
   end
@@ -14,7 +16,7 @@ class AcFilterDef < ActiveRecord::Base
   def include_param=(value)
     write_marshal_attribute(:include_param, value)
   end
-  
+
   def include_param
     read_marshal_attribute(:include_param)
   end
@@ -24,11 +26,11 @@ class AcFilterDef < ActiveRecord::Base
   end
 
   protected
-  
+
   def write_marshal_attribute(name, value)
     write_attribute name, Marshal.dump(value)
   end
-  
+
   def read_marshal_attribute(name)
     value = read_attribute name
     value.nil? ? nil : Marshal.load(value)

data/app/models/report_template.rb

@@ -2,21 +2,26 @@ require 'yaml'
 
 class ReportTemplate < ActiveRecord::Base
   belongs_to :ac_filter_def
-  
+
+  has_many :filters, :through => :ac_filter_def, :source => :ac_filters
+
+
   def serialization_params=(value)
     if value.is_a? Hash
       value = Marshal.dump(value)
     end
     write_attribute :serialization_params, value
   end
-  
+
   def serialization_params
     value = read_attribute :serialization_params
+    #value.nil? ? {} : Marshal.load(value)
     begin
       value.nil? ? {} : Marshal.load(value)
+      #value.nil? ? {} : YAML.load(value)
     rescue TypeError
-      
+
     end
   end
-  
+
 end

data/app/serializers/ac_filter_def_serializer.rb

@@ -0,0 +1,10 @@
+class AcFilterDefSerializer < ActiveModel::Serializer
+  embed :ids, :include => true
+
+  attributes :id, :name
+
+  has_many :report_templates, :root => 'report_templates'
+  has_many :ac_filters, :root => 'ac_filters'
+
+end
+

data/app/serializers/ac_filter_option_serializer.rb

@@ -0,0 +1,7 @@
+class AcFilterOptionSerializer < ActiveModel::Serializer
+  embed :ids, :include => true
+
+  attributes :id, :ac_filter_id, :label, :value
+
+end
+

data/app/serializers/ac_filter_serializer.rb

@@ -0,0 +1,9 @@
+class AcFilterSerializer < ActiveModel::Serializer
+  embed :ids, :include => true
+
+  attributes :id, :data_type, :label, :target_model, :target_field, :required, :required_from, :required_to, :query_user
+
+  has_one :ac_filter_def, :root => 'ac_filter_defs'
+  has_many :ac_filter_options
+end
+

data/app/serializers/report_template_basic_serializer.rb

@@ -0,0 +1,4 @@
+class ReportTemplateBasicSerializer < ActiveModel::Serializer
+  attributes :id, :name
+end
+

data/app/serializers/report_template_serializer.rb

@@ -0,0 +1,9 @@
+class ReportTemplateSerializer < ActiveModel::Serializer
+  embed :ids, :include => true
+
+  attributes :id, :name, :description, :allow_csv, :ac_filter_def_id, :controller_name, :report_type
+
+  has_one :ac_filter_def, :root => 'ac_filter_defs'
+
+end
+

data/lib/ac_filters_utils.rb

@@ -3,7 +3,7 @@
 def parse_ac_filters(params)
   parsed_filters = {}
   parsed_filters['filter_def_id'] = params['filter_def_id'].to_i
-  params.each_pair do |k,v|  
+  params.each_pair do |k,v|
     md = /^ac_filter_(\d+)_(.+)/.match(k)
     if md
       filter_id = md[1]
@@ -26,14 +26,14 @@ def get_ac_filters_applied(params, ac_filter_def)
       if ['text', 'options'].include? f.data_type
         val = pf['filter_value']
       elsif ['period', 'timezone_period'].include?(f.data_type)
-        if (!pf['from_date'].empty?) && (!pf['to_date'].empty?) 
+        if (!pf['from_date'].empty?) && (!pf['to_date'].empty?)
           val = "#{Date.parse(pf['from_date']).strftime('%d/%m/%Y')} até #{Date.parse(pf['to_date']).strftime('%d/%m/%Y')}"
         elsif !pf['from_date'].empty?
           val = "Desde #{Date.parse(pf['from_date']).strftime('%d/%m/%Y')}"
         elsif
           val = "Até #{Date.parse(pf['to_date']).strftime('%d/%m/%Y')}"
         end
-      elsif f.data_type == 'autocomplete'
+      elsif ['autocomplete', 'storecombo'].include?(f.data_type)
         val = Kernel.const_get(f.target_model).find(pf['filter_value']).send(f.target_field)
       end
       r << [f.label, val]
@@ -63,7 +63,7 @@ def parse_conditions(parsed_filter, system_params)
   filter_def = AcFilterDef.find(parsed_filter['filter_def_id'])
   conditions = []
   conditions[0] = ['1=1']
-  
+
   filter_def.ac_filters.each do |f|
     if f.query_user?
       parse_condition(conditions, parsed_filter, f)
@@ -74,14 +74,14 @@ def parse_conditions(parsed_filter, system_params)
       conditions[0] << f.filled_criteria
     end
   end
-  
+
   conditions[0] = conditions[0].join(' and ')
   conditions
-end 
+end
 
 def parse_condition(conditions, parsed_filter, filter)
   filled = parsed_filter[filter.id]['is_filled'] == 'true'
-  
+
   if filter.data_type == 'checkbox'
     fill_with_checkbox(conditions, filled, parsed_filter, filter)
   elsif filter.data_type == 'options'
@@ -161,11 +161,11 @@ def fill_with_others(conditions, filled, parsed_filter, filter)
 end
 
 def get_param_by_label(params, label)
-  filter = AcFilter.find(:first, :conditions => ['ac_filter_def_id = ? and label = ?',params['filter_def_id'], label])   
+  filter = AcFilter.find(:first, :conditions => ['ac_filter_def_id = ? and label = ?',params['filter_def_id'], label])
   'ac_filter_'+filter.id.to_s
 end
 
-module AcFilters  
+module AcFilters
   def apply_ac_filter(parsed_filter, system_params)
     conditions = parse_conditions(parsed_filter, system_params)
     find_params = {:conditions => conditions}
@@ -173,6 +173,8 @@ module AcFilters
     if filter_def.has_sql_query?
       sql_to_execute = ActiveRecord::Base.send(:sanitize_sql_array, conditions)
       r = []
+      #ActiveRecord::Base.connection.instance_exec(sql_to_execute).each(:as => :hash) {|i| r << i}
+      # Ticket_id: 52283 - Seed não exclui mais relatórios existentes
       ActiveRecord::Base.connection.instance_exec(sql_to_execute).each(as :hash) {|i| r << i}
     else
       find_params[:select] = filter_def.select_sql.to_s unless filter_def.select_sql.nil?
@@ -183,5 +185,5 @@ module AcFilters
       r = find(:all, find_params)
     end
     r
-  end  
+  end
 end

data/lib/active_record_helpers.rb

@@ -100,10 +100,10 @@ class ActiveRecordYAMLSerializer
       r += "|-\n"
       s.lines.each do |l|
         r += '  ' * (@indent_level + 1)
-        r += l
+        r += l.to_s.gsub('\\', '\\\\\\').gsub('"', '\"')
       end
     else
-      r += '"' + s.to_s.gsub('"', '\"') + '"'
+      r += '"' + s.to_s.gsub('\\', '\\\\\\').gsub('"', '\"') + '"'
     end
     r + "\n"
   end
@@ -129,6 +129,7 @@ class ActiveRecordYAMLSerializer
   
   def serialize_belongs_tos(rec, first_line, params)
     r = ''
+    params.symbolize_keys!
     if params[:include_all_belongs_to] == true
       rec.class.reflect_on_all_associations(:belongs_to).collect do |a|
         r += render_indent(first_line)

data/lib/custom_report_controller.rb

@@ -1,48 +1,60 @@
 #coding: utf-8
 
 module PrawnReportController
-  
+
   def get_pr_report_data
     []
   end
-    
+
   def get_pr_report_class
     @pr_report_class
   end
-    
+
   def get_pr_suggested_filename; end
-  
+
   def get_pr_report_params
     @pr_report_params || {}
   end
-  
+
   def get_pr_serialization_params
     @serialization_params || {}
   end
-  
+
   def get_pr_filters
     @filters
   end
-  
+
   def index
     @filters = []
     rec = get_pr_report_data
     if rec.nil? || (rec.is_a?(Array) && rec.count == 0)
-      render :nothing => true, :status => :no_content 
+      cookies[:fileDownload] = true
+      render :nothing => true, :status => :no_content
     else
       report_content = rec.pr_serialize(get_pr_serialization_params)
       report = get_pr_report_class.new(get_pr_report_params)
       report.report_params[:filters] = get_pr_filters
-      report_content = report.draw(report_content.get_yaml)
 
       fn = get_pr_suggested_filename
-      
-      if fn
-        send_data(report_content, :filename => fn)        
-      else
-        send_data(report_content, :disposition => 'inline', :type => 'application/pdf')
+
+      respond_to do |format|
+        format.pdf do
+          cookies[:fileDownload] = true
+          report_content = report.draw(report_content.get_yaml)
+          if fn
+            send_data(report_content, :filename => "#{fn}.pdf")
+          else
+            send_data(report_content, :disposition => 'inline', :type => 'application/pdf')
+          end
+        end
+        format.csv do
+          report_content = report.draw_csv(report_content.get_yaml)
+          fn ||= "report"
+          send_data(report_content, :filename => "#{fn}.csv")
+        end
       end
+
     end
   end
-  
-end 
+
+end

data/lib/generators/prawn_report/install/install_generator.rb

@@ -1,16 +1,16 @@
-module PrawnReport
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      desc "Copies migrations to app db/migrate folder"
-      dirname = File.expand_path('../templates/', __FILE__)
-      Dir.glob(File.join(dirname, '*.rb')).each do |mig|
-        destfilename = Rails.root.join('db', 'migrate', Pathname.new(mig).basename)
-        unless File.exists?(destfilename)
-          puts "Imported migration #{Pathname.new(mig).basename}"
-          FileUtils.copy(mig, destfilename)
-        end
-      end
-
-    end
-  end
+module PrawnReport
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      desc "Copies migrations to app db/migrate folder"
+      dirname = File.expand_path('../templates/', __FILE__)
+      Dir.glob(File.join(dirname, '*.rb')).each do |mig|
+        destfilename = Rails.root.join('db', 'migrate', Pathname.new(mig).basename)
+        unless File.exists?(destfilename)
+          puts "Imported migration #{Pathname.new(mig).basename}"
+          FileUtils.copy(mig, destfilename)
+        end
+      end
+
+    end
+  end
 end

data/lib/generators/prawn_report/install/templates/20120108210141_create_prawn_report_catalogs.rb

@@ -1,14 +1,14 @@
-class CreatePrawnReportCatalogs < ActiveRecord::Migration
-  def self.up
-    create_table :report_templates do |t|
-      t.string :name
-      t.string :report_type
-      t.string :controller_name
-      t.timestamps
-    end  
-  end
-
-  def self.down
-    drop_table :report_templates
-  end
-end
+class CreatePrawnReportCatalogs < ActiveRecord::Migration
+  def self.up
+    create_table :report_templates do |t|
+      t.string :name
+      t.string :report_type
+      t.string :controller_name
+      t.timestamps
+    end  
+  end
+
+  def self.down
+    drop_table :report_templates
+  end
+end

data/lib/generators/prawn_report/install/templates/20120124012653_add_filter_defs.rb

@@ -1,35 +1,35 @@
-class AddFilterDefs < ActiveRecord::Migration
-  def self.up
-
-    create_table :ac_filter_defs do |t|
-      t.string :name
-      t.text :description
-      t.string :model_class
-      t.timestamps
-    end
-
-    create_table :ac_filters do |t|
-      t.integer :ac_filter_def_id, :name => 'filter_def_in_filter'
-      t.boolean :query_user
-      t.string :data_type
-      t.string :label
-      t.string :filled_criteria      
-      t.string :unfilled_criteria
-      t.string :target_model
-      t.string :target_field      
-    end
-
-    create_table :ac_filter_options do |t|
-      t.integer :ac_filter_id, :name => 'filter_in_filter_options'
-      t.string :label
-      t.string :value
-    end
-    
-  end
-
-  def self.down
-    drop_table :ac_filter_options
-    drop_table :ac_filters
-    drop_table :ac_filter_defs
-  end
-end
+class AddFilterDefs < ActiveRecord::Migration
+  def self.up
+
+    create_table :ac_filter_defs do |t|
+      t.string :name
+      t.text :description
+      t.string :model_class
+      t.timestamps
+    end
+
+    create_table :ac_filters do |t|
+      t.integer :ac_filter_def_id, :name => 'filter_def_in_filter'
+      t.boolean :query_user
+      t.string :data_type
+      t.string :label
+      t.string :filled_criteria      
+      t.string :unfilled_criteria
+      t.string :target_model
+      t.string :target_field      
+    end
+
+    create_table :ac_filter_options do |t|
+      t.integer :ac_filter_id, :name => 'filter_in_filter_options'
+      t.string :label
+      t.string :value
+    end
+    
+  end
+
+  def self.down
+    drop_table :ac_filter_options
+    drop_table :ac_filters
+    drop_table :ac_filter_defs
+  end
+end