From d95e8f6a8205bf08d7de6d4f069acba9933cdba0 Mon Sep 17 00:00:00 2001 From: "Ira W. Snyder" Date: Thu, 22 Nov 2007 00:28:05 -0800 Subject: [PATCH 1/1] Add overdue handling to checked out items Signed-off-by: Ira W. Snyder --- app/controllers/coitem_controller.rb | 6 ++++++ app/models/coitem.rb | 4 ++++ app/views/coitem/list.rhtml | 2 ++ db/development.sqlite3 | Bin 9216 -> 9216 bytes 4 files changed, 12 insertions(+) diff --git a/app/controllers/coitem_controller.rb b/app/controllers/coitem_controller.rb index 224806d..73049f3 100644 --- a/app/controllers/coitem_controller.rb +++ b/app/controllers/coitem_controller.rb @@ -48,4 +48,10 @@ class CoitemController < ApplicationController Coitem.find(params[:id]).destroy redirect_to :action => 'list' end + + # Awesome, paginating overdue list, ordered by customer + def overdue + @coitem_pages, @coitems = paginate :coitems, :per_page => 50, :conditions => "due_date < DATE('NOW', 'LOCALTIME')", :order => "customer_id" + render :action => 'list' + end end diff --git a/app/models/coitem.rb b/app/models/coitem.rb index 8513465..513625a 100644 --- a/app/models/coitem.rb +++ b/app/models/coitem.rb @@ -17,6 +17,10 @@ class Coitem < ActiveRecord::Base validates_associated :customer validates_associated :rentable + def overdue? + return due_date < Time.now.to_date + end + protected def validate errors.add(:customer_id, "does not exist is the database") if customer.nil? diff --git a/app/views/coitem/list.rhtml b/app/views/coitem/list.rhtml index e506366..f6514cb 100644 --- a/app/views/coitem/list.rhtml +++ b/app/views/coitem/list.rhtml @@ -4,6 +4,7 @@ Customer Rentable + Overdue <% for column in Coitem.content_columns %> <%= column.human_name %> <% end %> @@ -13,6 +14,7 @@ <%=h coitem.customer.name %> <%=h coitem.rentable.title %> + <%=h coitem.overdue? %> <% for column in Coitem.content_columns %> <%=h coitem.send(column.name) %> <% end %> diff --git a/db/development.sqlite3 b/db/development.sqlite3 index 0e9ea78f87475648e7e39235f2c09fbcc7404d95..7673ae7b7a5d46d7124caef9a5c3c122d714a840 100644 GIT binary patch delta 57 zcmZqhXz-XI&3Iv>%zJLuWy~GSM>aNAFi-B_mt{1Wyo_I7n3auzkx@~Rk;%xwz+BhR NP}k66^9_Ct5da9V4~hT) delta 51 zcmZqhXz-XI&3JaB%zJLuBh1T~J2o~}Fi-B_mt{1Zyo_I-lZlOikx@~Rk!kV