Skip to content

Commit 0cc8118

Browse files
committed
Add date columns for coach the coaches and installation get-together
1 parent d0bc4ab commit 0cc8118

File tree

4 files changed

+48
-2
lines changed

4 files changed

+48
-2
lines changed

app/controllers/admin/events_controller.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@ def event_params
7171
:copy_templates_from_event_id,
7272
:confirmation_deadline,
7373
:reminder_date,
74-
:coach_registration_enabled)
74+
:coach_registration_enabled,
75+
:coach_the_coaches_date,
76+
:coach_the_coaches_start_time,
77+
:coach_the_coaches_end_time,
78+
:installation_get_together_date,
79+
:installation_get_together_start_time,
80+
:installation_get_together_end_time)
7581
end
7682

7783
def send_selection_emails(applications)

app/views/admin/events/edit.html.erb

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,30 @@
2222
<%= error_message(@event, :end_time) %>
2323
<p><%= f.text_field :end_time %></p>
2424

25+
<p><%= f.label(:coach_the_coaches_date, "Coach the Coaches date:") %></p>
26+
<%= error_message(@event, :coach_the_coaches_date) %>
27+
<p><%= f.date_select :coach_the_coaches_date %></p>
28+
29+
<p><%= f.label(:coach_the_coaches_start_time, "Coach the coaches starts at:") %></p>
30+
<%= error_message(@event, :coach_the_coaches_start_time) %>
31+
<p><%= f.time_select :coach_the_coaches_start_time %></p>
32+
33+
<p><%= f.label(:coach_the_coaches_end_time, "Coach the coaches ends at:") %></p>
34+
<%= error_message(@event, :coach_the_coaches_end_time) %>
35+
<p><%= f.time_select :coach_the_coaches_end_time %></p>
36+
37+
<p><%= f.label(:installation_get_together_date, "Installation Get-Together date:") %></p>
38+
<%= error_message(@event, :installation_get_together_date) %>
39+
<p><%= f.date_select :installation_get_together_date %></p>
40+
41+
<p><%= f.label(:installation_get_together_start_time, "Installation Get-Together starts at:") %></p>
42+
<%= error_message(@event, :installation_get_together_start_time) %>
43+
<p><%= f.time_select :installation_get_together_start_time %></p>
44+
45+
<p><%= f.label(:installation_get_together_end_time, "Installation Get-Together ends at:") %></p>
46+
<%= error_message(@event, :installation_get_together_end_time) %>
47+
<p><%= f.time_select :installation_get_together_end_time %></p>
48+
2549
<p><%= f.label(:application_start, "Applications start on:") %></p>
2650
<%= error_message(@event, :application_start) %>
2751
<p><%= f.date_select :application_start %></p>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
class AddNewColumnsToEvents < ActiveRecord::Migration[5.2]
2+
def change
3+
add_column :events, :coach_the_coaches_date, :date
4+
add_column :events, :coach_the_coaches_start_time, :time
5+
add_column :events, :coach_the_coaches_end_time, :time
6+
add_column :events, :installation_get_together_date, :date
7+
add_column :events, :installation_get_together_start_time, :time
8+
add_column :events, :installation_get_together_end_time, :time
9+
end
10+
end

db/schema.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# It's strongly recommended that you check this file into your version control system.
1212

13-
ActiveRecord::Schema.define(version: 2020_02_17_190804) do
13+
ActiveRecord::Schema.define(version: 2020_02_17_195541) do
1414

1515
# These are extensions that must be enabled in order to support this database
1616
enable_extension "plpgsql"
@@ -123,6 +123,12 @@
123123
t.boolean "coach_registration_enabled", default: true
124124
t.text "coach_approval_mail"
125125
t.text "coach_approval_mail_subject"
126+
t.date "coach_the_coaches_date"
127+
t.time "coach_the_coaches_start_time"
128+
t.time "coach_the_coaches_end_time"
129+
t.date "installation_get_together_date"
130+
t.time "installation_get_together_start_time"
131+
t.time "installation_get_together_end_time"
126132
end
127133

128134
create_table "users", id: :serial, force: :cascade do |t|

0 commit comments

Comments
 (0)