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

Marking State Dropdown and Release Checkbox Changed to Buttons #2337

Merged
merged 11 commits into from May 6, 2016

Conversation

Projects
None yet
3 participants
@wkwan
Copy link
Contributor

wkwan commented Nov 2, 2015

Also, merged the marking states "unmarked", "partial" to "incomplete".

@wkwan wkwan changed the title Marking State Dropdown Changed to a Button Marking State Dropdown and Release Checkbox Changed to Buttons Nov 4, 2015

@@ -78,8 +78,8 @@ jQuery(document).ready(function() {
});

// Update server status
var state = document.getElementById('marking_state');
update_status(state, state.value);
// var state = document.getElementById('marking_state');

This comment has been minimized.

@david-yz-liu

david-yz-liu Nov 17, 2015

Contributor

Remove these two lines.

@@ -403,7 +412,7 @@ def view_marks
@result = @submission.remark_result
# if remark result's marking state is 'unmarked' then the student has
# saved a remark request but not submitted it yet, therefore, still editable
if @result.marking_state != Result::MARKING_STATES[:unmarked] && !@result.released_to_students
if @result.marking_state != Result::MARKING_STATES[:incomplete] && !@result.released_to_students

This comment has been minimized.

@david-yz-liu

david-yz-liu Nov 17, 2015

Contributor

use == Result::MARKING_STATES[:complete]

@david-yz-liu

This comment has been minimized.

Copy link
Contributor

david-yz-liu commented Nov 17, 2015

@wkwan It appears that the old "unmarked" state was used for remark requests which the student had created, but had not submitted. Please create a third state "unsubmitted" which should only be used for such remark requests.

@wkwan

This comment has been minimized.

Copy link
Contributor

wkwan commented Nov 18, 2015

Ok will do.

@wkwan

This comment has been minimized.

Copy link
Contributor

wkwan commented Dec 2, 2015

@david-yz-liu What would the toggle button say if submission is in the unmarked state? Since the student hasn't submitted the request yet, I would expect the grader to still see it as complete, but then if they press the button to revert it to incomplete, then wouldn't that just override the unmarked state? Or do we need to show 3 states again?

@wkwan

This comment has been minimized.

Copy link
Contributor

wkwan commented Dec 2, 2015

Gah, wasn't intending to push that last commit yet.

wkwan added some commits Dec 9, 2015

Revert "unmarked state"
This reverts commit 7ce1c9e.

@reidka reidka merged commit 27827e9 into MarkUsProject:master May 6, 2016

1 check failed

continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment