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-09-10 18:39:10 +06:30
parent 430d5eaa7a
commit 8d1ca45f30
3 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/OQS.js
View File

@@ -69,13 +69,13 @@ $(document).on('turbolinks:load', function() {
oqs_id = $("#oqs_id").val();
status = $("#status").val();
if (table_id){
if (table_id.length>0){
var table = table_id
}else{
var table = null
}
if (oqs_id > 0 || status != "All" || tabel != null) {
if (oqs_id > 0 || status != "All" || table != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
@@ -85,7 +85,7 @@ $(document).on('turbolinks:load', function() {
// oqs_id = $(this).find(".oqs-id").text();
$("#oqs_active").attr('data-id',oqs_id);
var url = 'oqs/get_items/'+oqs_id;
console.log(table)
show_details(url,table,status);
}else{
$("#completed").removeClass('hide')
@@ -104,7 +104,7 @@ $(document).on('turbolinks:load', function() {
var table = null
}
if (oqs_id > 0 || status != "All" || tabel != null) {
if (oqs_id > 0 || status != "All" || table_id != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
@@ -133,7 +133,7 @@ $(document).on('turbolinks:load', function() {
var table = null
}
if (oqs_id > 0 || status != "All" || tabel != null) {
if (oqs_id > 0 || status != "All" || table != null) {
$(".oqs_click").removeClass('oqs_active');
$(".queue_station").removeClass('queue_station_box');
$("#completed").addClass('hide');
@@ -153,6 +153,7 @@ $(document).on('turbolinks:load', function() {
}); //End Click
function show_details(url,table_id,status){
console.log(table_id)
var oqs_append = $('.oqs_append');
oqs_append.empty();
var filter = $('.filter').text();

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

@@ -118,7 +118,8 @@ class Oqs::HomeController < BaseOqsController
status = params[:status]
items = queue_items_query(false,oqs_id,filter,table_id,status)
puts "items0"
puts items.to_json
if !items.empty?
items.each do |item|
if !item.set_menu_items.nil?
@@ -157,10 +158,10 @@ class Oqs::HomeController < BaseOqsController
# Query for OQS with delivery status
def queue_items_query(status,oqs_id=nil,filter,table_id,delivery_status)
if oqs_id == nil
oqs = ''
if oqs_id != "0"
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
else
oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
oqs = ''
end
if delivery_status == "All"
@@ -176,7 +177,7 @@ class Oqs::HomeController < BaseOqsController
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,

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

@@ -1,53 +1,40 @@
<!-- Column One -->
<div class="row clearfix" style="">
<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-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">All</option>
<% @queue_stations.each do |qsi| %>
<% if qsi.is_active != false %>
<% selected = ""%>
<%if qsi.id == current_user.order_queue_station_id %>
<% selected = 'selected=""'%>
<%end%>
<p class="hidden oqs-id"><%= qsi.id %></p>
<option value="<%= qsi.id %>" data-id="<%= qsi.id %>" <%=selected%> style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
<% end %>
<% end %>
</select>
</div>
<div class="form-group col-lg-2 col-md-2 col-sm-2">
<label class="label-align">Select Status</label>
<span class="hidden" id="oqs_active"></span>
<select class="form-control select status_click" name="status" id="status">
<option value="All">All</option>
<option value="New">New</option>
<option value="Processed">Processed</option>
</select>
</div>
<!--
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
<span class="hidden" id="room_id"></span>
<select class="form-control select rooms" name="table_id" id="rooms">
<option value="">Select Room</option>
<% @rooms.each do |table| %>
<option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
<% end %>
</select>
</div> -->
</div>
</div>
<div class="col-lg-8 col-md-8 col-sm-8">
<p class="hidden filter"><%= @filter %></p>
<div class="card">
<div class="card-block">
<div class="body p-l-10">
<div class="row clearfix">
<div class="form-group col-lg-4 col-md-4 col-sm-4">
<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">All</option>
<% @queue_stations.each do |qsi| %>
<% if qsi.is_active != false %>
<% selected = ""%>
<%if qsi.id == current_user.order_queue_station_id %>
<% selected = 'selected=""'%>
<%end%>
<p class="hidden oqs-id"><%= qsi.id %></p>
<option value="<%= qsi.id %>" data-id="<%= qsi.id %>" <%=selected%> style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
<% end %>
<% end %>
</select>
</div>
<div class="form-group col-lg-4 col-md-4 col-sm-4">
<label class="label-align">Select Status</label>
<span class="hidden" id="oqs_active"></span>
<select class="form-control select status_click" name="status" id="status">
<option value="All">All</option>
<option value="New">New</option>
<option value="Processed">Processed</option>
</select>
</div>
</div>
</div>
<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: ;">