pull origin master

app/assets/javascripts/OQS.js

@@ -18,23 +18,23 @@
 //= require cable
 
 $(document).ready(function(){
-	
-	// auto refresh every 10 seconds
-	// setTimeout(function(){
-	//    window.location.reload(1);
-	// }, 10000);
+
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
     });
 
     $(".oqs_click").on("click", function(){
-       $("#completed").addClass('hide')
-       $(".oqs_append").removeClass('hide')
-       
+       $(".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');
        var oqs_id = $(this).find(".oqs-id").text();
        var url    = 'oqs/get_items/'+oqs_id;
-       show_details(url); 
+      
+       show_details(url);
 
     }); //End Click
  
@@ -52,7 +52,7 @@ $(document).ready(function(){
 	        for(var field in data) {
 	          var price = parseFloat(data[field].price).toFixed(2);
 
-	          if (data[field]["options"] == "[]") {
+	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
 	           var options = "";
 	          }else{
 	           var options = data.options;
@@ -61,7 +61,7 @@ $(document).ready(function(){
 	          var date = new Date(data[field]["created_at"]); 
           var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	           
-	          row ='<div class="card queue_station">'
+	          row ='<div class="card queue_station" data-date="'+data[field]["order_id"]+'">'
 	                  +'<div class="card-block">'
 	                      +'<h4 class="card-title">'
 	                        +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'