git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update oqs

Browse Source
This commit is contained in:
Aung Myo
2018-02-07 10:51:49 +06:30
parent 4440f16559
commit 0517d66d48
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/controllers/oqs/home_controller.rb
View File

@@ -11,30 +11,30 @@ class Oqs::HomeController < BaseOqsController
@filter = params[:filter]
@queue_stations = queue_items_count_query(false,@filter)
@queue_stations = OrderQueueStation.all
@queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty?
@queue_completed_item.each do |queue_item|
if !queue_item.set_menu_items.nil?
instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
arr_instance_item_sets = Array.new
instance_item_sets.each do |instance_item|
item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
arr_instance_item_sets.push(item_instance_name)
end
queue_item.set_menu_items = arr_instance_item_sets
end
end
end
# if !@filter.nil?
# @count = queue_items_count_query(false,@filter)
# @count.each do |count|
# end
# if !@queue_completed_item.empty?
# @queue_completed_item.each do |queue_item|
# if !queue_item.set_menu_items.nil?
# instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
# arr_instance_item_sets = Array.new
# instance_item_sets.each do |instance_item|
# item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
# arr_instance_item_sets.push(item_instance_name)
# end
# queue_item.set_menu_items = arr_instance_item_sets
# end
# end
# end
if !@filter.nil?
@count = queue_items_count_query(false,@filter)
#@count.each do |count|
#end
end
# @queue_stations_items=Array.new
# Calculate Count for each station tab
@@ -211,12 +211,9 @@ class Oqs::HomeController < BaseOqsController
# end
def queue_items_count_query(status,filter)
query = OrderQueueStation.select("order_queue_stations.is_active as is_active,
order_queue_stations.id as station_id,
order_queue_stations.station_name as station_name,
order_queue_stations.auto_print as auto_print,
order_queue_stations.id as id,
count(odt.item_code) as total")
# query = OrderQueueStation.all
query = OrderQueueStation.select("order_queue_stations.id as station_id,
(case when (count(odt.item_code)>0) then count(odt.item_code) else 0 end) as total")
.joins(" left join assigned_order_items as aoi on aoi.order_queue_station_id= order_queue_stations.id
left join orders as od ON od.order_id = aoi.order_id
left join order_items as odt ON odt.item_instance_code = aoi.instance_code AND odt.order_id = aoi.order_id

17
app/views/oqs/home/index.html.erb
View File

@@ -36,10 +36,19 @@
<p class="hidden oqs-id"><%= qsi.id %></p>
<a class="nav-link" data-id="<%= qsi.id %>" data-toggle="tab" href="" role="tab" <%= status %>>
<%= qsi.station_name %>
<span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>" id="completed_count">
<!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>"> --> <%= qsi.total %>
</span>
<% if @filter.nil? %>
<span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>" id="completed_count">
<!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>
</span>
<%else%>
<span class="label-count badge bg-blue-grey" data-id="<%= qsi.id %>">
<% @count.each do |c|%>
<% if qsi.id == c.station_id %>
<%= c.total %>
<%end %>
<%end %>
</span>
<%end%>
<% if qsi.auto_print %>
<span>(ap)</span>
<% end %>