Work on events

app/controllers/activities_controller.rb

@@ -28,10 +28,11 @@ class ActivitiesController < ApplicationController
   # POST /activities.json
   def create
     @activity = Activity.new(activity_params)
+    @activity.group = @group
 
     respond_to do |format|
       if @activity.save
-        format.html { redirect_to @activity, notice: 'Activity was successfully created.' }
+        format.html { redirect_to group_activity_url(@group, @activity), notice: 'Activity was successfully created.' }
         format.json { render :show, status: :created, location: @activity }
       else
         format.html { render :new }
@@ -45,7 +46,7 @@ class ActivitiesController < ApplicationController
   def update
     respond_to do |format|
       if @activity.update(activity_params)
-        format.html { redirect_to @activity, notice: 'Activity was successfully updated.' }
+        format.html { redirect_to group_activity_url(@group, @activity), notice: 'Activity was successfully updated.' }
         format.json { render :show, status: :ok, location: @activity }
       else
         format.html { render :edit }
@@ -59,7 +60,7 @@ class ActivitiesController < ApplicationController
   def destroy
     @activity.destroy
     respond_to do |format|
-      format.html { redirect_to activities_url, notice: 'Activity was successfully destroyed.' }
+      format.html { redirect_to group_activities_url(@group), notice: 'Activity was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -76,6 +77,6 @@ class ActivitiesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def activity_params
-      params.fetch(:activity, {})
+      params.require(:activity).permit(:public_name, :secret_name, :description, :location, :start, :end, :deadline, :show_hidden)
     end
 end

app/controllers/groups_controller.rb

@@ -77,6 +77,6 @@ class GroupsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def group_params
-      params.fetch(:group, {})
+      params.require(:group).permit(:name)
     end
 end

app/views/activities/_form.html.erb

@@ -12,6 +12,42 @@
   <% end %>
 
   <div class="actions">
+    <div class="form-group">
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.label :public_name %>
+          <%= f.text_field :public_name, class: 'form-control' %>
+        </div>
+        <div class="col-md-6">
+          <%= f.label :secret_name %>
+          <%= f.text_field :secret_name, class: 'form-control' %>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.label :start %>
+          <%= f.datetime_field :start, class: 'form-control' %>
+        </div>
+        <div class="col-md-6">
+          <%= f.label :end %>
+          <%= f.datetime_field :end, class: 'form-control' %>
+        </div>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :description %>
+      <%= f.text_area :description, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :deadline %>
+      <%= f.datetime_field :deadline, class: 'form-control' %>
+    </div>
+    <div class="form-group">
+      <%= f.label :show_hidden %>
+      <%= f.check_box :show_hidden %>
+    </div>
     <%= f.submit %>
   </div>
 <% end %>

app/views/activities/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render 'form', activity: @activity %>
 
-<%= link_to 'Show', group_activity(@group, @activity) %> |
+<%= link_to 'Show', group_activity_path(@group, @activity) %> |
 <%= link_to 'Back', group_activities_path(@group) %>

app/views/activities/show.html.erb

@@ -1,4 +1,21 @@
-<p id="notice"><%= notice %></p>
+<h2><%= @activity.public_name %></h2>
+
+<ul>
+  <li>Secretly <%= @activity.secret_name %></li>
+  <li><%= @activity.description %></li>
+  <li><%= @activity.location %></li>
+  <li><%= @activity.start %> - <%= @activity.end %></li>
+  <li>Deadline <%= @activity.deadline %></li>
+</ul>
+
+<h2>Participants (<%= @activity.participants.count %>)</h2>
+<ul>
+  <% @activity.participants.each do |p| %>
+    <li>
+      <%= p.person.full_name %>, <%= p.is_organizer %>, <%= p.attending %>
+    </li>
+  <% end %>
+</ul>
 
 <%= link_to 'Edit', edit_group_activity_path(@group, @activity) %> |
 <%= link_to 'Back', group_activities_path(@group) %>

app/views/groups/_form.html.erb

@@ -12,6 +12,10 @@
   <% end %>
 
   <div class="actions">
+    <div class="form-group">
+      <%= f.label :name %>
+      <%= f.text_field :name, class: 'form-control' %>
+    </div>
     <%= f.submit %>
   </div>
 <% end %>

app/views/groups/show.html.erb

@@ -21,6 +21,9 @@
     </li>
   <% end %>
 </ul>
+<%= link_to "Manage activities", group_activities_path(@group) %>
 
+<div>
 <%= link_to 'Edit', edit_group_path(@group) %> |
 <%= link_to 'Back', groups_path %>
+</div>