added induties

app/controllers/induties/assign_in_duties_controller.rb

@@ -0,0 +1,54 @@
+class Induties::AssignInDutiesController < ApplicationController
+  def index
+    @commissioners=Commissioner.active.all.order(created_at: :desc)
+    @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)
+    respond_to do |format|
+      format.json { render json: @check_in_commissioner.to_json }
+    end
+  end
+  def induties_create
+    commissioner_ids =params[:commissionerId]
+    booking_id =params[:booking_id]
+    dinning_id = params[:dinning_id]
+    induty = InDuty.new
+    induty.dinning_id  = dinning_id
+    induty.booking_id = booking_id
+    induty.commissioner_ids = commissioner_ids
+    induty.by_name = params[:by_name]
+    induty.in_time = Time.now
+    if induty.save
+      dinning = DiningFacility.find(induty.dinning_id)
+      @induty= {"id"=>induty.id, 
+                "dinning_id"=>induty.dinning_id,
+                "in_time"=>induty.in_time,
+                "out_time"=>induty.out_time,
+                "dinning_type"=>dinning.type }
+      respond_to do |format|
+      format.json { render json: @induty.to_json }
+    end
+    end
+  end
+  def induties_checkout
+    induty_id = params[:induty_id]
+    induty = InDuty.find(induty_id)
+    induty.out_time = Time.now
+    induty.save
+    @induty =induty
+    respond_to do |format|
+      format.json { render json: @induty.to_json }
+    end
+  end
+  def induties_remove
+    induty_id = params[:induty_id]
+    induty = InDuty.find(induty_id)
+    induty.destroy
+  end
+
+end

app/controllers/settings/commissioners_controller.rb

@@ -18,6 +18,7 @@ class Settings::CommissionersController < ApplicationController
   def new
     @commissioner = Commissioner.new
     @employee = Employee.all.order('name asc')
+    
   end
 
   # GET /commissioners/1/edit
@@ -35,14 +36,21 @@ class Settings::CommissionersController < ApplicationController
     unless @commissioner.resigned_date.nil?
       @commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d')
     end
-    respond_to do |format|
-      if @commissioner.save
-        format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully created.'}
-        format.json {render :show, status: :created, location: @commissioner}
-      else
-        format.html {render :new}
-        format.json {render json: @commissioner.errors, status: :unprocessable_entity}
+    # puts params[:from_induty].length
+    if (params[:from_induty] != "true")
+      respond_to do |format|
+        if @commissioner.save
+            format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully created.'}
+            format.json {render :show, status: :created, location: @commissioner}
+        else
+          format.html {render :new}
+          format.json {render json: @commissioner.errors, status: :unprocessable_entity}
+        end
       end
+    else
+      @commissioner.save
+      flash[:notice] = 'Commissioner was successfully created.'
+      redirect_to induties_assign_in_duties_path(params[:booking_id])
     end
   end