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
2017-08-11 12:15:30 +06:30
parent 9eaf04778c d32fbf18e0
commit 5684d5d0c7
23 changed files with 345 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<div class="col-lg-8 col-md-8 col-sm-8">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
<li class="nav-item nav-completed">
<a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
</li>
@@ -17,11 +17,12 @@
<p class="hidden oqs-id"><%= qsi.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab" <%= status %>>
<%= qsi.station_name %>
<span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count %>
<span class="badge badge-pill badge-default" id=""><%= qsi.assigned_order_items.count(:delivery_status) %>
</span>
<% if qsi.auto_print %>
<span>(ap)</span>
<% end %>
<% end %>
<%= qsi.assigned_order_items.where("delivery_status=0").count %>
</a>
</li>
<% end %>
@@ -77,13 +78,11 @@
<!-- Order Item for Queue Station -->
<!--- Order Items -->
<div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">
<!--- end of Items-->
</div>
<!--- Order Items -->
<div class="card-columns oqs_append" style="padding-top:10px; column-gap: 1.2rem;">
</div>
<!--- end of Items-->
</div>
</div>
@@ -144,4 +143,3 @@
</div>
</div>