added active count induties
This commit is contained in:
@@ -1,14 +1,24 @@
|
||||
class Induties::AssignInDutiesController < ApplicationController
|
||||
def index
|
||||
@commissioners=Commissioner.active.all.order(created_at: :desc)
|
||||
@commissioners =[]
|
||||
@commiss=Commissioner.active.all.order(created_at: :desc)
|
||||
# puts @commissioners.to_json
|
||||
@commiss.each do|commissioner|
|
||||
check_in_count =InDuty.where('commissioner_ids =? and out_time is null', commissioner.id.to_json).count;
|
||||
@commissioners.push({ "id"=>commissioner.id,
|
||||
"name"=>commissioner.name,
|
||||
"image_path"=>commissioner.image_path.url,
|
||||
"check_in_count"=>check_in_count
|
||||
})
|
||||
|
||||
end
|
||||
@booking_id = params[:booking_id]
|
||||
end
|
||||
|
||||
def get_all_occupied_dining
|
||||
commissionerIds =params[:id]
|
||||
@check_in_commissioner =InDuty.select("in_duties.*,dining_facilities.type as dinning_type")
|
||||
.joins(" LEFT JOIN dining_facilities on dining_facilities.id = in_duties.dinning_id").where('commissioner_ids =? and out_time is null', commissionerIds);
|
||||
# Rails.logger.info(@check_in_commissioner.to_json)
|
||||
.joins(" LEFT JOIN dining_facilities on dining_facilities.id = in_duties.dinning_id").where('commissioner_ids =? and out_time is null', commissionerIds).order(created_at: :asc);
|
||||
respond_to do |format|
|
||||
format.json { render json: @check_in_commissioner.to_json }
|
||||
end
|
||||
@@ -22,7 +32,7 @@ class Induties::AssignInDutiesController < ApplicationController
|
||||
induty.booking_id = booking_id
|
||||
induty.commissioner_ids = commissioner_ids
|
||||
induty.by_name = params[:by_name]
|
||||
induty.in_time = Time.now
|
||||
induty.in_time = Time.now.utc
|
||||
if induty.save
|
||||
dinning = DiningFacility.find(induty.dinning_id)
|
||||
@induty= {"id"=>induty.id,
|
||||
@@ -38,7 +48,7 @@ class Induties::AssignInDutiesController < ApplicationController
|
||||
def induties_checkout
|
||||
induty_id = params[:induty_id]
|
||||
induty = InDuty.find(induty_id)
|
||||
induty.out_time = Time.now
|
||||
induty.out_time = Time.now.utc
|
||||
induty.save
|
||||
@induty =induty
|
||||
respond_to do |format|
|
||||
|
||||
Reference in New Issue
Block a user