Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Emphasize student reflection in Step 2 #137

Open
jleong-openedx wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Emphasize student reflection in Step 2 #137

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e470157
Emphasize student reflection in Step 2
jleong-openedx Nov 28, 2017
da3bade
Merge branch 'master' into fix-62-focus-student-engagement
jleong-openedx Feb 6, 2018
8305834
Show rationale area after selecting an option
jleong-openedx Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"chai": "^3.2.0",
"chai-as-promised": "^5.1.0",
"cucumber": "^0.5.2",
"d3": "~3.3",
"d3": "~3.5.17",
"jasmine-core": "^2.3.4",
"jquery": "~2.2",
"karma": "^0.13",
Expand All @@ -29,7 +29,7 @@
"phantomjs": "^1.9.17",
"protractor": "~2.5",
"request": "^2.60.0",
"uglify-js": "2.3.6"
"uglify-js": "2.6.0"
},
"scripts": {
"test": "./node_modules/karma/bin/karma start --reporters progress,coverage"
Expand Down
37 changes: 26 additions & 11 deletions ubcpi/static/html/ubcpi.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
<img ng-src="{{question_text.image_url}}" id="question-image" alt="{{question_text.image_alt}}" ng-if="question_text.image_position == 'below' && question_text.image_url" />
</div>

<a name="reflecting"></a>
<a id="reflecting" name="reflecting"></a>
<div role="group" aria-label="Progress Indicator">
<span id="reflect" ng-if="rc.status() == rc.ALL_STATUS.ANSWERED">
<ol style="background:#f8f8f8;border:2px solid #ddd;margin:1em 0;padding-top:.3em;">
Expand All @@ -33,14 +33,14 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n

<div class="others-responses" id="others-responses" data-ng-if="rc.status() == rc.ALL_STATUS.ANSWERED" tabindex="-1" role="region" aria-labelledby="ubcpi-other-answers-heading">

<span id="ubcpi-other-answers-heading" style="color:#414141" translate>Step 2) Read Other Students Answers</span>
<span id="ubcpi-other-answers-heading" style="color:#414141" translate>Step 2a) Read Other Student Answers</span>
<p class="ubcpi-other-answers-instructions" translate>These are samples of other student answers for this question. Read them and then compare with your answer below.</p>

<ul class="ubcpi-other-answers">
<li data-ng-repeat="answer in rc.other_answers.answers">
<img ng-src="{{options[answer.option].image_url}}" alt="{{options[answer.option].image_alt}}" ng-if="options[answer.option].image_position == 'above' && options[answer.option].image_url" />

<b><div class="other-answer" ng-if="options[answer.option].text" translate>Student Answer: {{options[answer.option].text}}</div></b>
<b><div class="other-answer" ng-if="options[answer.option].text" translate>"{{options[answer.option].text}}" chosen because:</div></b>

<img ng-src="{{options[answer.option].image_url}}" alt="{{options[answer.option].image_alt}}" ng-if="options[answer.option].image_position == 'below' && options[answer.option].image_url" />
<span class="sr" translate>Student Rationale</span><i aria-hidden="true" class="icon fa fa-user"></i>
Expand All @@ -49,6 +49,17 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
</li>
</ul>

<span id="ubcpi-init-answer-heading" style="color:#414141" translate>Step 2b) Compare Your Answer</span>

<ul class="ubcpi-other-answers">

<li>
<b><div class="other-answer" translate>"{{options[rc.answer_original].text}}" chosen by you because:</div></b>
<span class="sr" translate>Student Rationale</span><i aria-hidden="true" class="icon fa fa-user"></i>
<span class="other-rationale">"{{rc.rationale_original}}"</span>
</li>
</ul>

</div><!-- .others-responses -->

<div role="group" aria-label="Progress Indicator">
Expand All @@ -65,14 +76,14 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
</div>
<form name="answerForm" class="choicegroup your-answer-and-rationale">

<fieldset>
<fieldset id="field">

<legend>
<span ng-if="rc.status() == rc.ALL_STATUS.NEW" style="color:#414141" translate>Step 1) Your Initial Answer <span class="inline-hint">You can change this answer later, if you change your mind.</span></span>
<span ng-if="rc.status() == rc.ALL_STATUS.ANSWERED" style="color:#414141" translate>Step 3) Your Final Answer <span class="inline-hint">You now have the option to change your initial selection and explanation, if you wish.</span></span>
<span ng-if="rc.status() == rc.ALL_STATUS.NEW" style="color:#414141" translate>Step 1) Give Initial Answer <span class="inline-hint">You can change this answer later, if you change your mind.</span></span>
<span id="hiding-section" ng-if="rc.status() == rc.ALL_STATUS.ANSWERED" style="color:#414141;display:none;" translate>Step 3) Update Your Answer <span class="inline-hint">You now have the option to change your initial selection and explanation, if you wish.</span></span>
</legend>

<div class="ubcpi-possible-options">
<div id="hiding-options-div" class="ubcpi-possible-options">
<p class="ubcpi-option" data-ng-repeat="option in options track by $index">
<label class="ubcpi-label ubcpi-answer" for="original-option-input-{{ $index }}">
<input class="ubcpi-field" type="radio" id="original-option-input-{{ $index }}" name="q" data-ng-model="rc.answer" value="{{$index}}" required integer>
Expand All @@ -90,6 +101,7 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n

</fieldset>

