Added a button to release/unrelease grades

app/assets/javascripts/annotations.js

@@ -129,7 +129,7 @@ function purgeCurrentPageCache() {
     symbolTree: `<div id="symbol-tree-container">${$('#symbol-tree-container').html()}</div>`,
     versionLinks: `<span id="version-links">${$('#version-links').html()}</span>`,
     versionDropdown: `<span id="version-dropdown">${$('#version-dropdown').html()}</span>`,
-    url: window.location.href,
+    url: window.location.href
   };
 }
 
@@ -184,6 +184,7 @@ function fillAnnotationBox() {
     $('.problemGrades').html($page.find('.problemGrades'));
     $('#annotationPane').html($page.find(' #annotationPane'));
     $('.collapsible').collapsible({ accordion: false });
+    $('#release-grades').html($page.find('#release-grades'));
     $('#loadScreen').hide();
     attachChangeFileEvents();
     attachAnnotationPaneEvents();

app/controllers/submissions_controller.rb

@@ -9,7 +9,8 @@ class SubmissionsController < ApplicationController
   before_action :set_assessment
   before_action :set_assessment_breadcrumb
   before_action :set_manage_submissions_breadcrumb, except: %i[index]
-  before_action :set_submission, only: %i[destroy destroyConfirm download edit update view]
+  before_action :set_submission, only: %i[destroy destroyConfirm download edit update
+                                          view release_student_grade unrelease_student_grade]
   before_action :get_submission_file, only: %i[download view]
 
   # this page loads.  links/functionality may be/are off
@@ -611,6 +612,24 @@ def view
     end
   end
 
+  action_auth_level :release_student_grade, :course_assistant
+  def release_student_grade
+    @submission.scores.each do |score|
+      score.released = true
+      score.save
+    end
+    redirect_back(fallback_location: root_path)
+  end
+
+  action_auth_level :unrelease_student_grade, :course_assistant
+  def unrelease_student_grade
+    @submission.scores.each do |score|
+      score.released = false
+      score.save
+    end
+    redirect_back(fallback_location: root_path)
+  end
+
 private
 
   def new_submission_params

app/helpers/submission_helper.rb

@@ -6,4 +6,5 @@ def plus_fix(f)
       sprintf("%.2f", f.round(2))
     end
   end
+
 end

app/models/submission.rb

@@ -399,10 +399,13 @@ def as_json(options = {})
     json
   end
 
+  def problems_released?
+    scores.pluck(:released).all?
+  end
+
   def grades_released?(as_seen_by)
     include_unreleased = as_seen_by.course_assistant? || as_seen_by.instructor?
-    released = scores.pluck(:released).all?
-    released || include_unreleased
+    problems_released? || include_unreleased
   end
 
   # easy access to AUD

app/views/assessments/_handin_form.html.erb

@@ -4,18 +4,18 @@
     <% grace_late_info = "" %>
 
     <% if @aud.past_due_at? %>
-    <% currentTime = Time.zone.now %>
-    <% days_late = currentTime - @aud.due_at + (currentTime.utc_offset - @aud.due_at.utc_offset) %>
-    <% days_late = (days_late / 1.day).ceil %>
-    <% grace_days_left = @aud.grace_days_usable %>
-    <% if grace_days_left >= days_late %>
-    <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(days_late, 'grace day')}" %>
-    <% elsif grace_days_left > 0 %>
-    <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(grace_days_left, 'grace day')} with #{pluralize(days_late - grace_days_left, 'penalty late day')}" %>
-    <% else %>
-    <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(days_late, 'penalty late day')}" %>
-    <% end %>
-    <% late_confirm = " and that I am #{grace_late_info} under the late policy as defined in the syllabus" %>
+      <% currentTime = Time.zone.now %>
+      <% days_late = currentTime - @aud.due_at + (currentTime.utc_offset - @aud.due_at.utc_offset) %>
+      <% days_late = (days_late / 1.day).ceil %>
+      <% grace_days_left = @aud.grace_days_usable %>
+      <% if grace_days_left >= days_late %>
+        <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(days_late, 'grace day')}" %>
+      <% elsif grace_days_left > 0 %>
+        <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(grace_days_left, 'grace day')} with #{pluralize(days_late - grace_days_left, 'penalty late day')}" %>
+      <% else %>
+        <% grace_late_info = "submitting #{pluralize(days_late, 'day')} late using #{pluralize(days_late, 'penalty late day')}" %>
+      <% end %>
+      <% late_confirm = " and that I am #{grace_late_info} under the late policy as defined in the syllabus" %>
       <p><b>Warning:</b> Submitting late may result in the usage of a grace day or a grade penalty!</p>
     <% end %>
 
