jav.diff

From 332dd37c4fe49ec64341492bf4c377714b30c87f Mon Sep 17 00:00:00 2001
From: Jbarcena<javierbuilder@gmail.com>
Date: Wed, 4 Mar 2009 14:17:51 +1100
Subject: [PATCH 1/3] Added code to model - and some seed data

---
 app/models/account.rb                        |   78 ++++++++++++++++++--------
 config/database.yml                          |    8 ---
 db/migrate/20090219134958_create_accounts.rb |    5 ++
 db/migrate/20090304020429_seed_accounts.rb   |   63 +++++++++++++++++++++
 db/schema.rb                                 |    5 ++
 5 files changed, 127 insertions(+), 32 deletions(-)
 create mode 100644 db/migrate/20090304020429_seed_accounts.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index eda5e6d..6012286 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,58 +1,88 @@
 class Account < ActiveRecord::Base
+  belongs_to :parent, :class_name => 'Account'
+  has_many :children, :class_name => 'Account', :foreign_key => :parent_id, :dependent => :destroy, :order => :code
+
+  named_scope :tops, :conditions => 'parent_id IS NULL', :order => :code
+
   has_many :unit_transactions
   validates_presence_of :name
-    validates_uniqueness_of :name
-    
- cattr_reader :per_page
-    @@per_page = 2
+  validates_uniqueness_of :name
+
+  validates_uniqueness_of :code
 
+  before_save :check_code
 
+  @@padding = { 1 => nil, 2 => nil, 3 => nil, 4 => nil, 5 => 2, 6 => 4 }
+
+  cattr_reader :per_page
+  @@per_page = 2
 
   def history(since = 7.days.ago)
     UnitTransaction.find(:all,
-      :conditions => ['from_id = ? OR to_id = ? AND created_at > ?', self.id, self.id, since],
-      :order => 'created_at DESC')
+                         :conditions => ['from_id = ? OR to_id = ? AND created_at > ?', self.id, self.id, since],
+                         :order => 'created_at DESC')
   end     
-  
-  
- 
- ##Calculos  
-  
+
+  ##Calculos  
+
   def ingresos 
-  
   end
-  
+
   def egresos
-  
   end
-  
-  
+
   def base
     @base ||= unit_transactions.inject(0) {|total, il| total += il.total}
     @base = 0.0 if @base.nil?
     @base
   end
-  
-  
+
+
   # total_crub
   #
   def total_crub
     base * (crub / 100.0)
   end
-  
+
   # nqn
   #
   def total_nqn
     base * (nqn / 100.0)
   end
-  
+
   # total
   #
   def total 
     base - total_crub + total_nqn
   end
-  
-  
-  
-  
+
+  def level
+    self.code.present? ? self.code.count('.') + 1 : self.parent.code.count('.') + 2
+  end
+
+  def pad(s)
+    if @@padding[self.level].nil?
+      s.to_s
+    else
+      sprintf( "%0#{@@padding[self.level]}d", s)
+    end
+  end
+
+  def parent_prefix
+    self.parent.present? ? self.parent.code + '.' : ''
+  end
+
+  def check_code    # make sure we have a sensible code, and if not create one
+    # a code is sensible if it contains our parent's code plus a dot and a
+    # string
+    if self.code.blank? || self.code !~ /^#{self.parent_prefix}\d+$/
+      self.create_code
+    end
+  end
+
+  def create_code
+    _coll = self.parent.present? ? self.parent.children : self.class.tops
+    _code = self.pad( _coll.empty? ? 1 : _coll[-1].code.sub(/.*\./,'').to_i + 1 )
+    self.code = self.parent_prefix + _code
+  end
 end
diff --git a/config/database.yml b/config/database.yml
index 4c3f2f9..025d62a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,14 +6,6 @@ development:
   pool: 5
   timeout: 5000
 
-development:
-  adapter: mysql
-  database: account_development
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
-
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
diff --git a/db/migrate/20090219134958_create_accounts.rb b/db/migrate/20090219134958_create_accounts.rb
index e9550b4..4eea59c 100644
--- a/db/migrate/20090219134958_create_accounts.rb
+++ b/db/migrate/20090219134958_create_accounts.rb
@@ -3,9 +3,14 @@ class CreateAccounts < ActiveRecord::Migration
     create_table :accounts do |t|
       t.string :name
       t.decimal :balance, :precision => 8, :scale => 2, :default => 0
+      t.integer :parent_id
+      t.string :code, :null => false
 
       t.timestamps
     end
+
+    add_index :accounts, :code, :unique => true
+    add_index :accounts, :parent_id
   end
 
   def self.down
