Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
5a8b74a
created test cases for assignment marks, edit and update
chickenwaddle77 May 20, 2025
5de080a
Merge remote-tracking branch 'upstream/master'
chickenwaddle77 May 20, 2025
f1636e6
removed unnecessary comments
chickenwaddle77 May 20, 2025
36c16d3
added myself to list of contributors
chickenwaddle77 May 20, 2025
f4bea09
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 20, 2025
48b0303
added my change to changelog
chickenwaddle77 May 20, 2025
a4d30b1
Merge remote-tracking branch 'origin/master'
chickenwaddle77 May 20, 2025
6f6e9b3
merged from upstream/master
chickenwaddle77 May 20, 2025
26f5e6c
Added changes from 1 to 5
chickenwaddle77 May 28, 2025
16de70e
Added routing to redirect tab to submissions
chickenwaddle77 May 29, 2025
c82f105
Fixed previous commit for assignment description
chickenwaddle77 May 29, 2025
289cb58
Merge branch 'master' into assignment-view-students
chickenwaddle77 May 29, 2025
7d4ba25
Delete Changelog.md.orig
chickenwaddle77 May 29, 2025
fc3304b
Delete spec/controllers/criteria_controller_spec.rb.orig
chickenwaddle77 May 29, 2025
eb6de31
Added to changelog
chickenwaddle77 May 29, 2025
c97aeb8
Fixed rspec changes
chickenwaddle77 May 29, 2025
609a964
fixed from comments
chickenwaddle77 Jun 4, 2025
1994dff
fixed merge conflicts
chickenwaddle77 Jun 4, 2025
f489ab1
re-fixed a bug with styling
chickenwaddle77 Jun 4, 2025
c88a81d
implemented new section in summary stats, before clean-up
chickenwaddle77 Jun 4, 2025
fa3a513
removed commented code
chickenwaddle77 Jun 4, 2025
190b332
added to changelog
chickenwaddle77 Jun 4, 2025
8807ac7
fixed errors from rspec
chickenwaddle77 Jun 5, 2025
bb8f7de
merged branch based on previous ticket to branch based on master
chickenwaddle77 Jun 6, 2025
7821a22
edited changelog to reflect new pr number
chickenwaddle77 Jun 6, 2025
8b578c3
removed route
chickenwaddle77 Jun 6, 2025
c429a3d
added link to annotations tab
chickenwaddle77 Jun 11, 2025
307651e
Merge branch 'master' into assignment-summary-v2
chickenwaddle77 Jun 11, 2025
96ab262
made en.yml in alphabetical order
chickenwaddle77 Jun 11, 2025
0a55e27
resolved merge request
chickenwaddle77 Jun 11, 2025
c9492b9
Merge remote-tracking branch 'origin/assignment-summary-v2' into assi…
chickenwaddle77 Jun 11, 2025
be601f4
made suggested changes + resolved merge requests
chickenwaddle77 Jun 17, 2025
46c0a21
Merge remote-tracking branch 'upstream/master' into assignment-summar…
chickenwaddle77 Jun 18, 2025
8350f89
changed one to other for annotation
chickenwaddle77 Jun 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Improved layout and labeling in the assignment settings form for both standard and timed assessments. (#7531)
- Design improvement of tables when the data is empty. (#7557)
- Improved Assignment view for students (#7533)
- Added average annotations section in Assignment Summary (#7559)
- Maintain font size in grading view (#7525)
- Replaced assignment summary statistics in the "Status" column on the instructor Assignments page with a link to the grades page. (#7560)
- Renamed the "Summary" sub-tab label to "Grades" in the Assignment interface. (#7560)
Expand Down
1 change: 1 addition & 0 deletions app/controllers/assignments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ def grade_distribution
summary = {
name: "#{assignment.short_identifier}: #{assignment.description}",
average: assignment.results_average(points: true) || 0,
average_annotations: assignment.average_annotations,
median: assignment.results_median(points: true) || 0,
max_mark: assignment.max_mark || 0,
standard_deviation: assignment.results_standard_deviation || 0,
Expand Down
24 changes: 24 additions & 0 deletions app/javascript/Components/assignment_chart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -187,6 +188,28 @@ 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: this.state.summary.average_annotations || 0,
})}
</p>
<p>
{I18n.t("assignments.average_annotations_detail_descriptor")}{" "}
<a
href={Routes.course_assignment_annotation_categories_path(
this.props.course_id,
this.props.assessment_id
)}
>
{I18n.t("activerecord.models.annotation.other")}
</a>
</p>
</div>
);

return (
<React.Fragment>
<h2>
Expand Down Expand Up @@ -227,6 +250,7 @@ export class AssignmentChart extends React.Component {
/>
{criteria_graph}
{ta_grade_distribution_chart}
{annotation_summary}
</React.Fragment>
);
}
Expand Down
3 changes: 3 additions & 0 deletions config/locales/views/assignments/en.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
---
en:
assignments:
annotation_summary: Annotation Summary
assignment_has_groupings: Assignment has groupings.
assignment_information: Assignment information
average_annotations: "%{average_annotations} annotations per marked submission"
average_annotations_detail_descriptor: For detailed information, see
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?
Expand Down
2 changes: 2 additions & 0 deletions spec/controllers/assignments_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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,
Expand Down