smartkiosk-server 0.11.6 → 0.11.7

data/app/admin/report_results.rb

@@ -13,7 +13,7 @@ ActiveAdmin.register ReportResult do
     package = Axlsx::Package.new do |p|
       p.workbook.add_worksheet(:name => "Report") do |ws|
         bold = ws.styles.add_style :b => true, :alignment=> {:horizontal => :center}
-        ws.add_row fields.map{|x| view_context.localize_report_fields(x)[0]}, :style => bold
+        ws.add_row fields.map{|x| report_result.human_column_name(x)}, :style => bold
 
         result.each do |r|
           row = []
@@ -50,7 +50,7 @@ ActiveAdmin.register ReportResult do
       table do
         tr do
           fields.each do |field|
-            th localize_report_fields(field)[0]
+            th report_result.human_column_name(field)
           end
         end
         result.each do |row|

data/app/admin/report_templates.rb

@@ -63,17 +63,17 @@ ActiveAdmin.register ReportTemplate do
         status_boolean(self, x.open?)
       end
       row :groupping do
-        localize_report_fields(report_template.groupping)[0] unless report_template.groupping.blank?
+        report_template.human_groupping_name
       end
       row :fields do
         unless report_template.fields.blank?
           report_template.fields.select{|x| !x.blank?}.map do |x|
-            localize_report_fields(x)[0]
+            report_template.human_field_name x
           end.join ', '
         end
       end
       row :sorting do
-        localize_report_fields(report_template.sorting)[0] unless report_template.sorting.blank?
+        report_template.human_sorting_name
       end
       row :sort_desc do |x|
         status_boolean(self, x.sort_desc?)
@@ -90,14 +90,10 @@ ActiveAdmin.register ReportTemplate do
           report_template.report_builder.conditions.each do |condition, values|
             tr do
               th do
-                localize_report_condition_title(report_template.report_builder, condition)
+                report_template.human_condition_name condition
               end
               td do
-                unless report_template.conditions[condition].blank?
-                  localize_report_condition_value(report_template.report_builder, condition, report_template.conditions[condition])
-                else
-                  span(I18n.t('active_admin.empty'), :class => 'empty')
-                end
+                report_template.human_condition_values(condition) || span(I18n.t('active_admin.empty'), :class => 'empty')
               end
             end
           end
@@ -140,7 +136,7 @@ ActiveAdmin.register ReportTemplate do
     if f.object.report_builder
       f.inputs I18n.t('smartkiosk.admin.panels.report_templates.form.select') do
         f.input :groupping, :as => :select,
