diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 5e866699..07fb94f1 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -26,6 +26,21 @@ $(document).on('turbolinks:load', function() { var oqs_id = ""; + + if ($('.oqs_click').val()>0) { + $(".oqs_click").removeClass('oqs_active'); + $(".queue_station").removeClass('queue_station_box'); + $("#completed").addClass('hide'); + $(".oqs_append").removeClass('hide'); + $("#oqs_active").addClass('oqs_active'); + $(".queue_station").addClass('queue_station_box'); + // oqs_id = $(this).find(".oqs-id").text(); + $("#oqs_active").attr('data-id',$('.oqs_click').val()); + var url = 'oqs/get_items/'+$('.oqs_click').val(); + + show_details(url,null); + } + $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') $(".oqs_append").addClass('hide') diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 48e686b6..be896f1e 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -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? diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb index 323bb6da..baefd752 100755 --- a/app/controllers/settings/employees_controller.rb +++ b/app/controllers/settings/employees_controller.rb @@ -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 diff --git a/app/models/employee.rb b/app/models/employee.rb index 66f9a7f0..7bc5c4a4 100755 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -2,6 +2,7 @@ class Employee < ApplicationRecord has_secure_password has_many :commissioners has_many :shit_sales + belongs_to :order_queue_station validates_presence_of :name, :role validates_presence_of :password, :on => [:create] diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index a0372498..e9cbfd26 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -7,6 +7,7 @@ class OrderQueueStation < ApplicationRecord has_many :order_items has_many :order_queue_process_by_zones has_many :zones, through: :order_queue_process_by_zones + belongs_to :employee scope :active, -> {where(is_active: true)} diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index fe7f4b4e..ec5e0613 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -10,8 +10,12 @@ <% @queue_stations.each do |qsi| %> <% if qsi.is_active != false %> + <% selected = ""%> + <%if qsi.id == current_user.order_queue_station_id %> + <% selected = 'selected=""'%> + <%end%> - + <% end %> <% end %> @@ -186,5 +190,6 @@ }); }); document.getElementById("defaultOpen").click(); - - + + + \ No newline at end of file diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb index 19e15564..4bbf9d0f 100755 --- a/app/views/settings/employees/_form.html.erb +++ b/app/views/settings/employees/_form.html.erb @@ -9,15 +9,18 @@ <%= f.input :name %> <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %> <% if current_user.role == "administrator" %> - <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %> + <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group employee_roles' %> <% elsif current_user.role == "supervisor" %> - <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] == "cashier" || r[1] == "waiter"},:class=>'form-group' %> + <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] == "cashier" || r[1] == "waiter"},:class=>'form-group employee_roles' %> <% else %> - <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] != "administrator"},:class=>'form-group' %> + <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] != "administrator"},:class=>'form-group employee_roles' %> <% end %> + <%= f.input :emp_id, :label => "Employee Numberic ID (*Unique)" %> <%= f.input :password %> -
@@ -68,7 +71,19 @@
diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb index 0e57b032..87707b22 100755 --- a/app/views/settings/employees/show.html.erb +++ b/app/views/settings/employees/show.html.erb @@ -36,6 +36,12 @@ <%= t("views.right_panel.detail.role") %> <%= @employee.role %> + <% if @employee.role == "kitchen"%> + + <%= t("views.right_panel.detail.station_name") %> + <%= @employee.order_queue_station.station_name %> + + <% end%> <%= t("views.right_panel.detail.created_at") %> <%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %>