Added counties form for ledgers

app/controllers/county_ledgers_controller.rb

@@ -0,0 +1,26 @@
+class CountyLedgersController < ApplicationController
+    def new
+        @county_ledger = CountyLedger.new
+        respond_to do |format|
+          format.html # new.html.erb
+          format.xml  { render :xml => @county_ledger }
+        end
+    end
+
+    def create
+        @county_ledger = CountyLedger.new(params[:county_ledger])
+        respond_to do |format|
+
+          if @county_ledger.save!
+              format.html { redirect_to(ledger_path(@county_ledger.ledger)) }
+              format.xml  { render :xml => @county_ledger} #, :status => :created, :location => @journal }
+          else   
+              format.html { render :action => "new" }
+              format.xml  { render :xml => @county_ledger.errors, :status => :unprocessable_entity }
+          end
+
+        end
+    end
+
+
+end

app/controllers/ledgers_controller.rb

@@ -36,7 +36,7 @@ def create
     respond_to do |format|
         if @ledger.save  
             format.json { render :json => @ledger.to_json(:include => {:unit => {}, :project => {} }) }
-            format.html { redirect_to @ledger.account, :notice => "Ledger created" }
+            format.html { redirect_to @ledger, :notice => "Ledger created" }
             format.xml { head :ok }
         else
 
@@ -62,7 +62,7 @@ def update
   def new
     @account = Account.find(params[:account_id])
     @ledger = Ledger.new(:account => @account)
-    @ledger.county_ledgers.build
+    #~ @ledger.county_ledgers.build
     # @ledger.address = Address.new
     respond_to do |format|
       #~ format.html { render :partial => "accounts/ledger_form", :locals => {:account => @account, :ledger => @ledger} }
@@ -73,14 +73,17 @@ def new
 
   def show
     respond_to do |format|
-      format.json { render :json => @ledger.to_json(:include => [:account,
-                                                                 :address,
-                                                                 :unit,
-                                                                 :project]
-                                                    )
-      }
+      #~ format.json { render :json => @ledger.to_json(:include => [:account,
+                                                                 #~ :address,
+                                                                 #~ :unit,
+                                                                 #~ :project]
+                                                    #~ )
+      #~ }
       @account = @ledger.account
-      format.html { render :partial => "form", :locals => {:account => @account, :ledger => @ledger} }
+      #~ format.html { render :partial => "form", :locals => {:account => @account, :ledger => @ledger} }
+        format.html
+        format.xml  { render :xml => @ledger, :status => :created, :location => @ledger }
+
     end
   end
 

app/helpers/county_ledger_helper.rb

@@ -0,0 +1,2 @@
+module CountyLedgerHelper
+end

app/models/ledger.rb

@@ -6,7 +6,7 @@ class Ledger < ActiveRecord::Base
   belongs_to :address, :dependent => :destroy
   has_many :paycheck_line_templates , :foreign_key => "employee_id"  
   has_many :county_ledgers
-  accepts_nested_attributes_for :county_ledgers, :allow_destroy => false
+  #~ accepts_nested_attributes_for :county_ledgers, :allow_destroy => false
   validates :number, :uniqueness => {:scope => [:account_id]},  :presence => true
 
   validates :name, :presence => true
@@ -44,5 +44,15 @@ def first_name
   def last_name
     self.name.split(' ',2)[1]
   end
+
+
+    def county_at_date date
+        if !self.county_ledgers.blank?
+            self.county_ledgers.where('"from" <= ? ', date).first.county 
+        else
+            []
+        end
+    end
+
 
 end

app/views/accounts/_ledgers.html.erb

@@ -8,6 +8,7 @@
   <h2><%= t(:ledger_accounts, :scope => :accounts) -%></h2>
   <table id="ledger_table">
     <tr>
+      <th></th>  
       <th><%= t(:number, :scope => :accounts) -%></th>
       <th><%= t(:name, :scope => :accounts) -%></th>
       <th><%= t(:id_number, :scope => :accounts) -%></th>
