Assignment view students by chickenwaddle77 · Pull Request #7533 · MarkUsProject/Markus

chickenwaddle77 · 2025-05-29T06:41:00Z

Proposed Changes

(Describe your changes here. Also describe the motivation for your changes: what problem do they solve, or how do they improve the application or codebase? If this pull request fixes an open issue, use a keyword to link this pull request to the issue.)

Changes implements various updates to the user interface in the Assignments tab when viewed as a Student.

Changes Include:

Changed from "Assignment <short identifier>" to "<short identifier>: <description>".
Changed text in "Policies" section to be written in second-person ("You must complete this assignment individually.").
Make "Required Files" only show when there are files needed.
Moved "Starter Files" subsection to immediately above the "Submissions" subsection.
Modified title so "Files" in "Starter Files" is not capitalised.
Added period to the end of first line in starter files.
Moved to make "<X> files submitted" the first bullet point in "Submissions" and made it link to the "Submissions" tab.

Screenshots of your changes (if applicable)

Associated documentation repository pull request (if applicable)

Type of Change

(Write an X or a brief description next to the type or types that best describe your changes.)

Type	Applies?
🚨 Breaking change (fix or feature that would cause existing functionality to change)
✨ New feature (non-breaking change that adds functionality)
🐛 Bug fix (non-breaking change that fixes an issue)
🎨 User interface change (change to user interface; provide screenshots)	x
♻️ Refactoring (internal change to codebase, without changing functionality)
🚦 Test update (change that only adds or modifies tests)
📦 Dependency update (change that updates a dependency)
🔧 Internal (change that only affects developers or continuous integration)

Checklist

(Complete each of the following items for your pull request. Indicate that you have completed an item by changing the [ ] into a [x] in the raw text, or by clicking on the checkbox in the rendered description on GitHub.)

Before opening your pull request:

I have performed a self-review of my changes.
- Check that all changed files included in this pull request are intentional changes.
- Check that all changes are relevant to the purpose of this pull request, as described above.
I have added tests for my changes, if applicable.
- This is required for all bug fixes and new features.
I have updated the project documentation, if applicable.
- This is required for new features.
If this is my first contribution, I have added myself to the list of contributors.

After opening your pull request:

I have updated the project Changelog (this is required for all changes).
I have verified that the pre-commit.ci checks have passed.
I have verified that the CI tests have passed.
I have reviewed the test coverage changes reported by Coveralls.
I have requested a review from a project maintainer.

Questions and Comments

(Include any questions or comments you have regarding your changes.)

merge is necessary to add new tests

for more information, see https://pre-commit.ci

need to reconcile divergent branches

Repeat

Repeat file, accidentally pressed sync on GitHub instead of using command-line

coveralls · 2025-05-29T08:17:36Z

Pull Request Test Coverage Report for Build 15480154988

Details

0 of 0 changed or added relevant lines in 0 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 91.952%

Totals
Change from base Build 15431638733:	0.0%
Covered Lines:	41939
Relevant Lines:	44925

💛 - Coveralls

david-yz-liu

