git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oqs UI changes

Browse Source
This commit is contained in:
Aung Kyaw Phyoe
2019-02-06 16:09:29 +06:30
parent 0671f0c199
commit 6effdc9e27
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/OQS.js
View File

@@ -95,7 +95,7 @@ $(document).on('turbolinks:load', function() {
}); });
// $(".oqs_click").on("click", function(){ // $(".oqs_click").on("click", function(){
$(document).on('click', '.oqs_click', function(event){ $(document).on('change', '.oqs_click', function(event){
oqs_id = $(this).val(); oqs_id = $(this).val();
status = $("#status").val(); status = $("#status").val();
var table_id = $('#table_id').val(); var table_id = $('#table_id').val();
@@ -123,8 +123,8 @@ $(document).on('turbolinks:load', function() {
} }
}); //End Click }); //End Click
// $(".oqs_click").on("click", function(){ // $(".status_click").on("click", function(){
$(document).on('click', '.status_click', function(event){ $(document).on('change', '.status_click', function(event){
oqs_id = $("#oqs_id").val(); oqs_id = $("#oqs_id").val();
status = $(this).val(); status = $(this).val();
var table_id = $('#table_id').val(); var table_id = $('#table_id').val();

14
app/views/oqs/home/index.html.erb
View File

@@ -1,6 +1,6 @@
<!-- Column One --> <!-- Column One -->
<div class="row clearfix" style=""> <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> <p class="hidden filter"><%= @filter %></p>
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
@@ -146,30 +146,34 @@
</div> </div>
--> -->
<!-- Column Three --> <!-- 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> <p class="hidden filter"><%= @filter %></p>
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<div class="tab-content" id="table-slimscroll" style=""> <div class="tab-content" id="table-slimscroll" style="">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#table" id="defaultOpen">Table</a></li> <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> <li><a data-toggle="tab" href="#room">Room</a></li>
<% end %>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div id="table" class="tab-pane fade"> <div id="table" class="tab-pane fade">
<% @tables.each do |table| %> <% @tables.each do |table| %>
<div class="col-lg-4 col-md-4 col-sm-4 table-float"> <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> </div>
<% end %> <% end %>
</div> </div>
<%if !@rooms.empty? %>
<div id="room" class="tab-pane fade"> <div id="room" class="tab-pane fade">
<% @rooms.each do |room| %> <% @rooms.each do |room| %>
<div class="col-lg-4 col-md-4 col-sm-4 table-float"> <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> </div>
<% end %> <% end %>
</div> </div>
<% end %>
</div> </div>
</div> </div>
</div> </div>
@@ -177,7 +181,7 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- OQS Buttons --> <!-- OQS Buttons -->
<br> <!-- <br> -->
<% if current_user.role != "kitchen" %> <% 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> <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>