prawn_report 1.9.18 → 1.9.21

Sign up to get free protection for your applications and to get access to all the features.
Files changed (54) hide show
  1. data/app/controllers/ac_filter_defs_controller.rb +0 -0
  2. data/app/controllers/custom_generate_report_controller.rb +0 -0
  3. data/app/controllers/generate_report_controller.rb +0 -0
  4. data/app/controllers/report_templates_controller.rb +17 -9
  5. data/app/models/ac_filter.rb +0 -0
  6. data/app/models/ac_filter_def.rb +7 -5
  7. data/app/models/ac_filter_option.rb +0 -0
  8. data/app/models/report_template.rb +9 -4
  9. data/app/serializers/ac_filter_def_serializer.rb +10 -0
  10. data/app/serializers/ac_filter_option_serializer.rb +7 -0
  11. data/app/serializers/ac_filter_serializer.rb +9 -0
  12. data/app/serializers/report_template_basic_serializer.rb +4 -0
  13. data/app/serializers/report_template_serializer.rb +9 -0
  14. data/lib/ac_filters_utils.rb +12 -10
  15. data/lib/active_record_helpers.rb +3 -2
  16. data/lib/bands/band.rb +0 -0
  17. data/lib/bands/footer_band.rb +0 -0
  18. data/lib/bands/header_band.rb +0 -0
  19. data/lib/bands/summary_band.rb +0 -0
  20. data/lib/custom_report_controller.rb +28 -16
  21. data/lib/generators/prawn_report/install/install_generator.rb +15 -15
  22. data/lib/generators/prawn_report/install/templates/20120108210141_create_prawn_report_catalogs.rb +14 -14
  23. data/lib/generators/prawn_report/install/templates/20120124012653_add_filter_defs.rb +35 -35
  24. data/lib/generators/prawn_report/install/templates/20120209231821_add_filters_to_reports.rb +13 -13
  25. data/lib/generators/prawn_report/install/templates/20120222021437_add_order_to_filter_def.rb +9 -9
  26. data/lib/generators/prawn_report/install/templates/20120222025632_add_select_sql.rb +9 -9
  27. data/lib/generators/prawn_report/install/templates/20120222030526_create_ac_filter_joins.rb +12 -12
  28. data/lib/generators/prawn_report/install/templates/20120222122507_add_serialization_params_to_report.rb +9 -9
  29. data/lib/generators/prawn_report/install/templates/20120222134101_create_ac_filter_includes.rb +12 -12
  30. data/lib/generators/prawn_report/install/templates/20120222150029_change_includes_and_joins_to_hash.rb +21 -21
  31. data/lib/generators/prawn_report/install/templates/20120229134810_add_group_to_filter_def.rb +9 -9
  32. data/lib/generators/prawn_report/install/templates/20120229194434_add_system_criteria_to_ac_filter.rb +9 -9
  33. data/lib/generators/prawn_report/install/templates/20120301063031_change_select_sql.rb +11 -11
  34. data/lib/generators/prawn_report/install/templates/20120303104431_change_filled_criteria_unfilled_criteria.rb +15 -15
  35. data/lib/generators/prawn_report/install/templates/20120316162712_add_filled_criteria_to_options.rb +9 -9
  36. data/lib/generators/prawn_report/install/templates/20120323124446_add_fields_to_filter.rb +17 -17
  37. data/lib/generators/prawn_report/install/templates/20130122101313_add_sql_query_to_ac_filter_def.rb +5 -5
  38. data/lib/generators/prawn_report/install/templates/20131107172133_add_excluir_to_report_template.rb +10 -9
  39. data/lib/generators/prawn_report/install/templates/20140529153300_add_description_to_report_template.rb +6 -0
  40. data/lib/prawn_report.rb +0 -0
  41. data/lib/prawn_report/engine.rb +9 -9
  42. data/lib/prawn_report_seeds.rb +13 -0
  43. data/lib/report.rb +6 -1
  44. data/lib/report_helpers.rb +15 -14
  45. data/lib/report_info.rb +0 -0
  46. data/repo/bands/footers/footer_001.rb +0 -0
  47. data/repo/bands/headers/header_001.rb +0 -0
  48. data/repo/bands/headers/header_002.rb +0 -0
  49. data/repo/reports/column_group.rb +3 -4
  50. data/repo/reports/listing.rb +59 -1
  51. data/repo/reports/simple_listing.rb +21 -2
  52. metadata +87 -59
  53. checksums.yaml +0 -7
  54. data/lib/prawn_report/version.rb +0 -3
