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

@@ -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')

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

View File

@@ -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]

View File

@@ -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)}

View File

@@ -10,8 +10,12 @@
<option value="0" data-id="0">Processed</option>
<% @queue_stations.each do |qsi| %>
<% if qsi.is_active != false %>
<% selected = ""%>
<%if qsi.id == current_user.order_queue_station_id %>
<% selected = 'selected=""'%>
<%end%>
<p class="hidden oqs-id"><%= qsi.id %></p>
<option value="<%= qsi.id %>" data-id="<%= qsi.id %>" style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
<option value="<%= qsi.id %>" data-id="<%= qsi.id %>" <%=selected%> style="padding:5px 20px !important;"> <%= qsi.station_name %></option>
<% end %>
<% end %>
</select>
@@ -186,5 +190,6 @@
});
});
document.getElementById("defaultOpen").click();
</script>
</script>

View File

@@ -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 %>
<div class="form-group order_queue_station_id bmd-form-group hidden">
<%= f.label :order_queue_station, 'Order Queue Station'%>
<%= f.select :order_queue_station_id, OrderQueueStation.active.map {|l| [l.station_name, l.id]}, { :include_blank => 'Choose Order Queue Station'}, {class: 'form-control'} %>
</div>
<%= f.input :emp_id, :label => "Employee Numberic ID (*Unique)" %>
<%= f.input :password %>
</div>
<div class="form-inputs p-l-15">
<label>Employee Image</label>
@@ -68,7 +71,19 @@
</div>
<script type="text/javascript">
$(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign();
// $(document).on('turbolinks:load', function() {
// alert("hi")
// $('body').bootstrapMaterialDesign();
$(function() {
if ($("#employee_role").val()=="kitchen") {
$('.order_queue_station_id').removeClass("hidden");
}
$(document).on('click', '#employee_role', function(event){
if ($(this).val()=="kitchen") {
$('.order_queue_station_id').removeClass("hidden");
}else{
$('.order_queue_station_id').addClass("hidden");
}
});
});
</script>

View File

@@ -36,6 +36,12 @@
<th><%= t("views.right_panel.detail.role") %></th>
<td><%= @employee.role %></td>
</tr>
<% if @employee.role == "kitchen"%>
<tr>
<th><%= t("views.right_panel.detail.station_name") %></th>
<td><%= @employee.order_queue_station.station_name %></td>
</tr>
<% end%>
<tr>
<th><%= t("views.right_panel.detail.created_at") %></th>
<td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>