@syncfusion/ej2-schedule - npm Package Compare versions

Comparing version 25.1.35 to 25.1.37

dist/global/index.d.ts

 /*!
 *  filename: index.d.ts
-*  version : 25.1.35
+*  version : 25.1.37
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
@@ -5,0 +5,0 @@ *  Use of this code is subject to the terms of our license.

package.json

 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@22.9.0",
+  "_id": "@syncfusion/ej2-schedule@25.1.35",
   "_inBundle": false,
-  "_integrity": "sha512-HgWYJsJtHsRwZLq9VMWjqS/mOk6zZlOZ4oCvazTD0KeKLwl5mimeKns07gIPbz0pY8yWKHLOwt2tvzjYxIi23A==",
+  "_integrity": "sha512-C5bGDJaFwqPz1Wq+Z8zpeJVuVORM+lbciSAfEMADI0Y4RxFMazNh7QeO+TmJob7HNwweDSMqndt8PekrkE+/iw==",
   "_location": "/@syncfusion/ej2-schedule",
@@ -26,4 +26,4 @@ "_phantomChildren": {},
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-release/@syncfusion/ej2-schedule/-/ej2-schedule-22.9.0.tgz",
-  "_shasum": "35f485e5f3e388697c615f38881aa98e3965b071",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-25.1.35.tgz",
+  "_shasum": "dcc2a86f99921e8b4a2578498d701159a470ecec",
   "_spec": "@syncfusion/ej2-schedule@*",
@@ -41,9 +41,9 @@ "_where": "/jenkins/workspace/elease-automation_release_25.1.1/packages/included",
     "@syncfusion/ej2-buttons": "~25.1.35",
-    "@syncfusion/ej2-calendars": "~25.1.35",
+    "@syncfusion/ej2-calendars": "~25.1.37",
     "@syncfusion/ej2-data": "~25.1.35",
-    "@syncfusion/ej2-dropdowns": "~25.1.35",
+    "@syncfusion/ej2-dropdowns": "~25.1.37",
     "@syncfusion/ej2-excel-export": "~25.1.35",
-    "@syncfusion/ej2-inputs": "~25.1.35",
+    "@syncfusion/ej2-inputs": "~25.1.37",
     "@syncfusion/ej2-lists": "~25.1.35",
-    "@syncfusion/ej2-navigations": "~25.1.35",
+    "@syncfusion/ej2-navigations": "~25.1.37",
     "@syncfusion/ej2-popups": "~25.1.35"
@@ -78,4 +78,4 @@ },
   "typings": "index.d.ts",
-  "version": "25.1.35",
+  "version": "25.1.37",
   "sideEffects": false
 }

src/recurrence-editor/recurrence-editor.js

@@ -719,3 +719,2 @@ var __extends = (this && this.__extends) || (function () {
         var fullDay = this.getDayData('wide');
-        var labelId = this.element.id + '_' + 'end_label';
         this.element.innerHTML = '<div class="' + HEADER + '">' +
@@ -767,3 +766,3 @@ '<div class="' + INPUTWARAPPER + ' ' + FORMLEFT + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + ENDONLEFT + '">' +
-            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '" aria-labelledby="' + labelId + '"title="' + this.localeObj.getConstant(END) + '" />' +
+            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '"title="' + this.localeObj.getConstant(END) + '" />' +
             '</div>' +
@@ -770,0 +769,0 @@ '<div class="' + INPUTWARAPPER + ' ' + ENDONDATE + '" >' +

src/schedule/actions/crud.js

@@ -49,2 +49,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */
         this.parent.trigger(events.dataBinding, e, function (args) {
+            if (args.cancel) {
+                return;
+            }
             var resultData = extend([], args.result, null, true);
@@ -51,0 +54,0 @@ _this.parent.eventsData = resultData.filter(function (data) { return !data[_this.parent.eventFields.isBlock]; });

src/schedule/base/css-constant.d.ts

@@ -125,2 +125,4 @@ /**
 /** @private */
+export declare const APPOINTMENT_WRAPPER_HIDDEN_CLASS: string;
+/** @private */
 export declare const DAY_WRAPPER_CLASS: string;
@@ -127,0 +129,0 @@ /** @private */

src/schedule/base/css-constant.js

@@ -125,2 +125,4 @@ /**
 /** @private */
+export var APPOINTMENT_WRAPPER_HIDDEN_CLASS = 'e-appointment-wrapper-hidden';
+/** @private */
 export var DAY_WRAPPER_CLASS = 'e-day-wrapper';
@@ -127,0 +129,0 @@ /** @private */

src/schedule/base/type.d.ts

@@ -44,2 +44,3 @@ /**
     aggregates?: Record<string, any>;
+    cancel: boolean;
 };
@@ -46,0 +47,0 @@ /**

src/schedule/event-renderer/agenda-base.d.ts

@@ -9,3 +9,3 @@ import { ViewBase } from '../renderer/view-base';
     wireEventActions(): void;
-    calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date): void;
+    calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date, agendaEnd?: Date): void;
     private createResourceTableRow;
@@ -12,0 +12,0 @@ createDateHeaderElement(date: Date): Element;

src/schedule/event-renderer/agenda-base.js

@@ -166,3 +166,4 @@ var __extends = (this && this.__extends) || (function () {
     };
-    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate) {
+    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate, agendaEnd) {
+        if (agendaEnd === void 0) { agendaEnd = null; }
         if (isNullOrUndefined(this.parent.resourceBase.lastResourceLevel)) {
@@ -176,3 +177,5 @@ var level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
         var resData = this.parent.resourceBase.lastResourceLevel;
+        var agendaStart = agendaDate;
         var initialDate = agendaDate;
+        var showWeekend = this.parent.activeViewOptions.showWeekend;
         for (var i = 0; i < days; i++) {
@@ -185,2 +188,17 @@ var lastLevelInfo = [];
             var firstDate = util.addDays(initialDate, i);
+            if (this.parent.currentView === 'Agenda' && this.parent.activeViewOptions.group.byDate &&
+                this.parent.activeViewOptions.allowVirtualScrolling && !showWeekend && !this.isWorkDay(firstDate)) {
+                do {
+                    firstDate = util.addDays(firstDate, 1);
+                    if (firstDate >= agendaEnd) {
+                        break;
+                    }
+                } while (!this.isWorkDay(firstDate) ||
+                    this.parent.eventBase.filterEvents(firstDate, util.addDays(firstDate, 1)).length < 1);
+                if (firstDate >= agendaEnd) {
+                    break;
+                }
+                initialDate = util.addDays(firstDate, -i);
+                agendaLastDate = util.addDays(firstDate, 1);
+            }
             var finalDate = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda')
@@ -200,3 +218,5 @@ ? util.addDays(firstDate, 1) : agendaLastDate;
                             var resDayCollection = this.parent.eventBase.filterEvents(agendaDate, util.addDays(agendaDate, 1), resDataCollection, undefined);
-                            if (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays ||
+                            if (((showWeekend || !showWeekend && (this.parent.group.byDate ? this.isWorkDay(agendaDate) :
+                                this.isWorkDay(agendaDate, resData[parseInt(res.toString(), 10)].workDays)))
+                                && (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays)) ||
                                 this.parent.currentView === 'MonthAgenda') {
@@ -227,12 +247,14 @@ data.push(resDayCollection[0]);
                                 || this.parent.currentView === 'MonthAgenda') {
-                                lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = cls.AGENDA_DAY_BORDER_CLASS;
-                                var tempObj = {
-                                    rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
-                                    groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
-                                    resourceData: resData[parseInt(res.toString(), 10)].resourceData,
-                                    groupIndex: (lastLevelInfo.length - data.length), className: [cls.RESOURCE_NAME],
-                                    date: agendaDate
-                                };
-                                lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
-                                tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                if (data.length > 0) {
+                                    lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = cls.AGENDA_DAY_BORDER_CLASS;
+                                    var tempObj = {
+                                        rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
+                                        groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
+                                        resourceData: resData[parseInt(res.toString(), 10)].resourceData,
+                                        groupIndex: (lastLevelInfo.length - data.length), className: [cls.RESOURCE_NAME],
+                                        date: agendaDate
+                                    };
+                                    lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
+                                    tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                }
                                 break;
@@ -272,5 +294,5 @@ }
         }
-        var totalCollection = this.parent.eventBase.filterEvents(initialDate, agendaLastDate);
+        var totalCollection = this.parent.eventBase.filterEvents(agendaStart, agendaLastDate);
         if (totalCollection.length === 0 && !this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            this.renderEmptyContent(tBody, initialDate);
+            this.renderEmptyContent(tBody, agendaStart);
         }
@@ -277,0 +299,0 @@ };

src/schedule/event-renderer/vertical-view.js

@@ -47,2 +47,3 @@ var __extends = (this && this.__extends) || (function () {
     VerticalEvent.prototype.renderAppointments = function () {
+        var _this = this;
         if (isNullOrUndefined(this.parent)) {
@@ -107,3 +108,8 @@ return;
         }
-        this.parent.renderTemplates();
+        this.parent.renderTemplates(function () {
+            if (_this.parent.isReact && _this.parent.activeViewOptions.eventTemplate) {
+                var wraps = [].slice.call(_this.parent.element.querySelectorAll('.' + cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS));
+                removeClass(wraps, cls.APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+            }
+        });
     };
@@ -110,0 +116,0 @@ VerticalEvent.prototype.initializeValues = function () {

src/schedule/renderer/agenda.d.ts

@@ -23,2 +23,3 @@ import { IRenderer } from '../base/interface';
     renderContent(tBody: Element, agendaDate: Date, lastDate: Date): void;
+    private isAgendaWorkDay;
     private agendaScrolling;
@@ -25,0 +26,0 @@ private virtualScrolling;

src/schedule/renderer/agenda.js

@@ -153,5 +153,16 @@ var __extends = (this && this.__extends) || (function () {
         if (isObject.length > 0 && this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            agendaDate = isObject[0][fieldMapping.startTime];
-            agendaDate = new Date(new Date(agendaDate.getTime()).setHours(0, 0, 0, 0));
-            this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            if (!this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(isObject[0][fieldMapping.startTime])) {
+                for (var _i = 0, isObject_1 = isObject; _i < isObject_1.length; _i++) {
+                    var event_2 = isObject_1[_i];
+                    if (this.isAgendaWorkDay(event_2[fieldMapping.startTime])) {
+                        agendaDate = new Date(new Date(event_2[fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                        this.updateHeaderText(event_2[fieldMapping.startTime]);
+                        break;
+                    }
+                }
+            }
+            else {
+                agendaDate = new Date(new Date(isObject[0][fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            }
         }
@@ -170,10 +181,16 @@ var endDate;
                 }
-                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date);
+                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date, lastDate);
             }
             else {
                 for (var day = 0; day < this.parent.agendaDaysCount; day++) {
-                    var filterData = this.appointmentFiltering(agendaDate);
                     var nTr = this.createTableRowElement(agendaDate, 'data');
-                    if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
+                    var virtualContent = this.element.querySelector('tr[data-row-index="' + (+(nTr.dataset.rowIndex)) + '"]');
+                    if (virtualContent || !this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(agendaDate)) {
                         agendaDate = util.addDays(agendaDate, 1);
+                        if (!virtualContent && this.parent.activeViewOptions.allowVirtualScrolling) {
+                            day--;
+                        }
+                        if (agendaDate.getTime() > lastDate.getTime()) {
+                            break;
+                        }
                         continue;
@@ -183,2 +200,3 @@ }
                     var aTd = nTr.children[1];
+                    var filterData = this.appointmentFiltering(agendaDate);
                     if (filterData.length > 0 || (!this.parent.hideEmptyAgendaDays && filterData.length === 0)) {
@@ -210,2 +228,10 @@ var elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
     };
+    Agenda.prototype.isAgendaWorkDay = function (date) {
+        if (this.parent.uiStateValues.isGroupAdaptive && !this.parent.group.byDate) {
+            return this.isWorkDay(date, this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex].workDays);
+        }
+        else {
+            return this.isWorkDay(date);
+        }
+    };
     Agenda.prototype.agendaScrolling = function (event) {
@@ -315,5 +341,8 @@ if (this.parent.quickPopup) {
         do {
-            var filterData = this.appointmentFiltering(currentDate);
-            if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
-                daysCount++;
+            if (this.parent.activeViewOptions.showWeekend || !this.parent.activeViewOptions.showWeekend &&
+                this.isAgendaWorkDay(currentDate)) {
+                var filterData = this.appointmentFiltering(currentDate);
+                if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
+                    daysCount++;
+                }
             }
@@ -320,0 +349,0 @@ currentDate = util.addDays(currentDate, (type === 'next') ? 1 : -1);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

22194969

increased by0.2%

Lines of code

257466

increased by0.13%

Worsened metrics

Number of versions

236

decreased by-0.84%

Published versions last months

4

decreased by-20%

Published versions last two months

6

decreased by-14.29%

Published versions last week

1

decreased by-50%

Published versions last year

31

decreased by-6.06%

Dependency changes

• Updated@syncfusion/ej2-calendars@~25.1.37

• Updated@syncfusion/ej2-dropdowns@~25.1.37

• Updated@syncfusion/ej2-inputs@~25.1.37

• Updated@syncfusion/ej2-navigations@~25.1.37