Don't talk about soft deadlines in exercise description if the course doesn't have them

Author: Redande

app/views/exercises/show.html.erb

@@ -57,27 +57,61 @@
     <% end %>
   <% end %>
 
-    <% if @exercise.soft_deadline_for(current_user) %>
-      <li>
-        Deadline: <%= @exercise.soft_deadline_for(current_user) %>
-        <% if @exercise.soft_deadline_spec_obj.universal_description %>
-          (<%= @exercise.soft_deadline_spec_obj.universal_description %>)
+  <% if @exercise.soft_deadline_for(current_user) && @exercise.deadline_for(current_user) %>
+    <li>
+      Deadline:
+      <% if @exercise.soft_deadline_spec_obj.universal_description %>
+        <%= @exercise.soft_deadline_spec_obj.universal_description %>
+      <% else %>
+        <%= @exercise.soft_deadline_for(current_user) %>
+      <% end %>
+      <% if Exercise.deadline_expired?(@exercise.soft_deadline_for(current_user)) %>
+        <% if current_user.administrator? %>
+          (expired (if you weren't an admin))
+        <% else %>
+          (expired)
         <% end %>
-        <% if Exercise.deadline_expired?(@exercise.soft_deadline_for(current_user)) %>
-          <% if current_user.administrator? %>
-            (expired (if you weren't an admin))
-          <% else %>
-            (expired)
-          <% end %>
+      <% end %>
+      <br>After the deadline has passed, you can still return the exercise until
+      <% if @exercise.deadline_spec_obj.universal_description %>
+        <%= @exercise.deadline_spec_obj.universal_description %>
+      <% else %>
+        <%= @exercise.deadline_for(current_user) %>
+      <% end %>
+      <% if Exercise.deadline_expired?(@exercise.deadline_for(current_user)) %>
+        <% if current_user.administrator? %>
+          (expired (if you weren't an admin))
+        <% else %>
+          (expired)
         <% end %>
-      </li>
-    <% end %>
-
-  <% if @exercise.deadline_for(current_user) %>
+      <% end %>
+      <br>However, you will only get <%= @course.soft_deadline_point_multiplier * 100 %>% of the points.
+    </li>
+  <% elsif @exercise.soft_deadline_for(current_user) %>
+     <li>
+      Deadline:
+      <% if @exercise.soft_deadline_spec_obj.universal_description %>
+        <%= @exercise.soft_deadline_spec_obj.universal_description %>
+      <% else %>
+        <%= @exercise.soft_deadline_for(current_user) %>
+      <% end %>
+      <% if Exercise.deadline_expired?(@exercise.soft_deadline_for(current_user)) %>
+        <% if current_user.administrator? %>
+          (expired (if you weren't an admin))
+        <% else %>
+          (expired)
+        <% end %>
+      <% end %>
+      <br>After the deadline has passed, you can still return the exercise.
+      <br>However, you will only get <%= @course.soft_deadline_point_multiplier * 100 %>% of the points.
+    </li>
+  <% elsif @exercise.deadline_for(current_user) %>
     <li>
-      After the deadline has passed, you can still return the exercise until <%= @exercise.deadline_for(current_user) %>
+      Deadline:
       <% if @exercise.deadline_spec_obj.universal_description %>
-        (<%= @exercise.deadline_spec_obj.universal_description %>)
+        <%= @exercise.deadline_spec_obj.universal_description %>
+      <% else %>
+        <%= @exercise.deadline_for(current_user) %>
       <% end %>
       <% if Exercise.deadline_expired?(@exercise.deadline_for(current_user)) %>
         <% if current_user.administrator? %>
@@ -86,7 +120,6 @@
           (expired)
         <% end %>
       <% end %>
-      <br>However, you will only get <%= @course.soft_deadline_point_multiplier * 100 %>% of the points.
     </li>
   <% end %>