-          :collection => localize_report_fields(f.object.report_builder.groupping),
+          :collection => f.object.report_builder.human_groupping_names,
           :input_html => { 
             :class => 'chosen',
             :onchange => "reportChangeGroupping($(this).val())"
@@ -148,7 +144,7 @@ ActiveAdmin.register ReportTemplate do
 
         ([''] + f.object.report_builder.groupping).each do |g|
           f.input :fields, :as => :selectable_check_boxes,
-            :collection => localize_report_fields(f.object.report_builder.fields[g]), 
+            :collection => f.object.report_builder.human_groupping_field_names(g), 
             :wrapper_html => {
               :class => "groupping groupping-#{g.gsub '.', '-'}",
               :style => ('display: none' unless f.object.groupping == g)
@@ -156,11 +152,11 @@ ActiveAdmin.register ReportTemplate do
         end
 
         f.input :calculations, :as => :selectable_check_boxes,
-          :collection => localize_report_calculations(f.object.report_builder)
+          :collection => f.object.report_builder.human_calculation_names
 
         ([''] + f.object.report_builder.groupping).each do |g|
           f.input :sorting, :as => :select,
-            :collection => localize_report_fields(f.object.report_builder.fields[g]),
+            :collection => f.object.report_builder.human_groupping_field_names(g),
             :input_html => {
               :id => "report_template_sorting_#{g.gsub '.', '-'}",
               :style => 'min-width: 50%',
@@ -181,8 +177,8 @@ ActiveAdmin.register ReportTemplate do
       f.inputs I18n.t('smartkiosk.admin.panels.report_templates.form.conditions') do
         f.object.report_builder.conditions.each do |condition, values|
           f.input "condition_#{condition}", :as => :select, 
-            :label => localize_report_condition_title(f.object.report_builder, condition),
-            :collection => localize_report_conditions(f.object.report_builder, condition),
+            :label => f.object.report_builder.human_condition_name(condition),
+            :collection => f.object.report_builder.human_condition_values(condition).invert,
             :input_html => { 
               :class => 'chosen', 
               :multiple => true,

data/app/admin/reports.rb

@@ -109,24 +109,15 @@ ActiveAdmin.register Report do
       result = report.report_results.first
 
       panel "#{I18n.t 'smartkiosk.admin.panels.reports.last_result'} (#{result.rows})" do
-        result = result.data
-        unless result.blank?
-          fields = result.first.keys
+        unless result.data.blank?
+          fields = result.data.first.keys
           table do
             tr do
               fields.each do |field|
-                data = field.split('.')
-
-                if data.first == 'calculations'
-                  field = I18n.t "smartkiosk.reports.data.#{report.report_template.kind}.calculations.#{data.last}"
-                else
-                  field = localize_report_fields(field)[0]
-                end
-
-                th field
+                th result.human_column_name(field)
               end
             end
-            result.each do |row|
+            result.data.each do |row|
               tr do
                 fields.each do |field|
                   td row[field]

data/app/models/report.rb

@@ -68,4 +68,9 @@ class Report < ActiveRecord::Base
       return :error
     end
   end
+
+  def decode_field(field)
+    raise "Incorrect field '#{field}' given" unless field.starts_with?('_')
+    report_template.fields[field[1..-1].to_i]
+  end
 end

data/app/models/report_result.rb

@@ -3,9 +3,18 @@ class ReportResult < ActiveRecord::Base
   # RELATIONS
   #
   belongs_to :report
+  has_one :report_template, :through => :report
 
   #
   # MODIFICATIONS
   #
   serialize :data
+
+  def human_column_name(field)
+    if field.starts_with?('_')
+      report_template.human_field_name report.decode_field(field)
+    else
+      report_template.human_calculation_name field
+    end
+  end
 end

data/app/models/report_template.rb

@@ -18,11 +18,14 @@ class ReportTemplate < ActiveRecord::Base
   #
   # MODIFCIATIONS
   #
-  serialize :groupping
   serialize :fields
   serialize :calculations
   serialize :conditions
 
+  before_save do
+    fields.select!{|x| !x.blank?}
+  end
+
   #
   # METHODS
   #
@@ -53,4 +56,36 @@ class ReportTemplate < ActiveRecord::Base
       self.conditions[name]
     end
   end
+
+  def human_field_name(field)
+    report_builder.human_field_name field
+  end
+
+  def human_calculation_name(field)
+    report_builder.human_calculation_name field
+  end
+
+  def human_condition_name(field)
+    report_builder.human_condition_name field
+  end
+
+  def human_groupping_name
+    return nil if groupping.blank?
+    human_field_name groupping
+  end
+
+  def human_sorting_name
+    return nil if sorting.blank?
+    human_field_name sorting
+  end
+
+  def human_condition_values(condition)
+    return nil if conditions[condition].blank?
+
+    values = conditions[condition].map do |v|
+      report_builder.human_condition_values(condition)[v]
+    end
+
+    values.join(', ')
+  end
 end

data/app/reports/agents_report.rb

@@ -69,7 +69,7 @@ class AgentsReport < ReportBuilder::Base
 
   def calculations
     {
-      :quantity => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "calculations.quantity"').where(tables[:agent][:agent_id].not_eq nil) }
+      :quantity => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "quantity"').where(tables[:agent][:agent_id].not_eq nil) }
     }.with_indifferent_access
   end
 

data/app/reports/collections_report.rb

@@ -138,9 +138,9 @@ class CollectionsReport < ReportBuilder::Base
 
   def calculations
     {
-      :cash_sum              => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.cash_sum) AS "calculations.cash_sum"') },
-      :approved_payments_sum => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.approved_payments_sum) AS "calculations.approved_payments_sum"') },
-      :payments_sum          => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.payments_sum) AS "calculations.payments_sum"') }
+      :cash_sum              => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.cash_sum) AS "cash_sum"') },
+      :approved_payments_sum => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.approved_payments_sum) AS "approved_payments_sum"') },
+      :payments_sum          => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(collections.payments_sum) AS "payments_sum"') }
     }.with_indifferent_access
   end
 

data/app/reports/payments_report.rb

@@ -172,10 +172,10 @@ class PaymentsReport < ReportBuilder::Base
 
   def calculations
     {
-      :quantity   => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "calculations.quantity"') },
-      :enrolled   => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(enrolled_amount) AS "calculations.enrolled"') },
-      :paid       => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(paid_amount) AS "calculations.paid"') },
-      :commission => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(commission_amount) AS "calculations.commission"') }
+      :quantity   => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "quantity"') },
+      :enrolled   => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(enrolled_amount) AS "enrolled"') },
+      :paid       => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(paid_amount) AS "paid"') },
+      :commission => lambda{|q, t| t.groupping.blank? ? q : q.project('SUM(commission_amount) AS "commission"') }
     }.with_indifferent_access
   end
 

data/app/reports/terminals_report.rb

@@ -111,7 +111,7 @@ class TerminalsReport < ReportBuilder::Base
 
   def calculations
     {
-      :quantity => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "calculations.quantity"') }
+      :quantity => lambda{|q, t| t.groupping.blank? ? q : q.project('COUNT(*) AS "quantity"') }
     }.with_indifferent_access
   end
 

data/config/locales/smartkiosk.reports.ru.yml

