update queui chang

app/controllers/oqs/home_controller.rb

@@ -7,7 +7,8 @@ class Oqs::HomeController < BaseOqsController
   	# @queue_items_details = queue_items_query(false)
 
     # Query for OQS with delivery status true
-    
+    @tables   = DiningFacility.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
 
     @filter = params[:filter]
 
@@ -113,7 +114,11 @@ class Oqs::HomeController < BaseOqsController
   def get_items_by_oqs
     oqs_id = params[:id]
     filter = params[:filter]
-    items  = queue_items_query(false,oqs_id,filter)
+    table_id = params[:table_id]
+    puts params
+    puts table_id
+    puts "sssssssssssss"
+    items  = queue_items_query(false,oqs_id,filter,table_id)
     if !items.empty?
       items.each do |item|
         if !item.set_menu_items.nil?
@@ -151,13 +156,20 @@ class Oqs::HomeController < BaseOqsController
 
 
   # Query for OQS with delivery status
-  def queue_items_query(status,oqs_id=nil,filter) 
+  def queue_items_query(status,oqs_id=nil,filter,table_id) 
     if oqs_id == nil
        oqs = ''
     else
       oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
 
+    if table_id.to_i>0
+       table = "and df.id = '#{table_id}' "
+       
+    else
+     table = ''
+    end
+
     query = AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, 
                               oqs.id as station_id, oqs.station_name, 
                               oqs.is_active, oqpz.zone_id, 
@@ -173,7 +185,7 @@ class Oqs::HomeController < BaseOqsController
               left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
               left join bookings as bk on bk.booking_id = bo.booking_id
               left join dining_facilities as df on df.id = bk.dining_facility_id")
-    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ")
+    .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}")
     query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",)
     .order("assigned_order_items.assigned_order_item_id desc")
     .group("odt.order_items_id")