Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address most of Christina's code review comments

Browse Source
This commit is contained in:
Andy Armstrong
2015-01-05 10:38:52 -05:00
parent 8e787b4f03
commit fc5b94eeeb
13 changed files with 206 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/static/js/groups/models/content_group.js
View File

@@ -8,7 +8,8 @@ var edx = edx || {};
edx.groups.ContentGroupModel = Backbone.Model.extend({
idAttribute: 'id',
defaults: {
name: ''
name: '',
user_partition_id: null
}
});
}).call(this, Backbone);

19
lms/static/js/groups/views/cohort_editor.js
View File

@@ -15,9 +15,8 @@ var edx = edx || {};
initialize: function(options) {
this.template = _.template($('#cohort-editor-tpl').text());
this.cohorts = options.cohorts;
this.cohortUserPartitionId = options.cohortUserPartitionId;
this.contentGroups = options.contentGroups;
this.advanced_settings_url = options.advanced_settings_url;
this.context = options.context;
},
// Any errors that are currently being displayed to the instructor (for example, unknown email addresses).
@@ -28,14 +27,12 @@ var edx = edx || {};
render: function() {
this.$el.html(this.template({
cohort: this.model,
cohortUserPartitionId: this.cohortUserPartitionId,
contentGroups: this.contentGroups,
advanced_settings_url: this.advanced_settings_url
studioAdvancedSettingsUrl: this.context.studioAdvancedSettingsUrl
}));
this.cohortFormView = new CohortFormView({
model: this.model,
cohortUserPartitionId: this.cohortUserPartitionId,
contentGroups: this.contentGroups
contentGroups: this.contentGroups,
context: this.context
});
this.cohortFormView.render();
this.$('.tab-content-settings').append(this.cohortFormView.$el);
@@ -53,8 +50,12 @@ var edx = edx || {};
},
saveSettings: function(event) {
var cohortFormView = this.cohortFormView;
event.preventDefault();
this.cohortFormView.saveForm();
cohortFormView.saveForm()
.done(function() {
cohortFormView.showMessage(gettext('Saved cohort group.'));
});
},
setCohort: function(cohort) {
@@ -94,7 +95,7 @@ var edx = edx || {};
self.showErrorMessage(gettext('Error adding students.'), true);
});
} else {
self.showErrorMessage(gettext('Please enter a username or email.'), true);
self.showErrorMessage(gettext('Enter a username or email.'), true);
input.val('');
}
},

74
lms/static/js/groups/views/cohort_form.js
View File