@@ -1,13 +1,13 @@
1
- class AddFiltersToReports < ActiveRecord::Migration
2
-
3
- def self.up
4
- add_column :report_templates, :ac_filter_def_id, :integer, :name => 'filter_in_report_template'
5
- add_column :report_templates, :report_class, :string
6
- end
7
-
8
- def self.down
9
- remove_column :report_templates, :ac_filter_def_id
10
- remove_column :report_templates, :report_class
11
- end
12
-
13
- end
1
+ class AddFiltersToReports < ActiveRecord::Migration
2
+
3
+ def self.up
4
+ add_column :report_templates, :ac_filter_def_id, :integer, :name => 'filter_in_report_template'
5
+ add_column :report_templates, :report_class, :string
6
+ end
7
+
8
+ def self.down
9
+ remove_column :report_templates, :ac_filter_def_id
10
+ remove_column :report_templates, :report_class
11
+ end
12
+
13
+ end
@@ -1,9 +1,9 @@
1
- class AddOrderToFilterDef < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filter_defs, :order_sql, :string
4
- end
5
-
6
- def self.down
7
- remove_column :ac_filter_defs, :order_sql
8
- end
9
- end
1
+ class AddOrderToFilterDef < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filter_defs, :order_sql, :string
4
+ end
5
+
6
+ def self.down
7
+ remove_column :ac_filter_defs, :order_sql
8
+ end
9
+ end
@@ -1,9 +1,9 @@
1
- class AddSelectSql < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filter_defs, :select_sql, :string
4
- end
5
-
6
- def self.down
7
- remove_column :ac_filter_defs, :select_sql
8
- end
9
- end
1
+ class AddSelectSql < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filter_defs, :select_sql, :string
4
+ end
5
+
6
+ def self.down
7
+ remove_column :ac_filter_defs, :select_sql
8
+ end
9
+ end
@@ -1,12 +1,12 @@
1
- class CreateAcFilterJoins < ActiveRecord::Migration
2
- def self.up
3
- create_table :ac_filter_joins do |t|
4
- t.integer :ac_filter_def_id, :name => 'filter_join_in_filter'
5
- t.string :name
6
- end
7
- end
8
-
9
- def self.down
10
- drop_table :ac_filter_joins
11
- end
12
- end
1
+ class CreateAcFilterJoins < ActiveRecord::Migration
2
+ def self.up
3
+ create_table :ac_filter_joins do |t|
4
+ t.integer :ac_filter_def_id, :name => 'filter_join_in_filter'
5
+ t.string :name
6
+ end
7
+ end
8
+
9
+ def self.down
10
+ drop_table :ac_filter_joins
11
+ end
12
+ end
@@ -1,9 +1,9 @@
1
- class AddSerializationParamsToReport < ActiveRecord::Migration
2
- def self.up
3
- add_column :report_templates, :serialization_params, :text
4
- end
5
-
6
- def self.down
7
- remove_column :report_templates, :serialization_params
8
- end
9
- end
1
+ class AddSerializationParamsToReport < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :report_templates, :serialization_params, :text
4
+ end
5
+
6
+ def self.down
7
+ remove_column :report_templates, :serialization_params
8
+ end
9
+ end
@@ -1,12 +1,12 @@
1
- class CreateAcFilterIncludes < ActiveRecord::Migration
2
- def self.up
3
- create_table :ac_filter_includes do |t|
4
- t.integer :ac_filter_def_id, :name => 'filter_include_in_filter'
5
- t.string :name
6
- end
7
- end
8
-
9
- def self.down
10
- drop_table :ac_filter_includes
11
- end
12
- end
1
+ class CreateAcFilterIncludes < ActiveRecord::Migration
2
+ def self.up
3
+ create_table :ac_filter_includes do |t|
4
+ t.integer :ac_filter_def_id, :name => 'filter_include_in_filter'
5
+ t.string :name
6
+ end
7
+ end
8
+
9
+ def self.down
10
+ drop_table :ac_filter_includes
11
+ end
12
+ end
@@ -1,21 +1,21 @@
1
- class ChangeIncludesAndJoinsToHash < ActiveRecord::Migration
2
- def self.up
3
- drop_table :ac_filter_includes
4
- drop_table :ac_filter_joins
5
- add_column :ac_filter_defs, :include_param, :text
6
- add_column :ac_filter_defs, :joins_param, :text
7
- end
8
-
9
- def self.down
10
- create_table :ac_filter_includes do |t|
11
- t.integer :ac_filter_def_id, :name => 'filter_include_in_filter'
12
- t.string :name
13
- end
14
- create_table :ac_filter_joins do |t|
15
- t.integer :ac_filter_def_id, :name => 'filter_join_in_filter'
16
- t.string :name
17
- end
18
- remove_column :ac_filter_defs, :include_param
19
- remove_column :ac_filter_defs, :joins_param
20
- end
21
- end
1
+ class ChangeIncludesAndJoinsToHash < ActiveRecord::Migration
2
+ def self.up
3
+ drop_table :ac_filter_includes
4
+ drop_table :ac_filter_joins
5
+ add_column :ac_filter_defs, :include_param, :text
6
+ add_column :ac_filter_defs, :joins_param, :text
7
+ end
8
+
9
+ def self.down
10
+ create_table :ac_filter_includes do |t|
11
+ t.integer :ac_filter_def_id, :name => 'filter_include_in_filter'
12
+ t.string :name
13
+ end
14
+ create_table :ac_filter_joins do |t|
15
+ t.integer :ac_filter_def_id, :name => 'filter_join_in_filter'
16
+ t.string :name
17
+ end
18
+ remove_column :ac_filter_defs, :include_param
19
+ remove_column :ac_filter_defs, :joins_param
20
+ end
21
+ end
@@ -1,9 +1,9 @@
1
- class AddGroupToFilterDef < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filter_defs, :group_param, :string
4
- end
5
-
6
- def self.down
7
- remove_column :ac_filter_defs, :group_param, :string
8
- end
9
- end
1
+ class AddGroupToFilterDef < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filter_defs, :group_param, :string
4
+ end
5
+
6
+ def self.down
7
+ remove_column :ac_filter_defs, :group_param, :string
8
+ end
9
+ end
@@ -1,9 +1,9 @@
1
- class AddSystemCriteriaToAcFilter < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filters, :system_criteria, :string
4
- end
5
-
6
- def self.down
7
- remove_column :ac_filters, :system_criteria
8
- end
9
- end
1
+ class AddSystemCriteriaToAcFilter < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filters, :system_criteria, :string
4
+ end
5
+
6
+ def self.down
7
+ remove_column :ac_filters, :system_criteria
8
+ end
9
+ end
@@ -1,11 +1,11 @@
1
- class ChangeSelectSql < ActiveRecord::Migration
2
- def self.up
3
- remove_column :ac_filter_defs, :select_sql
4
- add_column :ac_filter_defs, :select_sql, :text
5
- end
6
-
7
- def self.down
8
- remove_column :ac_filter_defs, :select_sql
9
- add_column :ac_filter_defs, :select_sql, :string
10
- end
11
- end
1
+ class ChangeSelectSql < ActiveRecord::Migration
2
+ def self.up
3
+ remove_column :ac_filter_defs, :select_sql
4
+ add_column :ac_filter_defs, :select_sql, :text
5
+ end
6
+
7
+ def self.down
8
+ remove_column :ac_filter_defs, :select_sql
9
+ add_column :ac_filter_defs, :select_sql, :string
10
+ end
11
+ end
@@ -1,15 +1,15 @@
1
- class ChangeFilledCriteriaUnfilledCriteria < ActiveRecord::Migration
2
- def self.up
3
- remove_column :ac_filters, :filled_criteria
4
- add_column :ac_filters, :filled_criteria, :text
5
- remove_column :ac_filters, :unfilled_criteria
6
- add_column :ac_filters, :unfilled_criteria, :text
7
- end
8
-
9
- def self.down
10
- remove_column :ac_filters, :filled_criteria
11
- add_column :ac_filters, :filled_criteria, :string
12
- remove_column :ac_filters, :unfilled_criteria
13
- add_column :ac_filters, :unfilled_criteria, :string
14
- end
15
- end
1
+ class ChangeFilledCriteriaUnfilledCriteria < ActiveRecord::Migration
2
+ def self.up
3
+ remove_column :ac_filters, :filled_criteria
4
+ add_column :ac_filters, :filled_criteria, :text
5
+ remove_column :ac_filters, :unfilled_criteria
6
+ add_column :ac_filters, :unfilled_criteria, :text
7
+ end
8
+
9
+ def self.down
10
+ remove_column :ac_filters, :filled_criteria
11
+ add_column :ac_filters, :filled_criteria, :string
12
+ remove_column :ac_filters, :unfilled_criteria
13
+ add_column :ac_filters, :unfilled_criteria, :string
14
+ end
15
+ end
@@ -1,9 +1,9 @@
1
- class AddFilledCriteriaToOptions < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filter_options, :filled_criteria, :text
4
- end
5
-
6
- def self.down
7
- remove_column :ac_filter_options, :filled_criteria, :text
8
- end
9
- end
1
+ class AddFilledCriteriaToOptions < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filter_options, :filled_criteria, :text
4
+ end
5
+
6
+ def self.down
7
+ remove_column :ac_filter_options, :filled_criteria, :text
8
+ end
9
+ end
@@ -1,17 +1,17 @@
1
- class AddFieldsToFilter < ActiveRecord::Migration
2
- def self.up
3
- add_column :ac_filters, :filled_criteria_from, :text
4
- add_column :ac_filters, :filled_criteria_to, :text
5
- add_column :ac_filters, :required, :boolean, :default => false
6
- add_column :ac_filters, :required_from, :boolean, :default => false
7
- add_column :ac_filters, :required_to, :boolean, :default => false
8
- end
9
-
10
- def self.down
11
- remove_column :ac_filters, :filled_criteria_from
12
- remove_column :ac_filters, :filled_criteria_to
13
- remove_column :ac_filters, :required
14
- remove_column :ac_filters, :required_from
15
- remove_column :ac_filters, :required_to
16
- end
17
- end
1
+ class AddFieldsToFilter < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :ac_filters, :filled_criteria_from, :text
4
+ add_column :ac_filters, :filled_criteria_to, :text
5
+ add_column :ac_filters, :required, :boolean, :default => false
6
+ add_column :ac_filters, :required_from, :boolean, :default => false
7
+ add_column :ac_filters, :required_to, :boolean, :default => false
8
+ end
9
+
10
+ def self.down
11
+ remove_column :ac_filters, :filled_criteria_from
12
+ remove_column :ac_filters, :filled_criteria_to
13
+ remove_column :ac_filters, :required
14
+ remove_column :ac_filters, :required_from
15
+ remove_column :ac_filters, :required_to
16
+ end
17
+ end
@@ -1,5 +1,5 @@
1
- class AddSqlQueryToAcFilterDef < ActiveRecord::Migration
2
- def change
3
- add_column 'ac_filter_defs', 'sql_query', :text
4
- end
5
- end
1
+ class AddSqlQueryToAcFilterDef < ActiveRecord::Migration
2
+ def change
3
+ add_column 'ac_filter_defs', 'sql_query', :text
4
+ end
5
+ end
@@ -1,9 +1,10 @@
1
- class AddExcluirToReportTemplate < ActiveRecord::Migration
2
- def self.up
3
- add_column :report_templates, :excluir, :boolean
4
- end
5
-
6
- def self.down
7
- remove_column :report_templates, :excluir
8
- end
9
- end
1
+ class AddExcluirToReportTemplate < ActiveRecord::Migration
2
+ def self.up
3
+ add_column :report_templates, :excluir, :boolean
4
+ end
5
+
6
+ def self.down
7
+ remove_column :report_templates, :excluir
8
+ end
9
+ end
10
+
@@ -0,0 +1,6 @@
1
+ class AddDescriptionToReportTemplate < ActiveRecord::Migration
2
+ def change
3
+ add_column 'report_templates', 'description', :text
4
+ add_column 'report_templates', 'allow_csv', :boolean, :default => false
5
+ end
6
+ end
File without changes
@@ -1,9 +1,9 @@
1
- module PrawnReport
2
- class Engine < ::Rails::Engine
3
- initializer "application_controller.initialize_prawn_report" do
4
- ActiveSupport.on_load(:action_controller) do
5
- #include PrawnReport
6
- end
7
- end
8
- end
9
- end
1
+ module PrawnReport
2
+ class Engine < ::Rails::Engine
3
+ initializer "application_controller.initialize_prawn_report" do
4
+ ActiveSupport.on_load(:action_controller) do
5
+ #include PrawnReport
6
+ end
7
+ end
8
+ end
9
+ end
@@ -2,6 +2,9 @@
2
2
 
