Soft deadline support for weekly points

Author: nygrenh

app/models/course.rb

@@ -501,8 +501,7 @@ def exercise_group_completion_by_user
   end
 
   # Returns a hash of exercise group => {
-  #   :available_points => number of available points,
-  #   :points_by_user => {user_id => number_of_points}
+  #  { awarded: double, late: double }
   # }
   def exercise_group_completion_ratio_for_user(user)
     # TODO: clean up exercise group discovery
@@ -515,16 +514,19 @@ def exercise_group_completion_ratio_for_user(user)
       next if available_points.empty?
 
       sql = <<-EOS
-        SELECT COUNT(*)
+        SELECT awarded_after_soft_deadline, COUNT(*)
         FROM awarded_points
         WHERE course_id = #{conn.quote(id)} AND
               name IN (#{available_points.map { |ap| conn.quote(ap) }.join(',')}) AND
               user_id = #{conn.quote(user.id)}
-        GROUP BY user_id
+        GROUP BY awarded_after_soft_deadline
       EOS
 
-      res = conn.select_rows(sql)
-      result[group] = res.empty? ? 0 : res[0][0].to_f / available_points.length
+      res = conn.execute(sql).values.to_h
+      result[group] = {
+        awarded: res.empty? ? 0 : res["f"],
+        late: res.empty? ? 0 : res["t"],
+      }
     end
   end
 

app/views/participants/show.html.erb

@@ -47,13 +47,14 @@
             </div>
           </div>
           <% if @group_completion_ratios[course.id] %>
-            <% @group_completion_ratios[course.id].each do |group, ratio| %>
+            <% @group_completion_ratios[course.id].each do |group, ratios| %>
               <br>
               <span class="progress-label">Awarded points for <%= group %></span>
               <div class="progress course-points-progress">
-                <% unless ratio.zero? %>
-                  <div class="progress-bar bg-info" role="progressbar" style="width: <%= ratio * 100 %>%" aria-valuenow="<%= ratio * 100 %>" aria-valuemin="0" aria-valuemax="100">
-                    <%= sprintf("%.0f", ratio * 100) %>%
+                <% unless (ratios[:awarded] + ratios[:late]).zero? %>
+                  <% calculated_ratio = ratios[:awarded] + ratios[:late] * course.soft_deadline_point_multiplier %>
+                  <div class="progress-bar bg-info" role="progressbar" style="width: <%= calculated_ratio * 100 %>%" aria-valuenow="<%= calculated_ratio * 100 %>" aria-valuemin="0" aria-valuemax="100">
+                    <%= sprintf("%.0f", calculated_ratio * 100) %>%
                   </div>
                 <% end %>
               </div>