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.

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

Add a new version of the ignore file #889

Merged
merged 26 commits into from Apr 4, 2019

Conversation

libre-man added 6 commits Mar 25, 2019

@ghost ghost assigned libre-man Apr 2, 2019

@ghost ghost added the in progress label Apr 2, 2019

@yourivoet

This comment has been minimized.

Copy link
Contributor

commented Apr 2, 2019

I would suggest changing Probably superfluous files found to Your submission does not follow the hand-in instruction required by your teacher!

libre-man added 2 commits Apr 2, 2019
@yourivoet

This comment has been minimized.

Copy link
Contributor

commented Apr 2, 2019

For the "i" texts:

Delete empty directories:
If this option is enabled, this will automatically delete empty directories without any files in submissions.

Delete leading directories:
If this option is enabled, this will automatically delete any extra leading directories in a submission. For example, if all the files and/or directories are in a subdirectory, this will remove the top level directory.

Allow overrides by students:
If this option is enabled, this will allow students to press an override button to hand in a submission, even if it does not follow the hand-in requirements. Students will, however, get a warning that their submission does not follow the hand-in requirements.

@yourivoet

This comment has been minimized.

Copy link
Contributor

commented Apr 2, 2019

For the main "i" text, I suggest the following:

This allows you to set hand-in requirement for students, making sure their submission follows a certain file and directory structure. Students will be able to see these requirements before submitting and will get a warning if their submission does not follow the hand-in requirements.

libre-man added 7 commits Apr 2, 2019
@codecov

This comment has been minimized.

Copy link

commented Apr 3, 2019

Codecov Report

Merging #889 into master will increase coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #889      +/-   ##
==========================================
+ Coverage   99.45%   99.48%   +0.03%     
==========================================
  Files          57       58       +1     
  Lines        5856     6263     +407     
==========================================
+ Hits         5824     6231     +407     
  Misses         32       32
Impacted Files Coverage Δ
psef/models/work.py 98.91% <ø> (ø) ⬆️
psef/models/file.py 100% <100%> (ø) ⬆️
psef/models/course.py 100% <100%> (ø) ⬆️
psef/files.py 100% <100%> (ø) ⬆️
psef/ignore.py 100% <100%> (ø) ⬆️
psef/models/assignment.py 100% <100%> (ø) ⬆️
psef/exceptions.py 100% <100%> (ø) ⬆️
psef/extract_tree.py 100% <100%> (ø)
psef/helpers/register.py 100% <100%> (ø) ⬆️
psef/helpers/__init__.py 100% <100%> (ø) ⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 21e8f6a...8e170d8. Read the comment docs.

libre-man and others added 3 commits Apr 3, 2019

@ghost ghost assigned DevinHillenius Apr 3, 2019

docs/guides/setting-up-hand-in-requirements.rst Outdated Show resolved Hide resolved
docs/guides/setting-up-hand-in-requirements.rst Outdated Show resolved Hide resolved

Not a full review

@olmokramer
Copy link
Collaborator

left a comment

There seems to be a superfluous file, psef/submission_validate.py.

<div v-b-popover.top.hover="canOverrideIgnore ? '' : (canDeleteFiles ? 'You are not allowed to override the hand-in requirements.' : 'You are missing required files.')">
<submit-button label="Override"
variant="warning"
v-b-popover.top.hover="'hello'"

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