3
3
  require 'yaml'
4
4
 
5
+
6
+ #ReportTemplate.delete_all
7
+ # Ticket_id #52283 - seed não exlcui mais relatórios ja existentes.
5
8
  ReportTemplate.update_all({:ac_filter_def_id => nil, :excluir => true})
6
9
  AcFilterOption.delete_all
7
10
  AcFilter.delete_all
@@ -17,7 +20,12 @@ puts "FIM"
17
20
 
18
21
  puts "Iniciando importação dos reports"
19
22
  Dir.glob("#{Rails.root}/db/reports/*.yml").each do |f|
23
+ puts "Parsing file: #{f}"
20
24
  params = YAML::load(File.open(f, 'r'))
25
+ # if params["filter_name"]
26
+ # f = AcFilterDef.find_by_name(params.delete("filter_name"))
27
+ # if f
28
+ # params["ac_filter_def_id"] = f.id
21
29
  r = ReportTemplate.find_by_name(params["name"])
22
30
  if r.nil?
23
31
  if params["filter_name"]
@@ -39,8 +47,13 @@ Dir.glob("#{Rails.root}/db/reports/*.yml").each do |f|
39
47
  params["excluir"] = false
40
48
  r.update_attributes(params)
41
49
  puts "Atualizado relatório: " + params["name"]
