Edit UI design and table in OQS
This commit is contained in:
San Wai Lwin
@@ -3,8 +3,8 @@
|
||||
<div class="col-lg-8 col-md-8 col-sm-8">
|
||||
<div class="body p-l-10">
|
||||
<div class="row clearfix">
|
||||
<div class="form-group col-md-2">
|
||||
<label>Select Station</label>
|
||||
<div class="form-group col-lg-2 col-md-2 col-sm-2">
|
||||
<label class="label-align">Select Station</label>
|
||||
<span class="hidden" id="oqs_active"></span>
|
||||
<select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
|
||||
<option value="0" data-id="0">Processed</option>
|
||||
@@ -35,67 +35,64 @@
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<div class="tab-content" id="custom-slimscroll" style="">
|
||||
<div class="tab-pane in active" id="completed" role="tabpanel">
|
||||
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">
|
||||
<%
|
||||
@queue_completed_item.each do |qid|
|
||||
%>
|
||||
<div class="card queue_station" data-order-no="<%= qid.order_id %>">
|
||||
<div class="card-block">
|
||||
<div class="row">
|
||||
<%if qid.type.present?%>
|
||||
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
|
||||
<%else%>
|
||||
<span class="col-md-4 order-zone-type font-13"></span>
|
||||
<%end%>
|
||||
<div class="tab-pane in active" id="completed" role="tabpanel">
|
||||
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;column-count: ;">
|
||||
<%
|
||||
@queue_completed_item.each do |qid|
|
||||
%>
|
||||
<div class="card queue_station" data-order-no="<%= qid.order_id %>">
|
||||
<div class="card-block">
|
||||
<div class="row">
|
||||
<%if qid.type.present?%>
|
||||
<span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
|
||||
<%else%>
|
||||
<span class="col-md-4 order-zone-type font-13"></span>
|
||||
<%end%>
|
||||
|
||||
<span class="order-zone hidden font-13"><%= qid.zone %></span>
|
||||
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
|
||||
</div>
|
||||
<p class="m-b--10">
|
||||
<span class="order-item font-16">
|
||||
<%= qid.item_name %>
|
||||
</span> [x
|
||||
<span class="order-qty">
|
||||
<%= qid.qty %>
|
||||
</span> ]
|
||||
<% if !qid.set_menu_items.nil? %>
|
||||
<% qid.set_menu_items.each do |item_instance|%>
|
||||
<br><span class="font-12">
|
||||
<%= item_instance %>
|
||||
<span class="order-zone hidden font-13"><%= qid.zone %></span>
|
||||
<span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
|
||||
</div>
|
||||
<p class="m-b--10">
|
||||
<span class="order-item font-16">
|
||||
<%= qid.item_name %>
|
||||
</span> [x
|
||||
<span class="order-qty">
|
||||
<%= qid.qty %>
|
||||
</span> ]
|
||||
<% if !qid.set_menu_items.nil? %>
|
||||
<% qid.set_menu_items.each do |item_instance|%>
|
||||
<br><span class="font-12">
|
||||
<%= item_instance %>
|
||||
</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
|
||||
|
||||
<span class="card-text">
|
||||
<span class="text-muted">Order at -
|
||||
<span class="order-at font-13">
|
||||
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
|
||||
</span> <br>
|
||||
Order By - <span class="order-by font-13">
|
||||
<%= qid.item_order_by %>
|
||||
</span>
|
||||
</span>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</p>
|
||||
|
||||
<br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
|
||||
|
||||
<span class="card-text">
|
||||
<span class="text-muted">Order at -
|
||||
<span class="order-at font-13">
|
||||
<%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
|
||||
</span> <br>
|
||||
Order By - <span class="order-by font-13">
|
||||
<%= qid.item_order_by %>
|
||||
</span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
<p class="hidden order-status">completed</p>
|
||||
<p class="hidden order-customer"><%= qid.customer_name %></p>
|
||||
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">
|
||||
</span>
|
||||
<p class="hidden order-status">completed</p>
|
||||
<p class="hidden order-customer"><%= qid.customer_name %></p>
|
||||
<p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Column Two -->
|
||||
@@ -142,8 +139,8 @@
|
||||
</div>
|
||||
-->
|
||||
<!-- Column Three -->
|
||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||
<p class="hidden filter"><%= @filter %></p>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 table-block">
|
||||
<p class="hidden filter"><%= @filter %></p>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<div class="tab-content" id="table-slimscroll" style="">
|
||||
@@ -154,15 +151,15 @@
|
||||
<div class="tab-content">
|
||||
<div id="table" class="tab-pane fade">
|
||||
<% @tables.each do |table| %>
|
||||
<div class="col-lg-4 col-md-4 col-sm-4" style="float: left;">
|
||||
<button class='btn btn-lg waves-effect green tables' style="width: 100%; text-align: center;" value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></button>
|
||||
<div class="col-lg-4 col-md-4 col-sm-4 table-float">
|
||||
<button class='btn btn-lg waves-effect green tables table-width' value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></button>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<div id="room" class="tab-pane fade">
|
||||
<% @rooms.each do |room| %>
|
||||
<div class="col-lg-4 col-md-4 col-sm-4" style="float: left;">
|
||||
<button class='btn btn-lg waves-effect green tables' style="width: 100%;" value="<%= room.id %>" data-id="<%= room.id %>"> <%= room.name %></button>
|
||||
<div class="col-lg-4 col-md-4 col-sm-4 table-float">
|
||||
<button class='btn btn-lg waves-effect green tables table-width' value="<%= room.id %>" data-id="<%= room.id %>"> <%= room.name %></button>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user