Add field to set contact person on request show page. Fixes hpi-swt2#313

. (hpi-swt2#362)

* Add field to set contact person on request show page

* Allow unsetting contact

app/controllers/requests_controller.rb

@@ -40,6 +40,16 @@ def update
     end
   end
 
+  def set_contact_person
+    @request = Request.find(params[:request_id])
+    update_params = contact_person_params
+    if !update_params[:contact_person].nil? and @request.update(update_params)
+      redirect_to @request, notice: I18n.t('requests.notice.was_updated')
+    else
+      render :show
+    end
+  end
+
   # DELETE /requests/1
   def destroy
     @request.destroy
@@ -63,4 +73,8 @@ def set_request
     def request_params
       params.require(:request).permit(:form_of_address, :first_name, :last_name, :phone_number, :street, :zip_code_city, :topic_of_workshop, :time_period, :email, :number_of_participants, :knowledge_level, :annotations)
     end
+
+    def contact_person_params
+      params.require(:request).permit(:contact_person)
+    end
 end

app/views/requests/show.html.erb

@@ -15,6 +15,21 @@
   <dt><strong><%= model_class.human_attribute_name(:status) %>:</strong></dt>
   <dd><%= t(@request.status, scope: 'activerecord.attributes.request.statuses') %></dd>
 </dl>
+<dl class="dl-horizontal">
+  <dt><strong><%= model_class.human_attribute_name(:contact_person) %>:</strong></td>
+  <dd>
+  <%= form_for @request, url: request_set_contact_person_path(@request), html: { class: 'form-inline' } do |f| %>
+    <div class="m-b-1">
+      <div class="input-group">
+        <%= f.text_field :contact_person, class: 'form-control', placeholder: t('activerecord.attributes.request.contact_person') %>
+        <span class="input-group-btn">
+          <%= f.submit t('requests.form.set_contact_person'), class: 'btn btn-default' %>
+        </span>
+      </div>
+    </div>
+  <% end %>
+  </dd>
+</dl>
 
 <%= link_to t('.back', :default => t("helpers.links.back")),
               requests_path, :class => 'btn btn-default'  %>

config/locales/de.requests.yml

@@ -13,6 +13,7 @@ de:
     form:
       create_request: "Anfrage erstellen"
       accept: "Annehmen"
+      set_contact_person: "Ansprechpartner festlegen"
     hints:
       please_enter_two_topics: "Bitte 2 Wünsche angeben"
     notice:
@@ -40,6 +41,7 @@ de:
         annotations: "Anmerkungen"
         id: "Nummer"
         created_at: "Erstellt am"
+        contact_person: "Ansprechpartner"
         status: "Status"
         statuses:
           open: "Noch nicht angenommen"

config/routes.rb

@@ -2,7 +2,9 @@
   post 'agreement_letters/create'
   get 'agreement_letters/show'
 
-  resources :requests
+  resources :requests do
+    patch 'contact_person' => 'requests#set_contact_person', as: :set_contact_person
+  end
 
   put 'applications/:id/status' => 'application_letters#update_status', as: :update_application_letter_status
   get 'applications/:id/check' => 'application_letters#check', as: :check_application_letter

db/migrate/20170119223355_add_contact_person_to_requests.rb

@@ -0,0 +1,5 @@
+class AddContactPersonToRequests < ActiveRecord::Migration
+  def change
+    add_column :requests, :contact_person, :string
+  end
+end

db/schema.rb

@@ -11,9 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-
-ActiveRecord::Schema.define(version: 20170118185870) do
-
+ActiveRecord::Schema.define(version: 20170119223355) do
 
   create_table "agreement_letters", force: :cascade do |t|
     t.integer  "user_id",    null: false
@@ -28,11 +26,11 @@
 
   create_table "application_letters", force: :cascade do |t|
     t.string   "motivation"
-    t.integer  "user_id",                      null: false
-    t.integer  "event_id",                     null: false
-    t.datetime "created_at",                   null: false
-    t.datetime "updated_at",                   null: false
-    t.integer  "status",           default: 2, null: false
+    t.integer  "user_id",                               null: false
+    t.integer  "event_id",                              null: false
+    t.datetime "created_at",                            null: false
+    t.datetime "updated_at",                            null: false
+    t.integer  "status",                    default: 2, null: false
     t.integer  "grade"
     t.string   "experience"
     t.string   "coding_skills"
@@ -85,8 +83,8 @@
     t.string   "knowledge_level"
     t.date     "application_deadline"
     t.boolean  "application_status_locked"
-    t.boolean  "participants_are_unlimited", default: false
     t.text     "custom_application_fields"
+    t.boolean  "participants_are_unlimited", default: false
   end
 
   create_table "profiles", force: :cascade do |t|
@@ -124,6 +122,7 @@
     t.text     "annotations"
     t.integer  "status",                 default: 0
     t.string   "zip_code_city"
+    t.string   "contact_person"
   end
 
   create_table "users", force: :cascade do |t|

spec/controllers/requests_controller_spec.rb

@@ -125,6 +125,28 @@
     end
   end
 
+  describe "PATCH #set_contact_person" do
+    before :each do
+      @a_request = Request.create! valid_attributes
+    end
+
+    context "with valid params" do
+      it "saves the name" do
+        name = 'Me'
+        patch :set_contact_person, request_id: @a_request.to_param, request: {contact_person: name}, session: valid_session
+        @a_request.reload
+        expect(@a_request.contact_person).to eq(name)
+      end
+    end
+
+    context "with invalid params" do
+      it "re-renders the 'show' template" do
+        patch :set_contact_person, request_id: @a_request.to_param, request: invalid_attributes, session: valid_session
+        expect(response).to render_template("show")
+      end
+    end
+  end
+
   describe "POST #create" do
     context "with valid params" do
       it "creates a new Request" do

spec/features/request_spec.rb

@@ -80,6 +80,18 @@ def fill_in_required_fields
         accepted_status = I18n.t 'activerecord.attributes.request.statuses.accepted'
         expect(page).to have_text(accepted_status)
       end
+
+      it 'should allow me to enter an contact person' do
+        request = FactoryGirl.create(:request)
+
+        visit(request_path(request))
+        expect(page).to have_field('request_contact_person')
+        fill_in 'request_contact_person', with: 'Me'
+        click_button I18n.t('requests.form.set_contact_person')
+
+        visit(request_path(request))
+        expect(page).to have_field('request_contact_person', with: 'Me')
+      end
     end
   end
 end