Tie meetings to speakers

Gemfile

@@ -7,6 +7,7 @@ gem 'pry'
 gem 'slim'
 gem 'bourbon'
 gem 'neat'
+gem 'jquery-rails'
 gem 'redcarpet'
 gem 'quiet_assets'
 gem 'minitest'

Gemfile.lock

@@ -70,6 +70,10 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     json (1.8.3)
     kgio (2.10.0)
     loofah (2.0.3)
@@ -183,6 +187,7 @@ DEPENDENCIES
   coffee-rails
   devise
   faker
+  jquery-rails
   minitest
   neat
   pg

app/assets/javascripts/application.js

@@ -11,3 +11,5 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require_tree .
+//= require jquery
+//= require jquery_ujs

app/controllers/pages_controller.rb

@@ -1,11 +1,4 @@
 class PagesController < ApplicationController
-
-
-  def add_speaker
-    meeting = Meeting.add_speaker_to_next_meeting(params[:name], params[:title], params[:url])
-    render json: meeting
-  end
-
   def now
     @next_crb = Meeting.find_or_create_next_date
     @board_members = BoardMember.all.order(director: :desc, title: :asc)

app/controllers/speakers_controller.rb

@@ -2,10 +2,10 @@ class SpeakersController < ApplicationController
   before_action :set_speaker, only: [:show, :edit, :update, :destroy]
     http_basic_authenticate_with name: ENV["ADMIN_USER"], password: ENV["ADMIN_PASSWORD"]
 
-  layout false
+  layout 'blank_slate'
   # GET /speakers
   def index
-    @speakers = Speaker.all
+    @speakers = Speaker.all.includes(:meeting)
   end
 
   # GET /speakers/1
@@ -55,6 +55,6 @@ def set_speaker
 
     # Only allow a trusted parameter "white list" through.
     def speaker_params
-      params.require(:speaker).permit(:name, :title, :url)
+      params.require(:speaker).permit(:name, :title, :url, :meeting_id)
     end
 end

app/models/meeting.rb

@@ -7,6 +7,7 @@ class Meeting < ActiveRecord::Base
   scope :future_meetings, -> { where(["DATE(time) >= ?", Date.today]).order('time ASC') }
   scope :lecture, -> { where(["format = ?", "Lecture"]) }
   scope :current_month_crb, -> { where(["DATE(time) >? AND DATE(time)<?", Time.now.beginning_of_month, Time.now.end_of_month]).order('time ASC').limit(1) }
+
   def self.add_speaker_to_next_meeting(name, title, url)
     find_or_create_next_date.speakers.create!({name: name, title:title, url: url})
   end

app/views/layouts/blank_slate.html.slim

@@ -0,0 +1,16 @@
+
+doctype html
+html
+  head
+    meta(http-equiv="content-type" content="text/html; charset=utf-8")
+    meta(name="language" content="en")
+
+    title Columbus Ruby Brigade
+
+    = csrf_meta_tags
+    = stylesheet_link_tag    "scaffolds", :media => "all"
+    = javascript_include_tag "application"
+
+  body
+
+   = yield

app/views/speakers/_form.html.erb

@@ -23,6 +23,10 @@
     <%= f.label :url %><br>
     <%= f.text_field :url %>
   </div>
+  <div class="field">
+    <%= f.label :meeting %><br>
+    <%= f.select :meeting_id, Meeting.future_meetings.collect { |m| [ m.time, m.id ] }, include_blank: true %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

app/views/speakers/index.html.erb

@@ -8,6 +8,7 @@
       <th>Name</th>
       <th>Title</th>
       <th>Url</th>
+      <th>Meeting</th>
       <th colspan="3"></th>
     </tr>
   </thead>
@@ -18,6 +19,7 @@
         <td><%= speaker.name %></td>
         <td><%= speaker.title %></td>
         <td><%= speaker.url %></td>
+        <td><%= speaker.meeting.try(:time) %></td>
         <td><%= link_to 'Show', speaker %></td>
         <td><%= link_to 'Edit', edit_speaker_path(speaker) %></td>
         <td><%= link_to 'Destroy', speaker, method: :delete, data: { confirm: 'Are you sure?' } %></td>

app/views/speakers/show.html.erb

@@ -15,5 +15,10 @@
   <%= @speaker.url %>
 </p>
 
+<p>
+  <strong>Meeting:</strong>
+  <%= @speaker.meeting.try(:time) %>
+</p>
+
 <%= link_to 'Edit', edit_speaker_path(@speaker) %> |
 <%= link_to 'Back', speakers_path %>