diff --git a/app/controllers/admin/memberlogs_controller.rb b/app/controllers/admin/memberlogs_controller.rb index b322615..6e0993d 100644 --- a/app/controllers/admin/memberlogs_controller.rb +++ b/app/controllers/admin/memberlogs_controller.rb @@ -8,6 +8,7 @@ class Admin::MemberlogsController < OrbitMemberController def index @dayoffs = Dayoff.all @now = Time.now.to_date + # @ch = ["一","二","三","四","五","六","日"] @memberlogs = MemberLog.all.order_by(:created_at=>'desc').page(params[:page]).per(10) end diff --git a/app/views/admin/dayoffs/_form.html.erb b/app/views/admin/dayoffs/_form.html.erb index 64309e0..40940a6 100644 --- a/app/views/admin/dayoffs/_form.html.erb +++ b/app/views/admin/dayoffs/_form.html.erb @@ -39,8 +39,8 @@ <%= f.hidden_field :member_profile_id, :value => @member.id %> - <% end %> -
+
+ <% end %> <% @site_in_use_locales.each do |locale| %> diff --git a/app/views/admin/memberlogs/_memberlogs.html.erb b/app/views/admin/memberlogs/_memberlogs.html.erb index 999a7a7..013e2bc 100644 --- a/app/views/admin/memberlogs/_memberlogs.html.erb +++ b/app/views/admin/memberlogs/_memberlogs.html.erb @@ -1,7 +1,7 @@ <% @memberlogs.each do |memberlog| %> <%= memberlog.member_profile.name rescue "" %> - <%= memberlog.created_at.strftime('%Y/%m/%d (%a)') %> + <%= memberlog.created_at.strftime('%Y/%m/%d (%a)') %> <% if memberlog.dayoff == true %> <%= t('memberlog.dayoff') %> <% else %> diff --git a/app/views/plugin/memberlog/_profile.html.erb b/app/views/plugin/memberlog/_profile.html.erb index 41c304e..da45029 100644 --- a/app/views/plugin/memberlog/_profile.html.erb +++ b/app/views/plugin/memberlog/_profile.html.erb @@ -49,7 +49,7 @@