April review fixes 146 #147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…licked and opened in a new tab.
…rol over ordering. Remove length constraint from definition and class descriptions. Adjust forms accordingly.
…ter.org's viewer rather than on Github. Fix formatting of grade detail page for custom_questions_only submissions and for submissions with no criteria, no custom questions, and no standard questions.
gibsonbailey
commented
May 7, 2020
ckcollab
suggested changes
May 8, 2020
| @@ -81,6 +91,9 @@ <h4>Questions</h4> | |||
| target="_blank" rel="noopener noreferrer" | |||
| >{{ submission.publication_url }}</a></li>{% endif %} | |||
| </ol> | |||
| {% if not definition.ask_project_url and not definition.ask_publication_url and not definition.ask_method_name and not definition.ask_method_description %} | |||
There was a problem hiding this comment.
this seems kinda grody, could this become a model property or some such?
There was a problem hiding this comment.
Very grody. Can do. Thanks!
| @@ -245,7 +252,12 @@ <h4 class="ui header">Submission Details:</h4> | |||
| {% if definition.jupyter_notebook_enabled %} | |||
| <div class="ui tiny statistic"> | |||
| <div class="value"> | |||
| {{ grade.jupyter_notebook_grade }}/{{ definition.jupyter_notebook_highest }} | |||
| {% if not grade.jupyter_notebook_grade %} | |||
There was a problem hiding this comment.
Should be able to do this, may have to make 0.0 a string:
{{ grade.jupyter_notebook_grade|default:0.0 }}
https://docs.djangoproject.com/en/3.0/ref/templates/builtins/#default
| {% else %} | ||
| href="{{ submission.github_url }}" | ||
| {% endif %} | ||
| target="_blank" rel="noopener noreferrer"> |
There was a problem hiding this comment.
I feel like this would read a bit nicer if there was a property on the submission model that returned either github url or notebook url? in general moving logic out of templates is ideal, but can't always do it!
There was a problem hiding this comment.
Model: big
Template: smol
…to the Definition model as a property.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is built to address the problems discovered in the April review of Chagrade on May 7th (Outlined in #146)
Checklist