From 6effdc9e27f0c1e77d8b60a54c88ce138ff812f3 Mon Sep 17 00:00:00 2001
From: Aung Kyaw Phyoe <aungkyawphyoe@code2lab.com>
Date: Wed, 6 Feb 2019 16:09:29 +0630
Subject: [PATCH] oqs UI changes

---
 app/assets/javascripts/OQS.js     |  6 +++---
 app/views/oqs/home/index.html.erb | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 72ff4733..409b5c84 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -95,7 +95,7 @@ $(document).on('turbolinks:load', function() {
     });
 
     // $(".oqs_click").on("click", function(){
-    $(document).on('click', '.oqs_click', function(event){ 
+    $(document).on('change', '.oqs_click', function(event){ 
     	oqs_id = $(this).val();
     	status = $("#status").val();
     	var table_id = $('#table_id').val();
@@ -123,8 +123,8 @@ $(document).on('turbolinks:load', function() {
     	}
     }); //End Click
 
-    // $(".oqs_click").on("click", function(){
-    $(document).on('click', '.status_click', function(event){ 
+    // $(".status_click").on("click", function(){
+    $(document).on('change', '.status_click', function(event){ 
     	oqs_id = $("#oqs_id").val();
     	status = $(this).val();
     	var table_id = $('#table_id').val();
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 500772c3..e767bafe 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,6 +1,6 @@
 <!-- Column One -->
 <div class="row clearfix" style="">
-  <div class="col-lg-8 col-md-8 col-sm-8"> 
+  <div class="col-lg-7 col-md-7 col-sm-7"> 
     <p class="hidden filter"><%= @filter %></p>
     <div class="card">
       <div class="card-block">
@@ -146,30 +146,34 @@
   </div>
  -->
   <!-- Column Three -->
-  <div class="col-lg-3 col-md-3 col-sm-3 table-block">
+  <div class="col-lg-4 col-md-4 col-sm-4"><!-- table-block -->
     <p class="hidden filter"><%= @filter %></p>
     <div class="card">
       <div class="card-block">
         <div class="tab-content" id="table-slimscroll" style="">
           <ul class="nav nav-tabs">
             <li class="active"><a data-toggle="tab" href="#table" id="defaultOpen">Table</a></li>
+            <%if !@rooms.empty? %>
             <li><a data-toggle="tab" href="#room">Room</a></li>
+            <% end %>
           </ul>
           <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 table-float">
-                  <button class='btn btn-lg waves-effect green tables table-width' value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></button>
+                  <button class='btn btn-lg waves-effect green tables table-width' value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %> <br> <%= table.zone.name %></button>
                 </div>
               <% end %> 
             </div>
+            <%if !@rooms.empty? %>
             <div id="room" class="tab-pane fade">
               <% @rooms.each do |room|  %>
                 <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>
+                  <button class='btn btn-lg waves-effect green tables table-width' value="<%= room.id %>" data-id="<%= room.id %>"> <%= room.name %> <br> <%= room.zone.name %></button>
                 </div>
               <% end %> 
             </div>
+            <% end %>
           </div>
         </div>
       </div>
@@ -177,7 +181,7 @@
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
-    <br>
+    <!-- <br> -->
      <% if current_user.role != "kitchen" %>
     
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>