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

Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment

Browse Source 
Ibrahimahmed443/sol 1479 change time allotment
This commit is contained in:
Ibrahim Ahmed
2015-12-21 21:55:30 +05:00
parent 42de6ffa96 f3d43ab5db
commit 5832b579be
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cms/static/js/spec/views/pages/course_outline_spec.js
View File

@@ -727,6 +727,29 @@ define(["jquery", "common/js/spec_helpers/ajax_helpers", "common/js/components/u
expect($('.modal-section .advanced-settings-button')).toHaveClass('active');
});
it('can select valid time', function() {
createCourseOutlinePage(this, mockCourseJSON, false);
outlinePage.$('.outline-subsection .configure-button').click();
selectAdvancedSettings();
var default_time = "00:30";
var valid_times = ["00:30", "23:00", "24:00", "99:00"];
var invalid_times = ["00:00", "100:00", "01:60"];
var time_limit, i;
for (i = 0; i < valid_times.length; i++){
time_limit = valid_times[i];
selectTimedExam(time_limit);
expect($("#id_time_limit").val()).toEqual(time_limit);
}
for (i = 0; i < invalid_times.length; i++){
time_limit = invalid_times[i];
selectTimedExam(time_limit);
expect($("#id_time_limit").val()).not.toEqual(time_limit);
expect($("#id_time_limit").val()).toEqual(default_time);
}
});
it('can be edited', function() {
createCourseOutlinePage(this, mockCourseJSON, false);
outlinePage.$('.outline-subsection .configure-button').click();

4
cms/static/js/views/modals/course_outline_modals.js
View File

@@ -388,7 +388,7 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
this.$('input.time').timepicker({
'timeFormat' : 'H:i',
'minTime': '00:30',
'maxTime': '05:00',
'maxTime': '24:00',
'forceRoundTime': false
});
@@ -429,7 +429,7 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
this.$('#id_exam_review_rules').val(value);
},
isValidTimeLimit: function(time_limit) {
var pattern = new RegExp('^([0-9]|0[0-9]|1[0-9]|2[0-3]):[0-5][0-9]$');
var pattern = new RegExp('^\\d{1,2}:[0-5][0-9]$');
return pattern.test(time_limit) && time_limit !== "00:00";
},
getExamTimeLimit: function () {