Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix issues with multiple ubcpi xblocks in same unit #153

Merged
merged 1 commit into from
Jan 18, 2019
Merged

Fix issues with multiple ubcpi xblocks in same unit #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ubcpi/static/html/ubcpi.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n

<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 }}">
<label class="ubcpi-label ubcpi-answer">
<input class="ubcpi-field" type="radio" id="original-option-input-{{ $index }}" name="q" data-ng-model="rc.answer" value="{{$index}}" required integer>

<img ng-src="{{option.image_url}}" id="original-option-image-{{ $index }}" alt="{{option.image_alt}}" ng-if="option.image_position == 'above' && option.image_url" />
Expand Down Expand Up @@ -130,7 +130,7 @@ <h3 id="pi-question-h" class="question-text" style="display:inline;">{{display_n
</div>
</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);" aria-describedby="button-disabled-reason ubcpi-next-inline-hints" onclick=""/>
<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);" aria-describedby="button-disabled-reason ubcpi-next-inline-hints" scroll-to-top-of-block='click' onclick=""/>

</form>

Expand Down
36 changes: 27 additions & 9 deletions ubcpi/static/js/src/ubcpi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,28 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
};
}])

/**
* Scroll to top of the xblock on given event
*/
.directive('scrollToTopOfBlock', function() {
return {
restrict: 'A',
scope: {
scrollToTopOfBlock: '@'
},
link: function(scope, ele, attr, ctrl) {
ele.on(scope.scrollToTopOfBlock? scope.scrollToTopOfBlock : 'click', function() {
var target;
target = ele.parents('.ubcpi_block');
if (!target) {
target = ele;
}
$('html,body').animate({scrollTop: target.offset().top}, "slow");
});
}
};
})

.factory('backendService', ['$http', '$q', '$rootScope', function ($http, $q, $rootScope) {
return {
getStats: getStats,
Expand Down Expand Up @@ -101,8 +123,8 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
}
}])

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

Expand All @@ -121,7 +143,7 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
var persistedDataObject = get_data().then( function(persistedData) {

if ( persistedData.answer_original !== null ) {
assignData(self, data);
assignData(self, persistedData);
}
});

Expand Down Expand Up @@ -154,10 +176,6 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
self.submitting = true;
return backendService.submit(self.answer, self.rationale, self.status()).then(function(data) {
assignData(self, data);
$timeout(function() {
$location.hash('others-responses');
$anchorScroll();
});
}, function(error) {
notify('error', {
'title': gettext('Error submitting answer!'),
Expand Down Expand Up @@ -185,7 +203,7 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
self.calc = function(s) {
var originalPercentage = gettext(" Initial Answer Selection: ");
var revisedPercentage = gettext(" Final Answer Selection: ");
if (typeof self.stats.original[s] !== 'undefined') {
if (typeof self.stats !== 'undefined' && typeof s !== 'undefined' && typeof self.stats.original[s] !== 'undefined') {
var totalCounts = 0;
for (var i = 0; i < data.options.length; i++) {
if (typeof self.stats.original[i] !== 'undefined')
Expand All @@ -196,7 +214,7 @@ angular.module('UBCPI', ['ngSanitize', 'ngCookies', 'gettext'])
else
originalPercentage += "0%";

if (typeof self.stats.revised[s] !== 'undefined') {
if (typeof self.stats !== 'undefined' && typeof s !== 'undefined' && typeof self.stats.revised[s] !== 'undefined') {
var totalCounts = 0;
for (var i = 0; i < data.options.length; i++) {
if (typeof self.stats.revised[i] !== 'undefined')
Expand Down