diff --git a/app/assets/stylesheets/induties/assign_in_duties.scss b/app/assets/stylesheets/induties/assign_in_duties.scss index 8534da8e..1f324cf1 100644 --- a/app/assets/stylesheets/induties/assign_in_duties.scss +++ b/app/assets/stylesheets/induties/assign_in_duties.scss @@ -78,8 +78,8 @@ margin-left: 0.5rem; } .show_all_commissioner_card{ - min-height: 790px; - max-height: 790px; + min-height: 805px; + max-height: 805px; overflow: scroll; } .sweet-alert p { diff --git a/app/controllers/induties/assign_in_duties_controller.rb b/app/controllers/induties/assign_in_duties_controller.rb index b3c4179a..357f7b0e 100644 --- a/app/controllers/induties/assign_in_duties_controller.rb +++ b/app/controllers/induties/assign_in_duties_controller.rb @@ -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| diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb index 68573460..eb32f0bb 100755 --- a/app/models/commissioner.rb +++ b/app/models/commissioner.rb @@ -1,7 +1,7 @@ class Commissioner < ApplicationRecord belongs_to :employee, foreign_key: 'emp_id' belongs_to :commission, foreign_key: 'commission_id' - has_many :in_juties + has_many :in_duties has_many :product_commissions scope :active, -> { where(is_active: true) } diff --git a/app/views/induties/assign_in_duties/index.html.erb b/app/views/induties/assign_in_duties/index.html.erb index 15f3cf08..a9ed8d61 100644 --- a/app/views/induties/assign_in_duties/index.html.erb +++ b/app/views/induties/assign_in_duties/index.html.erb @@ -10,11 +10,14 @@