react-weekly-planning 1.0.16 → 1.0.17

package/README.md

@@ -165,9 +165,10 @@ Props for the Calendar component.
 
 - **Description**: Checks if a new task overlaps with any existing tasks in the schedule. This function helps prevent overlapping tasks when scheduling.
 - **Parameters**:
-  - `tasks` (TasksType): An array of existing tasks. Each task should have `taskStart` and `taskEnd` properties representing the start and end times of the task.
+  - `tasks` (TasksType): An array of existing tasks. Each task should have `groupId`,`taskStart` and `taskEnd` properties representing the groupId of new task, the start and end times of the task.
   - `taskStart` (number): The start time in milliseconds of the new task to be checked.
   - `taskEnd` (number): The end time in milliseconds of the new task to be checked.
+  - `groupId` (string): The groupId of new task.
 - **Returns**: `boolean` - Returns `true` if there is an overlap with any existing task, otherwise returns `false`.
 
 

package/index.js

@@ -221,13 +221,13 @@ export const updateOffsetWithDateCalendar = (calendarDate) => {
 export const millisecondsToHours = (milliseconds) => {
     return millisecondsToDate(milliseconds).formattedDate;
 };
-export const checkDuplicates = (tasks, taskStart, taskEnd) => {
+export const checkDuplicates = (tasks, taskStart, taskEnd, groupId) => {
     const findDuplicates = tasks === null || tasks === void 0 ? void 0 : tasks.filter((task) => (taskStart >= task.taskStart && taskStart < task.taskEnd) ||
         (taskEnd > task.taskStart && taskEnd < task.taskEnd) ||
         (taskStart <= task.taskStart &&
             taskEnd > task.taskStart &&
             taskEnd >= task.taskEnd &&
-            taskStart <= task.taskEnd));
+            taskStart <= task.taskEnd)).filter((task) => task.groupId === groupId);
     return findDuplicates.length > 0;
 };
 export default Calendar;

package/index.tsx

@@ -594,17 +594,20 @@ export const millisecondsToHours = (milliseconds: number) => {
 export const checkDuplicates = (
   tasks: TasksType,
   taskStart: number,
-  taskEnd: number
+  taskEnd: number,
+  groupId: string
 ) => {
-  const findDuplicates = tasks?.filter(
-    (task) =>
-      (taskStart >= task.taskStart && taskStart < task.taskEnd) ||
-      (taskEnd > task.taskStart && taskEnd < task.taskEnd) ||
-      (taskStart <= task.taskStart &&
-        taskEnd > task.taskStart &&
-        taskEnd >= task.taskEnd &&
-        taskStart <= task.taskEnd)
-  );
+  const findDuplicates = tasks
+    ?.filter(
+      (task) =>
+        (taskStart >= task.taskStart && taskStart < task.taskEnd) ||
+        (taskEnd > task.taskStart && taskEnd < task.taskEnd) ||
+        (taskStart <= task.taskStart &&
+          taskEnd > task.taskStart &&
+          taskEnd >= task.taskEnd &&
+          taskStart <= task.taskEnd)
+    )
+    .filter((task) => task.groupId === groupId);
   return findDuplicates.length > 0;
 };
 export default Calendar;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-weekly-planning",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "main": "index.js",
   "scripts": {
     "test": "jest",