From e90d4d59ee4a1def7a97b5c2dcc665cb59db4a64 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 14 Dec 2017 17:08:08 +0630 Subject: [PATCH] checkin --- app/assets/javascripts/channels/checkin.js | 37 ++++++++++------------ app/jobs/checkin_job.rb | 4 ++- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/channels/checkin.js b/app/assets/javascripts/channels/checkin.js index 9bd51bdf..1d948d1b 100644 --- a/app/assets/javascripts/channels/checkin.js +++ b/app/assets/javascripts/channels/checkin.js @@ -5,26 +5,23 @@ App.order = App.cable.subscriptions.create('CheckinChannel', { disconnected: function() {}, - received: function(data) { - if((data.table != undefined) && (data.table.length > 0)){ - $.each(data.table,function(key,value){ - console.log(value.table_id); - if($('.table_'+value.table_id).hasClass('blue')){ - $('.table_'+value.table_id).removeClass('blue'); - $('.table_'+value.table_id).addClass('orange'); - } - else if($('.table_'+value.table_id).hasClass('red')){ - $('.table_'+value.table_id).removeClass('red'); - $('.table_'+value.table_id).addClass('orange'); - } - else { - $('.table_'+value.table_id).removeClass('green'); - $('.table_'+value.table_id).addClass('orange'); - } - $('.new_text_'+value.table_id).removeClass('hide'); - }); - - } + received: function(data) { + $.each(data.table,function(key,value){ + // console.log(value.table_id); + if($('.table_'+value.table_id).hasClass('blue')){ + $('.table_'+value.table_id).removeClass('blue'); + $('.table_'+value.table_id).addClass('orange'); + } + else if($('.table_'+value.table_id).hasClass('red')){ + $('.table_'+value.table_id).removeClass('red'); + $('.table_'+value.table_id).addClass('orange'); + } + else { + $('.table_'+value.table_id).removeClass('green'); + $('.table_'+value.table_id).addClass('orange'); + } + $('.new_text_'+value.table_id).removeClass('hide'); + }); } }); diff --git a/app/jobs/checkin_job.rb b/app/jobs/checkin_job.rb index 3a0d329f..7cdb500c 100644 --- a/app/jobs/checkin_job.rb +++ b/app/jobs/checkin_job.rb @@ -3,7 +3,9 @@ class CheckinJob < ApplicationJob def perform() table = DiningFacility.get_checkin_booking - ActionCable.server.broadcast "checkin_channel",table: table + if table.length > 0 + ActionCable.server.broadcast "checkin_channel",table: table + end end