Louis | Allows users to associate clients with agencies

app/controllers/clients_controller.rb

@@ -59,8 +59,8 @@ class ClientsController < ApplicationController
         :weight,
         :helmet,
         :lock,
-        :agency,
         :completion_date,
-        :bike_id) 
+        :bike_id,
+        :agency_id) 
     end
 end

app/models/agency.rb

@@ -1,2 +1,3 @@
 class Agency < ActiveRecord::Base
+  has_many :clients
 end

app/models/client.rb

@@ -1,3 +1,4 @@
 class Client < ActiveRecord::Base
   has_one :bike
+  belongs_to :agency
 end

app/views/clients/_fields.html.haml

@@ -50,11 +50,6 @@
     = f.label "Lock", class: "col-sm-2 control-label"
     .col-sm-10
       = f.check_box :lock, disabled: disabled
- 
-  .form-group
-    = f.label "Agency", class: "col-sm-2 control-label"
-    .col-sm-10
-      = f.text_field :agency, class: "form-control", disabled: disabled
 
   .form-group
     = f.label "Completion Date:", class: "col-sm-2 control-label"
@@ -66,3 +61,8 @@
     .col-sm-10
       = f.select(:bike_id, Bike.all.collect {|b| [ b.name, b.id ] }, {include_blank: 'None'})
 
+  .form-group
+    = f.label "Agency:", class: "col-sm-2 control-label"
+    .col-sm-10
+      = f.select(:agency_id, Agency.all.collect {|b| [ b.agency_name, b.id ] }, {include_blank: 'None'})
+

app/views/clients/index.html.haml

@@ -15,7 +15,7 @@
         %tr
           %td= client.first_name 
           %td= client.last_name 
-          %td= client.agency
+          %td= client.agency.agency_name if client.agency
           %td= link_to 'Show', client
           %td= link_to 'Edit', edit_client_path(client)
           %td= link_to 'Destroy', client, method: :delete, data: { confirm: 'Are you sure?' }