@@ -8,15 +8,14 @@ var edx = edx || {};
edx.groups.CohortFormView = Backbone.View.extend({
events : {
'change .cohort-management-details-association-course input': 'onRadioButtonChange',
'change .input-cohort-group-association': 'onGroupAssociationChange',
'click .tab-content-settings .action-save': 'saveSettings',
'submit .cohort-management-group-add-form': 'addStudents'
},
initialize: function(options) {
this.template = _.template($('#cohort-form-tpl').text());
this.cohortUserPartitionId = options.cohortUserPartitionId;
this.contentGroups = options.contentGroups;
this.context = options.context;
},
showNotification: function(options, beforeElement) {
@@ -26,9 +25,6 @@ var edx = edx || {};
model: model
});
this.notification.render();
if (!beforeElement) {
beforeElement = this.$('.cohort-management-group');
}
beforeElement.before(this.notification.$el);
},
@@ -41,7 +37,8 @@ var edx = edx || {};
render: function() {
this.$el.html(this.template({
cohort: this.model,
contentGroups: this.contentGroups
contentGroups: this.contentGroups,
studioGroupConfigurationsUrl: this.context.studioGroupConfigurationsUrl
}));
return this;
},
@@ -51,22 +48,29 @@ var edx = edx || {};
groupsEnabled = target.val() === 'yes';
if (!groupsEnabled) {
// If the user has chosen 'no', then clear the selection by setting
// it to the first option ('Choose a content group to associate').
// it to the first option which represents no selection.
this.$('.input-cohort-group-association').val('None');
}
// Enable the select if the user has chosen groups, else disable it
this.$('.input-cohort-group-association').prop('disabled', !groupsEnabled);
},
onGroupAssociationChange: function(event) {
// Since the user has chosen a content group, click the 'Yes' button too
this.$('.cohort-management-details-association-course .radio-yes').click();
},
getSelectedGroupId: function() {
var selectValue = this.$('.input-cohort-group-association').val();
getSelectedContentGroup: function() {
var selectValue = this.$('.input-cohort-group-association').val(),
ids, groupId, userPartitionId, i, contentGroup;
if (!this.$('.radio-yes').prop('checked') || selectValue === 'None') {
return null;
}
return parseInt(selectValue);
ids = selectValue.split(':');
groupId = parseInt(ids[0]);
userPartitionId = parseInt(ids[1]);
for (i=0; i < this.contentGroups.length; i++) {
contentGroup = this.contentGroups[i];
if (contentGroup.get('id') === groupId && contentGroup.get('user_partition_id') === userPartitionId) {
return contentGroup;
}
}
return null;
},
getUpdatedCohortName: function() {
@@ -74,37 +78,43 @@ var edx = edx || {};
return cohortName ? cohortName.trim() : this.model.get('name');
},
showMessage: function(message, type) {
this.showNotification(
{type: type || 'confirmation', title: message},
this.$('.form-fields')
);
},
saveForm: function() {
var self = this,
cohort = this.model,
saveOperation = $.Deferred(),
cohortName, groupId, showMessage, showAddError;
isUpdate = this.model.id !== null,
cohortName, selectedContentGroup, showErrorMessage;
this.removeNotification();
showMessage = function(message, type) {
self.showNotification(
{type: type || 'confirmation', title: message},
self.$('.form-fields')
);
};
showAddError = function(message, type) {
showMessage(message, 'error');
showErrorMessage = function(message) {
self.showMessage(message, 'error');
};
cohortName = this.getUpdatedCohortName();
if (cohortName.length === 0) {
showAddError(gettext('Please enter a name for your new cohort group.'));
showErrorMessage(gettext('Enter a name for your cohort group.'));
saveOperation.reject();
} else {
groupId = this.getSelectedGroupId();
selectedContentGroup = this.getSelectedContentGroup();
cohort.save(
{name: cohortName, user_partition_id: this.cohortUserPartitionId, group_id: groupId},
{patch: true}
{
name: cohortName,
group_id: selectedContentGroup ? selectedContentGroup.id : null,
user_partition_id: selectedContentGroup ? selectedContentGroup.get('user_partition_id') : null
},
{patch: isUpdate}
).done(function(result) {
if (!result.error) {
cohort.id = result.id;
showMessage(gettext('Saved cohort group.'));
self.render(); // re-render to remove any now invalid error messages
saveOperation.resolve();
} else {
showAddError(result.error);
showErrorMessage(result.error);
saveOperation.reject();
}
}).fail(function(result) {
@@ -116,9 +126,9 @@ var edx = edx || {};
// Ignore the exception and show the default error message instead.
}
if (!errorMessage) {
errorMessage = gettext("We've encountered an error. Please refresh your browser and then try again.");
errorMessage = gettext("We've encountered an error. Refresh your browser and then try again.");
}
showAddError(errorMessage);
showErrorMessage(errorMessage);
saveOperation.reject();
});
}

24
lms/static/js/groups/views/cohorts.js
View File

@@ -24,9 +24,7 @@ var edx = edx || {};
this.template = _.template($('#cohorts-tpl').text());
this.selectorTemplate = _.template($('#cohort-selector-tpl').text());
this.advanced_settings_url = options.advanced_settings_url;
this.upload_cohorts_csv_url = options.upload_cohorts_csv_url;
this.cohortUserPartitionId = options.cohortUserPartitionId;
this.context = options.context;
this.contentGroups = options.contentGroups;
model.on('sync', this.onSync, this);
@@ -58,9 +56,14 @@ var edx = edx || {};
hasCohorts = this.model.length > 0,
cohortNavElement = this.$('.cohort-management-nav'),
additionalCohortControlElement = this.$('.wrapper-cohort-supplemental'),
isModelUpdate = options && options.patch && response.hasOwnProperty('user_partition_id');
isModelUpdate;
isModelUpdate = function() {
// Distinguish whether this is a sync event for just one model, or if it is for
// an entire collection.
return options && options.patch && response.hasOwnProperty('user_partition_id');
};
this.hideAddCohortForm();
if (isModelUpdate) {
if (isModelUpdate()) {
// Refresh the selector in case the model's name changed
this.renderSelector(selectedCohort);
} else if (hasCohorts) {
@@ -104,9 +107,8 @@ var edx = edx || {};
el: this.$('.cohort-management-group'),
model: cohort,
cohorts: this.model,
cohortUserPartitionId: this.cohortUserPartitionId,
contentGroups: this.contentGroups,
advanced_settings_url: this.advanced_settings_url
context: this.context
});
this.editor.render();
}
@@ -142,8 +144,8 @@ var edx = edx || {};
newCohort.url = this.model.url;
this.cohortFormView = new CohortFormView({
model: newCohort,
cohortUserPartitionId: this.cohortUserPartitionId,
contentGroups: this.contentGroups
contentGroups: this.contentGroups,
context: this.context
});
this.cohortFormView.render();
this.$('.cohort-management-add-modal').append(this.cohortFormView.$el);
@@ -215,10 +217,10 @@ var edx = edx || {};
inputTip: gettext("Only properly formatted .csv files will be accepted."),
submitButtonText: gettext("Upload File and Assign Students"),
extensions: ".csv",
url: this.upload_cohorts_csv_url,
url: this.context.uploadCohortsCsvUrl,
successNotification: function (file, event, data) {
var message = interpolate_text(gettext(
"Your file '{file}' has been uploaded. Please allow a few minutes for processing."
"Your file '{file}' has been uploaded. Allow a few minutes for processing."
), {file: file});
return new NotificationModel({
type: "confirmation",