@syncfusion/ej2-schedule 20.4.42 → 20.4.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 +19 -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 +143 -119
- package/dist/es6/ej2-schedule.es2015.js.map +1 -1
- package/dist/es6/ej2-schedule.es5.js +144 -121
- 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 +12 -12
- package/src/schedule/base/schedule.d.ts +2 -1
- package/src/schedule/base/schedule.js +6 -2
- package/src/schedule/event-renderer/agenda-base.js +0 -1
- package/src/schedule/event-renderer/event-base.js +1 -9
- package/src/schedule/event-renderer/month.js +1 -1
- package/src/schedule/event-renderer/vertical-view.js +0 -1
- package/src/schedule/event-renderer/year.js +1 -1
- package/src/schedule/popups/event-tooltip.js +2 -7
- package/src/schedule/popups/event-window.js +40 -31
- package/src/schedule/popups/quick-popups.js +93 -68
|
@@ -5716,20 +5716,12 @@ var EventBase = /** @__PURE__ @class */ (function () {
|
|
|
5716
5716
|
};
|
|
5717
5717
|
EventBase.prototype.removeSelectedAppointmentClass = function () {
|
|
5718
5718
|
var selectedAppointments = this.getSelectedAppointments();
|
|
5719
|
-
for (var _i = 0, selectedAppointments_1 = selectedAppointments; _i < selectedAppointments_1.length; _i++) {
|
|
5720
|
-
var appointment = selectedAppointments_1[_i];
|
|
5721
|
-
appointment.setAttribute('aria-pressed', 'false');
|
|
5722
|
-
}
|
|
5723
5719
|
removeClass(selectedAppointments, APPOINTMENT_BORDER);
|
|
5724
5720
|
if (this.parent.currentView === 'Agenda' || this.parent.currentView === 'MonthAgenda') {
|
|
5725
5721
|
removeClass(selectedAppointments, AGENDA_SELECTED_CELL);
|
|
5726
5722
|
}
|
|
5727
5723
|
};
|
|
5728
5724
|
EventBase.prototype.addSelectedAppointments = function (cells) {
|
|
5729
|
-
for (var _i = 0, cells_1 = cells; _i < cells_1.length; _i++) {
|
|
5730
|
-
var cell = cells_1[_i];
|
|
5731
|
-
cell.setAttribute('aria-pressed', 'true');
|
|
5732
|
-
}
|
|
5733
5725
|
if (this.parent.currentView !== 'MonthAgenda') {
|
|
5734
5726
|
this.parent.removeSelectedClass();
|
|
5735
5727
|
}
|
|
@@ -6293,7 +6285,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
|
|
|
6293
6285
|
className: BLOCK_APPOINTMENT_CLASS,
|
|
6294
6286
|
attrs: {
|
|
6295
6287
|
'data-id': 'Appointment_' + record[this.parent.eventFields.id],
|
|
6296
|
-
'aria-disabled': 'true'
|
|
6288
|
+
'aria-disabled': 'true'
|
|
6297
6289
|
}
|
|
6298
6290
|
});
|
|
6299
6291
|
var templateElement;
|
|
@@ -6814,7 +6806,6 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
|
|
|
6814
6806
|
'role': 'button',
|
|
6815
6807
|
'tabindex': '0',
|
|
6816
6808
|
'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
|
|
6817
|
-
'aria-pressed': 'false',
|
|
6818
6809
|
'aria-label': this.parent.getAnnouncementString(record)
|
|
6819
6810
|
}
|
|
6820
6811
|
});
|
|
@@ -7758,7 +7749,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
|
|
|
7758
7749
|
var attrs = {
|
|
7759
7750
|
'data-id': 'Appointment_' + record[this.fields.id],
|
|
7760
7751
|
'role': 'button', 'tabindex': '0',
|
|
7761
|
-
'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
|
|
7752
|
+
'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
|
|
7762
7753
|
'aria-label': this.parent.getAnnouncementString(newRecord, eventSubject)
|
|
7763
7754
|
};
|
|
7764
7755
|
if (!isCloneElement) {
|
|
@@ -9282,7 +9273,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
9282
9273
|
'data-id': '' + eventData[fields.id],
|
|
9283
9274
|
'data-guid': eventData.Guid, 'role': 'button', 'tabindex': '0',
|
|
9284
9275
|
'aria-disabled': this_1.parent.eventBase.getReadonlyAttribute(eventData),
|
|
9285
|
-
'aria-
|
|
9276
|
+
'aria-label': this_1.parent.getAnnouncementString(eventData)
|
|
9286
9277
|
}
|
|
9287
9278
|
});
|
|
9288
9279
|
var templateElement = void 0;
|
|
@@ -9356,7 +9347,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
9356
9347
|
if (deleteIcon) {
|
|
9357
9348
|
this.renderButton('e-flat e-round e-small', ICON + ' ' + DELETE_ICON_CLASS, deleteAction, deleteIcon, this.deleteClick);
|
|
9358
9349
|
}
|
|
9359
|
-
this.beforeQuickPopupOpen(target);
|
|
9350
|
+
this.beforeQuickPopupOpen(target, e);
|
|
9360
9351
|
};
|
|
9361
9352
|
QuickPopups.prototype.isCellBlocked = function (args) {
|
|
9362
9353
|
var tempObj = {};
|
|
@@ -9443,7 +9434,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
9443
9434
|
this.quickPopup.content = quickCellPopup;
|
|
9444
9435
|
this.quickPopup.relateTo = target;
|
|
9445
9436
|
this.quickPopup.dataBind();
|
|
9446
|
-
this.beforeQuickPopupOpen(target);
|
|
9437
|
+
this.beforeQuickPopupOpen(target, args.event);
|
|
9447
9438
|
};
|
|
9448
9439
|
QuickPopups.prototype.isSameEventClick = function (events) {
|
|
9449
9440
|
var isSameTarget = this.quickPopup.relateTo === closest(events.element, '.' + APPOINTMENT_CLASS);
|
|
@@ -9520,7 +9511,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
9520
9511
|
this.quickPopup.relateTo = this.parent.isAdaptive ? document.body :
|
|
9521
9512
|
closest(events.element, '.' + APPOINTMENT_CLASS);
|
|
9522
9513
|
this.quickPopup.dataBind();
|
|
9523
|
-
this.beforeQuickPopupOpen(events.element);
|
|
9514
|
+
this.beforeQuickPopupOpen(events.element, events.originalEvent);
|
|
9524
9515
|
}
|
|
9525
9516
|
};
|
|
9526
9517
|
QuickPopups.prototype.getPopupHeader = function (headerType, headerData) {
|
|
@@ -9801,15 +9792,16 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
9801
9792
|
this.morePopup.relateTo = closest(target, '.' + WORK_CELLS_CLASS);
|
|
9802
9793
|
}
|
|
9803
9794
|
}
|
|
9804
|
-
this.parent.renderTemplates()
|
|
9805
|
-
|
|
9806
|
-
|
|
9807
|
-
|
|
9808
|
-
|
|
9809
|
-
|
|
9810
|
-
|
|
9811
|
-
|
|
9812
|
-
|
|
9795
|
+
this.parent.renderTemplates(function () {
|
|
9796
|
+
var eventProp = {
|
|
9797
|
+
type: 'EventContainer', cancel: false,
|
|
9798
|
+
element: _this.morePopup.element, data: data
|
|
9799
|
+
};
|
|
9800
|
+
_this.parent.trigger(popupOpen, eventProp, function (popupArgs) {
|
|
9801
|
+
if (!popupArgs.cancel) {
|
|
9802
|
+
_this.morePopup.show();
|
|
9803
|
+
}
|
|
9804
|
+
});
|
|
9813
9805
|
});
|
|
9814
9806
|
};
|
|
9815
9807
|
QuickPopups.prototype.saveClick = function (event) {
|
|
@@ -10000,71 +9992,95 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
|
|
|
10000
9992
|
}
|
|
10001
9993
|
});
|
|
10002
9994
|
};
|
|
10003
|
-
QuickPopups.prototype.beforeQuickPopupOpen = function (target) {
|
|
9995
|
+
QuickPopups.prototype.beforeQuickPopupOpen = function (target, originalEvent) {
|
|
10004
9996
|
var _this = this;
|
|
10005
|
-
this.parent.renderTemplates()
|
|
10006
|
-
|
|
10007
|
-
|
|
10008
|
-
|
|
10009
|
-
|
|
10010
|
-
|
|
10011
|
-
|
|
10012
|
-
|
|
10013
|
-
|
|
10014
|
-
|
|
10015
|
-
|
|
10016
|
-
|
|
10017
|
-
|
|
10018
|
-
|
|
10019
|
-
|
|
10020
|
-
|
|
10021
|
-
}
|
|
10022
|
-
else {
|
|
10023
|
-
var display = _this.quickPopup.element.style.display;
|
|
10024
|
-
_this.quickPopup.element.style.display = 'block';
|
|
10025
|
-
if (_this.parent.isAdaptive) {
|
|
10026
|
-
_this.quickPopup.element.removeAttribute('style');
|
|
10027
|
-
_this.quickPopup.element.style.display = 'block';
|
|
10028
|
-
_this.quickPopup.element.style.height = formatUnit((popupType === 'EditEventInfo') ? 65 : window.innerHeight);
|
|
9997
|
+
this.parent.renderTemplates(function () {
|
|
9998
|
+
var isEventPopup = _this.quickPopup.element.querySelector('.' + EVENT_POPUP_CLASS);
|
|
9999
|
+
var popupType = _this.parent.isAdaptive ? isEventPopup ? 'ViewEventInfo' : 'EditEventInfo' : 'QuickInfo';
|
|
10000
|
+
var eventProp = {
|
|
10001
|
+
type: popupType, cancel: false, data: extend({}, _this.getDataFromTarget(target), null, true),
|
|
10002
|
+
target: target, element: _this.quickPopup.element
|
|
10003
|
+
};
|
|
10004
|
+
_this.parent.trigger(popupOpen, eventProp, function (popupArgs) {
|
|
10005
|
+
if (popupArgs.cancel) {
|
|
10006
|
+
_this.quickPopupHide();
|
|
10007
|
+
_this.destroyPopupButtons('quickPopup');
|
|
10008
|
+
if (popupArgs.element.classList.contains(POPUP_OPEN)) {
|
|
10009
|
+
_this.quickPopupClose();
|
|
10010
|
+
}
|
|
10011
|
+
removeChildren(_this.quickPopup.element);
|
|
10012
|
+
_this.isMultipleEventSelect = false;
|
|
10029
10013
|
}
|
|
10030
10014
|
else {
|
|
10031
|
-
var
|
|
10032
|
-
|
|
10033
|
-
|
|
10034
|
-
|
|
10035
|
-
|
|
10036
|
-
|
|
10037
|
-
|
|
10038
|
-
|
|
10039
|
-
|
|
10040
|
-
|
|
10041
|
-
_this.
|
|
10042
|
-
|
|
10043
|
-
|
|
10044
|
-
|
|
10015
|
+
var display = _this.quickPopup.element.style.display;
|
|
10016
|
+
_this.quickPopup.element.style.display = 'block';
|
|
10017
|
+
if (_this.parent.isAdaptive) {
|
|
10018
|
+
_this.quickPopup.element.removeAttribute('style');
|
|
10019
|
+
_this.quickPopup.element.style.display = 'block';
|
|
10020
|
+
_this.quickPopup.element.style.height = formatUnit((popupType === 'EditEventInfo') ? 65 : window.innerHeight);
|
|
10021
|
+
}
|
|
10022
|
+
else {
|
|
10023
|
+
var isVirtualScroll = _this.parent.virtualScrollModule && _this.parent.virtualScrollModule.isHorizontalScroll
|
|
10024
|
+
&& !isNullOrUndefined(closest(target, '.' + CONTENT_TABLE_CLASS));
|
|
10025
|
+
var conTable = _this.parent.element.querySelector('.' + CONTENT_WRAP_CLASS + ' table');
|
|
10026
|
+
_this.quickPopup.offsetX = isVirtualScroll && !_this.parent.enableRtl ? (getTranslateX(conTable) + 10) : 10;
|
|
10027
|
+
_this.quickPopup.offsetY = _this.parent.virtualScrollModule && !_this.parent.virtualScrollModule.isHorizontalScroll ?
|
|
10028
|
+
_this.quickPopup.offsetY : 0;
|
|
10029
|
+
_this.quickPopup.collision = { X: _this.parent.enableRtl ? 'flip' : 'none', Y: 'fit' };
|
|
10030
|
+
_this.quickPopup.position = { X: _this.parent.enableRtl ? 'left' : 'right', Y: _this.parent.enableRtl ? 'bottom' : 'top' };
|
|
10045
10031
|
_this.quickPopup.dataBind();
|
|
10046
10032
|
_this.quickPopup.refreshPosition(null, true);
|
|
10047
|
-
var
|
|
10048
|
-
if (
|
|
10049
|
-
_this.quickPopup.
|
|
10050
|
-
_this.
|
|
10051
|
-
|
|
10033
|
+
var collide = isCollide(_this.quickPopup.element, _this.parent.element);
|
|
10034
|
+
if (collide.indexOf(_this.parent.enableRtl ? 'left' : 'right') > -1) {
|
|
10035
|
+
_this.quickPopup.offsetX = -target.offsetWidth - 10 - _this.quickPopup.element.offsetWidth;
|
|
10036
|
+
if (isVirtualScroll && !_this.parent.enableRtl) {
|
|
10037
|
+
_this.quickPopup.offsetX = getTranslateX(conTable) + _this.quickPopup.offsetX;
|
|
10038
|
+
}
|
|
10052
10039
|
_this.quickPopup.dataBind();
|
|
10040
|
+
_this.quickPopup.refreshPosition(null, true);
|
|
10041
|
+
var leftCollide = isCollide(_this.quickPopup.element, _this.parent.element);
|
|
10042
|
+
if (leftCollide.indexOf('left') > -1) {
|
|
10043
|
+
_this.quickPopup.position = { X: 'center', Y: 'center' };
|
|
10044
|
+
_this.quickPopup.collision = { X: 'fit', Y: 'fit' };
|
|
10045
|
+
_this.quickPopup.offsetX = -(_this.quickPopup.element.offsetWidth / 2);
|
|
10046
|
+
_this.quickPopup.dataBind();
|
|
10047
|
+
}
|
|
10048
|
+
}
|
|
10049
|
+
if (_this.parent.virtualScrollModule && !_this.parent.virtualScrollModule.isHorizontalScroll && (collide.indexOf('top') > -1 || collide.indexOf('bottom') > -1)) {
|
|
10050
|
+
var translateY = getTranslateY(conTable);
|
|
10051
|
+
_this.quickPopup.offsetY = translateY;
|
|
10052
|
+
_this.quickPopup.dataBind();
|
|
10053
|
+
_this.quickPopup.refreshPosition(null, true);
|
|
10054
|
+
}
|
|
10055
|
+
if (_this.quickPopup.position.X === 'center' && _this.quickPopup.position.Y === 'center' && !isNullOrUndefined(originalEvent)) {
|
|
10056
|
+
var previousOffset = _this.quickPopup.offsetY;
|
|
10057
|
+
var collision = isCollide(target, _this.quickPopup.element);
|
|
10058
|
+
var popupRect = _this.quickPopup.element.getBoundingClientRect();
|
|
10059
|
+
if (collision.indexOf('top') > -1 || collision.indexOf('bottom') > -1) {
|
|
10060
|
+
if (popupRect.top <= originalEvent.clientY && originalEvent.clientY <= popupRect.top + popupRect.height) {
|
|
10061
|
+
_this.quickPopup.offsetY = previousOffset - popupRect.height - 10;
|
|
10062
|
+
_this.quickPopup.dataBind();
|
|
10063
|
+
collision = isCollide(_this.quickPopup.element, _this.parent.element);
|
|
10064
|
+
if (collision.indexOf('top') > -1) {
|
|
10065
|
+
_this.quickPopup.offsetY = previousOffset + originalEvent.offsetY;
|
|
10066
|
+
_this.quickPopup.dataBind();
|
|
10067
|
+
}
|
|
10068
|
+
}
|
|
10069
|
+
else if (isCollide(_this.quickPopup.element, _this.parent.element).indexOf('bottom') > -1) {
|
|
10070
|
+
_this.quickPopup.offsetY = previousOffset - originalEvent.offsetY - Math.ceil(popupRect.height) - 10;
|
|
10071
|
+
_this.quickPopup.dataBind();
|
|
10072
|
+
}
|
|
10073
|
+
}
|
|
10053
10074
|
}
|
|
10054
10075
|
}
|
|
10055
|
-
if (
|
|
10056
|
-
|
|
10057
|
-
_this.quickPopup.offsetY = translateY;
|
|
10058
|
-
_this.quickPopup.dataBind();
|
|
10076
|
+
if (isEventPopup) {
|
|
10077
|
+
_this.applyEventColor();
|
|
10059
10078
|
}
|
|
10079
|
+
_this.quickPopup.element.style.display = display;
|
|
10080
|
+
_this.quickPopup.dataBind();
|
|
10081
|
+
_this.quickPopup.show();
|
|
10060
10082
|
}
|
|
10061
|
-
|
|
10062
|
-
_this.applyEventColor();
|
|
10063
|
-
}
|
|
10064
|
-
_this.quickPopup.element.style.display = display;
|
|
10065
|
-
_this.quickPopup.dataBind();
|
|
10066
|
-
_this.quickPopup.show();
|
|
10067
|
-
}
|
|
10083
|
+
});
|
|
10068
10084
|
});
|
|
10069
10085
|
};
|
|
10070
10086
|
QuickPopups.prototype.applyEventColor = function () {
|
|
@@ -10415,13 +10431,8 @@ var EventTooltip = /** @__PURE__ @class */ (function () {
|
|
|
10415
10431
|
startMonthDate = capitalizeFirstWord(startMonthDate, 'single');
|
|
10416
10432
|
startMonthYearDate = capitalizeFirstWord(startMonthYearDate, 'single');
|
|
10417
10433
|
endMonthYearDate = capitalizeFirstWord(endMonthYearDate, 'single');
|
|
10418
|
-
var
|
|
10419
|
-
var
|
|
10420
|
-
type: 'time', skeleton: skeleton, calendar: this.parent.getCalendarMode()
|
|
10421
|
-
});
|
|
10422
|
-
var endTime = globalize.formatDate(eventEnd, {
|
|
10423
|
-
type: 'time', skeleton: skeleton, calendar: this.parent.getCalendarMode()
|
|
10424
|
-
});
|
|
10434
|
+
var startTime = this.parent.getTimeString(eventStart);
|
|
10435
|
+
var endTime = this.parent.getTimeString(eventEnd);
|
|
10425
10436
|
var tooltipDetails = void 0;
|
|
10426
10437
|
if (startDate.getTime() === endDate.getTime()) {
|
|
10427
10438
|
tooltipDetails =
|
|
@@ -11845,6 +11856,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
|
|
|
11845
11856
|
return container;
|
|
11846
11857
|
};
|
|
11847
11858
|
EventWindow.prototype.renderFormElements = function (form, args) {
|
|
11859
|
+
var _this = this;
|
|
11848
11860
|
if (!isNullOrUndefined(this.parent.editorTemplate)) {
|
|
11849
11861
|
if (args) {
|
|
11850
11862
|
if (this.recurrenceEditor) {
|
|
@@ -11861,8 +11873,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
|
|
|
11861
11873
|
var templateId = this.parent.element.id + '_editorTemplate';
|
|
11862
11874
|
var tempEle = [].slice.call(this.parent.getEditorTemplate()(args || {}, this.parent, 'editorTemplate', templateId, false));
|
|
11863
11875
|
append(tempEle, form);
|
|
11864
|
-
this.parent.renderTemplates()
|
|
11865
|
-
|
|
11876
|
+
this.parent.renderTemplates(function () {
|
|
11877
|
+
_this.applyFormValidation();
|
|
11878
|
+
});
|
|
11866
11879
|
}
|
|
11867
11880
|
else {
|
|
11868
11881
|
form.appendChild(this.getDefaultEventWindowContent());
|
|
@@ -12808,7 +12821,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
|
|
|
12808
12821
|
}
|
|
12809
12822
|
}
|
|
12810
12823
|
if (this.recurrenceEditor && this.recurrenceEditor.value && this.recurrenceEditor.value !== '') {
|
|
12811
|
-
|
|
12824
|
+
if (this.parent.currentAction !== 'EditOccurrence') {
|
|
12825
|
+
alertType = this.recurrenceValidation(eventObj[this.fields.startTime], eventObj[this.fields.endTime], alert);
|
|
12826
|
+
}
|
|
12812
12827
|
var isShowAlert = true;
|
|
12813
12828
|
if (alertType === 'seriesChangeAlert' && this.parent.uiStateValues.isIgnoreOccurrence) {
|
|
12814
12829
|
isShowAlert = false;
|
|
@@ -13041,53 +13056,58 @@ var EventWindow = /** @__PURE__ @class */ (function () {
|
|
|
13041
13056
|
if (isNullOrUndefined(index)) {
|
|
13042
13057
|
return false;
|
|
13043
13058
|
}
|
|
13059
|
+
var currentStartTime = new Date(+currentData[this.fields.startTime]);
|
|
13060
|
+
var currentEndTime = new Date(+currentData[this.fields.endTime]);
|
|
13061
|
+
if (index !== recurColl.length - 1) {
|
|
13062
|
+
var nextStartTime = new Date(+recurColl[index + 1][this.fields.startTime]);
|
|
13063
|
+
var nextEndTime = new Date(+recurColl[index + 1][this.fields.endTime]);
|
|
13064
|
+
}
|
|
13065
|
+
var lastEndTime = new Date(+recurColl[recurColl.length - 1][this.fields.endTime]);
|
|
13044
13066
|
if (index === 0) {
|
|
13045
13067
|
if (!isNullOrUndefined(recurColl[index + 1])) {
|
|
13046
|
-
if (!(
|
|
13047
|
-
resetTime(
|
|
13048
|
-
|
|
13049
|
-
|
|
13050
|
-
this.parent.quickPopup.openRecurrenceValidationAlert('
|
|
13068
|
+
if (!(nextStartTime.getTime() >= currentEndTime.getTime()) &&
|
|
13069
|
+
(resetTime(lastEndTime).getTime() >=
|
|
13070
|
+
resetTime(currentStartTime).getTime()) ||
|
|
13071
|
+
resetTime(lastEndTime).getTime() < resetTime(currentStartTime).getTime()) {
|
|
13072
|
+
this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
|
|
13051
13073
|
return true;
|
|
13052
13074
|
}
|
|
13053
|
-
else if (resetTime(
|
|
13054
|
-
resetTime(
|
|
13055
|
-
this.parent.quickPopup.openRecurrenceValidationAlert('
|
|
13075
|
+
else if (!(resetTime(currentStartTime).getTime() <
|
|
13076
|
+
resetTime(nextStartTime).getTime())) {
|
|
13077
|
+
this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
|
|
13056
13078
|
return true;
|
|
13057
13079
|
}
|
|
13058
13080
|
}
|
|
13059
13081
|
return false;
|
|
13060
13082
|
}
|
|
13061
13083
|
else {
|
|
13084
|
+
var previousStartTime = new Date(+recurColl[index - 1][this.fields.startTime]);
|
|
13085
|
+
var previousEndTime = new Date(+recurColl[index - 1][this.fields.endTime]);
|
|
13062
13086
|
if (index === recurColl.length - 1) {
|
|
13063
|
-
if (
|
|
13064
|
-
resetTime(
|
|
13065
|
-
|
|
13066
|
-
resetTime(new Date(+currentData[this.fields.endTime])).getTime())) {
|
|
13067
|
-
this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
|
|
13087
|
+
if (resetTime(new Date(+recurColl[(recurColl.length - 1) - index][this.fields.startTime])).getTime() >
|
|
13088
|
+
resetTime(currentStartTime).getTime()) {
|
|
13089
|
+
this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
|
|
13068
13090
|
return true;
|
|
13069
13091
|
}
|
|
13070
|
-
else if (
|
|
13071
|
-
resetTime(
|
|
13072
|
-
this.parent.quickPopup.openRecurrenceValidationAlert('
|
|
13092
|
+
else if (!((previousEndTime.getTime() <= currentStartTime.getTime()) &&
|
|
13093
|
+
(resetTime(currentStartTime).getTime() > resetTime(previousStartTime).getTime()))) {
|
|
13094
|
+
this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
|
|
13073
13095
|
return true;
|
|
13074
13096
|
}
|
|
13075
13097
|
}
|
|
13076
|
-
else if (!(((resetTime(
|
|
13077
|
-
resetTime(new Date(+
|
|
13078
|
-
|
|
13079
|
-
|
|
13080
|
-
|
|
13081
|
-
resetTime(new Date(+currentData[this.fields.endTime])).getTime()) ||
|
|
13082
|
-
(resetTime(new Date(+recurColl[recurColl.length - 1][this.fields.endTime])).getTime() <
|
|
13083
|
-
resetTime(new Date(+currentData[this.fields.startTime])).getTime())))) {
|
|
13098
|
+
else if (!(((resetTime(previousStartTime).getTime() < resetTime(currentStartTime).getTime()) ||
|
|
13099
|
+
resetTime(new Date(+recurColl[0][this.fields.startTime])).getTime() >
|
|
13100
|
+
resetTime(currentStartTime).getTime()) &&
|
|
13101
|
+
((resetTime(nextStartTime).getTime() > resetTime(currentStartTime).getTime()) ||
|
|
13102
|
+
(lastEndTime.getTime() < currentStartTime.getTime())))) {
|
|
13084
13103
|
this.parent.quickPopup.openRecurrenceValidationAlert('sameDayAlert');
|
|
13085
13104
|
return true;
|
|
13086
13105
|
}
|
|
13087
|
-
else if ((
|
|
13088
|
-
|
|
13089
|
-
|
|
13090
|
-
|
|
13106
|
+
else if (!(previousEndTime.getTime() <= currentStartTime.getTime() && nextStartTime.getTime() >
|
|
13107
|
+
currentEndTime.getTime()) || (resetTime(nextEndTime).getTime() <
|
|
13108
|
+
resetTime(currentStartTime).getTime()) ||
|
|
13109
|
+
(resetTime(previousStartTime).getTime() > resetTime(currentEndTime).getTime()) ||
|
|
13110
|
+
!(resetTime(currentStartTime).getTime() < resetTime(nextStartTime).getTime())) {
|
|
13091
13111
|
this.parent.quickPopup.openRecurrenceValidationAlert('occurrenceAlert');
|
|
13092
13112
|
return true;
|
|
13093
13113
|
}
|
|
@@ -16525,12 +16545,16 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
|
|
|
16525
16545
|
/**
|
|
16526
16546
|
* Method to render react templates
|
|
16527
16547
|
*
|
|
16548
|
+
* @param {Function} callBack - specifies the callBack method
|
|
16528
16549
|
* @returns {void}
|
|
16529
16550
|
* @private
|
|
16530
16551
|
*/
|
|
16531
|
-
Schedule.prototype.renderTemplates = function () {
|
|
16552
|
+
Schedule.prototype.renderTemplates = function (callback) {
|
|
16532
16553
|
if (this.isReact) {
|
|
16533
|
-
this.renderReactTemplates();
|
|
16554
|
+
this.renderReactTemplates(callback);
|
|
16555
|
+
}
|
|
16556
|
+
else if (callback) {
|
|
16557
|
+
callback();
|
|
16534
16558
|
}
|
|
16535
16559
|
};
|
|
16536
16560
|
/**
|
|
@@ -20705,7 +20729,7 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
|
|
|
20705
20729
|
'data-id': 'Appointment_' + record[this.fields.id],
|
|
20706
20730
|
'data-guid': record.Guid,
|
|
20707
20731
|
'role': 'button', 'tabindex': '0',
|
|
20708
|
-
'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
|
|
20732
|
+
'aria-disabled': this.parent.eventBase.getReadonlyAttribute(record),
|
|
20709
20733
|
'aria-label': this.parent.getAnnouncementString(record)
|
|
20710
20734
|
}
|
|
20711
20735
|
});
|
|
@@ -24918,7 +24942,6 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
|
|
|
24918
24942
|
'role': 'button',
|
|
24919
24943
|
'tabindex': '0',
|
|
24920
24944
|
'aria-disabled': _this.parent.eventBase.getReadonlyAttribute(listData[parseInt(li.toString(), 10)]),
|
|
24921
|
-
'aria-pressed': 'false',
|
|
24922
24945
|
'aria-label': _this.parent.getAnnouncementString(listData[parseInt(li.toString(), 10)])
|
|
24923
24946
|
}
|
|
24924
24947
|
});
|