@chickenwaddle77 good work, I just left a few inline comments. Please also do a merge from upstream master, and fix the merge conflict in the Changelog (I don't anticipate this being a large conflict).

david-yz-liu · 2025-05-30T01:23:15Z

Changelog.md

 ### 🚨 Breaking changes

 ### ✨ New features and improvements
+- Fix front-end Assignment view for students (#7533)


The word "fix" is a bit misleading, as there wasn't an error before. You can use the verb "Improve" instead. Also, "front-end" and "view" are redundant; I think you can just say "Assignment view" here.

david-yz-liu · 2025-05-30T01:24:28Z

app/views/assignments/show.html.erb

 <% end %>

-<% content_for :title, "#{Assignment.model_name.human} #{@assignment.short_identifier}" %>
+<% content_for :title, "#{@assignment.short_identifier}: #{@assignment.description}" %>


This is on the right track, but loses out on distinguishing the "peer review" assignments (see code you deleted that was replaced by "Assignment information". This title should be consistent with that code.

david-yz-liu · 2025-05-30T01:29:31Z

config/locales/views/assignments/en.yml

        shuffle: Randomly select one top level file or directory from each starter file group
        simple: Assign the default starter file group to all students
-      title: Starter Files
+      title: Starter files


This change is good, but a bit tricky because now the word "files" is no longer capitalized in the download button, which isn't good. You might need to do some case conversion in the front-end to make this work.

david-yz-liu · 2025-05-30T01:30:28Z

app/views/assignments/_read.html.erb

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


add a space before the %>

david-yz-liu

@chickenwaddle77 good work, I just left two small inline comments.

david-yz-liu · 2025-06-05T22:37:55Z

app/views/assignments/_read.html.erb

      <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)%>


I think you misunderstood my previous comment: you should add a space before the %>

I see what you mean 👍

david-yz-liu · 2025-06-05T22:39:27Z

Changelog.md


 ### ✨ 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)


This is better, but make sure the verb "Improve" is in the past tense to match the style of other entries

david-yz-liu

Thanks, @chickenwaddle77!

1. Changed from "Assignment <short identifier>" to "<short identifier>: <description>". 2. Changed text in "Policies" section to be written in second-person ("You must complete this assignment individually."). 3. Make "Required Files" only show when there are files needed. 4. Moved "Starter Files" subsection to immediately above the "Submissions" subsection. 5. Modified title so "Files" in "Starter Files" is not capitalised. 6. Added period to the end of first line in starter files. 7. Moved to make "<X> files submitted" the first bullet point in "Submissions" and made it link to the "Submissions" tab.

chickenwaddle77 and others added 16 commits May 20, 2025 00:13

created test cases for assignment marks, edit and update

5a8b74a

Merge remote-tracking branch 'upstream/master'

5de080a

merge is necessary to add new tests

removed unnecessary comments

f1636e6

added myself to list of contributors

36c16d3

[pre-commit.ci] auto fixes from pre-commit.com hooks

f4bea09

for more information, see https://pre-commit.ci

added my change to changelog

48b0303

Merge remote-tracking branch 'origin/master'

a4d30b1

need to reconcile divergent branches

merged from upstream/master

6f6e9b3

Added changes from 1 to 5

26f5e6c

Added routing to redirect tab to submissions

16de70e

Fixed previous commit for assignment description

c82f105

Merge branch 'master' into assignment-view-students

289cb58

Delete Changelog.md.orig

7d4ba25

Repeat

Delete spec/controllers/criteria_controller_spec.rb.orig

fc3304b

Repeat file, accidentally pressed sync on GitHub instead of using command-line

Added to changelog

eb6de31

Fixed rspec changes

c97aeb8

chickenwaddle77 requested a review from david-yz-liu May 29, 2025 08:24

david-yz-liu reviewed May 30, 2025

View reviewed changes

chickenwaddle77 added 3 commits June 4, 2025 03:31

fixed from comments

609a964

fixed merge conflicts

1994dff

re-fixed a bug with styling

f489ab1

chickenwaddle77 requested a review from david-yz-liu June 4, 2025 15:12

david-yz-liu reviewed Jun 5, 2025

View reviewed changes

fixed errors from comments

46b45ba

chickenwaddle77 requested a review from david-yz-liu June 6, 2025 00:38

david-yz-liu approved these changes Jun 6, 2025

View reviewed changes

david-yz-liu merged commit dedc070 into MarkUsProject:master Jun 6, 2025
6 checks passed

Conversation

chickenwaddle77 commented May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed Changes

Type of Change

Checklist

Questions and Comments

Uh oh!

coveralls commented May 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 15480154988

Details

💛 - Coveralls

Uh oh!

david-yz-liu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

david-yz-liu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

david-yz-liu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

chickenwaddle77 commented May 29, 2025 •

edited

Loading

coveralls commented May 29, 2025 •

edited

Loading