Created
November 11, 2012 15:00
-
-
Save benjaminvialle/4055150 to your computer and use it in GitHub Desktop.
Diff from RB for issue 730
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
diff --git a/app/views/submissions/submissions_table_row/_table_row.html.erb b/app/views/submissions/submissions_table_row/_table_row.html.erb | |
--- a/app/views/submissions/submissions_table_row/_table_row.html.erb | |
+++ b/app/views/submissions/submissions_table_row/_table_row.html.erb | |
@@ -6,11 +6,17 @@ | |
<% end %>> | |
<td> | |
+ <% unless !grouping.current_submission_used.result.released_to_students or remark_complete_but_unreleased(grouping.current_submission_used) %> | |
+ <% unrelease = true %> | |
+ <% else %> | |
+ <% unrelease = false %> | |
+ <% end %> | |
<input type="checkbox" | |
name="groupings[]" | |
class="ap_selectable" | |
id="grouping_<%= grouping.id %>" | |
- value="<%= grouping.id %>" /> | |
+ value="<%= grouping.id %>" | |
+ onclick="markButtonCheck('grouping_<%= grouping.id %>', <%= unrelease %>)" /> | |
</td> | |
<td> | |
<% if !grouping.has_submission? %> | |
diff --git a/public/javascripts/submissions_manager.js b/public/javascripts/submissions_manager.js | |
--- a/public/javascripts/submissions_manager.js | |
+++ b/public/javascripts/submissions_manager.js | |
@@ -58,3 +58,26 @@ function done_thinking() { | |
$('loading_list').hide(); | |
} | |
*/ | |
+ | |
+function markButtonCheck(checkbox, unrelease_status) { | |
+ box = document.getElementById(checkbox); | |
+ release = document.getElementsByName('release_results'); | |
+ unrelease = document.getElementsByName('unrelease_results') | |
+ if (box.checked == false) { | |
+ for (i=0;i<release.length;i++) { | |
+ release[i].setAttribute('disabled', 'disabled'); | |
+ } | |
+ for (i=0;i<unrelease.length;i++) { | |
+ unrelease[i].setAttribute('disabled', 'disabled'); | |
+ } | |
+ } else { | |
+ for (i=0;i<release.length;i++) { | |
+ release[i].removeAttribute('disabled', 0); | |
+ } | |
+ if (unrelease_status) { | |
+ for (i=0;i<unrelease.length;i++) { | |
+ unrelease[i].removeAttribute('disabled', 0); | |
+ } | |
+ } | |
+ } | |
+} | |
\ No newline at end of file | |
diff --git a/app/views/submissions/browse.html.erb b/app/views/submissions/browse.html.erb | |
--- a/app/views/submissions/browse.html.erb | |
+++ b/app/views/submissions/browse.html.erb | |
@@ -77,9 +77,9 @@ | |
<% if @current_user.admin? %> | |
<div class="floatLeft"> | |
<%= submit_tag I18n.t("browse_submissions.release_marks"), | |
- :name => "release_results" %> | |
+ :name => "release_results", :disabled => "disabled", :title => "Select groups to use this option." %> | |
<%= submit_tag I18n.t("browse_submissions.unrelease_marks"), | |
- :name => "unrelease_results" %> | |
+ :name => "unrelease_results", :disabled => "disabled", :title => "Selected groups must have released marks to use this option." %> | |
<% if !@assignment.results_average.nil? %> | |
<%= I18n.t("browse_submissions.class_average", | |
:results_average => h(@assignment.results_average)) %> | |
@@ -175,11 +175,11 @@ | |
<div class="floatLeft"> | |
<% if @current_user.admin? %> | |
<%= submit_tag I18n.t("browse_submissions.release_marks"), | |
- :name => "release_results" %> | |
+ :name => "release_results", :disabled => "disabled", :title => "Select groups to use this option." %> | |
<%= submit_tag I18n.t("browse_submissions.unrelease_marks"), | |
- :name => "unrelease_results" %> | |
+ :name => "unrelease_results", :disabled => "disabled", :title => "Selected groups must have released marks to use this option." %> | |
<% end %> | |
- </div> | |
+ </div> | |
<div class="ap_filters" id="ap_filters_2"> | |
<%= render :partial => 'submissions_table_filters', | |
:locals => { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment