Skip to content

Commit ceda7f3

Browse files
committed
Modify timetable and members
1 parent 78e2194 commit ceda7f3

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

app/helpers/timetables_helper.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def opening(start_at)
2525
def closing(start_at)
2626
[].tap do |list|
2727
list << {:id => nil, :title => "告知タイム", :speaker => "", :start_at => start_at}
28-
list << {:id => nil, :title => "クロージング", :speaker => "", :start_at => start_at += 10.minutes}
28+
list << {:id => nil, :title => "クロージング", :speaker => "", :start_at => start_at += 15.minutes}
2929
list << {:id => nil, :title => "記念撮影", :speaker => "運営", :start_at => start_at += 5.minutes}
3030
list << {:id => nil, :title => "懇親会 - 野良LTも受け付けます!", :speaker => "", :start_at => DateTime.new(2011, 4, 14, 18, 00)}
3131
list << {:id => nil, :title => "撤収 - 気をつけてお帰り下さい。", :speaker => "", :start_at => DateTime.new(2011, 4, 14, 19, 30)}
@@ -44,10 +44,11 @@ def talk(start_at, num = 0)
4444
start_at += 360.seconds
4545
end
4646
end
47+
talks << {:id => nil, :title => "--- 休憩 ---", :speaker => "", :start_at => start_at}
4748
end
4849
end
4950

5051
def speakers
51-
[[12, 20, 2, 10, 31, 7, 19, 23, 8, 5], [17, 28, 22, 11, 16, 1, 4, 9, 15, 26], [25, 33, 24, 21, 29, 18, 32, 14, nil, nil]]
52+
[[12, 20, 2, 10, 31, 7, 19, 23, 8, 5], [17, 28, 22, 11, 16, 1, 4, 9], [15, 26, 25, 33, 24, 21, 29, 47, 32, 14]]
5253
end
5354
end

app/views/members/index.html.haml

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
%th.image_col
66
%th= t(".name")
77
%th= t(".comment")
8-
%th= t(".registered_at")
8+
%th= t(".attend_parties")
9+
-# %th= t(".registered_at")
910
%tbody
1011
- @members.each do |member|
1112
%tr
1213
%td.image_col= image_tag member.image
1314
%td= link_to member.screen_name, member_path(member.id)
1415
%td= member.profile.comment
15-
%td= I18n.l member.created_at, :format => :short
16+
%td= member.profile.attend_parties? ? "" : nil
17+
-# %td= I18n.l member.created_at, :format => :short

app/views/timetables/show.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
%td= I18n.l contents[:start_at], :format => :timetable
2323
%td= contents[:speaker]
2424
%td= contents[:title]
25-
- talk(DateTime.new(2011, 4, 14, 16, 30), 2).each do |contents|
25+
- talk(DateTime.new(2011, 4, 14, 16, 25), 2).each do |contents|
2626
%tr
2727
%td= I18n.l contents[:start_at], :format => :timetable
2828
%td= contents[:speaker]

config/locales/page_ja.yml

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ ja:
6767
registered_at: "登録日"
6868
comment: "一言"
6969
name: "名前"
70+
attend_parties: "懇親会"
7071
show:
7172
name: "名前"
7273
talk_title: "発表タイトル"

0 commit comments

Comments
 (0)