@@ -29,6 +30,10 @@
 
     <% @account.ledgers.each do |ledger| %>
     <tr class="ledger_item" id="ledger_id_<%= ledger.id %>">
+      <td>
+          <%=link_to t(:edit, :scope => :global),  edit_ledger_path(ledger) %>
+          <%=link_to t(:show, :scope => :global),  ledger_path(ledger) %>
+      </td>
       <td><%= ledger.number -%></td>
       <td><%= ledger.name -%></td>
       <td><%= ledger.id_number -%></td>

app/views/ledgers/_county_ledger_form.html.erb

@@ -0,0 +1,36 @@
+<table>
+    <tr>
+        <th>t(:county, :scope => :counties</th>
+        <th>t(:from, :scope => :counties</th>
+        <th></th>
+    </tr>
+    <% if !@ledger.county_ledgers.blank? %>
+
+    <% @ledger.county_ledgers.order('"from" asc').each do |cl| %>
+        <tr>
+
+                <td> <%= cl.county.name %></td>
+                <td><%= cl.from %></td>
+                <td> </td><%= %>
+<!--
+                link_to t(:destroy, :scope => :global), county_ledger_path, :confirm => 'Are you sure?', :method => :delete %></td>
+-->
+            <% end %>
+        </tr>
+    <% end %>
+        <tr>
+            <%= form_for ([CountyLedger.new]) do |county_ledger| %>
+                <%= county_ledger.hidden_field :ledger_id, :value => @ledger.id %>
+                <td>
+                    <%= county_ledger.select :county_id, County.all.collect {|p| [p.name, p.id]} %> 
+                </td>
+                <td>
+                    <%= county_ledger.text_field :from, :class=> :datepicker %>        
+                </td>
+                <td>
+                    <%= submit_tag t(:add_county, :scope => :conties ) %>
+                </td>
+
+            <% end %>  
+    </tr>
+</table>

app/views/ledgers/_form.html.erb

@@ -74,17 +74,6 @@
     <%= f.text_field :work_stop, :class => :datepicker  %>
   </p>
 
-  <p> 
-    <%= f.fields_for :county_ledgers do |county_ledger| %>
-
-      <%= county_ledger.label "county", t(:county, :scope => :accounts) -%>
-      <%= county_ledger.select :county_id, County.all.collect {|p| [p.name, p.id]} %> 
-
-      <%= county_ledger.label :from %>
-      <%= county_ledger.text_field :from, :class=> :datepicker %>        
-    <% end %>  
-  </p>  
-
   <p>
     <%= f.label :placement_top, t(:placement_top, :scope => :accounts) -%><br />
     <%= f.check_box :placement_top %>
@@ -122,3 +111,5 @@
   <%= submit_tag t(:add_ledger, :scope => :accounts) %>
 
 <% end %>
+
+

app/views/ledgers/show.html.erb

@@ -0,0 +1,36 @@
+<h1><%= t(:showing_ledger, :scope => :ledgers) %> <%= @ledger %></h1>
+
+<p>
+<%= @ledger.number %>
+</p>
+<p>
+<%= @ledger.name %>
+</p>
+<p>
+<%= @ledger.account %>
+</p>
+<p>
+<%= @ledger.email %>
+</p>
+<p>
+<%= @ledger.address.street1 %>
+</p>
+<p>
+<%= @ledger.mobile_number %>
+</p>
+<p>
+<%= @ledger.customer_number %>
+</p>
+<p>
+<%= @ledger.ledger_bank_number %>
+</p>
+<p>
+</p>
+
+<p>
+    <%= render :partial => "ledgers/county_ledger_form" %>
+</p>
+
+
+<%= link_to t(:edit, :scope => :global), edit_ledger_path(@ledger) %> |
+<%= link_to t(:back, :scope => :global), edit_account_path(@ledger.account) %>

test/functional/county_ledger_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class CountyLedgerControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

test/unit/helpers/county_ledger_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class CountyLedgerHelperTest < ActionView::TestCase
+end