update oqs employee and oqs station

This commit is contained in:
Aung Myo
2018-08-14 17:21:06 +06:30
parent f6ec819545
commit ba8c723c17
8 changed files with 57 additions and 11 deletions

View File

@@ -11,7 +11,7 @@ class Oqs::HomeController < BaseOqsController
@filter = params[:filter]
@queue_stations = OrderQueueStation.all
@queue_stations = OrderQueueStation.active
@queue_completed_item = completed_order(@filter)
if !@queue_completed_item.empty?

View File

@@ -30,6 +30,9 @@ class Settings::EmployeesController < ApplicationController
# POST /employees
# POST /employees.json
def create
puts "puts ssssssssssssssssssssssssss"
puts employee_params.to_json
@employee = Employee.new(employee_params)
respond_to do |format|
@@ -72,6 +75,6 @@ class Settings::EmployeesController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def employee_params
params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password, :image_path)
params.require(:employee).permit(:name, :role, :is_active, :emp_id, :password,:order_queue_station_id, :image_path)
end
end