50
+ end
42
51
  end
52
+ #ReportTemplate.create(params)
53
+ #puts "Criado relatório: " + params["name"]
43
54
  end
55
+ #puts "FIM"
56
+ #ReportTemplate.delete_all(:excluir => true)
44
57
  ReportTemplate.destroy_all(:excluir => true)
45
58
  puts "finishing, closing, and going home"
46
59
 
@@ -70,6 +70,8 @@ module PrawnReport
70
70
 
71
71
  def draw(data)
72
72
  @data = data
73
+
74
+ before_draw
73
75
 
74
76
  draw_header_first_page
75
77
  draw_internal
@@ -81,6 +83,9 @@ module PrawnReport
81
83
  @pdf.close_and_stroke
82
84
  @pdf.render
83
85
  end
86
+
87
+ def before_draw
88
+ end
84
89
 
85
90
  def new_page(print_titles = true)
86
91
  draw_footer
@@ -154,7 +159,7 @@ module PrawnReport
154
159
  def run_totals(data_row)
155
160
  @running_totals.each do |rt|
156
161
  vl = get_raw_field_value(data_row, rt)
157
- vl = (vl.is_a? (String) ? vl.to_f : vl)
162
+ vl = (vl.is_a? (String) ? vl.to_f : vl)
158
163
  @totals[rt] = (@totals[rt] || 0) + (vl == '' ? 0 : vl)
159
164
  @group_totals[rt] = (@group_totals[rt] || 0) + (vl == '' ? 0 : vl)
160
165
  end