git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check menu and table status

Browse Source
This commit is contained in:
phyusin
2018-10-04 10:25:15 +06:30
parent 7bf01a863c
commit 497458371b
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/menus_controller.rb
View File

@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
# GET /settings/menus # GET /settings/menus
# GET /settings/menus.json # GET /settings/menus.json
def index def index
@settings_menus = Menu.all.page(params[:page]).per(10) @settings_menus = Menu.unscoped.all.page(params[:page]).per(10)
respond_to do |format| respond_to do |format|
format.html format.html
format.xlsx format.xlsx

2
app/views/settings/menus/index.html.erb
View File

@@ -41,6 +41,7 @@
<th><%= t("views.right_panel.detail.valid_days") %></th> <th><%= t("views.right_panel.detail.valid_days") %></th>
<th><%= t("views.right_panel.detail.valid_from") %></th> <th><%= t("views.right_panel.detail.valid_from") %></th>
<th><%= t("views.right_panel.detail.valid_to") %></th> <th><%= t("views.right_panel.detail.valid_to") %></th>
<th><%= t("views.right_panel.detail.is_active") %></th>
<!-- <th>Created By</th> <!-- <th>Created By</th>
<th>Created At</th> --> <th>Created At</th> -->
@@ -55,6 +56,7 @@
<td><%= settings_menu.valid_days %></td> <td><%= settings_menu.valid_days %></td>
<td><%= settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td> <td><%= settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
<td><%= settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td> <td><%= settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
<td><%= settings_menu.is_active %></td>
<!-- <td><%= settings_menu.created_by %></td> --> <!-- <td><%= settings_menu.created_by %></td> -->
<!-- <td><%= settings_menu.created_at %></td> --> <!-- <td><%= settings_menu.created_at %></td> -->
<!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> --> <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->

2
app/views/settings/rooms/_form.html.erb
View File

@@ -7,7 +7,7 @@
<div class="form-inputs p-l-15"> <div class="form-inputs p-l-15">
<%= f.input :name %> <%= f.input :name %>
<%= f.input :status %> <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_room.status %>
<%= f.input :seater %> <%= f.input :seater %>
<%= f.input :order_by %> <%= f.input :order_by %>
<%= f.input :is_active %> <%= f.input :is_active %>

2
app/views/settings/tables/_form.html.erb
View File

@@ -7,7 +7,7 @@
<div class="form-inputs p-l-15"> <div class="form-inputs p-l-15">
<%= f.input :name %> <%= f.input :name %>
<%= f.input :status %> <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_table.status %>
<%= f.input :seater %> <%= f.input :seater %>
<%= f.input :order_by %> <%= f.input :order_by %>
<%= f.input :is_active %> <%= f.input :is_active %>