change report filter for shift and checkin api
This commit is contained in:
@@ -67,7 +67,7 @@ class DiningFacility < ApplicationRecord
|
||||
end
|
||||
|
||||
def get_current_checkout_booking
|
||||
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null").limit(1)
|
||||
booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null").limit(1)
|
||||
if booking.count > 0 then
|
||||
return booking[0]
|
||||
else
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
$(function(){
|
||||
|
||||
var check_arr = [];
|
||||
|
||||
search_by_period();
|
||||
$('#sel_period').change(function(){
|
||||
|
||||
search_by_period();
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<script>
|
||||
$(function(){
|
||||
var check_arr = [];
|
||||
|
||||
search_by_period();
|
||||
$('#sel_period').change(function(){
|
||||
search_by_period();
|
||||
});
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
$(function(){
|
||||
|
||||
var check_arr = [];
|
||||
|
||||
search_by_period();
|
||||
$('#sel_period').change(function(){
|
||||
|
||||
search_by_period();
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
$(function(){
|
||||
|
||||
var check_arr = [];
|
||||
|
||||
search_by_period();
|
||||
$('#sel_period').change(function(){
|
||||
|
||||
search_by_period();
|
||||
|
||||
@@ -90,6 +90,7 @@
|
||||
<script>
|
||||
$(function(){
|
||||
var check_arr = [];
|
||||
search_by_period();
|
||||
$('#sel_period').change(function(){
|
||||
search_by_period();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user