diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index acf99e41..07f12b93 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -1,5 +1,12 @@ class Oqs::HomeController < BaseOqsController def index + @queue_stations=OrderQueueStation.all + + # @queue_stations.each do |que| + # Contact.find(:all, :joins => ['left join sales s on s.customer_id = contacts.id'], :conditions => ["contact_type = 'Customer' AND name IS NOT NULL"],:group => ["contacts.id"]) + # AssignedOrderItem.find(:all, :conditions=>["order_queue_station_id=#{que.id}"], :group => ["order_queue_station_id"]) + # # AssignedOrderItem.where("order_queue_station_id = :que_id", {:que_id => que_id}).get + # end end def show end diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 35815331..1f449cbc 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -4,18 +4,27 @@ @@ -67,7 +76,7 @@ -
+
diff --git a/dump.rdb b/dump.rdb index 96c96478..b931754d 100644 Binary files a/dump.rdb and b/dump.rdb differ