diff --git a/db/migrate/20090304020429_seed_accounts.rb b/db/migrate/20090304020429_seed_accounts.rb
new file mode 100644
index 0000000..f4de654
--- /dev/null
+++ b/db/migrate/20090304020429_seed_accounts.rb
@@ -0,0 +1,63 @@
+class SeedAccounts < ActiveRecord::Migration
+  def self.up
+    [
+      { :code => '1', :name => 'ACTIVO' },
+      { :code => '2', :name => 'PASIVO' },
+      { :code => '3', :name => 'PATRIM. NETO' },
+      { :code => '4', :name => 'RESULTADOS' },
+      { :code => '5', :name => 'CTAS. DE ORDEN' }
+    ].each {|r|
+      Account.create(r)
+    }
+
+    p1 = Account.find_by_code('1')
+    [
+      { :name => 'ACTIVO CORRIENTE' },
+      { :name => 'ACTIVO NO CORRIENTE' },
+    ].each {|r|
+      p1.children.create(r)
+    }
+
+    p2 = Account.find_by_code('2')
+    [
+      { :name => 'PASIVO CORRIENTE' },
+      { :name => 'PASIVO NO CORRIENTE' }
+    ].each {|r|
+      p2.children.create(r)
+    }
+
+    p11 = Account.find_by_code('1.1')
+    [
+      { :name => 'CAJA Y BANCOS' },
+      { :name => 'INVERSIONES CORRIENTES' },
+      { :name => 'CREDITOS' },
+      { :name => 'BIENES DE CAMBIO' }
+    ].each {|r|
+      p11.children.create(r)
+    }
+
+    p111 = Account.find_by_code('1.1.1')
+    [
+      { :name => 'CAJA' },
+      { :name => 'BANCOS EN MONEDA NACIONAL' },
+      { :name => 'BANCOS EN MONEDA EXTRANJERA' }
+    ].each {|r|
+      p111.children.create(r)
+    }
+
+    p1111 = Account.find_by_code('1.1.1.1')
+    [
+      { :name => 'CAJA EN MONEDA NACIONAL' },
+      { :name => 'FONDO FIJO' },
+      { :name => 'CAJA EN MONEDA EXTRANJERA' }
+    ].each {|r|
+      p1111.children.create(r)
+    }
+
+  end
+
+  def self.down
+    Account.delete_all
+  end
+end
+
diff --git a/db/schema.rb b/db/schema.rb
index 890083d..ad2419f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,10 +14,15 @@ ActiveRecord::Schema.define(:version => 20090226110242) do
   create_table "accounts", :force => true do |t|
     t.string   "name"
     t.decimal  "balance",    :precision => 8, :scale => 2, :default => 0.0
+    t.integer  "parent_id"
+    t.string   "code",                                                      :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  add_index "accounts", ["code"], :name => "index_accounts_on_code", :unique => true
+  add_index "accounts", ["parent_id"], :name => "index_accounts_on_parent_id"
+
   create_table "departamentos", :force => true do |t|
     t.string   "nombre"
     t.datetime "created_at"
-- 
1.6.1


From 8f2a3153e3444c116ddf8e4423241ed5f8f5f330 Mon Sep 17 00:00:00 2001
From: Jason King <jk@silentcow.com>
Date: Wed, 4 Mar 2009 14:27:27 +1100
Subject: [PATCH 2/3] Adding the code (and order) into the view

---
 app/controllers/accounts_controller.rb |    7 +------
 app/views/accounts/index.html.erb      |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index e2414d2..27e1e97 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -18,12 +18,7 @@ class AccountsController < ApplicationController
   end
 
   def index
-   
-    @accounts = Account.find(:all)
-    #@accounts = Account.paginate(:order => 'created_at DESC',
-#:per_page => 20,
-#:page => params[:page])
-        
+    @accounts = Account.all( :order => :code )
   end
 
   def list
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
index 5a9370d..ebb4bd3 100644
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -21,7 +21,7 @@
 	<% for account in @accounts %>
 
 		<tr class="<%= cycle('even', 'odd') %>">
-			<td><%= link_to account.name, account_path(account) %></td> 
+      <td><%= link_to "#{account.code} &nbsp;#{account.name}", account_path(account) %></td> 
 	
 			<td><span class="green"><%=  account.balance %>$</span></td>
 			<td> <%= link_to 'Destroy', account_path(account), :confirm => 'Are you sure?', :method => :delete %></td> 
-- 
1.6.1


From 7469f7e3bd45d3a7a4f8ef75fb91cc74e6367bfb Mon Sep 17 00:00:00 2001
From: Jason King <jk@silentcow.com>
Date: Wed, 4 Mar 2009 14:33:41 +1100
Subject: [PATCH 3/3] Adding parents to new accounts

---
 app/controllers/accounts_controller.rb |    2 +-
 app/models/account.rb                  |    3 ++-
 app/views/accounts/new.html.erb        |    4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 27e1e97..f76445f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
 
 
   def new
-  @account = Account.new
+    @account = Account.new
   end
   
   
diff --git a/app/models/account.rb b/app/models/account.rb
index 6012286..88c8912 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -57,7 +57,8 @@ class Account < ActiveRecord::Base
   end
 
   def level
-    self.code.present? ? self.code.count('.') + 1 : self.parent.code.count('.') + 2
+    return 1 unless self.parent
+    self.code.present? ? self.code.count('.') + 1 : self.parent.level + 1
   end
 
   def pad(s)
diff --git a/app/views/accounts/new.html.erb b/app/views/accounts/new.html.erb
index dc5fc9e..37b00a5 100644
--- a/app/views/accounts/new.html.erb
+++ b/app/views/accounts/new.html.erb
@@ -5,6 +5,10 @@
   <%= f.error_messages %>
 
   <p>
+    <%= f.label :parent_id %><br />
+    <%= f.collection_select :parent_id, Account.all(:order => :code), :id, :code, :include_blank => true %>
+  </p>
+  <p>
     <%= f.label :name %><br />
     <%= f.text_field :name %>
   </p>
-- 
1.6.1