From 8ce14f8c9963fb9826f90bd06d7ca2a0c0de9396 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Mar 2018 14:04:26 +0630 Subject: [PATCH] update queui chang --- app/assets/javascripts/OQS.js | 76 +++++-- .../channels/order_queue_station.js | 3 +- app/controllers/oqs/home_controller.rb | 20 +- app/views/oqs/home/index.html.erb | 204 ++++++++---------- .../oqs/home/index_quechange_backup.html.erb | 196 +++++++++++++++++ 5 files changed, 364 insertions(+), 135 deletions(-) mode change 100755 => 100644 app/views/oqs/home/index.html.erb create mode 100755 app/views/oqs/home/index_quechange_backup.html.erb diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index ec3db11f..2bbf07bb 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -31,30 +31,75 @@ $(document).on('turbolinks:load', function() { $(".oqs_append").addClass('hide') }); + $(".tables").on("click", function(){ + + var table_id = $(this).val(); + $('#table_id').val(table_id); + oqs_id = $("#oqs_id").val(); + if (table_id){ + var table = table_id + }else{ + var table = null + } + + if (oqs_id > 0) { + $(".oqs_click").removeClass('oqs_active'); + $(".queue_station").removeClass('queue_station_box'); + $("#completed").addClass('hide'); + $(".oqs_append").removeClass('hide'); + $("#oqs_active").addClass('oqs_active'); + $(".queue_station").addClass('queue_station_box'); + // oqs_id = $(this).find(".oqs-id").text(); + $("#oqs_active").attr('data-id',oqs_id); + var url = 'oqs/get_items/'+oqs_id; + + show_details(url,table); + }else{ + $("#completed").removeClass('hide') + $(".oqs_append").addClass('hide') + } + }); + $(".oqs_click").on("click", function(){ - $(".oqs_click").removeClass('oqs_active'); - $(".queue_station").removeClass('queue_station_box'); - $("#completed").addClass('hide'); - $(".oqs_append").removeClass('hide'); - $(this).addClass('oqs_active'); - $(".queue_station").addClass('queue_station_box'); - oqs_id = $(this).find(".oqs-id").text(); - console.log(oqs_id); - var url = 'oqs/get_items/'+oqs_id; - - show_details(url); + oqs_id = $(this).val(); + var table_id = $('#table_id').val(); + if (table_id){ + var table = table_id + }else{ + var table = null + } + + if (oqs_id > 0) { + $(".oqs_click").removeClass('oqs_active'); + $(".queue_station").removeClass('queue_station_box'); + $("#completed").addClass('hide'); + $(".oqs_append").removeClass('hide'); + $("#oqs_active").addClass('oqs_active'); + $(".queue_station").addClass('queue_station_box'); + // oqs_id = $(this).find(".oqs-id").text(); + $("#oqs_active").attr('data-id',oqs_id); + var url = 'oqs/get_items/'+oqs_id; + + show_details(url,table); + }else{ + $("#completed").removeClass('hide') + $(".oqs_append").addClass('hide') + } + }); //End Click - function show_details(url){ + function show_details(url,table_id){ var oqs_append = $('.oqs_append'); oqs_append.empty(); var filter = $('.filter').text(); + + console.log(table_id) //Start Ajax $.ajax({ type: "GET", url: url, - data: {'filter':filter}, + data: {'filter':filter,'table_id':table_id}, dataType: "json", success: function(data) { for(var field in data) { @@ -67,7 +112,8 @@ $(document).on('turbolinks:load', function() { } var date = new Date(data[field]["created_at"]); - var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + // var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + var show_date =date.getHours()+ ':' + date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM'); var set_menu_items = data[field]["set_menu_items"]; var set_instance_items = ""; if(set_menu_items!=null){ @@ -100,7 +146,7 @@ $(document).on('turbolinks:load', function() { +set_instance_items +'

' - +'

'+ options +'

' + +'

'+ options +'

' +'' +'Order at - ' diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index d2b502d4..c8b59231 100755 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -5,8 +5,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann disconnected: function() {}, - received: function(data) { - // console.log(data.order); + received: function(data) { var oqs_id = $('.oqs_active').attr('data-id'); items = data.order; for(var field in items) { diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 53a3e879..95c4d833 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -7,7 +7,8 @@ class Oqs::HomeController < BaseOqsController # @queue_items_details = queue_items_query(false) # Query for OQS with delivery status true - + @tables = DiningFacility.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') @filter = params[:filter] @@ -113,7 +114,11 @@ class Oqs::HomeController < BaseOqsController def get_items_by_oqs oqs_id = params[:id] filter = params[:filter] - items = queue_items_query(false,oqs_id,filter) + table_id = params[:table_id] + puts params + puts table_id + puts "sssssssssssss" + items = queue_items_query(false,oqs_id,filter,table_id) if !items.empty? items.each do |item| if !item.set_menu_items.nil? @@ -151,13 +156,20 @@ class Oqs::HomeController < BaseOqsController # Query for OQS with delivery status - def queue_items_query(status,oqs_id=nil,filter) + def queue_items_query(status,oqs_id=nil,filter,table_id) if oqs_id == nil oqs = '' else oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' " end + if table_id.to_i>0 + table = "and df.id = '#{table_id}' " + + 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, @@ -173,7 +185,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} ") + .where("assigned_order_items.delivery_status = #{status} AND assigned_order_items.created_at >= '#{Time.now.beginning_of_day.utc}' #{oqs} #{table}") query = query.where("df.name LIKE ? OR odt.order_id LIKE ? OR odt.item_name LIKE ? OR cus.name = '#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%",) .order("assigned_order_items.assigned_order_item_id desc") .group("odt.order_items_id") diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb old mode 100755 new mode 100644 index 33ee74b7..585f9968 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,137 +1,115 @@ -
-
+
+
- <%= form_tag oqs_root_path, :method => :get do %>
- - + +
-
- +
+ +
- +
- <% end %>
- - - - - - -
- - + + +
+
+
-
+
<% @queue_completed_item.each do |qid| %>
-
- <%if qid.type.present?%> - <%= qid.type %>-<%= qid.zone %> - <%else%> - - <%end%> - - - <%= qid.order_id %> -
-

- - <%= qid.item_name %> - [x - - <%= qid.qty %> - ] - <% if !qid.set_menu_items.nil? %> - <% qid.set_menu_items.each do |item_instance|%> -
- <%= item_instance %> - - <% end %> - <% end %> -

- -

<%= qid.options == "[]"? "" : qid.options %>

+
+ <%if qid.type.present?%> + <%= qid.type %>-<%= qid.zone %> + <%else%> + + <%end%> - - Order at - - - <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> -
- Order By - - <%= qid.item_order_by %> - + + <%= qid.order_id %> +
+

+ + <%= qid.item_name %> + [x + + <%= qid.qty %> + ] + <% if !qid.set_menu_items.nil? %> + <% qid.set_menu_items.each do |item_instance|%> +
+ <%= item_instance %> + + <% end %> + <% end %> +

+ +

<%= qid.options == "[]"? "" : qid.options %>

+ + + Order at - + + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> +
+ Order By - + <%= qid.item_order_by %> + + - - +
-
- <% - end - %> +
+ <% end %>
-
+
- - -
-
+
+
+
-
+ - - - + --> + +
- + -->
+
reply Back <% if ENV["SERVER_MODE"] != "cloud" %> +
+ +
+ <% end %> + + + + + + + +
+ + +
+
+ <% + @queue_completed_item.each do |qid| + %> +
+
+
+ <%if qid.type.present?%> + <%= qid.type %>-<%= qid.zone %> + <%else%> + + <%end%> + + + <%= qid.order_id %> +
+

+ + <%= qid.item_name %> + [x + + <%= qid.qty %> + ] + <% if !qid.set_menu_items.nil? %> + <% qid.set_menu_items.each do |item_instance|%> +
+ <%= item_instance %> + + <% end %> + <% end %> +

+ +

<%= qid.options == "[]"? "" : qid.options %>

+ + + Order at - + + <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> +
+ Order By - + <%= qid.item_order_by %> + + + + + + + +
+
+ <% + end + %> +
+
+ + + + +
+
+ +
+ + + +
+
+
+
ORDER DETAILS
+
+
+
+ + + + + + + + + + + + + + + + + + + +
Order ByOrder At
+
+
+ + + + + + + + + + +
ItemsQTY
+
+
+
+
+ + +
+ + reply Back + <% if ENV["SERVER_MODE"] != "cloud" %> + + <%end%> +
+ + +