Marking State Dropdown and Release Checkbox Changed to Buttons #2337

Merged
merged 11 commits into from May 6, 2016

Projects

None yet

3 participants

@wkwan
Contributor
wkwan commented Nov 2, 2015

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

@wkwan wkwan changed the title from Marking State Dropdown Changed to a Button to Marking State Dropdown and Release Checkbox Changed to Buttons Nov 4, 2015
@david-yz-liu david-yz-liu commented on an outdated diff Nov 17, 2015
app/assets/javascripts/Grader/marking.js
@@ -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');
@david-yz-liu
david-yz-liu Nov 17, 2015 Contributor

Remove these two lines.

@david-yz-liu david-yz-liu commented on an outdated diff Nov 17, 2015
app/controllers/results_controller.rb
@@ -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
@david-yz-liu
david-yz-liu Nov 17, 2015 Contributor

use == Result::MARKING_STATES[:complete]

@david-yz-liu
Contributor

@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
Contributor
wkwan commented Nov 18, 2015

Ok will do.

@wkwan
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
Contributor
wkwan commented Dec 2, 2015

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

@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