db/migrate/20080930171605_prepare_for_kansai01.rb
@@ -18,7 +18,7 @@ class Admin::EventsController < AdminController
def new
@event = Event.new
-
+ @event.capacity = 0
respond_to do |format|
format.html
end
app/controllers/admin/events_controller.rb
@@ -1,11 +1,17 @@
# -*- coding: utf-8 -*-
module EventsHelper
def render_registration_link
+ if @event.single_day?
content_tag :div, :class => "registration_link" do
- if @event.registration_enabled?
- link_to('フォームから参加登録をする', :action => 'registration')
- else
- message_for_retgistration_is_closed
+ if @event.registration_enabled?
+ link_to('フォームから参加登録をする', :action => 'registration')
+ else
+ message_for_retgistration_is_closed
+ end
+ end
+ else
+ content_tag :div, :class => "registration_external" do
+ render_hiki(@event.register_information)
end
end
end
@@ -15,4 +21,12 @@ module EventsHelper
"参加登録の受付は終了しました"
end
end
+
+ def dates_of(event)
+ if event.single_day?
+ event.start_on.strftime("%Y-%m-%d(%a)")
+ else
+ "#{event.start_on.strftime("%Y-%m-%d(%a)")}〜#{event.end_on.strftime('%m-%d(%a)')}"
+ end
+ end
end
app/helpers/events_helper.rb
@@ -3,19 +3,19 @@ class Event < ActiveRecord::Base
has_many :attendees
named_scope :upcomings, lambda {
- {:conditions => ["force_disabled = ? and scheduled_on > ?",
+ {:conditions => ["force_disabled = ? and start_on > ?",
false, Date.today],
- :order => "scheduled_on DESC"}
+ :order => "start_on DESC"}
}
named_scope :archives, lambda {
- {:conditions => ["force_disabled = ? and publish_at <= ? and scheduled_on < ?",
+ {:conditions => ["force_disabled = ? and publish_at <= ? and end_on < ?",
false, DateTime.now, Date.today],
- :order => "scheduled_on"}
+ :order => "end_on"}
}
validates_uniqueness_of :name
validates_format_of :name, :with => /[a-z]+\d+/, :message => "は、開催場所アルファベット名に数字を加えたもの(例:tokyo01)にしてください。"
- validates_presence_of :title, :scheduled_on, :contact_email, :official_tag
+ validates_presence_of :name, :title, :start_on, :end_on, :contact_email, :official_tag
validates_numericality_of :capacity, :only_integer => true
def registration_enabled?
@@ -27,13 +27,17 @@ class Event < ActiveRecord::Base
end
def expired?
- scheduled_on < Date.today
+ end_on < Date.today
end
def published?
publish_at <= DateTime.now
end
+ def single_day?
+ start_on == end_on
+ end
+
private
def attendees_count
attendees.count
app/models/event.rb
@@ -2,7 +2,12 @@
URLとして使う名前: <%= form.text_field :name %><br />
(例 http://regional.rubykaigi.org/<strong>tokyo01</strong>)<br />
イベントのタイトル: <%= form.text_field :title %><br />
-イベントの開催日: <%= form.text_field :scheduled_on %>
+</p>
+<p>
+イベントの会期:<br />
+開始日:<%= form.text_field :start_on %><br />
+終了日:<%= form.text_field :end_on %><br />
+(単日開催の場合は、開始日と終了日を同じ日にしてください)
</p>
<p>
@@ -10,12 +15,36 @@ URLとして使う名前: <%= form.text_field :name %><br />
公式タグ: <%= form.text_field :official_tag %><br />
</p>
+<p>
+ウェブページを公開する日時: <%= form.datetime_select :publish_at, {:start_year => Date.today.year, :use_month_numbers => true, :minute_step => 15} %><br />
+(ここで指定した日時を過ぎると、トップページからイベント個別のページへのリンクが有効になります)
+</p>
+<p>
+<%= form.label :force_disabled, 'イベントを無効にする: ' %><%= form.check_box :force_disabled %><br />
+(このチェックボックスをONにすると、一般の閲覧者からはイベントの存在が見えなくなります)
+</p>
+
+
+<p>申し込み登録の設定:
+
+<fieldset id="register_builtin">
+<legend><%= form.radio_button :use_builtin_registration, true %><label for="event_use_builtin_registration_true"> regional.rubykaigi.org提供の登録フォームを利用する</label></legend>
+<p>
参加登録の定員: <%= form.text_field :capacity, :size => 5 %> <%= form.check_box :notify_email_enabled %><%=form.label :notify_email_enabled, ' 登録されたらメールで通知する' %>
</p>
+</fieldset>
+
+</p>
+
+
+<fieldset id="register_external">
+<legend><%= form.radio_button :use_builtin_registration, false %><label for="event_use_builtin_registration_false">外部のサイトなどを利用する</legend>
<p>
-ウェブページを公開する日時: <%= form.datetime_select :publish_at, {:start_year => Date.today.year, :use_month_numbers => true, :minute_step => 15} %> <br />
-<%= form.label :force_disabled, '無効: ' %><%= form.check_box :force_disabled %>
+イベントに登録したいユーザはどうすればよいのか、説明を書いてください。<br />
+例えば、申し込みページのURLとその説明などがふさわしいでしょう(<%= link_to_hikidoc %>):
+<%= form.text_area :register_information, :cols => 75, :rows => 5 %>
</p>
+</fieldset>
<p>
イベント開催翌日以降に表示するメッセージ(<%= link_to_hikidoc %>):<br />
@@ -37,6 +66,7 @@ URLとして使う名前: <%= form.text_field :name %><br />
$.datepicker.parseDate('yy-mm-dd', $(id).val()));
$(id).datepicker({dateFormat: 'yy-mm-dd'})
};
- initDatePicker("#event_scheduled_on");
+ initDatePicker("#event_start_on");
+ initDatePicker("#event_end_on");
});
</script>
app/views/admin/events/_form.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing event</h1>
+<h2>地域Ruby会議の情報を編集する</h2>
<p><%= link_to '参加登録者の一覧', admin_event_attendees_path(@event) %></p>
app/views/admin/events/edit.html.erb
@@ -1,4 +1,4 @@
-<h1>新規イベント</h1>
+<h2>新しく地域Ruby会議を開催する</h2>
<% form_for(@event, :url => {:action => "create"}) do |f| %>
<%= f.error_messages %>
app/views/admin/events/new.html.erb
@@ -5,7 +5,7 @@
<ul>
<% unless @upcomings.blank? -%>
<% @upcomings.each do |event| -%>
- <li><%=h event.scheduled_on.to_s(:index) %>: <span class="event_name"><%= link_to_if event.published?, h(event.title), event_path(:action => 'show', :name => event.name) %></span>
+ <li><%=h(dates_of(event)) %>: <span class="event_name"><%= link_to_if event.published?, h(event.title), event_path(:action => 'show', :name => event.name) %></span>
<%# TODO duplicated %>
<% if logged_in_as_admin? -%>
<span class="admin_event_edit"><%= link_to '編集', edit_admin_event_path(event) %></span>
@@ -20,7 +20,7 @@
<h2>過去の地域Ruby会議</h2>
<ul>
<% @archives.each do |event| -%>
-<li><%=h event.scheduled_on.to_s(:index) %>: <%= link_to h(event.title), url_for(:action => 'show', :name => event.name) %>
+<li><%=h(dates_of(event)) %>: <%= link_to h(event.title), url_for(:action => 'show', :name => event.name) %>
<%# TODO duplicated %>
<% if logged_in_as_admin? -%>
<span class="admin_event_edit"><%= link_to '編集', edit_admin_event_path(event) %></span>
@@ -35,7 +35,7 @@
<li><%= link_to '地域Ruby会議を新しく開催する', new_admin_event_path %></li>
</ul>
<ul>
-<li><%= link_to '地域Ruby会議の管理用メニュー', admin_events_path %></li>
+<li><%= link_to '地域Ruby会議の一覧', admin_events_path %></li>
<li><%= link_to 'ユーザ(というか管理者)の一覧', admin_users_path %></li>
</ul>
<% end -%>
app/views/events/index.html.erb
@@ -2,7 +2,16 @@
Factory.define :tokyo01, :class => Event do |e|
e.name 'tokyo01'
e.title '東京Ruby会議01'
+ e.official_tag "tokyorubykaigi01"
+ e.contact_email "tokyo01@rubykaigi.org"
+ e.start_on Date.parse("2008-08-20")
+ e.end_on Date.parse("2008-08-20")
e.capacity 100
- e.scheduled_on Date.parse("2008-08-20")
e.publish_at DateTime.parse("2008-08-13 12:00:00")
end
+
+Factory.define :kansai01, :class => Event do |e|
+ e.name 'kansai01'
+ e.start_on Date.parse('2008-11-07')
+ e.end_on Date.parse('2008-11-08')
+end
spec/factories.rb
@@ -25,7 +25,7 @@ end
describe Event, "#expired?" do
before do
- @event = Factory.build(:tokyo01, :scheduled_on => Date.parse("2008-08-01"))
+ @event = Factory.build(:tokyo01, :end_on => Date.parse("2008-08-01"))
end
describe "when the day before" do
@@ -96,27 +96,32 @@ describe Event, "for toppage" do
Event.create_without_validation(:name => 'rubykaigi2008',
:title => 'RubyKaigi2008', :capacity => 800,
- :scheduled_on => Date.parse("2008-06-20"),
+ :start_on => Date.parse("2008-06-20"),
+ :end_on => Date.parse("2008-06-20"),
:publish_at => DateTime.parse("2008-03-01 12:00:00"))
Event.create_without_validation(:name => 'tokyo01',
:title => '東京Ruby会議01', :capacity => 100,
- :scheduled_on => Date.parse("2008-08-20"),
+ :start_on => Date.parse("2008-08-20"),
+ :end_on => Date.parse("2008-08-20"),
:publish_at => DateTime.parse("2008-08-13 12:00:00"))
Event.create_without_validation(:name => 'sapporo01',
:title => '札幌Ruby会議01', :capacity => 100,
- :scheduled_on => Date.parse("2008-10-25"),
+ :start_on => Date.parse("2008-10-25"),
+ :end_on => Date.parse("2008-10-25"),
:publish_at => DateTime.parse("2008-09-16 12:00:00"))
Event.create_without_validation(:name => 'matsue01',
:title => '松江Ruby会議01', :capacity => 100,
- :scheduled_on => Date.parse("2008-10-18"),
+ :start_on => Date.parse("2008-10-18"),
+ :end_on => Date.parse("2008-10-18"),
:publish_at => DateTime.parse("2008-09-10 12:00:00"))
Event.create_without_validation(:name => 'kyushu01',
:title => '九州Ruby会議01', :capacity => 80,
- :scheduled_on => Date.parse("2008-12-14"),
+ :start_on => Date.parse("2008-12-14"),
+ :end_on => Date.parse("2008-12-14"),
:publish_at => DateTime.parse("2008-11-30 12:00:00"))
end
@@ -148,3 +153,8 @@ describe Event, "for toppage" do
it { @archives[1].name.should == "tokyo01" }
end
end
+
+describe Event, "#single_day?" do
+# it { Factory(:kansai01).should_not single_day? }
+ it { Factory.build(:tokyo01).should be_single_day }
+end
spec/models/event_spec.rb
d2d273d6dbfbf62648f35d6ef02299b97db52879
KAKUTANI Shintaro
shintaro@kakutani.com
http://github.com/kakutani/regional_rubykaigi/commit/dd34d4ef30e5fd9dc43c492bd0f525bc1d533e37
dd34d4ef30e5fd9dc43c492bd0f525bc1d533e37
2008-09-30T12:02:40-07:00
2008-09-30T12:02:40-07:00
ready for kansai01 naively.
- enabled event range of dates(start_on/end_on).
- allow choice builtin registration form or external registartion webpage or something.
- imporove events/index appearance.
4a8ae7e79ade90d020115e1f356ed806976f41d6
KAKUTANI Shintaro
shintaro@kakutani.com