Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add filename, line number, better collapsibility to annotations #1617

Merged
merged 42 commits into from
Oct 27, 2022
Merged

Add filename, line number, better collapsibility to annotations #1617

merged 42 commits into from
Oct 27, 2022

Conversation

damianhxy
Copy link
Member

@damianhxy damianhxy commented Sep 29, 2022 •
edited
Loading

Description

  • Allow multiple problems open at once, fix stutter for initial open
  • Add file name to annotations
  • Add line number to annotations
  • Add open / close arrows next to category name
  • Use jquery load to refresh annotations
  • Make scores in annotations and grades tabs 2 d.p.
  • Make default annotation score 0, set type to number
  • Remove some dead code
  • Validate against missing annotation scores
  • Fix annotation-box badge color updates for score 0 annotations (previously, if you update an annotation that had score 0, the "badge" turns green instead of staying gray)

Motivation and Context

Initial work for generalized feedback.

How Has This Been Tested?

  • Create an assessment that accepts tar files
  • Submit a tar file (e.g. hello.tar)
  • Create annotations, taking note that
    • Annotations appearance is consistent after updates (add / delete)
    • Annotations are still clickable (and bring you to its location) after updates
    • Annotations are grouped by filename
    • Line numbers appear for annotations
    • Multiple categories can be open at once
    • No more stuttering when collapsing a category
    • It is no longer possible to create an annotation without a score
    • Creating, then updating annotations with -ve, 0, +ve scores preserve the "badge colors" in annotation boxes as expected

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Checklist:

  • I have run rubocop for style check. If you haven't, run overcommit --install && overcommit --sign to use pre-commit hook for linting

@damianhxy
Add line number
ed3800a
@damianhxy
Move active class
4654ffa
@damianhxy
Add lineNumber when updating
e37b22b
@damianhxy
Change score field to type number
64ce5f6
@damianhxy
Consistently display annotation scores to 1 d.p.
b0e2b3f
@damianhxy
Fix plus_fix
4d5fb75
@damianhxy
Sort annotations after updates
6fdcc3f
@damianhxy
Add sorting logic
8cb7acc
@damianhxy
Match get_correct_filename behavior
027c446
@damianhxy
Round grades to 1dp
083576d
@damianhxy
Merge branch 'master' into generalized-feedback
1e215a8
@damianhxy
Fix indentation
a1e55d4
@damianhxy
Disable accordion (to allow multiple sections open at once)
e812aec
@damianhxy
annotation.js cleanup
5eabd15
@damianhxy
Remove max-height on collapsible
0242217
@damianhxy
Run attachChangeFileEvents once at the end
69c0556
@damianhxy
Group annotations by filename
55ca96b
@damianhxy
Implement group_by for js
ff9e8ab
@damianhxy
Add collapsible arrows
b7220f5
@damianhxy
Add collapsible arrows (after update)
ce66d94
@damianhxy
Increase arrow size
098a9e2
@damianhxy
Disable user-select on header
df52f66
@damianhxy
Add spacing between annotations of different files
9fb0d91
@damianhxy
Remove debug statement
adabb78
@damianhxy
Use jquery load for annotations
6d8fb16
@damianhxy damianhxy changed the title [WIP] Generalized feedback Add filename, line number, better collapsibility to annotations Oct 7, 2022
@damianhxy damianhxy marked this pull request as ready for review October 7, 2022 04:57
20wildmanj and others added 3 commits October 23, 2022 14:46
@20wildmanj
make submission summary fill up space (#1624)
833db77 
* - fix submission summary/history table to fill up horizontal space, but still overflow properly
  - only show link to full submission history table if submissions exceed summary view limit
* - make "Download Submission" and "View Source" into buttons
* Vertically center-align icon and text
* add spaces, move view source to be above download submission
@michellexliu
Merge branch 'generalized-feedback' of https://github.com/autolab/Aut…
5654639 
…olab into generalized-feedback
@michellexliu
round 2 decimal places
31721a7
michellexliu
michellexliu approved these changes Oct 27, 2022
View reviewed changes
Copy link
Contributor

@michellexliu michellexliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@damianhxy damianhxy merged commit 218f8b9 into master Oct 27, 2022
@damianhxy damianhxy deleted the generalized-feedback branch October 27, 2022 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michellexliu michellexliu michellexliu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@damianhxy @michellexliu @najclark @20wildmanj