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

added active count induties

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-06-18 11:02:01 +06:30
parent 784c090ff8
commit 4ef7eef803
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/induties/assign_in_duties.scss
View File

@@ -78,8 +78,8 @@
margin-left: 0.5rem; margin-left: 0.5rem;
} }
.show_all_commissioner_card{ .show_all_commissioner_card{
min-height: 790px; min-height: 805px;
max-height: 790px; max-height: 805px;
overflow: scroll; overflow: scroll;
} }
.sweet-alert p { .sweet-alert p {

20
app/controllers/induties/assign_in_duties_controller.rb
View File

@@ -1,14 +1,24 @@
class Induties::AssignInDutiesController < ApplicationController class Induties::AssignInDutiesController < ApplicationController
def index 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] @booking_id = params[:booking_id]
end end
def get_all_occupied_dining def get_all_occupied_dining
commissionerIds =params[:id] commissionerIds =params[:id]
@check_in_commissioner =InDuty.select("in_duties.*,dining_facilities.type as dinning_type") @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); .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);
# Rails.logger.info(@check_in_commissioner.to_json)
respond_to do |format| respond_to do |format|
format.json { render json: @check_in_commissioner.to_json } format.json { render json: @check_in_commissioner.to_json }
end end
@@ -22,7 +32,7 @@ class Induties::AssignInDutiesController < ApplicationController
induty.booking_id = booking_id induty.booking_id = booking_id
induty.commissioner_ids = commissioner_ids induty.commissioner_ids = commissioner_ids
induty.by_name = params[:by_name] induty.by_name = params[:by_name]
induty.in_time = Time.now induty.in_time = Time.now.utc
if induty.save if induty.save
dinning = DiningFacility.find(induty.dinning_id) dinning = DiningFacility.find(induty.dinning_id)
@induty= {"id"=>induty.id, @induty= {"id"=>induty.id,
@@ -38,7 +48,7 @@ class Induties::AssignInDutiesController < ApplicationController
def induties_checkout def induties_checkout
induty_id = params[:induty_id] induty_id = params[:induty_id]
induty = InDuty.find(induty_id) induty = InDuty.find(induty_id)
induty.out_time = Time.now induty.out_time = Time.now.utc
induty.save induty.save
@induty =induty @induty =induty
respond_to do |format| respond_to do |format|

2
app/models/commissioner.rb
View File

@@ -1,7 +1,7 @@
class Commissioner < ApplicationRecord class Commissioner < ApplicationRecord
belongs_to :employee, foreign_key: 'emp_id' belongs_to :employee, foreign_key: 'emp_id'
belongs_to :commission, foreign_key: 'commission_id' belongs_to :commission, foreign_key: 'commission_id'
has_many :in_juties has_many :in_duties
has_many :product_commissions has_many :product_commissions
scope :active, -> { where(is_active: true) } scope :active, -> { where(is_active: true) }

11
app/views/induties/assign_in_duties/index.html.erb
View File

@@ -10,11 +10,14 @@
<div class="card show_all_commissioner_card"> <div class="card show_all_commissioner_card">
<div class="card-block row" style="margin:0.5rem;"> <div class="card-block row" style="margin:0.5rem;">
<% @commissioners.each do |com| %> <% @commissioners.each do |com| %>
<div class="col-md-6 col-sm-6 col-lg-3 mt-3 touch_commissioner" commissionerId='<%= com.id %>' commissionerName='<%= com.name %>'> <div class="col-md-6 col-sm-6 col-lg-3 mt-3 touch_commissioner" commissionerId='<%= com["id"] %>' commissionerName='<%= com["name"] %>'>
<div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(<%= com.image_path.url%>);background-repeat: no-repeat; background-size: cover;"> <div class="card custom-card testimonial-card fadeInRight" style="height:100%;background-image:url(<%=com["image_path"] %>);background-repeat: no-repeat; background-size: cover;">
<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;"> <div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">
<div class="col-md-10 " style="padding:0px !important;"><%=com.name %> <div class="col-6" style="padding:0px !important;"><%=com["name"] %></div>
</div> <% if com["check_in_count"] >0%>
<div class="col-6" style="margin:auto;"><span class="badge badge-primary" style="font-size: 1rem;">Active <%=com["check_in_count"] %></span></div>
<% end %>
</div> </div>
<div class="add_icon p-t-65 p-b-65 m-r-"> <div class="add_icon p-t-65 p-b-65 m-r-">