Skip to content

fix: remove relative due date limit #32094

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

Merged
Agrendalath merged 1 commit into from
May 4, 2023
Merged

fix: remove relative due date limit #32094

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions cms/static/js/spec/views/pages/course_outline_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2291,13 +2291,6 @@ describe('CourseOutlinePage', function() {
it('shows validation error on relative date', function() {
outlinePage.$('.outline-subsection .configure-button').click();

// when due number of weeks goes over 18
selectRelativeWeeksSubsection('19');
expect($('#relative_weeks_due_warning_max').css('display')).not.toBe('none');
expect($('#relative_weeks_due_warning_max')).toContainText('The maximum number of weeks this subsection can be due in is 18 weeks from the learner enrollment date.');
expect($('.wrapper-modal-window .action-save').prop('disabled')).toBe(true);
expect($('.wrapper-modal-window .action-save').hasClass('is-disabled')).toBe(true);

// when due number of weeks is less than 1
selectRelativeWeeksSubsection('-1');
expect($('#relative_weeks_due_warning_min').css('display')).not.toBe('none');
Expand All @@ -2306,8 +2299,7 @@ describe('CourseOutlinePage', function() {
expect($('.wrapper-modal-window .action-save').hasClass('is-disabled')).toBe(true);

// when no validation error should show up
selectRelativeWeeksSubsection('10');
expect($('#relative_weeks_due_warning_max').css('display')).toBe('none');
selectRelativeWeeksSubsection('19');
expect($('#relative_weeks_due_warning_min').css('display')).toBe('none');
expect($('.wrapper-modal-window .action-save').prop('disabled')).toBe(false);
expect($('.wrapper-modal-window .action-save').hasClass('is-disabled')).toBe(false);
Expand Down
10 changes: 3 additions & 7 deletions cms/static/js/views/modals/course_outline_modals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,14 +420,10 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',

validateDueIn: function() {
this.$('#relative_weeks_due_projected').hide();
if (this.getValue() > 18){
this.$('#relative_weeks_due_warning_max').show();
BaseModal.prototype.disableActionButton.call(this.parent, 'save');
} else if (this.getValue() < 1){
this.$('#relative_weeks_due_warning_min').show()
if (this.getValue() < 1) {
this.$('#relative_weeks_due_warning_min').show();
BaseModal.prototype.disableActionButton.call(this.parent, 'save');
} else {
this.$('#relative_weeks_due_warning_max').hide();
this.$('#relative_weeks_due_warning_min').hide();
this.showProjectedDate();
BaseModal.prototype.enableActionButton.call(this.parent, 'save');
Expand All @@ -452,7 +448,7 @@ define(['jquery', 'backbone', 'underscore', 'gettext', 'js/views/baseview',
// Grab all the subsections, map them to their block_ids, then return as an Array
var subsectionIds = $('.outline-subsection').map(function(){ return this.id; }).get()
var relative_weeks_due = null;
if (this.getValue() < 19 && this.getValue() > 0 && $('#grading_type').val() !== 'notgraded') {
if (this.getValue() > 0 && $('#grading_type').val() !== 'notgraded') {
relative_weeks_due = this.getValue()
}
window.analytics.track('edx.bi.studio.relative_date.saved', {
Expand Down
6 changes: 1 addition & 5 deletions cms/templates/js/self-paced-due-date-editor.underscore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Translators: Please use a generic pluralization that makes sense in most contexts for the second half of the sentence "weeks from learner enrollment date" which is preceded by "Due in: [input entry]" -->
<label for="due_in"><%- gettext('Due in:') %></label>
<input type="number" id="due_in" name="due_in" value=""
placeholder="" autocomplete="off" min="1" max="18" style="width:20%"/>
placeholder="" autocomplete="off" min="1" style="width:20%"/>
<%- gettext('weeks from learner enrollment date')%>
</li>
</ul>
Expand All @@ -19,10 +19,6 @@
%>
</div>

<div id="relative_weeks_due_warning_max" class="message-status error">
<%- gettext('The maximum number of weeks this subsection can be due in is 18 weeks from the learner enrollment date.') %>
</div>

<div id="relative_weeks_due_warning_min" class="message-status error">
<%- gettext('The minimum number of weeks this subsection can be due in is 1 week from the learner enrollment date.') %>
</div>
Expand Down