Add average annotations section in Assignment Summary

Changelog.md

@@ -6,6 +6,8 @@
 
 ### ✨ New features and improvements
 - Improved layout and labeling in the assignment settings form for both standard and timed assessments. (#7531)
+- Improve Assignment view for students (#7533)
+- Add average annotations section in Assignment Summary (#7556)
 
 ### 🐛 Bug fixes
 

app/controllers/assignments_controller.rb

@@ -348,6 +348,7 @@ def grade_distribution
     assignment_remark_requests = assignment.groupings.joins(current_submission_used: :submitted_remark)
     summary = {
       name: "#{assignment.short_identifier}: #{assignment.description}",
+      average_annotations: assignment.average_annotations,
       average: assignment.results_average(points: true) || 0,
       median: assignment.results_median(points: true) || 0,
       max_mark: assignment.max_mark || 0,

app/javascript/Components/assignment_chart.jsx

@@ -11,6 +11,7 @@ export class AssignmentChart extends React.Component {
     this.state = {
       summary: {
         average: null,
+        average_annotations: null,
         median: null,
         num_submissions_collected: null,
         num_submissions_graded: null,
@@ -187,6 +188,13 @@ export class AssignmentChart extends React.Component {
         );
       }
 
+      let annotation_summary = (
+        <div className="distribution-graph">
+          <h3>{I18n.t("assignments.annotation_summary")}</h3>
+          <p>{I18n.t("assignments.average_annotations", {average_annotations: 2.75})}</p>
+        </div>
+      );
+
       return (
         <React.Fragment>
           <h2>
@@ -227,6 +235,7 @@ export class AssignmentChart extends React.Component {
           />
           {criteria_graph}
           {ta_grade_distribution_chart}
+          {annotation_summary}
         </React.Fragment>
       );
     }

app/views/assignments/_read.html.erb

@@ -1,8 +1,4 @@
-<% short_identifier = @assignment.is_peer_review? ?
-     "#{@assignment.parent_assignment.short_identifier} #{PeerReview.model_name.human}" :
-     @assignment.short_identifier %>
-
-<h2><%= "#{short_identifier}: #{@assignment.description}" %></h2>
+<h2><%= t('assignments.assignment_information') %></h2>
 
 <div class='block-content'>
   <% if @assignment.message %>
@@ -134,6 +130,32 @@
       </div>
     <% end %>
   <% end %>
+  <% unless @assignment.starter_file_updated_at.nil? || @grouping.nil? %>
+    <% if allowed_to?(:download_starter_file?, @grouping) %>
+      <h3><%= I18n.t('assignments.starter_file.title').downcase.capitalize %></h3>
+      <p><%= I18n.t('assignments.starter_file.provided') %></p>
+      <p><%= I18n.t('assignments.starter_file.changed_at',
+                    changed_date: I18n.l(@assignment.starter_file_updated_at)) %></p>
+      <p>
+        <%= button_to t(:download_the, item: t('assignments.starter_file.title')),
+                      download_starter_file_course_assignment_groups_path(@current_course, @assignment),
+                      method: 'get' %>
+      </p>
+      <% # Display the URL of this group's repository if applicable
+         if allowed_to?(:access_repo?, @grouping) %>
+        <p>
+          <%= button_to t('assignments.starter_file.populate_repo'),
+                        populate_repo_with_starter_files_course_assignment_groups_path(
+                          course_id: @assignment.course_id,
+                          assignment_id: @assignment.id
+                        ),
+                        { method: :patch,
+                          data: { confirm: t('assignments.starter_file.populate_repo_confirm'),
+                                  disable_with: t(:please_wait) } } %>
+        </p>
+      <% end %>
+    <% end %>
+  <% end %>
   <% if !peer_review && (!@assignment.is_timed || !@grouping&.start_time.nil? || @grouping&.past_collection_date?) %>
     <h3><%= Submission.model_name.human.pluralize %></h3>
     <% if @grouping.nil? %>
@@ -146,19 +168,20 @@
         </p>
       <% end %>
       <ul>
+        <li><%= link_to t('submissions.student.files_submitted', count: @num_submitted_files),
+                        file_manager_course_assignment_submissions_path(course_id: @assignment.course_id,
+                                                                        assignment_id: @assignment.id)%>
+        </li>
         <% if @num_submitted_files > 0 %>
           <li>
             <%= t('submissions.student.last_revision_date') %>
             <%= l(@last_modified_date) %>
           </li>
         <% end %>
-        <li><%= t('submissions.student.files_submitted', count: @num_submitted_files) %></li>
       </ul>
 
-      <h3><%= Assignment.human_attribute_name(:assignment_files) %></h3>
-      <% if @assignment.assignment_files.length == 0 %>
-        <p><%= t('assignments.no_required_files') %></p>
-      <% else %>
+      <% if @assignment.assignment_files.length > 0 %>
+        <h3><%= Assignment.human_attribute_name(:assignment_files) %></h3>
         <ul>
           <% @assignment.assignment_files.each do |assignment_file| %>
             <li><%= assignment_file.filename %></li>
@@ -175,30 +198,4 @@
       <% end %>
     <% end %>
 <% end %>
-<% unless @assignment.starter_file_updated_at.nil? || @grouping.nil? %>
-  <% if allowed_to?(:download_starter_file?, @grouping) %>
-    <h3><%= I18n.t('assignments.starter_file.title') %></h3>
-    <p><%= I18n.t('assignments.starter_file.provided') %></p>
-    <p><%= I18n.t('assignments.starter_file.changed_at',
-                  changed_date: I18n.l(@assignment.starter_file_updated_at)) %></p>
-    <p>
-      <%= button_to t(:download_the, item: t('assignments.starter_file.title')),
-                    download_starter_file_course_assignment_groups_path(@current_course, @assignment),
-                    method: 'get' %>
-    </p>
-    <% # Display the URL of this group's repository if applicable
-       if allowed_to?(:access_repo?, @grouping) %>
-       <p>
-         <%= button_to t('assignments.starter_file.populate_repo'),
-                       populate_repo_with_starter_files_course_assignment_groups_path(
-                         course_id: @assignment.course_id,
-                         assignment_id: @assignment.id
-                       ),
-                       { method: :patch,
-                         data: { confirm: t('assignments.starter_file.populate_repo_confirm'),
-                                 disable_with: t(:please_wait) } } %>
-       </p>
-    <% end %>
-  <% end %>
-<% end %>
 </div>

app/views/assignments/show.html.erb

@@ -24,7 +24,11 @@
   <% end %>
 <% end %>
 
-<% content_for :title, "#{Assignment.model_name.human} #{@assignment.short_identifier}" %>
+<% short_identifier = @assignment.is_peer_review? ?
+                        "#{@assignment.parent_assignment.short_identifier} #{PeerReview.model_name.human}" :
+                        @assignment.short_identifier %>
+
+<% content_for :title, "#{short_identifier}: #{@assignment.description}" %>
 
 <div class='pane-wrapper'>
   <div class='pane block'>

config/locales/views/assignments/en.yml

@@ -1,7 +1,9 @@
 ---
 en:
   assignments:
+    annotation_summary: Annotation Summary
     assignment_has_groupings: Assignment has groupings.
+    assignment_information: Assignment information
     average_annotations: "%{average_annotations} annotations per marked submission"
     configuration_zip_file: Configuration Zip File
     deadline_with_extension: You have an extension until %{extension_deadline}.
@@ -31,7 +33,6 @@ en:
     hidden: "%{assignment_text} (hidden)"
     manage_course_work: Manage Course Work
     marking_scheme: 'Marking Scheme: %{identifier}'
-    no_required_files: There are no required files for this assignment.
     none: There are currently no assignments.
     scanned_exam:
       under_review: This exam is still under review.
@@ -64,7 +65,7 @@ en:
       populate_repo_confirm: Are you sure you want to add the starter files to your repository? If they already exist in the repository, any changes will be overwritten.
       populate_repo_error: Unfortunately, the starter files could not be added to your repository. Please download them as a zip file instead.
       populate_repo_success: Starter files successfully added to your repository.
-      provided: Starter files have been provided for this assignment
+      provided: Starter files have been provided for this assignment.
       rename: Rename Selected File or Directory
       starter_file_rule: Starter File Assignment Rules
       starter_file_rule_types:

config/locales/views/groups/en.yml

@@ -86,7 +86,7 @@ en:
       not_allowed_to_delete_group: If you would like to remove this group, you must contact your instructor.
       not_allowed_to_form_group: You are not allowed to form a group yourself. Please wait until your instructor forms your group.
       section_groups_only: You can only form a group with students in your section.
-      students_work_alone: Students work individually.
+      students_work_alone: You must complete this assignment individually.
       url_repository: Repository URL
       work_alone: Work alone
       working_alone: You have indicated you are working individually on this assignment. If you change your mind and want to create or join a group, first delete your group using the button below.

config/routes.rb

@@ -32,6 +32,9 @@
         end
       end
       resources :assignments, except: [:new, :edit] do
+        member do
+          get 'average_annotations'
+        end
         resources :groups, except: [:new, :edit, :destroy] do
           collection do
             get 'annotations'

spec/controllers/assignments_controller_spec.rb

@@ -1305,6 +1305,7 @@
       it 'should contain the right keys' do
         keys = response.parsed_body['summary'].keys
         expect(keys).to contain_exactly('name',
+                                        'average_annotations',
                                         'average',
                                         'median',
                                         'max_mark',
@@ -1325,6 +1326,7 @@
         summary = response.parsed_body['summary']
         assignment_remark_requests = assignment.groupings.joins(current_submission_used: :submitted_remark)
         expected = { name: "#{assignment.short_identifier}: #{assignment.description}",
+                     average_annotations: assignment.average_annotations,
                      average: assignment.results_average(points: true) || 0,
                      median: assignment.results_median(points: true) || 0,
                      max_mark: assignment.max_mark || 0,