has_accounts 0.7.1 → 0.8.0

data/app/models/account.rb

@@ -18,29 +18,14 @@ class Account < ActiveRecord::Base
   belongs_to :account_type
 
   def is_asset_account?
-    [1, 2, 5].include? account_type_id
+    Account.by_type(['current_assets', 'capital_assets', 'costs']).exists?(self)
   end
   
   def is_liability_account?
-    [3, 4, 6].include? account_type_id
+    !is_asset_account?
   end
 
-  scope :current_assets, where('account_type_id = 1') do
-    include AccountScopeExtension
-  end
-  scope :capital_assets, where('account_type_id = 2') do
-    include AccountScopeExtension
-  end
-  scope :outside_capital, where('account_type_id = 3') do
-    include AccountScopeExtension
-  end
-  scope :equity_capital, where('account_type_id = 4') do
-    include AccountScopeExtension
-  end
-  scope :expenses, where('account_type_id = 5') do
-    include AccountScopeExtension
-  end
-  scope :earnings, where('account_type_id = 6') do
+  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value)} do
     include AccountScopeExtension
   end
 

data/app/models/account.rb~

@@ -18,29 +18,14 @@ class Account < ActiveRecord::Base
   belongs_to :account_type
 
   def is_asset_account?
-    [1, 2, 5].include? account_type_id
+    AccountType.by_type(['current_assets', 'capital_assets', 'costs']).include? account_type
   end
   
   def is_liability_account?
-    [3, 4, 6].include? account_type_id
+    !is_asset_account?
   end
 
-  scope :current_assets, where('account_type_id = 1') do
-    include AccountScopeExtension
-  end
-  scope :capital_assets, where('account_type_id = 2') do
-    include AccountScopeExtension
-  end
-  scope :outside_capital, where('account_type_id = 3') do
-    include AccountScopeExtension
-  end
-  scope :equity_capital, where('account_type_id = 4') do
-    include AccountScopeExtension
-  end
-  scope :expenses, where('account_type_id = 5') do
-    include AccountScopeExtension
-  end
-  scope :earnings, where('account_type_id = 6') do
+  scope :by_type, lambda {|value| includes(:account_type).where('account_types.name' => value.underscore)} do
     include AccountScopeExtension
   end
 
@@ -83,8 +68,16 @@ class Account < ActiveRecord::Base
           }]
         end
       elsif
-        # TODO support inclusive param
-        condition = {:value_date => selector}
+        if selector.first == selector.last
+          condition = ["date(value_date) = :value_date", {
+            :value_date => selector.first
+          }]
+        else
+          condition = ["date(value_date) BETWEEN :first_value_date AND :latest_value_date", {
+            :first_value_date => selector.first,
+            :latest_value_date => selector.last
+          }]
+        end
       end
     else
       if selector.is_a? Booking
@@ -93,7 +86,7 @@ class Account < ActiveRecord::Base
         condition = ["(value_date < :value_date) OR (date(value_date) = :value_date AND id <#{equality} :id)", {:value_date => selector.value_date, :id => selector.id}]
       else
         equality = "=" if inclusive
-        condition = ["value_date <#{equality} ?", selector]
+        condition = ["date(value_date) <#{equality} ?", selector]
       end
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: 
 dependencies: []