@syncfusion/ej2-schedule 23.1.39 → 23.1.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -0
- package/dist/ej2-schedule.min.js +2 -2
- package/dist/ej2-schedule.umd.min.js +2 -2
- package/dist/ej2-schedule.umd.min.js.map +1 -1
- package/dist/es6/ej2-schedule.es2015.js +27 -5
- package/dist/es6/ej2-schedule.es2015.js.map +1 -1
- package/dist/es6/ej2-schedule.es5.js +27 -5
- package/dist/es6/ej2-schedule.es5.js.map +1 -1
- package/dist/global/ej2-schedule.min.js +2 -2
- package/dist/global/ej2-schedule.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +14 -14
- package/src/schedule/actions/drag.js +2 -2
- package/src/schedule/actions/work-cells.js +1 -1
- package/src/schedule/base/schedule.js +9 -0
- package/src/schedule/exports/print.js +5 -0
- package/src/schedule/popups/event-window.js +10 -2
- package/styles/bootstrap4.css +32 -2
- package/styles/recurrence-editor/bootstrap4.css +13 -2
- package/styles/schedule/bootstrap4.css +32 -2
|
@@ -11888,6 +11888,10 @@ class EventWindow {
|
|
|
11888
11888
|
this.parent.renderTemplates(() => {
|
|
11889
11889
|
if (this.element) {
|
|
11890
11890
|
this.applyFormValidation();
|
|
11891
|
+
if (this.eventCrudData) {
|
|
11892
|
+
this.showDetails(this.eventCrudData);
|
|
11893
|
+
this.eventCrudData = null;
|
|
11894
|
+
}
|
|
11891
11895
|
}
|
|
11892
11896
|
});
|
|
11893
11897
|
}
|
|
@@ -12480,13 +12484,17 @@ class EventWindow {
|
|
|
12480
12484
|
this.fieldValidator.renderFormValidator(form, rules, this.element, this.parent.locale);
|
|
12481
12485
|
}
|
|
12482
12486
|
showDetails(eventData) {
|
|
12483
|
-
this.eventData = eventData;
|
|
12487
|
+
this.eventData = this.eventCrudData ? this.eventData : eventData;
|
|
12484
12488
|
const eventObj = extend({}, eventData, null, true);
|
|
12489
|
+
const formElements = this.getFormElements(EVENT_WINDOW_DIALOG_CLASS);
|
|
12490
|
+
if (this.parent.isReact && formElements.length < 1) {
|
|
12491
|
+
this.eventCrudData = eventObj;
|
|
12492
|
+
return;
|
|
12493
|
+
}
|
|
12485
12494
|
if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
|
|
12486
12495
|
eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
|
|
12487
12496
|
this.trimAllDay(eventObj);
|
|
12488
12497
|
}
|
|
12489
|
-
const formElements = this.getFormElements(EVENT_WINDOW_DIALOG_CLASS);
|
|
12490
12498
|
const keyNames = Object.keys(eventObj);
|
|
12491
12499
|
for (const curElement of formElements) {
|
|
12492
12500
|
const columnName = curElement.name || this.getColumnName(curElement);
|
|
@@ -14888,7 +14896,7 @@ class WorkCellInteraction {
|
|
|
14888
14896
|
}
|
|
14889
14897
|
else {
|
|
14890
14898
|
const date = this.parent.getDateFromElement(target);
|
|
14891
|
-
if (!isNullOrUndefined(date) &&
|
|
14899
|
+
if (!isNullOrUndefined(date) && this.parent.isMinMaxDate(date)) {
|
|
14892
14900
|
this.parent.setProperties({ selectedDate: date }, true);
|
|
14893
14901
|
this.parent.changeView(this.parent.getNavigateView(), e);
|
|
14894
14902
|
}
|
|
@@ -16954,6 +16962,7 @@ let Schedule = class Schedule extends Component {
|
|
|
16954
16962
|
occurenceAlert: 'Cannot reschedule an occurrence of the recurring appointment if it skips over ' +
|
|
16955
16963
|
'a later occurrence of the same appointment.',
|
|
16956
16964
|
editRecurrence: 'Edit Recurrence',
|
|
16965
|
+
recurringEvent: 'Recurring Event',
|
|
16957
16966
|
repeats: 'Repeats',
|
|
16958
16967
|
alert: 'Alert',
|
|
16959
16968
|
startEndError: 'The selected end date occurs before the start date.',
|
|
@@ -17433,6 +17442,7 @@ let Schedule = class Schedule extends Component {
|
|
|
17433
17442
|
resourceName = this.quickPopup.getResourceText({ event: event }, 'event') + constantText;
|
|
17434
17443
|
}
|
|
17435
17444
|
const recordSubject = (subject || (event[this.eventFields.subject] || this.eventSettings.fields.subject.default));
|
|
17445
|
+
const recordLocation = (event[this.eventFields.location] || this.eventSettings.fields.location.default);
|
|
17436
17446
|
const skeleton = 'full';
|
|
17437
17447
|
const startDateText = this.globalize.formatDate(event[this.eventFields.startTime], {
|
|
17438
17448
|
type: 'dateTime', skeleton: skeleton, calendar: this.getCalendarMode()
|
|
@@ -17445,6 +17455,13 @@ let Schedule = class Schedule extends Component {
|
|
|
17445
17455
|
if (resourceName) {
|
|
17446
17456
|
announcementString = resourceName + ' ' + announcementString;
|
|
17447
17457
|
}
|
|
17458
|
+
if (recordLocation && recordLocation !== '') {
|
|
17459
|
+
announcementString = announcementString + ' ' + this.localeObj.getConstant('location') + ' ' + recordLocation;
|
|
17460
|
+
}
|
|
17461
|
+
if (event[this.eventFields.recurrenceRule] && event[this.eventFields.recurrenceRule] !== ''
|
|
17462
|
+
&& event[this.eventFields.id] === event[this.eventFields.recurrenceID]) {
|
|
17463
|
+
announcementString = announcementString + ' ' + this.localeObj.getConstant('recurringEvent');
|
|
17464
|
+
}
|
|
17448
17465
|
return announcementString;
|
|
17449
17466
|
}
|
|
17450
17467
|
/**
|
|
@@ -21014,7 +21031,7 @@ class DragAndDrop extends ActionBase {
|
|
|
21014
21031
|
if (this.parent.quickPopup) {
|
|
21015
21032
|
this.parent.quickPopup.quickPopupHide(true);
|
|
21016
21033
|
}
|
|
21017
|
-
if ((!isNullOrUndefined(e.target)) && e.target.classList.contains(DISABLE_DATES)) {
|
|
21034
|
+
if ((!isNullOrUndefined(e.target)) && e.target.classList && e.target.classList.contains(DISABLE_DATES)) {
|
|
21018
21035
|
return;
|
|
21019
21036
|
}
|
|
21020
21037
|
const eventObj = extend({}, this.actionObj.event, null, true);
|
|
@@ -21104,7 +21121,7 @@ class DragAndDrop extends ActionBase {
|
|
|
21104
21121
|
if (this.isAllowDrop(e)) {
|
|
21105
21122
|
return;
|
|
21106
21123
|
}
|
|
21107
|
-
const target = ((!e.target.classList.contains('e-work-cells') && this.parent.cellTemplate) ?
|
|
21124
|
+
const target = (e.target.classList && (!e.target.classList.contains('e-work-cells') && this.parent.cellTemplate) ?
|
|
21108
21125
|
closest(e.target, '.e-work-cells') : e.target);
|
|
21109
21126
|
const dragArgs = {
|
|
21110
21127
|
cancel: false, data: this.getChangedData(this.updatedData), selectedData: this.updatedData,
|
|
@@ -27097,6 +27114,11 @@ class Print {
|
|
|
27097
27114
|
if (timeCellsScroll) {
|
|
27098
27115
|
timeCellsScroll.scrollTop = scrollableEle.scrollTop;
|
|
27099
27116
|
}
|
|
27117
|
+
const contentCellScroll = printWindow.document.querySelector(className);
|
|
27118
|
+
if (contentCellScroll) {
|
|
27119
|
+
contentCellScroll.scrollLeft = scrollableEle.scrollLeft;
|
|
27120
|
+
contentCellScroll.scrollTop = scrollableEle.scrollTop;
|
|
27121
|
+
}
|
|
27100
27122
|
printWindow.print();
|
|
27101
27123
|
printWindow.close();
|
|
27102
27124
|
}
|