Merge branch 'dev' into 555_show_agreement_letter_upload_form_only_wh…

…en_accepted

app/assets/stylesheets/profiles.css

@@ -2,3 +2,13 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+
+.profile_details dt {
+    width: 200px;
+    white-space: normal;
+}
+
+.profile_details dd {
+    margin-left: 220px;
+}

app/assets/stylesheets/requests.css

@@ -2,3 +2,13 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+
+.request_details dt {
+    width: 200px;
+    white-space: normal;
+}
+
+.request_details dd {
+    margin-left: 220px;
+}

app/controllers/application_letters_controller.rb

@@ -33,7 +33,7 @@ def new
     last_application_letter = ApplicationLetter.where(user: current_user).order("created_at").last
     if last_application_letter
       attrs_to_fill_in = last_application_letter.attributes
-        .slice("emergency_number", "vegetarian", "vegan", "allergies")
+        .slice("emergency_number", "organisation", "vegetarian", "vegan", "allergies")
       @application_letter.attributes = attrs_to_fill_in
       flash.now[:notice] = I18n.t('application_letters.fields_filled_in')
     end

app/views/application_letters/index.html.erb

@@ -14,7 +14,11 @@
   <% @application_letters.each do |application| %>
       <tr>
         <td><%= link_to application.event.name, event_path(application.event) %></td>
-        <td><%= application.status_type %></td>
+        <% if current_user.present? && current_user.role == 'pupil' && application.event.phase == :selection %>
+          <td><%= t('application_status.pending_after_deadline') %></td>
+        <% else %>
+          <td><%= application.status_type %></td>
+        <% end %>
         <td>
         <%= link_to t('.details'),
                       check_application_letter_path(application), :class => 'btn btn-default btn-xs' %>

app/views/profiles/show.html.erb

@@ -3,7 +3,7 @@
   <h1><%=t '.title', :default => model_class.model_name.human.titleize %></h1>
 </div>
 
-<dl class="dl-horizontal">
+<dl class="dl-horizontal profile_details">
   <% [:first_name, :last_name, :gender, :birth_date, :street_name, :zip_code, :city, :state, :country, :discovery_of_site].each do |attr_name| %>
     <dt><strong><%= model_class.human_attribute_name(attr_name) %>:</strong></dt>
     <% if attr_name == :gender %>

app/views/requests/show.html.erb

@@ -4,7 +4,7 @@
 </div>
 
 <h3><%=t 'requests.workshop_information' %></h3>
-<dl class="dl-horizontal">
+<dl class="dl-horizontal request_details">
   <dt><strong><%= model_class.human_attribute_name(:topic_of_workshop) %>:</strong></dt>
   <dd><%= @request.topic_of_workshop %></dd>
   <dt><strong><%= model_class.human_attribute_name(:number_of_participants) %>:</strong></dt>
@@ -20,7 +20,7 @@
 </dl>
 
 <% if can? :set_contact_person, Request %>
-<dl class="dl-horizontal">
+<dl class="dl-horizontal request_details">
   <dt><strong><%= model_class.human_attribute_name(:contact_person) %>:</strong></dt>
   <dd>
     <%= form_for @request, url: request_set_contact_person_path(@request), html: { class: 'form-inline' } do |f| %>
@@ -38,7 +38,7 @@
 <% end %>
 
 <% if can? :set_notes, Request %>
-<dl class="dl-horizontal">
+<dl class="dl-horizontal request_details">
   <dt><strong><%= model_class.human_attribute_name(:notes) %>:</strong></dt>
   <dd>
     <%= form_for @request, url: request_set_notes_path(@request) do |f| %>
@@ -52,7 +52,7 @@
 <% end %>
 
 <h3><%= t('requests.personal_information') %></h3>
-<dl class="dl-horizontal">
+<dl class="dl-horizontal request_details">
   <dt><strong><%= model_class.human_attribute_name(:first_name) %>:</strong></dt>
   <dd><%= @request.first_name %></dd>
   <dt><strong><%= model_class.human_attribute_name(:last_name) %>:</strong></dt>

spec/factories/events.rb

@@ -137,6 +137,17 @@
       end
     end
 
+    trait :in_selection_phase_with_no_mails_sent_and_application do
+      after(:build) do |event, evaluator|
+        create_list(:application_letter, 1, event: event, status: :accepted)
+
+        event.published = true
+        event.application_deadline = Date.yesterday
+        event.acceptances_have_been_sent = false
+        event.rejections_have_been_sent = false
+      end
+    end
+
     trait :in_selection_phase_with_participants_locked do
       after(:build) do |event|
         event.published = true

spec/features/application_letters_spec.rb

@@ -67,6 +67,7 @@
     end
 
     check_filled_field.call(:emergency_number)
+    check_filled_field.call(:organisation)
     check_filled_field.call(:allergies)
     check_checked_checkbox.call(:vegetarian)
     check_checked_checkbox.call(:vegan)

spec/views/application_letters/index.html.erb_spec.rb

@@ -53,4 +53,24 @@
     render
     expect(rendered).to have_link(@application_letters[0].event.name, href: event_path(@application_letters[0].event.id))
   end
+
+  it "should hide the temporary state of an applicant from the user" do
+    @event = assign(:event, FactoryGirl.create(:event, :in_selection_phase_with_no_mails_sent_and_application))
+    @application_letter = @event.application_letters[0]
+    @application_letter.user = FactoryGirl.create(:user_with_profile, role: :pupil)
+    @application_letters = @event.application_letters
+    @current_user = sign_in(@event.application_letters[0].user)
+    render
+    expect(rendered).to have_text(I18n.t('application_status.pending_after_deadline'))
+  end
+
+  it "should show the temporary state of an applicant to a coach" do
+    @event = assign(:event, FactoryGirl.create(:event, :in_selection_phase_with_no_mails_sent_and_application))
+    @application_letter = @event.application_letters[0]
+    @application_letter.user = FactoryGirl.create(:user_with_profile, role: :coach)
+    @application_letters = @event.application_letters
+    @current_user = sign_in(@application_letter.user)
+    render
+    expect(rendered).to have_text(@application_letter.status_type)
+  end
 end