Index: lams_monitoring/web/css/tblmonitor.scss =================================================================== diff -u -r37945afeca0f748fbb1f1608d8317bea73234a5e -r85ec7090c5fa9da3cde91c145d90f3b4d3068dee --- lams_monitoring/web/css/tblmonitor.scss (.../tblmonitor.scss) (revision 37945afeca0f748fbb1f1608d8317bea73234a5e) +++ lams_monitoring/web/css/tblmonitor.scss (.../tblmonitor.scss) (revision 85ec7090c5fa9da3cde91c145d90f3b4d3068dee) @@ -400,4 +400,8 @@ .disclose-button-group { margin-top: -2px; +} + +.disclose-all-button-group { + margin-bottom: 10px; } \ No newline at end of file Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r37945afeca0f748fbb1f1608d8317bea73234a5e -r85ec7090c5fa9da3cde91c145d90f3b4d3068dee --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 37945afeca0f748fbb1f1608d8317bea73234a5e) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 85ec7090c5fa9da3cde91c145d90f3b4d3068dee) @@ -335,4 +335,6 @@ label.learning.summary.other.team.answers =Other teams' answers label.disclose.correct.answers =Disclose correct answers label.disclose.groups.answers =Disclose groups' answers +label.disclose.all.correct.answers =Disclose all correct answers +label.disclose.all.groups.answers =Disclose all groups' answers #======= End labels: Exported 324 labels for en AU ===== Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp =================================================================== diff -u -r37945afeca0f748fbb1f1608d8317bea73234a5e -r85ec7090c5fa9da3cde91c145d90f3b4d3068dee --- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision 37945afeca0f748fbb1f1608d8317bea73234a5e) +++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision 85ec7090c5fa9da3cde91c145d90f3b4d3068dee) @@ -25,21 +25,64 @@ //insert total learners number taken from the parent tblmonitor.jsp $("#total-learners-number").html(TOTAL_LESSON_LEARNERS_NUMBER); - // disclose correct/group answers on click - $('.disclose-button-group .btn').not('[disabled]').one('click', function(){ - var button = $(this); - $.ajax({ - 'url' : 'tblmonitoring.do', - 'data' : { - 'method' : button.hasClass('disclose-correct-button') ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers', - 'questionUid' : button.closest('.disclose-button-group').attr('questionUid') - } - }).done(function(){ - // disable the button after click - button.attr('disabled', true).html(' ' + button.text()); + // go through each AE and set up disclose buttons there + $('.assessmentPane').each(function(){ + var assessmentPane = $(this), + // are any correct/groups buttons clickable? + discloseAllCorrectEnabled = false, + discloseAllGroupsEnabled = false; + + // disclose correct/group answers on click + $('.disclose-button-group .btn', assessmentPane).not('[disabled]').each(function(){ + let button = $(this), + isCorrectButton = button.hasClass('disclose-correct-button'); + if (isCorrectButton) { + discloseAllCorrectEnabled = true; + } else { + discloseAllGroupsEnabled = true; + } + + button.one('click', function() { + $.ajax({ + 'url' : 'tblmonitoring.do', + 'data' : { + 'method' : isCorrectButton ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers', + 'questionUid' : button.closest('.disclose-button-group').attr('questionUid') + } + }).done(function(){ + // disable the button after click + disabledAndCheckButton(button); + }); }); + }); + + // if disclose all correct/groups answers buttons are clickable, add a click handler + // and disable if not + var allCorrectButton = $('.disclose-all-correct-button', assessmentPane); + if (discloseAllCorrectEnabled) { + allCorrectButton.one('click', function(){ + $('.disclose-correct-button', assessmentPane).not('[disabled]').click(); + disabledAndCheckButton(allCorrectButton); + }); + } else { + disabledAndCheckButton(allCorrectButton); + } + + var allGroupsButton = $('.disclose-all-groups-button', assessmentPane); + if (discloseAllGroupsEnabled) { + allGroupsButton.one('click', function(){ + $('.disclose-groups-button', assessmentPane).not('[disabled]').click(); + disabledAndCheckButton(allGroupsButton); + }); + } else { + disabledAndCheckButton(allGroupsButton); + } }); }); + + function disabledAndCheckButton(button){ + button.attr('disabled', true).html(' ' + button.text()); + } @@ -105,8 +148,25 @@
-
active"> + + + <%-- Release correct/groups answers for all questions in this assessment --%> +
+
+
+
+ +
+
+ +
+
+
+
+
+