react-weekly-planning 1.0.5 → 1.0.7

package/docs/index.html

@@ -330,18 +330,8 @@ taskId, taskStart taskEnd, task, taskDate, groupId, dayIndex
 </tr>
 <tr>
 <td><code>addTaskRender</code></td>
-<td>addTaskRender?: ({currentGroup,dayInfo}:{</td>
-<td></td>
-</tr>
-<tr>
-<td>currentGroup: GroupFeildsType;dayInfo: dayInfoType;</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>}) =&gt; React.ReactNode;</td>
+<td>addTaskRender?: ({currentGroup,dayInfo}:{currentGroup: GroupFeildsType;dayInfo: dayInfoType}) =&gt; React.ReactNode;</td>
 <td>Custom render function for adding a task.</td>
-<td></td>
 </tr>
 <tr>
 <td><code>tasks</code></td>

package/docs/index.ts.html

@@ -124,7 +124,7 @@ type GroupRiquiredFieldsType = {
 /**
  * Additional fields for a group.
  */
-type GroupAdditionalFieldsType = Record<any, unknown>;
+type GroupAdditionalFieldsType = Record<any,any>;
 
 /**
  * Fields for a group, including both required and additional fields.
@@ -467,7 +467,7 @@ export type SumHoursHeadContainerPropsType = {
 /**
  * Additional fields for a task.
  */
-type TaskAdditionalFieldsType = Record<any, unknown>;
+type TaskAdditionalFieldsType = Record<any, any>;
 
 /**
  * Fields for a task, including both required and additional fields.

package/lib/utils.js

@@ -346,46 +346,64 @@ const calculateTimeOfDayRange = (start, end) => {
     }
     return range;
 };
+/**
+ * Get the ISO week number for a given date.
+ * @param date - The date to get the week number for.
+ * @returns The ISO week number.
+ */
 function getWeekNumber(date) {
-    date.setHours(0, 0, 0, 0);
-    date.setDate(date.getDate() + 4 - (date.getDay() || 7));
-    const yearStart = new Date(date.getFullYear(), 0, 1).getTime();
-    const weekNumber = Math.ceil(((date.getTime() - yearStart) / 86400000 + 1) / 7);
+    const tempDate = new Date(date.getTime());
+    tempDate.setHours(0, 0, 0, 0);
+    // Thursday in current week decides the year
+    tempDate.setDate(tempDate.getDate() + 4 - (tempDate.getDay() || 7));
+    const yearStart = new Date(tempDate.getFullYear(), 0, 1);
+    const weekNumber = Math.ceil((((tempDate.getTime() - yearStart.getTime()) / 86400000) + 1) / 7);
     return weekNumber;
 }
+/**
+ * Update the selected date to avoid issues with weeks starting on Sunday.
+ * @param dateSelectionnee - The selected date.
+ * @returns The updated date.
+ */
 function updateSelectedDateForEcartSemaine(dateSelectionnee) {
-    if (dateSelectionnee.getDay() === 0)
-        return new Date(dateSelectionnee.getTime() + 86400000);
-    return dateSelectionnee;
+    const updatedDate = new Date(dateSelectionnee.getTime());
+    if (updatedDate.getDay() === 0) {
+        updatedDate.setDate(updatedDate.getDate() + 1);
+    }
+    return updatedDate;
 }
+/**
+ * Calculate the week difference between the selected date and the current date.
+ * @param dateSelectionnee - The selected date.
+ * @returns The week difference in days.
+ */
 function calculerEcartSemaine(dateSelectionnee) {
-    // Récupérer la date actuelle
     if (!dateSelectionnee) {
-        return;
+        return 0;
     }
     const selectedDateUpdated = updateSelectedDateForEcartSemaine(dateSelectionnee);
     const dateActuelle = new Date();
-    // Extraire l'année et le numéro de la semaine de la date actuelle
     const anneeActuelle = dateActuelle.getFullYear();
     const numeroSemaineActuelle = getWeekNumber(dateActuelle);
-    // Extraire l'année et le numéro de la semaine de la date sélectionnée
     const anneeSelectionnee = selectedDateUpdated.getFullYear();
     const numeroSemaineSelectionnee = getWeekNumber(selectedDateUpdated);
-    // Calculer le nombre de semaines depuis une date d'origine arbitraire
-    // Calculer l'écart entre les semaines en utilisant la formule
     const ecartSemaine = semainesDepuisOrigine(anneeSelectionnee, numeroSemaineSelectionnee) -
         semainesDepuisOrigine(anneeActuelle, numeroSemaineActuelle);
     return ecartSemaine * 7;
 }
+/**
+ * Calculate the number of weeks since an arbitrary origin date (January 1, 2022).
+ * @param annee - The year.
+ * @param numeroSemaine - The week number.
+ * @returns The number of weeks since the origin date.
+ */
 function semainesDepuisOrigine(annee, numeroSemaine) {
-    // Choisir le 1er janvier 2022 comme date d'origine
     const dateOrigine = new Date(2022, 0, 1);
     const anneeOrigine = dateOrigine.getFullYear();
     const numeroSemaineOrigine = getWeekNumber(dateOrigine);
-    // Calculer le nombre total de semaines écoulées depuis la date d'origine
     let nombreSemaines = 0;
     for (let i = anneeOrigine; i < annee; i++) {
-        nombreSemaines += moment().year(i).weeksInYear();
+        nombreSemaines += moment().year(i).isoWeeksInYear();
     }
     nombreSemaines += numeroSemaine - numeroSemaineOrigine;
     return nombreSemaines;
@@ -397,15 +415,18 @@ function getSessionStorageRecordForDragAndDrop(tasks, positionDay, dropGroupId)
     const dragdayIndex = window.sessionStorage.getItem("calendardragdayIndex");
     let newTask;
     let newTasks = [];
-    // window.sessionStorage.clear();
+    window.sessionStorage.clear();
     if (!dragdayIndex || !dragtaskStart || !dragtaskEnd || !dragtaskId || !tasks)
         return;
     const dragTask = tasks.find((task) => task.taskId === dragtaskId);
     const dayIndex = parseInt(dragdayIndex);
-    const ecartDaysIndex = positionDay - dayIndex;
-    const ecartDays = ecartDaysIndex * 86400000;
-    const taskDropStart = parseInt(dragtaskStart) + ecartDays;
-    const taskDropEnd = parseInt(dragtaskEnd) + ecartDays;
+    let ecartDaysIndex = positionDay - dayIndex;
+    const convertTaskDropStart = new Date(parseInt(dragtaskStart));
+    convertTaskDropStart.setDate(convertTaskDropStart.getDate() + ecartDaysIndex);
+    const taskDropStart = convertTaskDropStart.getTime();
+    let convertTaskDropEnd = new Date(parseInt(dragtaskEnd));
+    convertTaskDropEnd.setDate(convertTaskDropEnd.getDate() + ecartDaysIndex);
+    const taskDropEnd = convertTaskDropEnd.getTime();
     const taskDropDate = new Date(taskDropStart);
     if (dragTask) {
         const { taskStart, taskEnd, taskDate, groupId, dayIndex } = dragTask, rest = __rest(dragTask, ["taskStart", "taskEnd", "taskDate", "groupId", "dayIndex"]);

package/lib/utils.ts

@@ -444,64 +444,82 @@ const calculateTimeOfDayRange = (start: number, end: number) => {
   return range;
 };
 
-function getWeekNumber(date: Date) {
-  date.setHours(0, 0, 0, 0);
-  date.setDate(date.getDate() + 4 - (date.getDay() || 7));
-  const yearStart = new Date(date.getFullYear(), 0, 1).getTime();
+/**
+ * Get the ISO week number for a given date.
+ * @param date - The date to get the week number for.
+ * @returns The ISO week number.
+ */
+function getWeekNumber(date: Date): number {
+  const tempDate = new Date(date.getTime());
+  tempDate.setHours(0, 0, 0, 0);
+  // Thursday in current week decides the year
+  tempDate.setDate(tempDate.getDate() + 4 - (tempDate.getDay() || 7));
+  const yearStart = new Date(tempDate.getFullYear(), 0, 1);
   const weekNumber = Math.ceil(
-    ((date.getTime() - yearStart) / 86400000 + 1) / 7
+    (((tempDate.getTime() - yearStart.getTime()) / 86400000) + 1) / 7
   );
   return weekNumber;
 }
-function updateSelectedDateForEcartSemaine(dateSelectionnee: Date) {
-  if (dateSelectionnee.getDay() === 0)
-    return new Date(dateSelectionnee.getTime() + 86400000);
-  return dateSelectionnee;
+
+/**
+ * Update the selected date to avoid issues with weeks starting on Sunday.
+ * @param dateSelectionnee - The selected date.
+ * @returns The updated date.
+ */
+function updateSelectedDateForEcartSemaine(dateSelectionnee: Date): Date {
+  const updatedDate = new Date(dateSelectionnee.getTime());
+  if (updatedDate.getDay() === 0) {
+    updatedDate.setDate(updatedDate.getDate() + 1);
+  }
+  return updatedDate;
 }
 
-function calculerEcartSemaine(dateSelectionnee: Date) {
-  // Récupérer la date actuelle
+/**
+ * Calculate the week difference between the selected date and the current date.
+ * @param dateSelectionnee - The selected date.
+ * @returns The week difference in days.
+ */
+function calculerEcartSemaine(dateSelectionnee: Date): number {
   if (!dateSelectionnee) {
-    return;
+    return 0;
   }
-  const selectedDateUpdated=updateSelectedDateForEcartSemaine(dateSelectionnee)
+  const selectedDateUpdated = updateSelectedDateForEcartSemaine(dateSelectionnee);
 
   const dateActuelle = new Date();
-
-  // Extraire l'année et le numéro de la semaine de la date actuelle
   const anneeActuelle = dateActuelle.getFullYear();
   const numeroSemaineActuelle = getWeekNumber(dateActuelle);
 
-  // Extraire l'année et le numéro de la semaine de la date sélectionnée
-
   const anneeSelectionnee = selectedDateUpdated.getFullYear();
   const numeroSemaineSelectionnee = getWeekNumber(selectedDateUpdated);
 
-  // Calculer le nombre de semaines depuis une date d'origine arbitraire
-
-  // Calculer l'écart entre les semaines en utilisant la formule
-  const ecartSemaine =
+  const ecartSemaine = 
     semainesDepuisOrigine(anneeSelectionnee, numeroSemaineSelectionnee) -
     semainesDepuisOrigine(anneeActuelle, numeroSemaineActuelle);
 
   return ecartSemaine * 7;
 }
-function semainesDepuisOrigine(annee: number, numeroSemaine: number) {
-  // Choisir le 1er janvier 2022 comme date d'origine
+
+/**
+ * Calculate the number of weeks since an arbitrary origin date (January 1, 2022).
+ * @param annee - The year.
+ * @param numeroSemaine - The week number.
+ * @returns The number of weeks since the origin date.
+ */
+function semainesDepuisOrigine(annee: number, numeroSemaine: number): number {
   const dateOrigine = new Date(2022, 0, 1);
   const anneeOrigine = dateOrigine.getFullYear();
   const numeroSemaineOrigine = getWeekNumber(dateOrigine);
 
-  // Calculer le nombre total de semaines écoulées depuis la date d'origine
   let nombreSemaines = 0;
   for (let i = anneeOrigine; i < annee; i++) {
-    nombreSemaines += moment().year(i).weeksInYear();
+    nombreSemaines += moment().year(i).isoWeeksInYear();
   }
   nombreSemaines += numeroSemaine - numeroSemaineOrigine;
 
   return nombreSemaines;
 }
 
+
 function getSessionStorageRecordForDragAndDrop(
   tasks: TasksType,
   positionDay: number,
@@ -513,15 +531,18 @@ function getSessionStorageRecordForDragAndDrop(
   const dragdayIndex = window.sessionStorage.getItem("calendardragdayIndex");
   let newTask: TaskFeildsType | any;
   let newTasks: TasksType = [];
-  // window.sessionStorage.clear();
+  window.sessionStorage.clear();
   if (!dragdayIndex || !dragtaskStart || !dragtaskEnd || !dragtaskId || !tasks)
     return;
   const dragTask = tasks.find((task) => task.taskId === dragtaskId);
   const dayIndex = parseInt(dragdayIndex);
-  const ecartDaysIndex = positionDay - dayIndex;
-  const ecartDays = ecartDaysIndex * 86400000;
-  const taskDropStart = parseInt(dragtaskStart) + ecartDays;
-  const taskDropEnd = parseInt(dragtaskEnd) + ecartDays;
+  let ecartDaysIndex = positionDay - dayIndex;
+  const convertTaskDropStart = new Date(parseInt(dragtaskStart));
+  convertTaskDropStart.setDate(convertTaskDropStart.getDate() + ecartDaysIndex);
+  const taskDropStart = convertTaskDropStart.getTime();
+  let convertTaskDropEnd = new Date(parseInt(dragtaskEnd));
+  convertTaskDropEnd.setDate(convertTaskDropEnd.getDate() + ecartDaysIndex);
+  const taskDropEnd = convertTaskDropEnd.getTime();
   const taskDropDate = new Date(taskDropStart);
   if (dragTask) {
     const { taskStart, taskEnd, taskDate, groupId, dayIndex, ...rest } =

package/package.json

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