From caa0180e8cc3b73086e73cc52812e1d669273f68 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 2 May 2018 17:55:53 +0630 Subject: [PATCH] Edit UI design and table in OQS --- app/assets/stylesheets/OQS.scss | 16 ++++ app/controllers/oqs/home_controller.rb | 3 +- app/views/oqs/home/index.html.erb | 123 ++++++++++++------------- 3 files changed, 78 insertions(+), 64 deletions(-) diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 88b00402..d66fcd1e 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -104,4 +104,20 @@ select.form-control { i.logout_icon{ position: relative; top: 5px; +} + +.table-block{ + padding: 24px 8px 0 0; +} + +.label-align{ + padding-left: 10px; +} + +.table-float{ + float: left; +} + +.table-width{ + width: 100%; } \ No newline at end of file diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index c39de390..48e686b6 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -5,7 +5,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') + # @tables = DiningFacility.all.active.order('status desc') + @tables = DiningFacility.where(:type => 'Table').order('status desc') @rooms = Room.all.active.order('status desc') @filter = params[:filter] diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index ee786127..fe7f4b4e 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -3,8 +3,8 @@
-
- +
+