This should change or be removed.

):
raise APIException(
'It is not possible to override the ignore filter',
'The filter disallows overriding it', APICodes.INVALID_PARAM, 400

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

This message could be better.

This comment has been minimized.

Copy link
@libre-man

libre-man Apr 3, 2019

Author Collaborator

Students will probably never see it, but what suggestion do you have?

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

Well, specifying what "it" is, for instance...

psef/ignore.py Show resolved Hide resolved
psef/ignore.py Show resolved Hide resolved
psef/ignore.py Show resolved Hide resolved
src/components/CGIgnoreFile.vue Show resolved Hide resolved
@click="$emit('file-sep-click', `${fromRoot ? '/' : ''}${dirParts.slice(0, index + 1).join('/')}/`)">
<icon name="angle-right"/>
</span>
<span></span>

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

???

This comment has been minimized.

Copy link
@libre-man

libre-man Apr 3, 2019

Author Collaborator

!!!

if (this.internalName.length < 1) {
return 'The name cannot be empty.';
} else if (this.internalName === '/' || this.internalName === '\\') {

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

This doesn't catch names consisting only of multiple slashes and/or backslashes.

:assignmentId="assignment.id"
:editable="false"
summary-mode/>
<div no-body class="no-rubric text-muted font-italic" v-else>

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

Maybe change the no-rubric class to something more generic?

This comment has been minimized.

Copy link
@libre-man

libre-man Apr 4, 2019

Author Collaborator

I changed it to empty-text

#app.dark & {
border-color: @color-primary-darker;

li.nav-item > .nav-link {
color: @text-color-dark;
&.disabled {

This comment has been minimized.

Copy link
@olmokramer

olmokramer Apr 3, 2019

Collaborator

These 2 lines can be removedn

libre-man added 2 commits Apr 3, 2019
@olmokramer
Copy link
Collaborator

left a comment

  • The padding around the component on the assignment management page is not the same on above and below.
    padding
  • The border around the selected item in the checkbox "buttons" is bright blue.
    button
  • In Chromium the "small-caps" letters in the dropdown aren't centered vertically. I'm fine with leaving that as is, though.
  • The delete button is slightly less wide than the edit button.
    buttons
  • File tree icons are not aligned.
    icon-alignment
  • The modal that pops up when your submission does not meet the requirements has a max width of 1550px, but I think that is way too much.
    modal
  • After submitting a rejected archive, in the modal that pops up, you can click on the arrows separating directories/files to insert a new rule.
    modal-arrows
  • The double arrows between required/denied/allowed and the root symbol have a cursor: pointer; but don't respond to clicks.
  • The delete/edit rule buttons should have popovers.
libre-man added 3 commits Apr 4, 2019

@yourivoet yourivoet merged commit 047d064 into master Apr 4, 2019

5 of 8 checks passed

codeclimate 6 issues to fix
Details
codeclimate/diff-coverage 8% (50% threshold)
Details
codeclimate/total-coverage 26% (-0.7% change)
Details
codecov/patch 100% of diff hit (target 99.45%)
Details
codecov/project 99.48% (+0.03%) compared to 21e8f6a
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.04%) to 99.489%
Details
pyup.io/safety-ci No dependencies with known security vulnerabilities.
Details

@ghost ghost removed the in progress label Apr 4, 2019

@yourivoet yourivoet deleted the feature/ignore-file-v2 branch Apr 4, 2019

This was referenced Apr 4, 2019
olmokramer added a commit that referenced this pull request Apr 4, 2019
Merge pull request #899 from CodeGra-de/master
# Version 1.5.x (Izanami.2)

**Released**: April 04th, 2019

You can now set up detailed hand-in requirements for your students, create course snippets and the submission page is easier to and has more information (including the possibility to upload multiple files).

## Features & Updates

- Add a new version of the ignore file [(#889)](#889): this makes it possible to set detail hand-in requirements for students.
- Allow uploading multiple files [(#888)](#888): students can now upload multiple files and archives.
- Add course snippets [(#897)](#897): course snippets are shared between all teachers and ta's of a course.
- Add Moodle support [(#873)](#873): full LTI integration with Moodle.
- Add Blackboard support [(#820)](#820): full LTI integration with Blackboard.
- Enhance documentation [(#875)](#875): better documentation which includes user guides.
- Rewrite submission list page header [(#885)](#885): more information, including a better visible rubric for students.

## Minor updates

- Edit snippets in modal [(#855)](#855): a better UI for adding snippets.
- Add border when CodeGrade is loaded in an iframe in Canvas [(#883)](#883): this makes it more clear where CodeGrade begins and Canvas ends.
- White background for sidebar when not in dark theme [(#865)](#865): this makes the light mode more beautiful.
- Improve the way rubric maximum points are presented [(#895)](#895): added warnings and improved the UI, so the feature is not misused.
- Make it possible to filter submissions by member of the group [(#840)](#840).
- Increase the default value used for minimal similarity for jplag [(#894)](#894): changed it from 25 to 50, making sure users don't get too much cases by default.
- Add multiple file uploader to documentation [(#896)](#896).
- Update documentation to apply to new snippet management UI [(#891)](#891).
- Improve filtering the course users [(#893)](#893): increased the efficiency of the filtering.

## Fixes

- Make sure duplicate filenames are detected and renamed [(#898)](#898).
- Show when user has no snippets [(#890)](#890).
- Set default deadline time to 23:59 [(#879)](#879).
- Fix new tab button position in sidebar [(#867)](#867).
- Fix home page logo position [(#851)](#851).
- Fix header text color in dark theme [(#852)](#852).
- Fix file tree resizer z-index [(#853)](#853).
- Rename "Old password" to "Current password" [(#856)](#856).
olmokramer added a commit that referenced this pull request Apr 4, 2019
Merge pull request #899 from CodeGra-de/master
**Released**: April 04th, 2019

You can now set up detailed hand-in requirements for your students, create course snippets and the submission page is easier to and has more information (including the possibility to upload multiple files).

- Add a new version of the ignore file [(#889)](#889): this makes it possible to set detail hand-in requirements for students.
- Allow uploading multiple files [(#888)](#888): students can now upload multiple files and archives.
- Add course snippets [(#897)](#897): course snippets are shared between all teachers and ta's of a course.
- Add Moodle support [(#873)](#873): full LTI integration with Moodle.
- Add Blackboard support [(#820)](#820): full LTI integration with Blackboard.
- Enhance documentation [(#875)](#875): better documentation which includes user guides.
- Rewrite submission list page header [(#885)](#885): more information, including a better visible rubric for students.

- Edit snippets in modal [(#855)](#855): a better UI for adding snippets.
- Add border when CodeGrade is loaded in an iframe in Canvas [(#883)](#883): this makes it more clear where CodeGrade begins and Canvas ends.
- White background for sidebar when not in dark theme [(#865)](#865): this makes the light mode more beautiful.
- Improve the way rubric maximum points are presented [(#895)](#895): added warnings and improved the UI, so the feature is not misused.
- Make it possible to filter submissions by member of the group [(#840)](#840).
- Increase the default value used for minimal similarity for jplag [(#894)](#894): changed it from 25 to 50, making sure users don't get too much cases by default.
- Add multiple file uploader to documentation [(#896)](#896).
- Update documentation to apply to new snippet management UI [(#891)](#891).
- Improve filtering the course users [(#893)](#893): increased the efficiency of the filtering.

- Make sure duplicate filenames are detected and renamed [(#898)](#898).
- Show when user has no snippets [(#890)](#890).
- Set default deadline time to 23:59 [(#879)](#879).
- Fix new tab button position in sidebar [(#867)](#867).
- Fix home page logo position [(#851)](#851).
- Fix header text color in dark theme [(#852)](#852).
- Fix file tree resizer z-index [(#853)](#853).
- Rename "Old password" to "Current password" [(#856)](#856).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.