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

oqs item count fixed

Browse Source
This commit is contained in:
Yan
2017-06-03 13:25:23 +06:30
parent 03ae60d2e6
commit aa36c679ab
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,22 @@
class Oqs::HomeController < BaseOqsController
def index
@queue_stations=OrderQueueStation.all
queue_stations=OrderQueueStation.all
@queue_items_details = queue_items_query('false')
@queue_items_details = queue_items_query(0)
@queue_completed_item = queue_items_query('true')
@queue_completed_item = queue_items_query(1)
@queue_stations_items=Array.new
# Calculate Count for each station tab
@queue_stations.each do |que|
queue_stations.each do |que|
i=0
@queue_items_details.each do |qid|
if qid.station_name == que.station_name
i+=1
@queue_stations_items.push({:station_name => que.station_name ,:item_count => i })
break
if qid.station_name == que.station_name
i=i+1
end
end
end
@queue_stations_items.push({:station_name => que.station_name, :is_active => que.is_active ,:item_count => i })
end
@queue_stations_items
@@ -43,8 +42,8 @@ class Oqs::HomeController < BaseOqsController
left join orders as od ON od.id = assigned_order_items.order_id
left join order_items as odt ON odt.item_code = assigned_order_items.item_code
left join customers as cus ON cus.id = od.customer_id")
.where('assigned_order_items.delivery_status=' + status)
.group('assigned_order_items.id')
.where("assigned_order_items.delivery_status = #{status}")
.group("assigned_order_items.id")
.order("odt.item_name DESC")
end
end

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

@@ -12,25 +12,17 @@
<%
# For Tab Disable for Station is inactive
status=""
@queue_stations.each do |que|
if que.is_active == false
@queue_stations_items.each do |qsi|
if qsi[:is_active] == false
status="disabled"
end
%>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href=<%= '#' + que.station_name.gsub(' ', '_') %> role="tab" <%= status %>>
<%= que.station_name %>
<%
@queue_stations_items.each do |qsi|
if qsi[:station_name] == que.station_name
%>
<span class="badge badge-pill badge-default" id=<%= que.station_name.gsub(' ', '_') + '_count' %>>
<a class="nav-link" data-toggle="tab" href=<%= '#' + qsi[:station_name].gsub(' ', '_') %> role="tab" <%= status %>>
<%= qsi[:station_name] %>
<span class="badge badge-pill badge-default" id=<%= qsi[:station_name].gsub(' ', '_') + '_count' %>>
<%= qsi[:item_count] %>
</span>
<%
end
end
%>
</span>
</a>
</li>
<% end %>
@@ -84,15 +76,15 @@
<!-- Order Item for Queue Station -->
<%
@queue_stations.each do |que|
@queue_stations_items.each do |qsi|
%>
<!-- Generated Pane -->
<div class="tab-pane" id=<%= que.station_name.gsub(' ', '_') %> role="tabpanel">
<div class="tab-pane" id=<%= qsi[:station_name].gsub(' ', '_') %> role="tabpanel">
<!--- Order Items -->
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<%
@queue_items_details.each do |qid|
if qid.station_name == que.station_name
if qid.station_name == qsi[:station_name]
%>
<div class="card queue_station">
<div class="card-block">