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

change checkout fun: in UI

Browse Source
This commit is contained in:
phyusin
2017-12-08 10:40:57 +06:30
parent 46bbd90df5
commit 2faf5ba386
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/dining_facility.rb
View File

@@ -85,7 +85,7 @@ class DiningFacility < ApplicationRecord
checkout_at = booking.checkout_at.utc checkout_at = booking.checkout_at.utc
checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int
checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int
checkout_at_min -= min # checkout_at_min -= min
if (checkout_at_hr <= hr) && (checkout_at_min <= 15) if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
return booking return booking
else else

4
app/views/origami/home/index.html.erb
View File

@@ -41,7 +41,7 @@
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>"> <div class="card tables red text-white" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white" data-id="<%= table.id %>"> <div class="card tables orange text-white" data-id="<%= table.id %>">
@@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables blue text-white" data-id="<%= table.id %>"> <div class="card tables blue text-white" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white" data-id="<%= table.id %>"> <div class="card tables orange text-white" data-id="<%= table.id %>">

4
app/views/origami/home/show.html.erb
View File

@@ -40,7 +40,7 @@
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
@@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">

4
app/views/origami/rooms/show.html.erb
View File

@@ -40,7 +40,7 @@
<% @tables.each do |table| %> <% @tables.each do |table| %>
<% if table.status == 'occupied' %> <% if table.status == 'occupied' %>
<% if table.get_booking.nil? %> <% if table.get_booking.nil? %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables red text-white table_<%= table.id %>" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">
@@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<% if table.get_current_checkout_booking.nil? %> <% if table.get_checkout_booking.nil? %>
<div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables blue text-white table_<%= table.id %>" data-id="<%= table.id %>">
<% else %> <% else %>
<div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>"> <div class="card tables orange text-white table_<%= table.id %>" data-id="<%= table.id %>">