@@ -7,8 +7,7 @@ ru:
             quantity: Количество
           conditions:
             agent:
-              agent_id:
-                title: Агент
+              agent_id: Агент
         collections:
           calculations:
             approved_payments_sum: Сумма проведенных платежей
@@ -22,19 +21,15 @@ ru:
             quantity: Количество
           conditions:
             payment:
-              state:
-                title: Состояние
-              payment_type:
-                title: Тип
-              provider_id:
-                title: Получатели
+              state: Состояние
+              payment_type: Тип
+              provider_id: Получатели
         terminals:
           calculations:
             quantity: Количество
           conditions:
             terminal:
-              condition:
-                title: Состояние
+              condition: Состояние
       kinds:
         # preprocessing: Предпроцессинг
         agents: Агенты

data/lib/report_builder.rb

@@ -46,7 +46,7 @@ module ReportBuilder
         'postgresql' => 'MIN'
       }[ActiveRecord::Base.configurations[Rails.env]['adapter']]
 
-      fields = template.fields.select{|x| !x.blank?}.each do |field|
+      fields = template.fields.each_with_index do |field, i|
         projection = arelize(field)
 
         if !aggregate.blank? && !template.groupping.blank?
@@ -55,7 +55,7 @@ module ReportBuilder
           )
         end
 
-        projection = projection.as("\"#{field}\"")
+        projection = projection.as("\"_#{i}\"")
         query = query.project(projection)
       end
 
@@ -84,5 +84,39 @@ module ReportBuilder
 
       query.to_sql
     end
+
+    def human_field_name(field)
+      model, name = field.split '.'
+      title       = []
+
+      title << I18n.t("activerecord.models.#{model}", :count => 1)
+      title << I18n.t("activerecord.attributes.#{model}.#{name}")
+
+      title.join(': ')
+    end
+
+    def human_calculation_name(field)
+      I18n.t "smartkiosk.reports.data.#{keyword}.calculations.#{field}"
+    end
+
+    def human_condition_name(field)
+      I18n.t "smartkiosk.reports.data.#{keyword}.conditions.#{field}"
+    end
+
+    def human_groupping_names
+      groupping.map{|x| [human_field_name(x), x]}
+    end
+
+    def human_groupping_field_names(groupping)
+      fields[groupping].map{|x| [human_field_name(x), x]}
+    end
+
+    def human_calculation_names
+      calculations.keys.map{|x| [human_calculation_name(x), x]}
+    end
+
+    def human_condition_values(condition)
+      conditions[condition].call().with_indifferent_access
+    end
   end
 end

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.11.6'
+    VERSION = '0.11.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,6 @@ files:
 - app/controllers/terminal_orders_controller.rb
 - app/controllers/terminal_pings_controller.rb
 - app/controllers/welcome_controller.rb
-- app/helpers/active_admin/report_templates_helper.rb
 - app/helpers/active_admin/views_helper.rb
 - app/helpers/application_helper.rb
 - app/mailers/.gitkeep
@@ -334,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4539088124566055437
+      hash: -3103762174964566922
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/helpers/active_admin/report_templates_helper.rb

@@ -1,56 +0,0 @@
-module ActiveAdmin::ReportTemplatesHelper
-  def localize_report_fields(data)
-    if data.is_a? Array
-      data.map do |x|
-        localize_report_entry x
-      end
-    else
-      localize_report_entry data
-    end
-  end
-
-  def localize_report_entry(entry)
-    model, name = entry.split '.'
-
-    title =  I18n.t("activerecord.models.#{model}", :count => 1) 
-    title += ' / '
-    title += I18n.t("activerecord.attributes.#{model}.#{name}")
-
-    [title, entry]
-  end
-
-  def localize_report_calculations(builder)
-    builder.calculations.keys.map do |x|
-      title = I18n.t "smartkiosk.reports.data.#{builder.keyword}.calculations.#{x}"
-      [title, x]
-    end
-  end
-
-  def localize_report_condition_title(builder, field)
-    I18n.t "smartkiosk.reports.data.#{builder.keyword}.conditions.#{field}.title"
-  end
-
-  def localize_report_condition_value(builder, field, value)
-    condition  = builder.conditions[field]
-    collection = if condition.is_a?(Array)
-      I18n.t "smartkiosk.reports.data.#{builder.keyword}.conditions.#{field}.values"
-    else
-      condition.call().with_indifferent_access
-    end
-
-    return value.is_a?(Array) ? value.map{|x| collection[x]}.join(', ') : collection[value]
-  end
-
-  def localize_report_conditions(builder, field)
-    condition = builder.conditions[field]
-
-    if condition.is_a?(Array)
-      return condition.map do |x|
-        title = I18n.t "smartkiosk.reports.data.#{builder.keyword}.conditions.#{field}.values.#{x}"
-        [title, x]
-      end
-    elsif condition.is_a?(Proc)
-      return condition.call().invert
-    end
-  end
-end