Update the Status column in the instructor Assignments page

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
         - id: prettier
           types_or: [javascript, jsx, css, scss, html]
   -   repo: https://github.com/thibaudcolas/pre-commit-stylelint
-      rev: v16.19.1
+      rev: v16.20.0
       hooks:
         - id: stylelint
           additional_dependencies: [
@@ -39,7 +39,7 @@ repos:
               app/assets/stylesheets/common/_reset.scss
             )$
   - repo: https://github.com/rubocop/rubocop
-    rev: v1.75.5
+    rev: v1.75.8
     hooks:
       - id: rubocop
         args: ["--autocorrect"]

Changelog.md

@@ -6,6 +6,9 @@
 
 ### ✨ New features and improvements
 - Improved layout and labeling in the assignment settings form for both standard and timed assessments. (#7531)
+- Improved Assignment view for students (#7533)
+- Replaced assignment summary statistics in the "Status" column on the instructor Assignments page with a link to the grades page. (#7553)
+- Renamed the "Summary" sub-tab label to "Grades" in the Assignment interface. (#7553)
 
 ### 🐛 Bug fixes
 

Gemfile.lock

@@ -93,7 +93,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
     bootsnap (1.18.4)
@@ -201,7 +201,7 @@ GEM
     glob (0.4.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    hashdiff (1.1.1)
+    hashdiff (1.2.0)
     highline (3.1.2)
       reline
     histogram (0.2.4.1)
@@ -297,7 +297,7 @@ GEM
     psych (5.2.4)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
@@ -478,7 +478,7 @@ GEM
     uniform_notifier (1.16.0)
     uri (1.0.3)
     useragent (0.16.11)
-    webmock (3.24.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

app/views/assignments/_list_manage.html.erb

@@ -38,18 +38,6 @@
                               browse_course_assignment_submissions_path(@current_course, assignment) %>
                 </span>
               <% end %>
-              <% unless assignment.results_average.nil? %>
-                <br>
-                <span>
-                  <%= "#{t(:class_average)}: #{number_to_percentage(assignment.results_average, precision: 1)}" %>
-                </span>
-              <% end %>
-              <% unless assignment.results_median.nil? %>
-                <br>
-                <span>
-                  <%= "#{t(:class_median)}: #{number_to_percentage(assignment.results_median, precision: 1)}" %>
-                </span>
-              <% end %>
               <% if assignment.submission_rule.can_collect_all_now? %>
                 <% ta_id = @current_role.instructor? ? nil : @current_role.id %>
                 <br>
@@ -59,10 +47,8 @@
                         num_assigned: assignment.get_num_assigned(ta_id)) %>
                 </span>
                 <br>
-                <span>
-                  <%= t('assignments.average_annotations',
-                        average_annotations: assignment.average_annotations(ta_id)) %>
-                </span>
+                <%= link_to t('assignments.grades'),
+                            summary_course_assignment_path(course_id: assignment.course_id, id: assignment.id) %>
               <% end %>
             </td>
           </tr>

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'>

app/views/layouts/menus/_instructor_ta_sub_menu_assessments.html.erb

@@ -92,7 +92,7 @@
     </li>
     <% if assessment.is_a?(Assignment) && !assessment.is_peer_review? %>
       <li class='<%= "active" if controller.controller_name == 'assignments' && controller.action_name == 'summary' %>'>
-        <%= link_to t('results.summary'),
+        <%= link_to t('assignments.grades'),
                     summary_course_assignment_path(@current_course, target_id) %>
       </li>
     <% end %>

config/locales/views/assignments/en.yml

@@ -2,7 +2,6 @@
 en:
   assignments:
     assignment_has_groupings: Assignment has groupings.
-    average_annotations: "%{average_annotations} annotations per marked submission"
     configuration_zip_file: Configuration Zip File
     deadline_with_extension: You have an extension until %{extension_deadline}.
     deletion_confirmation: Are you sure you want to delete this assignment?
@@ -21,6 +20,7 @@ en:
       required_files_by_student: You may specify file(s) that students are required to submit.
       section_due_dates_info_html: "<strong>Important</strong> If the section-specific settings are enabled, students can only form groups within their section. Students not assigned to any section will only be allowed to form groups with other students not assigned to any section."
     grace_credits_used_html: 'Grace Credits Used: <strong>%{grace_credits_used}</strong>'
+    grades: Grades
     help:
       edit:
         assignment_type_html: 'Persist Groups/Properties from ___: use the same groups and repositories from previous assignment. If selected, assignment folders will be created for every group immediately, rather than when a student clicks on the assignment for the first time.<br />If students can form their own groups, group names are always autogenerated. You can also create groups manually or by uploading a file.'

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.