<div id="hiding-rationale-div">
<label class="ubcpi-label" for="rationale" translate>Explain to other students why you chose this answer (Required):</label>
<textarea class="ubcpi-field ubcpi-rationale" id="rationale" name="rationale" data-ng-model="rc.rationale" required ng-minlength="{{rationale_size.min}}" ng-maxlength="{{rationale_size.max}}"></textarea>
<p class="ubcpi-rationale-warning" ng-if="((rationale_size.max - rc.rationale.length) <= (rationale_size.max/10)) && (rc.rationale.length <= rationale_size.max)" translate>You are approaching the limit of {{rationale_size.max}} characters for this answer. Characters left: {{rationale_size.max - rc.rationale.length}}</p>
Expand Down Expand Up @@ -128,10 +140,13 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
<p class="ubcpi-chart-label">Revised Answer</p>
</div><!-- .revised-answers -->
</div>
</div></div>
<p id="decision-prompt" style="text-align: center; display: none;" translate>What would you like to do?</p>
<div style="text-align: center;">
<input id="update-button" style="display: none; margin-right: 5px" type='button' class='ubcpi_submit' value="{{ 'Update Answer' | translate }}" name='ubcpi_update_step' ng-click="rc.jump();" onclick="document.getElementById('hiding-options-div').style.display='block'; document.getElementById('hiding-rationale-div').style.display='block'; document.getElementById('hiding-section').style.display='block'; this.style.display='none'; document.getElementById('decision-prompt').style.display='none'; document.getElementById('field').style.display='block';"/>
<input id="submit-button" onclick="this.value='Submit Answer'; document.getElementById('update-button').style.display='inline'; document.getElementById('hiding-options-div').style.display='none'; document.getElementById('hiding-rationale-div').style.display='none'; document.getElementById('decision-prompt').style.display='block'; this.blur(); document.getElementById('field').style.display='none';" style="display: inline; margin-left: 5px;" data-ng-disabled="answerForm.$invalid" type='button' class='ubcpi_submit' value="{{ 'Next Step' | translate }}" name='ubcpi_next_step' data-ng-click="rc.clickSubmit($event);" aria-describedby="button-disabled-reason ubcpi-next-inline-hints"/>
</div>

<input data-ng-disabled="answerForm.$invalid" type='button' class='ubcpi_submit' value="{{ 'Next Step' | translate }} &rarr;" name='ubcpi_next_step' data-ng-click="rc.clickSubmit($event); location.href='#reflecting;'" aria-describedby="button-disabled-reason ubcpi-next-inline-hints" onclick="location.href='#reflecting'"/>

</form>

</div><!-- .question-other-explain -->
Expand All @@ -155,7 +170,7 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
<img ng-src="{{question_text.image_url}}" id="question-image" alt="{{question_text.image_alt}}" ng-if="question_text.image_position == 'below' && question_text.image_url" />
</div>

<div role="group" aria-label="Progress Indicator">
<div id="finalReflecting" role="group" aria-label="Progress Indicator">
<span id="test" ng-if="rc.status() == rc.ALL_STATUS.REVISED">
<ol style="background:#f8f8f8;border:2px solid #ddd;margin:1em 0;padding-top:.3em;">
<li style="display:inline-block;width:30%;text-align:center;color:#414141;padding-top:.3em"><span class="fa fa-check-circle" aria-hidden="true" style="font-size:1.4em;"></span><br><span translate>Answer</span><span class="sr" translate>, Completed</span></li>
Expand Down Expand Up @@ -208,7 +223,7 @@ <h5 id="correct-option-heading" ng-if="options.length == rc.correct_answer && rc
<span class="sr" translate>Student Rationale</span><i aria-hidden="true" class="icon fa fa-user"></i><span class="ubcpi-solution-your-final-rationale ubcpi-solution-rationales">"{{rc.rationale_revised}}"</span>
</li>
</ul>
<p translate>See how your classmates answered <a href="#classbreakdown">below</a></p>
<p translate>See how your classmates answered <a href="" ng-click="rc.jumpBelow()">below</a></p>

</div>
</div><!-- .detailed-solution -->
Expand Down
25 changes: 23 additions & 2 deletions ubcpi/static/js/src/ubcpi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
}
}])

.controller('ReviseController', ['$scope', 'notify', 'backendService', '$q', 'gettext',
function ($scope, notify, backendService, $q, gettext) {
.controller('ReviseController', ['$scope', 'notify', 'backendService', '$q', 'gettext', '$location', '$anchorScroll', '$timeout',
function ($scope, notify, backendService, $q, gettext, $location, $anchorScroll, $timeout) {
var self = this;
var data = $scope.config.data;

Expand Down Expand Up @@ -162,10 +162,31 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
return $q.reject(error);
}).finally(function() {
self.submitting = false;
$timeout(function() {
if(self.status()==self.ALL_STATUS.ANSWERED)
$location.hash('reflecting');
else
$location.hash('finalReflecting');
$anchorScroll();
});
notify('save', {state: 'end'});
});
};

self.jump = function () {
$timeout(function() {
$location.hash('ubcpi-init-answer-heading');
$anchorScroll();
});
};

self.jumpBelow = function () {
$timeout(function() {
$location.hash('classbreakdown');
$anchorScroll();
});
};

self.getStats = function () {
return backendService.getStats().then(function(data) {
self.stats = data;
Expand Down