@@ -33,14 +33,14 @@
             <%= render partial: "submission_panel", locals: { repos: @repos, f: } %>
             <% filename_list = @assessment.handin_filename.split(".") %>
             <% if (filename_list.size > 1) %>
-                <!-- file needs to have a period, else we ignore (e.g. for README files) -->
-                <div class="filename-check" id="filename-check">
-                  <div>
-                    Handin format:
-                    .<b id="handin-file-type"><%= filename_list[1..].join(".") %></b> files
-                  </div>
-                  <b id="handin-file-type-incorrect" style="color: red; margin: 0"></b>
+              <!-- file needs to have a period, else we ignore (e.g. for README files) -->
+              <div class="filename-check" id="filename-check">
+                <div>
+                  Handin format:
+                  .<b id="handin-file-type"><%= filename_list[1..].join(".") %></b> files
                 </div>
+                <b id="handin-file-type-incorrect" style="color: red; margin: 0"></b>
+              </div>
             <% end %>
             <%= label_tag(:integrity_checkbox) do %>
               <%= check_box_tag(:integrity_checkbox) %>
@@ -52,13 +52,13 @@
             <div class="row" style="padding-top: 10px">
               <div id="submission_error" style="color:red" class="col s6 m8 center-align"></div>
               <% if @aud.past_due_at? then %>
-                  <div class="col s6 m4 center-align">
-                    <%= f.submit("Submit Late", id: "fake-submit", class: "btn primary handin-btn disabled") %>
-                  </div>
+                <div class="col s6 m4 center-align">
+                  <%= f.submit("Submit Late", id: "fake-submit", class: "btn primary handin-btn disabled") %>
+                </div>
               <% else %>
-                  <div class="col s6 m4 center-align">
-                    <%= f.submit("Submit", id: "fake-submit", class: "btn primary handin-btn disabled") %>
-                  </div>
+                <div class="col s6 m4 center-align">
+                  <%= f.submit("Submit", id: "fake-submit", class: "btn primary handin-btn disabled") %>
+                </div>
               <% end %>
             </div>
             <div class="row">

app/views/submissions/_grades.html.erb

@@ -11,6 +11,15 @@
           <b> &ndash; </b>
         <% end %>
         <b> / <%= p.max_score ? sprintf("%.2f", p.max_score.round(2)) : raw("&ndash;") %></b>
+        <b>
+          <% if p_score != nil and (@cud.instructor? or @cud.course_assistant?) %>
+            <% if p_score.released %>
+              (Released)
+            <% else %>
+              (Unreleased)
+            <% end %>
+          <% end %>
+        </b>
       </div>
     </div>
   <% end %>

app/views/submissions/_release_grades.html.erb

@@ -0,0 +1,13 @@
+<span id="release-grades">
+  <% unless @submission.problems_released? %>
+    <%= link_to(release_student_grade_course_assessment_submission_path(@course, @assessment, @submission),
+                class: "btn small", title: "Release scores for current student", method: :post) do %>
+    Release Grade
+    <% end %>
+  <% else %>
+    <%= link_to(unrelease_student_grade_course_assessment_submission_path(@course, @assessment, @submission),
+                class: "btn small", title: "Unrelease scores for current student", method: :post) do %>
+    Unrelease Grade
+    <% end %>
+  <% end %>
+</span>

app/views/submissions/view.html.erb

@@ -73,6 +73,7 @@
         <%= render "version_links" %>
       <a href="<%= download_file_url(@submission) %>" class="btn small" title="Download">Download</a>
       <button class="btn small" onclick="resetLayout()">Reset Layout</button>
+        <%= render "release_grades" %>
     </div>
 
     <div class="col s2 center-align">

config/routes.rb

@@ -149,6 +149,8 @@
           get "destroyConfirm"
           get "download"
           get "view"
+          post "release_student_grade"
+          post "unrelease_student_grade"
         end
 
         collection do