From b093a993ba002c92659bbb34338c55c031c11d87 Mon Sep 17 00:00:00 2001 From: Phyo Date: Sat, 17 Jun 2017 18:00:59 +0630 Subject: [PATCH] Zone and OQS --- .../order_queue_stations_controller.rb | 2 +- app/controllers/settings/rooms_controller.rb | 81 +++++++++++++ app/controllers/settings/tables_controller.rb | 81 +++++++++++++ app/controllers/settings/zones_controller.rb | 10 +- app/models/employee.rb | 3 + app/models/order_queue_station.rb | 8 +- app/models/zone.rb | 5 + app/views/layouts/_header.html.erb | 1 + .../order_queue_stations/_form.html.erb | 7 ++ app/views/settings/rooms/_form.html.erb | 16 +++ .../rooms/_settings_room.json.jbuilder | 2 + app/views/settings/rooms/edit.html.erb | 10 ++ app/views/settings/rooms/index.html.erb | 51 ++++++++ app/views/settings/rooms/new.html.erb | 11 ++ app/views/settings/rooms/show.html.erb | 49 ++++++++ app/views/settings/tables/_form.html.erb | 16 +++ .../tables/_settings_table.json.jbuilder | 2 + app/views/settings/tables/edit.html.erb | 10 ++ app/views/settings/tables/index.html.erb | 49 ++++++++ app/views/settings/tables/new.html.erb | 11 ++ app/views/settings/tables/show.html.erb | 47 ++++++++ app/views/settings/zones/_form.html.erb | 4 +- app/views/settings/zones/edit.html.erb | 16 ++- app/views/settings/zones/index.html.erb | 64 +++++----- app/views/settings/zones/show.html.erb | 110 +++++++++++++++--- ...20170403142424_create_dining_facilities.rb | 2 +- 26 files changed, 608 insertions(+), 60 deletions(-) create mode 100644 app/controllers/settings/rooms_controller.rb create mode 100644 app/controllers/settings/tables_controller.rb create mode 100644 app/views/settings/rooms/_form.html.erb create mode 100644 app/views/settings/rooms/_settings_room.json.jbuilder create mode 100644 app/views/settings/rooms/edit.html.erb create mode 100644 app/views/settings/rooms/index.html.erb create mode 100644 app/views/settings/rooms/new.html.erb create mode 100644 app/views/settings/rooms/show.html.erb create mode 100644 app/views/settings/tables/_form.html.erb create mode 100644 app/views/settings/tables/_settings_table.json.jbuilder create mode 100644 app/views/settings/tables/edit.html.erb create mode 100644 app/views/settings/tables/index.html.erb create mode 100644 app/views/settings/tables/new.html.erb create mode 100644 app/views/settings/tables/show.html.erb diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index e8b9bbe0..6a0a52ae 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -71,6 +71,6 @@ class Settings::OrderQueueStationsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_order_queue_station_params - params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by) + params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] }) end end diff --git a/app/controllers/settings/rooms_controller.rb b/app/controllers/settings/rooms_controller.rb new file mode 100644 index 00000000..69e3ec22 --- /dev/null +++ b/app/controllers/settings/rooms_controller.rb @@ -0,0 +1,81 @@ +class Settings::RoomsController < ApplicationController + before_action :set_settings_room, only: [:show, :edit, :update, :destroy] + before_action :set_settings_zone, only: [:index, :show, :edit, :new, :update,:create] + # GET /settings/rooms + # GET /settings/rooms.json + def index + @settings_rooms = @zone.rooms + end + + # GET /settings/rooms/1 + # GET /settings/rooms/1.json + def show + @room = Room.find(params[:id]) + end + + # GET /settings/rooms/new + def new + @settings_room = Room.new + end + + # GET /settings/rooms/1/edit + def edit + end + + # POST /settings/rooms + # POST /settings/rooms.json + def create + @settings_room = Room.new(settings_room_params) + @settings_room.type = DiningFacility::ROOM_TYPE + @settings_room.zone_id = params[:zone_id] + respond_to do |format| + if @settings_room.save + format.html { redirect_to settings_zone_rooms_path, notice: 'Room was successfully created.' } + format.json { render :show, status: :created, location: @settings_room } + else + puts "abc" + format.html { render :new } + format.json { render json: @settings_room.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/rooms/1 + # PATCH/PUT /settings/rooms/1.json + def update + respond_to do |format| + if @settings_room.update(settings_room_params) + format.html { redirect_to settings_zone_rooms_path, notice: 'Room was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_room } + else + format.html { render :edit } + format.json { render json: @settings_room.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/rooms/1 + # DELETE /settings/rooms/1.json + def destroy + @settings_room.destroy + respond_to do |format| + format.html { redirect_to settings_zones_path, notice: 'Room was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_room + @settings_room = Room.find(params[:id]) + end + + def set_settings_zone + @zone = Zone.find(params[:zone_id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_room_params + params.require(:room).permit(:name, :status, :seater, :order_by,:is_active ,:id, :zone_id, :created_by) + end +end diff --git a/app/controllers/settings/tables_controller.rb b/app/controllers/settings/tables_controller.rb new file mode 100644 index 00000000..124a0d94 --- /dev/null +++ b/app/controllers/settings/tables_controller.rb @@ -0,0 +1,81 @@ +class Settings::TablesController < ApplicationController + before_action :set_settings_table, only: [:show, :edit, :update, :destroy] + before_action :set_settings_zone, only: [:index, :show, :edit, :new, :update,:create] + # GET /settings/tables + # GET /settings/tables.json + def index + @settings_tables = @zone.tables + end + + # GET /settings/tables/1 + # GET /settings/tables/1.json + def show + @table = Table.find(params[:id]) + end + + # GET /settings/tables/new + def new + @settings_table = Table.new + end + + # GET /settings/tables/1/edit + def edit + end + + # POST /settings/tables + # POST /settings/tables.json + def create + @settings_table = Table.new(settings_table_params) + @settings_table.type = DiningFacility::TABLE_TYPE + @settings_table.zone_id = params[:zone_id] + respond_to do |format| + if @settings_table.save + format.html { redirect_to settings_zone_tables_path, notice: 'Table was successfully created.' } + format.json { render :show, status: :created, location: @settings_table } + else + puts "abc" + format.html { render :new } + format.json { render json: @settings_table.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/tables/1 + # PATCH/PUT /settings/tables/1.json + def update + respond_to do |format| + if @settings_table.update(settings_table_params) + format.html { redirect_to settings_zone_tables_path, notice: 'Table was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_table } + else + format.html { render :edit } + format.json { render json: @settings_table.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/tables/1 + # DELETE /settings/tables/1.json + def destroy + @settings_table.destroy + respond_to do |format| + format.html { redirect_to settings_zones_path, notice: 'Table was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_table + @settings_table = Table.find(params[:id]) + end + + def set_settings_zone + @zone = Zone.find(params[:zone_id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_table_params + params.require(:table).permit(:name, :status, :seater, :order_by,:is_active ,:id, :zone_id, :created_by) + end +end diff --git a/app/controllers/settings/zones_controller.rb b/app/controllers/settings/zones_controller.rb index 779c03fe..5752b5e3 100644 --- a/app/controllers/settings/zones_controller.rb +++ b/app/controllers/settings/zones_controller.rb @@ -10,6 +10,8 @@ class Settings::ZonesController < ApplicationController # GET /settings/zones/1 # GET /settings/zones/1.json def show + @settings_tables = @settings_zone.tables + @settings_rooms = @settings_zone.rooms end # GET /settings/zones/new @@ -28,7 +30,7 @@ class Settings::ZonesController < ApplicationController respond_to do |format| if @settings_zone.save - format.html { redirect_to @settings_zone, notice: 'Zone was successfully created.' } + format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully created.' } format.json { render :show, status: :created, location: @settings_zone } else format.html { render :new } @@ -42,7 +44,7 @@ class Settings::ZonesController < ApplicationController def update respond_to do |format| if @settings_zone.update(settings_zone_params) - format.html { redirect_to @settings_zone, notice: 'Zone was successfully updated.' } + format.html { redirect_to settings_zone_path(@settings_zone), notice: 'Zone was successfully updated.' } format.json { render :show, status: :ok, location: @settings_zone } else format.html { render :edit } @@ -56,7 +58,7 @@ class Settings::ZonesController < ApplicationController def destroy @settings_zone.destroy respond_to do |format| - format.html { redirect_to settings_zones_url, notice: 'Zone was successfully destroyed.' } + format.html { redirect_to settings_zones_path, notice: 'Zone was successfully destroyed.' } format.json { head :no_content } end end @@ -69,6 +71,6 @@ class Settings::ZonesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_zone_params - params.require(:settings_zone).permit(:name, :is_active, :created_by) + params.require(:zone).permit(:name, :is_active, :created_by) end end diff --git a/app/models/employee.rb b/app/models/employee.rb index 1f3cace0..98b8380b 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -6,6 +6,9 @@ class Employee < ApplicationRecord validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true validates :password, numericality: true, length: {in: 3..9}, allow_blank: true + def self.collection + Employee.select("id, name").map { |e| [e.name, e.id] } + end def self.login(emp_id, password) user = Employee.find_by_emp_id(emp_id) diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index b0619af2..874f2fb0 100644 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -5,10 +5,12 @@ class OrderQueueStation < ApplicationRecord has_many :assigned_order_items has_many :order_items + has_many :order_queue_process_by_zones + has_many :zones, through: :order_queue_process_by_zones scope :active, -> {where(is_active: true)} - def process_order (order) + def process_order (order) oqs_stations = OrderQueueStation.active order_items = order.order_items @@ -20,10 +22,10 @@ class OrderQueueStation < ApplicationRecord #Loop through the processing items pq_items.each do |pq_item| #Processing through the looping items - order_items.each do |order_item| + order_items.each do |order_item| if (pq_item == order_item.item_code) #Same Order_items can appear in two location. - AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) + AssignedOrderItem.assigned_order_item(order, order_item.item_code, oqs) end end diff --git a/app/models/zone.rb b/app/models/zone.rb index e5ad15c7..164b80f4 100644 --- a/app/models/zone.rb +++ b/app/models/zone.rb @@ -2,7 +2,12 @@ class Zone < ApplicationRecord # model association has_many :tables, dependent: :destroy has_many :rooms, dependent: :destroy + has_many :order_queue_stations # validations validates_presence_of :name, :created_by + + def self.collection + Zone.select("id, name").map { |e| [e.name, e.id] } + end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 58ecd9b5..a385806c 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -14,6 +14,7 @@
  • <%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %>
  • <%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %>
  • <%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %>
  • <%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %>
    • diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index db7ed5fd..d54b69b9 100644 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -1,3 +1,8 @@ + <%= simple_form_for([:settings,@settings_order_queue_station]) do |f| %> <%= f.error_notification %> @@ -7,6 +12,8 @@ <%= f.input :printer_name %> <%= f.input :font_size %> <%= f.input :print_copy %> + <%= f.label "Select Zones", :class => 'control-label' %> + <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'ta'%> <%= f.input :cut_per_item %> <%= f.input :use_alternate_name %> <%= f.input :processing_items, as: :hidden %> diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb new file mode 100644 index 00000000..c164ab67 --- /dev/null +++ b/app/views/settings/rooms/_form.html.erb @@ -0,0 +1,16 @@ +<%= simple_form_for([:settings,@zone,@settings_room]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :status %> + <%= f.input :seater %> + <%= f.input :order_by %> + <%= f.input :is_active %> + <%= f.input :created_by, :collection => Employee.collection %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/rooms/_settings_room.json.jbuilder b/app/views/settings/rooms/_settings_room.json.jbuilder new file mode 100644 index 00000000..3b3010d8 --- /dev/null +++ b/app/views/settings/rooms/_settings_room.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_table, :id, :name, :status, :seater, :order_by, :is_active, :created_by, :created_at, :updated_at +json.url settings_table_url(settings_room, format: :json) diff --git a/app/views/settings/rooms/edit.html.erb b/app/views/settings/rooms/edit.html.erb new file mode 100644 index 00000000..7ae2b31d --- /dev/null +++ b/app/views/settings/rooms/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', settings_table: @settings_room %> +
    diff --git a/app/views/settings/rooms/index.html.erb b/app/views/settings/rooms/index.html.erb new file mode 100644 index 00000000..1480682d --- /dev/null +++ b/app/views/settings/rooms/index.html.erb @@ -0,0 +1,51 @@ + + +
    + +
    + +
    +
    + + + + + + + + + + + + + + + + + <% @settings_rooms.each do |room| %> + + + + + + + + <% if Employee.exists?(room.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameStatusTypeSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to room.name, settings_menu_path(room) %><%= room.status %>Room<%= room.seater rescue "-" %><%= room.order_by rescue "-" %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,room), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/rooms/new.html.erb b/app/views/settings/rooms/new.html.erb new file mode 100644 index 00000000..60bd48ee --- /dev/null +++ b/app/views/settings/rooms/new.html.erb @@ -0,0 +1,11 @@ + +
    +
    + +
    + <%= render 'form', settings_table: @settings_room %> +
    diff --git a/app/views/settings/rooms/show.html.erb b/app/views/settings/rooms/show.html.erb new file mode 100644 index 00000000..893ea325 --- /dev/null +++ b/app/views/settings/rooms/show.html.erb @@ -0,0 +1,49 @@ +
    + +
    + +
    +
    +
    +

    Room

    + + + + + + + + + + + + + + + + + + + + + + + <% if Employee.exists?(@room.created_by) %> + + <% else %> + + <% end %> + + + + + +
    NameStatusRoomSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to @room.name, settings_menu_path(@room) %><%= @room.status %>Room<%= @room.seater rescue "-" %><%= @room.order_by rescue "-" %><%= @room.is_active rescue "-" %><%= Employee.find(@room.created_by).name %><%= @room.created_by %><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %><%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb new file mode 100644 index 00000000..a411175c --- /dev/null +++ b/app/views/settings/tables/_form.html.erb @@ -0,0 +1,16 @@ +<%= simple_form_for([:settings,@zone,@settings_table]) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :status %> + <%= f.input :seater %> + <%= f.input :order_by %> + <%= f.input :is_active %> + <%= f.input :created_by, :collection => Employee.collection %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/tables/_settings_table.json.jbuilder b/app/views/settings/tables/_settings_table.json.jbuilder new file mode 100644 index 00000000..97a32ec3 --- /dev/null +++ b/app/views/settings/tables/_settings_table.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_table, :id, :name, :status, :seater, :order_by, :is_active, :created_by, :created_at, :updated_at +json.url settings_table_url(settings_table, format: :json) diff --git a/app/views/settings/tables/edit.html.erb b/app/views/settings/tables/edit.html.erb new file mode 100644 index 00000000..325aaf39 --- /dev/null +++ b/app/views/settings/tables/edit.html.erb @@ -0,0 +1,10 @@ +
    +
    + +
    + <%= render 'form', settings_table: @settings_table %> +
    diff --git a/app/views/settings/tables/index.html.erb b/app/views/settings/tables/index.html.erb new file mode 100644 index 00000000..c1e509b7 --- /dev/null +++ b/app/views/settings/tables/index.html.erb @@ -0,0 +1,49 @@ + + +
    + +
    + +
    +
    + + + + + + + + + + + + + + + + <% @settings_tables.each do |table| %> + + + + + + + <% if Employee.exists?(table.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameStatusSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to table.name, settings_menu_path(table) %><%= table.status %><%= table.seater rescue "-" %><%= table.order_by rescue "-" %><%= table.is_active %><%= Employee.find(table.created_by).name %><%= table.created_by %><%= table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@zone,table) %><%= link_to 'Destroy', settings_zone_table_path(@zone,table), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/tables/new.html.erb b/app/views/settings/tables/new.html.erb new file mode 100644 index 00000000..52b87627 --- /dev/null +++ b/app/views/settings/tables/new.html.erb @@ -0,0 +1,11 @@ + +
    +
    + +
    + <%= render 'form', settings_table: @settings_table %> +
    diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb new file mode 100644 index 00000000..7b8bd8ed --- /dev/null +++ b/app/views/settings/tables/show.html.erb @@ -0,0 +1,47 @@ +
    + +
    + +
    +
    +
    +

    Table

    + + + + + + + + + + + + + + + + + + + + + <% if Employee.exists?(@table.created_by) %> + + <% else %> + + <% end %> + + + + + +
    NameStatusSeaterOrder byis ActiveCreated ByCreated At
    <%= link_to @table.name, settings_menu_path(@table) %><%= @table.status %><%= @table.seater rescue "-" %><%= @table.order_by rescue "-" %><%= @table.is_active rescue "-" %><%= Employee.find(@table.created_by).name %><%= @table.created_by %><%= @table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@zone,@table) %><%= link_to 'Destroy', settings_zone_table_path(@zone,@table), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index c43a3244..a7740211 100644 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -1,10 +1,10 @@ -<%= simple_form_for(@settings_zone) do |f| %> +<%= simple_form_for([:settings,@settings_zone]) do |f| %> <%= f.error_notification %>
    <%= f.input :name %> <%= f.input :is_active %> - <%= f.input :created_by %> + <%= f.input :created_by, :collection => Employee.collection %>
    diff --git a/app/views/settings/zones/edit.html.erb b/app/views/settings/zones/edit.html.erb index 177c4c61..b9b19f7e 100644 --- a/app/views/settings/zones/edit.html.erb +++ b/app/views/settings/zones/edit.html.erb @@ -1,6 +1,10 @@ -

    Editing Settings Zone

    - -<%= render 'form', settings_zone: @settings_zone %> - -<%= link_to 'Show', @settings_zone %> | -<%= link_to 'Back', settings_zones_path %> +
    +
    + +
    + <%= render 'form', settings_zone: @settings_zone %> +
    diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb index 40ee09c8..cdbe1f80 100644 --- a/app/views/settings/zones/index.html.erb +++ b/app/views/settings/zones/index.html.erb @@ -1,31 +1,41 @@ -

    <%= notice %>

    -

    Settings Zones

    - - - - - - - - - - - - - <% @settings_zones.each do |settings_zone| %> - - - - - - - - - <% end %> - -
    NameIs activeCreated by
    <%= settings_zone.name %><%= settings_zone.is_active %><%= settings_zone.created_by %><%= link_to 'Show', settings_zone %><%= link_to 'Edit', edit_settings_zone_path(settings_zone) %><%= link_to 'Destroy', settings_zone, method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
      +
    • Home
      • +
    • Zones
      • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_zone_path,:class => 'btn btn-primary btn-sm' %> + +
    +

    +
    + + + + + + + + + -<%= link_to 'New Settings Zone', new_settings_zone_path %> + + <% @settings_zones.each do |settings_zone| %> + + + + <% if Employee.exists?(settings_zone.created_by) %> + + <% else %> + + <% end %> + + + + + <% end %> + +
    NameIs activeCreated by
    <%= settings_zone.name %><%= settings_zone.is_active %><%= Employee.find(settings_zone.created_by).name %><%= settings_zone.created_by %><%= link_to 'Show', settings_zone_path(settings_zone) %><%= link_to 'Edit', edit_settings_zone_path(settings_zone) %><%= link_to 'Destroy', settings_zone_path(settings_zone), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    diff --git a/app/views/settings/zones/show.html.erb b/app/views/settings/zones/show.html.erb index 4c0b93dd..33e8487c 100644 --- a/app/views/settings/zones/show.html.erb +++ b/app/views/settings/zones/show.html.erb @@ -1,19 +1,97 @@ -

    <%= notice %>

    +
    +
      +
    • Home
      • +
    • Zones
      • +
    • Details
      • + + <%= link_to 'Back', settings_zones_path %> + +
    +
    -

    - Name: - <%= @settings_zone.name %> -

    +
    +
    +
    +

    Zone

    + + + + + + + + + -

    - Is active: - <%= @settings_zone.is_active %> -

    + + + + + <% if Employee.exists?(@settings_zone.created_by) %> + + <% else %> + + <% end %> + + + + +
    NameIs activeCreated by
    <%= @settings_zone.name %><%= @settings_zone.is_active %><%= Employee.find(@settings_zone.created_by).name %><%= @settings_zone.created_by %><%= link_to 'Edit', edit_settings_zone_path(@settings_zone) %><%= link_to 'Destroy', settings_zone_path(@settings_zone), method: :delete, data: { confirm: 'Are you sure?' } %>
    +
    +
    +
    +
    +
    +

    Dining Facilities + + <%= link_to "New Table",new_settings_zone_table_path(@settings_zone),:class => 'btn btn-primary btn-sm' %> + <%= link_to "New Room",new_settings_zone_room_path(@settings_zone),:class => 'btn btn-primary btn-sm' %> + +

    + + + + + + + + + + + -

    - Created by: - <%= @settings_zone.created_by %> -

    - -<%= link_to 'Edit', edit_settings_zone_path(@settings_zone) %> | -<%= link_to 'Back', settings_zones_path %> + + <% @settings_tables.each do |settings_table|%> + + + + + + <% if Employee.exists?(settings_table.created_by) %> + + <% else %> + + <% end %> + + + + <% end %> + <% @settings_rooms.each do |room|%> + + + + + + <% if Employee.exists?(room.created_by) %> + + <% else %> + + <% end %> + + + + <% end %> + +
    NameTypeSeaterIs activeCreated by
    <%= link_to settings_table.name, settings_zone_table_path(@settings_zone,settings_table) %>Table<%= settings_table.seater %><%= settings_table.is_active %><%= Employee.find(settings_table.created_by).name %><%= settings_table.created_by %><%= settings_table.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_table_path(@settings_zone, settings_table) %>
    <%= link_to room.name, settings_zone_room_path(@settings_zone,room) %>Room<%= room.seater %><%= room.is_active %><%= Employee.find(room.created_by).name %><%= room.created_by %><%= room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %><%= link_to 'Edit', edit_settings_zone_room_path(@settings_zone, room) %>
    +
    +
    diff --git a/db/migrate/20170403142424_create_dining_facilities.rb b/db/migrate/20170403142424_create_dining_facilities.rb index 599151c6..cf81e775 100644 --- a/db/migrate/20170403142424_create_dining_facilities.rb +++ b/db/migrate/20170403142424_create_dining_facilities.rb @@ -4,7 +4,7 @@ class CreateDiningFacilities < ActiveRecord::Migration[5.1] t.references :zone, foreign_key: true t.string :name, :null => false t.string :status, :null => false, :default => "available" - t.string :type, :null => false, :default => "table" + t.string :type, :null => false, :default => "Table" t.integer :seater, :null => false, :default => 2 t.integer :order_by