Added labor_budget virtual field and made that the Budget column. #1190

This commit is contained in:
Eric Davis committed 2008-06-09 15:31:57 -07:00
1 parent e691f4c2f0
commit 6c6f756de8
4 files changed
+17 -2

No files matched your search

+4 -2
View File
@@ -125,7 +125,7 @@ class DeliverablesController < ApplicationController
# Sorting orders
def sort_order
if %w(score spent progress).include?(session[@sort_name][:key])
if %w(score spent progress labor_budget).include?(session[@sort_name][:key])
return { }
else
return { :order => sort_clause }
@@ -134,7 +134,7 @@ class DeliverablesController < ApplicationController
# Sort +deliverables+ manually using the virtual fields
def sort_if_needed(deliverables)
if %w(score spent progress).include?(session[@sort_name][:key])
if %w(score spent progress labor_budget).include?(session[@sort_name][:key])
case session[@sort_name][:key]
when "score":
sorted = deliverables.sort {|a,b| a.score <=> b.score}
@@ -142,6 +142,8 @@ class DeliverablesController < ApplicationController
sorted = deliverables.sort {|a,b| a.spent <=> b.spent}
when "progress":
sorted = deliverables.sort {|a,b| a.progress <=> b.progress}
when "labor_budget":
sorted = deliverables.sort {|a,b| a.labor_budget <=> b.labor_budget}
end
return sorted if session[@sort_name][:order] == 'asc'