From 16346e3529ca5bace44c673a27962e829ec559f8 Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benni@dresdener27.de>
Date: Wed, 12 Aug 2009 13:09:10 +0200
Subject: [PATCH] Added note to deliveries. Closes #34

---
 app/views/deliveries/_form.html.haml                | 13 +++++++++----
 app/views/deliveries/index.html.haml                |  2 ++
 app/views/deliveries/show.html.haml                 |  3 +++
 db/migrate/20090812110010_add_note_to_deliveries.rb |  9 +++++++++
 db/schema.rb                                        |  4 +++-
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20090812110010_add_note_to_deliveries.rb

diff --git a/app/views/deliveries/_form.html.haml b/app/views/deliveries/_form.html.haml
index 39aa3007..28eebf1e 100644
--- a/app/views/deliveries/_form.html.haml
+++ b/app/views/deliveries/_form.html.haml
@@ -5,10 +5,7 @@
     .column_content
       = f.error_messages
       = f.hidden_field :supplier_id
-      %p
-        %b= f.label :delivered_on
-        = f.date_select :delivered_on
-      %h2 Lagerartikel des Lieferanten
+      %b Lagerartikel des Lieferanten
       #stock_changes
         - f.fields_for :stock_changes do |stock_change_form|
           %p
@@ -19,6 +16,14 @@
             = stock_change_form.check_box :_delete
       %p
         = remote_link_to "Lagerartikel hinzufügen", :url => {:action => 'add_stock_change', :supplier_id => @supplier.id}
+      %hr/
+      %p
+        %b= f.label :delivered_on, "Lieferdatum"
+        = f.date_select :delivered_on
+      %p
+        %b= f.label :note, "Notiz"
+        %br/
+        = f.text_area :note, :size => "35x8"
       %p
         = f.submit "Lieferung speichern"
 
diff --git a/app/views/deliveries/index.html.haml b/app/views/deliveries/index.html.haml
index e8b615c3..28a8e648 100644
--- a/app/views/deliveries/index.html.haml
+++ b/app/views/deliveries/index.html.haml
@@ -5,6 +5,7 @@
     %tr
       %th Geliefert am
       %th Rechnungsbetrag
+      %th Notiz
       %th
       %th
       %th
@@ -13,6 +14,7 @@
       %tr
         %td=h delivery.delivered_on
         %td= link_to_invoice(delivery)
+        %td= truncate delivery.note
         %td= link_to 'Anzeigen', [@supplier, delivery]
         %td= link_to 'Bearbeiten', edit_supplier_delivery_path(@supplier,delivery)
         %td= link_to 'Löschen', [@supplier,delivery], :confirm => 'Are you sure?', :method => :delete
diff --git a/app/views/deliveries/show.html.haml b/app/views/deliveries/show.html.haml
index f8da7d5c..c46323f3 100644
--- a/app/views/deliveries/show.html.haml
+++ b/app/views/deliveries/show.html.haml
@@ -13,6 +13,9 @@
   %p
     %b bereinigter Rechnungsbetrag:
     = number_to_currency @delivery.invoice.net_amount
+%p
+  %b Notiz:
+  = simple_format @delivery.note
 
 %h2 Artikel
 %table.list{:style => "width:30em"}
diff --git a/db/migrate/20090812110010_add_note_to_deliveries.rb b/db/migrate/20090812110010_add_note_to_deliveries.rb
new file mode 100644
index 00000000..7aae0cc4
--- /dev/null
+++ b/db/migrate/20090812110010_add_note_to_deliveries.rb
@@ -0,0 +1,9 @@
+class AddNoteToDeliveries < ActiveRecord::Migration
+  def self.up
+    add_column :deliveries, :note, :text
+  end
+
+  def self.down
+    remove_column :deliveries, :note
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b56e81fc..83a24558 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090731132547) do
+ActiveRecord::Schema.define(:version => 20090812110010) do
 
   create_table "article_categories", :force => true do |t|
     t.string "name",        :default => "", :null => false
@@ -75,6 +75,7 @@ ActiveRecord::Schema.define(:version => 20090731132547) do
     t.integer  "supplier_id"
     t.date     "delivered_on"
     t.datetime "created_at"
+    t.text     "note"
   end
 
   create_table "financial_transactions", :force => true do |t|
@@ -261,6 +262,7 @@ ActiveRecord::Schema.define(:version => 20090731132547) do
     t.datetime "created_on",                        :null => false
     t.datetime "updated_on",                        :null => false
     t.integer  "required_users", :default => 1
+    t.boolean  "weekly"
   end
 
   add_index "tasks", ["due_date"], :name => "index_tasks_on_due_date"