Show section due date on student view.

Closes #263. Students will now see the section due date where previously it only showed "Due dates are specified per section".
MarkUsProject · Feb 23, 2012 · 777aa58 · 777aa58
1 parent d202ba9
commit 777aa58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
@@ -109,6 +109,8 @@ def index
     @assignments = Assignment.all(:order => :id)
     @grade_entry_forms = GradeEntryForm.all(:order => :id)
     if current_user.student?
+      #get the section of current user
+      @section = current_user.section
       # get results for assignments for the current user
       @a_id_results = Hash.new()
       @assignments.each do |a|

diff --git a/app/views/assignments/_list.html.erb b/app/views/assignments/_list.html.erb
@@ -36,7 +36,14 @@
                     :hours => ((((assignment.due_date - Time.now)/(60 * 60)) % 24).floor)) %>
                 <% end %>
 	      <% else %>
-                <%= I18n.t('assignment.section_due_date_type')%>
+               <% if assignment.section_due_date(@section) < Time.now %>
+                <strong><%= I18n.l(assignment.section_due_date(@section), :format => :long_date) %></strong>
+                <% else %>
+                  <strong><%= I18n.l(assignment.section_due_date(@section), :format => :long_date) %></strong><br />
+                    <%= I18n.t(:days_and_hours_left,
+                    :days => ((((assignment.due_date - Time.now)/(60 * 60 * 24)).floor).to_s),
+                    :hours => ((((assignment.due_date - Time.now)/(60 * 60)) % 24).floor)) %>
+               <% end %>
 	      <% end %>
             </td>
             <td style="width: 40%;">