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 Scheduler localization in appointment popup, first step (T887054) #13008

Merged
merged 4 commits into from
May 13, 2020
Merged

Fix Scheduler localization in appointment popup, first step (T887054) #13008

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff9b1f4
Trying to fix
Yarovaya May 11, 2020
6150292
Fix tests
Yarovaya May 12, 2020
891421d
Add test
Yarovaya May 12, 2020
1cacd10
small fix
Yarovaya May 12, 2020
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
3 changes: 2 additions & 1 deletion js/ui/scheduler/appointmentPopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { extend } from '../../core/utils/extend';
import { each } from '../../core/utils/iterator';
import { Deferred, when } from '../../core/utils/deferred';
import { isDefined } from '../../core/utils/type';
import messageLocalization from '../../localization/message';

const toMs = dateUtils.dateToMilliseconds;

Expand Down Expand Up @@ -282,7 +283,7 @@ export default class AppointmentPopup {
return [
{
shortcut: 'done',
options: { text: 'Done' },
options: { text: messageLocalization.format('Done') },
location: TOOLBAR_ITEM_AFTER_LOCATION,
onClick: (e) => this._doneButtonClickHandler(e)
},
Expand Down
10 changes: 7 additions & 3 deletions js/ui/scheduler/ui.scheduler.recurrence_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,18 +383,22 @@ const RecurrenceEditor = Editor.inherit({
const firstDayOfWeek = this._getFirstDayOfWeek();
const byDay = this._recurrenceRule.rules()['byday'] ?
this._recurrenceRule.rules()['byday'].split(',') : days[firstDayOfWeek];
const that = this;
const itemsButtonGroup = days.slice(firstDayOfWeek).concat(days.slice(0, firstDayOfWeek)).map(item => { return { text: item }; });

const localDaysNames = dateLocalization.getDayNames('abbreviated');
const dayNames = days.slice(firstDayOfWeek).concat(days.slice(0, firstDayOfWeek));

const itemsButtonGroup = localDaysNames.slice(firstDayOfWeek).concat(localDaysNames.slice(0, firstDayOfWeek)).map((item, index) => { return { text: item, key: dayNames[index] }; });

this._$repeatOnWeek = $('<div>').addClass(RECURRENCE_BUTTON_GROUP).appendTo(this._$repeatOnEditor);

this._weekEditor = this._createComponent(this._$repeatOnWeek, ButtonGroup, {
items: itemsButtonGroup,
selectionMode: 'multiple',
selectedItemKeys: byDay,
keyExpr: 'key',
onSelectionChanged: (e) => {
const selectedKeys = e.component.option('selectedItemKeys');
that._recurrenceRule.makeRule('byday', selectedKeys);
this._recurrenceRule.makeRule('byday', selectedKeys);
this._changeEditorValue();
}
});
Expand Down
10 changes: 4 additions & 6 deletions testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,23 +715,21 @@ QUnit.test('Repeat-until dateBox should have right firstDayOfWeek after firstDay
assert.equal(untilDate.option('calendarOptions.firstDayOfWeek'), 1, 'First day of the week is ok');
});

const dayNames = [{ key: 'SU', text: 'Sun' }, { key: 'MO', text: 'Mon' }, { key: 'TU', text: 'Tue' }, { key: 'WE', text: 'Wed' }, { key: 'TH', text: 'Thu' }, { key: 'FR', text: 'Fri' }, { key: 'SA', text: 'Sat' }];

QUnit.test('Repeat-on-week editor should be rendered correctly', function(assert) {
this.createInstance({ firstDayOfWeek: 3, value: 'FREQ=WEEKLY;BYDAY=TU' });

const buttonGroup = $('.' + 'dx-buttongroup').eq(0).dxButtonGroup('instance');
assert.deepEqual(buttonGroup.option('items'), [
{ text: 'WE' }, { text: 'TH' }, { text: 'FR' }, { text: 'SA' }, { text: 'SU' }, { text: 'MO' }, { text: 'TU' }
]);
assert.deepEqual(buttonGroup.option('items'), dayNames.slice(3).concat(dayNames.slice(0, 3)));
});

QUnit.test('Repeat-on-week editor should be rendered correctly after firstDayOfWeek option changing', function(assert) {
this.createInstance({ firstDayOfWeek: 3, value: 'FREQ=WEEKLY;BYDAY=TU' });
this.instance.option('firstDayOfWeek', 5);

const buttonGroup = $('.' + 'dx-buttongroup').eq(0).dxButtonGroup('instance');
assert.deepEqual(buttonGroup.option('items'), [
{ text: 'FR' }, { text: 'SA' }, { text: 'SU' }, { text: 'MO' }, { text: 'TU' }, { text: 'WE' }, { text: 'TH' }
]);
assert.deepEqual(buttonGroup.option('items'), dayNames.slice(5).concat(dayNames.slice(0, 5)));
});

QUnit.test('Repeat-count editor should have correct value after re-initializing values', function(assert) {
Expand Down