react-weekly-planning 1.0.32 → 1.0.34

package/components/CalendarForday.js

@@ -16,15 +16,15 @@ function CalendarForDay(props) {
     const currentDailyHours = dailyHours[props.dayOffset || 0];
     return (_jsxs("div", { className: ` CalendarTableForDay ${props.className}`, style: Object.assign({}, props.style), children: [currentDay && (_jsx(DayContainer, { style: props.dayStyle, className: props.dayClassName, dayIndex: props.dayOffset || 0, dayRender: props.dayRender, day: currentDay.day, dayOfTheMonth: currentDay.dayOfTheMonth, dayMonth: currentDay.dayMonth, dayYear: currentDay.dayYear })), _jsx("div", { className: `CalendarTableForDayTasksContainer`, children: currentDailyHours &&
                     props.groups.map((group, i) => {
-                        return (_jsxs("div", { style: Object.assign({ width: "100%", height: "auto", background: "#f2f8f8", padding: "5px", borderBottom: "1.5px solid #0f52737e", borderRight: "0.74px solid rgba(198, 219, 225, 0.68)", borderLeft: "0.74px solid rgba(198, 219, 225, 0.68)" }, props.rowsStyle), className: `${props.rowsClassName}`, children: [_jsx("div", { style: Object.assign({ width: "auto", height: "auto" }, props.groupsColsStyle), className: props.groupsColsClassName, children: _jsx(GroupContainer, { style: props.groupContainerStyle, className: props.groupContainerClassName, groupRender: props.groupRender, currentGroup: group, handleClickGroup: props.handleClickGroup }) }), props.tasks.map((task, taskKey) => {
-                                    if (task.dayIndex === (props.dayOffset || 0) &&
-                                        task.groupId === group.id &&
-                                        compareWeekOffset(props.date, props.weekOffset || 0, task.taskDate, props.timeZone)) {
-                                        return (_jsx(TaskContainer, { handleDragTask: props.handleDragTask, taskRender: props.taskRender, handleDragTaskEnd: props.handleDragTaskEnd, style: props.taskContainerStyle, className: `${props.taskContainerClassName}`, currentTask: task, handleClickTask: props.handleClickTask }, `${taskKey} task`));
-                                    }
-                                    else
-                                        return "";
-                                }), _jsx(AddTask, { addTaskStyle: props.addTaskStyle, addTaskClassName: props.addTaskClassName, currentGroup: group, dayInfo: currentDailyHours, addTaskRender: props.addTaskRender, handleAddTask: props.handleAddTask })] }, i));
+                        return (_jsxs("div", { style: Object.assign({ width: "100%", height: "auto", padding: "5px", borderBottom: "1.5px solid #0f52737e", borderRight: "0.74px solid rgba(198, 219, 225, 0.68)", borderLeft: "0.74px solid rgba(198, 219, 225, 0.68)" }, props.rowsStyle), className: `CalendarTableForDayRow ${props.rowsClassName}`, children: [_jsx("div", { style: Object.assign({ width: "auto", height: "auto" }, props.groupsColsStyle), className: props.groupsColsClassName, children: _jsx(GroupContainer, { style: props.groupContainerStyle, className: props.groupContainerClassName, groupRender: props.groupRender, currentGroup: group, handleClickGroup: props.handleClickGroup }) }), _jsxs("div", { className: "CalendarTableForDayGroupTasks", children: [props.tasks.map((task, taskKey) => {
+                                            if (task.dayIndex === (props.dayOffset || 0) &&
+                                                task.groupId === group.id &&
+                                                compareWeekOffset(props.date, props.weekOffset || 0, task.taskDate, props.timeZone)) {
+                                                return (_jsx(TaskContainer, { handleDragTask: props.handleDragTask, taskRender: props.taskRender, handleDragTaskEnd: props.handleDragTaskEnd, style: props.taskContainerStyle, className: `${props.taskContainerClassName}`, currentTask: task, handleClickTask: props.handleClickTask }, `${taskKey} task`));
+                                            }
+                                            else
+                                                return "";
+                                        }), _jsx(AddTask, { addTaskStyle: props.addTaskStyle, addTaskClassName: props.addTaskClassName, currentGroup: group, dayInfo: currentDailyHours, addTaskRender: props.addTaskRender, handleAddTask: props.handleAddTask })] })] }, i));
                     }) })] }));
 }
 export default memo(CalendarForDay, (prevProps, nextProps) => prevProps.tasks === nextProps.tasks &&

package/components/CalendarForday.tsx

@@ -51,14 +51,13 @@ function CalendarForDay(props: CalendarTablePropsType) {
                 style={{
                   width: "100%",
                   height: "auto",
-                  background: "#f2f8f8",
                   padding: "5px",
                   borderBottom: "1.5px solid #0f52737e",
                   borderRight: "0.74px solid rgba(198, 219, 225, 0.68)",
                   borderLeft: "0.74px solid rgba(198, 219, 225, 0.68)",
                   ...props.rowsStyle,
                 }}
-                className={`${props.rowsClassName}`}
+                className={`CalendarTableForDayRow ${props.rowsClassName}`}
               >
                 <div
                   style={{
@@ -76,40 +75,41 @@ function CalendarForDay(props: CalendarTablePropsType) {
                     handleClickGroup={props.handleClickGroup}
                   />
                 </div>
-
-                {props.tasks.map((task, taskKey) => {
-                  if (
-                    task.dayIndex === (props.dayOffset || 0) &&
-                    task.groupId === group.id &&
-                    compareWeekOffset(
-                      props.date,
-                      props.weekOffset || 0,
-                      task.taskDate,
-                      props.timeZone
-                    )
-                  ) {
-                    return (
-                      <TaskContainer
-                        key={`${taskKey} task`}
-                        handleDragTask={props.handleDragTask}
-                        taskRender={props.taskRender}
-                        handleDragTaskEnd={props.handleDragTaskEnd}
-                        style={props.taskContainerStyle}
-                        className={`${props.taskContainerClassName}`}
-                        currentTask={task}
-                        handleClickTask={props.handleClickTask}
-                      />
-                    );
-                  } else return "";
-                })}
-                <AddTask
-                  addTaskStyle={props.addTaskStyle}
-                  addTaskClassName={props.addTaskClassName}
-                  currentGroup={group}
-                  dayInfo={currentDailyHours}
-                  addTaskRender={props.addTaskRender}
-                  handleAddTask={props.handleAddTask}
-                />
+                <div className="CalendarTableForDayGroupTasks">
+                  {props.tasks.map((task, taskKey) => {
+                    if (
+                      task.dayIndex === (props.dayOffset || 0) &&
+                      task.groupId === group.id &&
+                      compareWeekOffset(
+                        props.date,
+                        props.weekOffset || 0,
+                        task.taskDate,
+                        props.timeZone
+                      )
+                    ) {
+                      return (
+                        <TaskContainer
+                          key={`${taskKey} task`}
+                          handleDragTask={props.handleDragTask}
+                          taskRender={props.taskRender}
+                          handleDragTaskEnd={props.handleDragTaskEnd}
+                          style={props.taskContainerStyle}
+                          className={`${props.taskContainerClassName}`}
+                          currentTask={task}
+                          handleClickTask={props.handleClickTask}
+                        />
+                      );
+                    } else return "";
+                  })}
+                  <AddTask
+                    addTaskStyle={props.addTaskStyle}
+                    addTaskClassName={props.addTaskClassName}
+                    currentGroup={group}
+                    dayInfo={currentDailyHours}
+                    addTaskRender={props.addTaskRender}
+                    handleAddTask={props.handleAddTask}
+                  />
+                </div>
               </div>
             );
           })}

package/lib/utils.js

@@ -9,7 +9,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import moment from "moment";
 import dayjs from "dayjs";
 import { v4 as uuidv4 } from "uuid";
 export const DAY_IN_MILLISECONDS = 86400000;
@@ -184,18 +183,6 @@ export function calculerEcartSemaine(dateSelectionnee, timeZone) {
  * @param numeroSemaine - The week number.
  * @returns The number of weeks since the origin date.
  */
-function semainesDepuisOrigine(annee, numeroSemaine) {
-    const dateActuelle = new Date();
-    const dateOrigine = new Date(dateActuelle.getFullYear() - 2, 0, 1);
-    const anneeOrigine = dateOrigine.getFullYear();
-    const numeroSemaineOrigine = getWeekNumber(dateOrigine);
-    let nombreSemaines = 0;
-    for (let i = anneeOrigine; i < annee; i++) {
-        nombreSemaines += moment().year(i).isoWeeksInYear();
-    }
-    nombreSemaines += numeroSemaine - numeroSemaineOrigine;
-    return nombreSemaines;
-}
 export function getSessionStorageRecordForDragAndDrop(tasks, positionDay, dropGroupId) {
     const dragtaskId = window.sessionStorage.getItem("calendardragtaskId");
     const dragtaskStart = window.sessionStorage.getItem("calendardragtaskStart");
@@ -229,10 +216,7 @@ export function compareWeekOffset(calendarDate, weekOffset, taskDate, timeZone)
     // if (taskDate.getDay() === 0 && calculerEcartSemaine(taskDate) === -7) {
     //   return true;
     // }
-    console.log(weekOffset, "WEEKOFFSET", calculerEcartSemaine(taskDate, timeZone) + 7);
-    console.log(calendarDate, "CALENDAR DATE");
     const localTaskDate = getArbitraryDateInTimeZone(taskDate, timeZone);
-    console.log(localTaskDate.getDay(), "TASK DATE", localTaskDate);
     // if (calendarDate)
     //     return (calculerEcartSemaine(calendarDate) === calculerEcartSemaine(taskDate));
     const ecartTask = calculerEcartSemaine(taskDate, timeZone) + (localTaskDate.getDay() === 0 ? 7 : 0);
@@ -299,7 +283,6 @@ export const getSavedTasks = () => {
     const tasksTable = JSON.parse(taskSavedString);
     const savedTasks = tasksTable.map((task) => {
         const { taskDate, taskExpiryDate } = task, rest = __rest(task, ["taskDate", "taskExpiryDate"]);
-        console.log("SAVED", taskDate);
         if (taskExpiryDate) {
             return Object.assign({ taskDate: new Date(taskDate), taskExpiryDate: new Date(taskExpiryDate) }, rest);
         }
@@ -430,7 +413,6 @@ export function recurringTasks(allTasks, task, recurrenceType, occurrences, time
     else if (recurrenceType === "monthly") {
         monthly();
     }
-    console.log(tasks);
     // Return the list of generated tasks
     return tasks;
 }

package/lib/utils.ts

@@ -1,4 +1,3 @@
-import moment from "moment";
 import dayjs from "dayjs";
 import { v4 as uuidv4 } from "uuid";
 import {
@@ -210,20 +209,7 @@ export function calculerEcartSemaine(dateSelectionnee: Date, timeZone?: TimeZone
  * @param numeroSemaine - The week number.
  * @returns The number of weeks since the origin date.
  */
-function semainesDepuisOrigine(annee: number, numeroSemaine: number): number {
-  const dateActuelle = new Date();
-  const dateOrigine = new Date(dateActuelle.getFullYear() - 2, 0, 1);
-  const anneeOrigine = dateOrigine.getFullYear();
-  const numeroSemaineOrigine = getWeekNumber(dateOrigine);
-
-  let nombreSemaines = 0;
-  for (let i = anneeOrigine; i < annee; i++) {
-    nombreSemaines += moment().year(i).isoWeeksInYear();
-  }
-  nombreSemaines += numeroSemaine - numeroSemaineOrigine;
 
-  return nombreSemaines;
-}
 
 export function getSessionStorageRecordForDragAndDrop(
   tasks: TasksType,
@@ -280,10 +266,9 @@ export function compareWeekOffset(
   // }
 
 
-  console.log(weekOffset, "WEEKOFFSET", calculerEcartSemaine(taskDate, timeZone) + 7);
-  console.log(calendarDate, "CALENDAR DATE");
+
   const localTaskDate = getArbitraryDateInTimeZone(taskDate, timeZone);
-  console.log(localTaskDate.getDay(), "TASK DATE", localTaskDate);
+
 
   // if (calendarDate)
   //     return (calculerEcartSemaine(calendarDate) === calculerEcartSemaine(taskDate));
@@ -380,7 +365,7 @@ export const getSavedTasks = () => {
   const savedTasks: TasksType | any = tasksTable.map((task) => {
     const { taskDate, taskExpiryDate, ...rest } = task;
 
-    console.log("SAVED", taskDate);
+
 
     if (taskExpiryDate) {
       return {
@@ -578,7 +563,7 @@ export function recurringTasks(
     monthly();
   }
 
-  console.log(tasks);
+
 
   // Return the list of generated tasks
   return tasks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-weekly-planning",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "main": "index.js",
   "scripts": {
     "test": "jest --env=jsdom",
@@ -41,13 +41,8 @@
   "dependencies": {
     "@babel/types": "^7.29.0",
     "@types/babel__generator": "^7.27.0",
-    "axios": "^1.13.6",
     "dayjs": "^1.11.19",
-    "ical": "^0.8.0",
-    "ics-to-json": "^2.0.2",
-    "moment": "^2.30.1",
     "react-window": "^2.2.7",
-    "sass": "^1.97.3",
     "ts-node": "^10.9.2",
     "uuid": "^13.0.0"
   },
@@ -60,12 +55,10 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@types/babel__core": "^7.20.5",
-    "@types/ical": "^0.8.3",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.14",
     "@types/react-window": "^2.0.0",
     "babel-jest": "^30.2.0",
-    "docdash": "^2.0.2",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "react": "^19.2.4",

package/style.css

@@ -98,3 +98,26 @@
   padding: 10px;
   position: relative;
 }
+
+.CalendarTableForDayRow {
+  display: flex !important;
+  flex-direction: row !important;
+  gap: 15px;
+  align-items: flex-start;
+  padding: 15px !important;
+}
+
+.CalendarTableForDayGroupTasks {
+  flex: 1;
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  gap: 10px;
+}
+
+.CalendarTableForDayGroupTasks .taskContainer,
+.CalendarTableForDayGroupTasks .addPlanStyle {
+  margin-bottom: 0px;
+  height: 100%;
+  min-height: 80px;
+}
+

package/__tests__/page.test.js

@@ -1,106 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import "@testing-library/jest-dom";
-import ical from "ical";
-export function parseICSToTasks(icsData, group) {
-    var _a;
-    const events = ical.parseICS(icsData);
-    const tasks = [];
-    for (const key in events) {
-        const event = events[key];
-        if (event.type === "VEVENT") {
-            const taskStart = event.start
-                ? new Date(event.start).getTime()
-                : new Date().getTime();
-            const taskEnd = event.end
-                ? new Date(event.end).getTime()
-                : new Date().getTime();
-            const taskDate = event.start ? new Date(event.start) : new Date();
-            const taskSummary = event.summary || "";
-            const taskLocation = event.location || "";
-            const taskTimezone = "";
-            const taskCreatedAt = event.created
-                ? new Date(event.created)
-                : new Date();
-            const taskExpiryDate = ((_a = event.rrule) === null || _a === void 0 ? void 0 : _a.options.until)
-                ? new Date(event.rrule.options.until)
-                : new Date();
-            const task = {
-                taskStart,
-                taskEnd,
-                taskDate,
-                taskSummary,
-                taskLocation,
-                taskTimzone: taskTimezone,
-                groupId: group,
-                dayIndex: taskDate.getDay() || 0,
-                taskId: event.uid || "",
-                taskCreatedAt,
-                taskExpiryDate,
-            };
-            tasks.push(task);
-            if (!event.start)
-                return [];
-            // Gestion des occurrences récurrentes
-            if (event.rrule) {
-                const occurrences = event.rrule.between(event.start, taskExpiryDate || new Date());
-                occurrences.forEach((occurrence) => {
-                    tasks.push(Object.assign(Object.assign({}, task), { taskStart: occurrence.getTime(), taskEnd: occurrence.getTime() + (taskEnd - taskStart), taskDate: new Date(occurrence.getTime()), dayIndex: new Date(occurrence.getTime()).getDay() }));
-                });
-            }
-        }
-    }
-    return tasks;
-}
-import axios from "axios";
-// Get ICS text however you like, example below
-// Make sure you have the right CORS settings if needed
-const convert = (fileLocation) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const task = fileLocation.map((link) => __awaiter(void 0, void 0, void 0, function* () {
-            const icsRes = yield axios.get(link);
-            const icstext = yield icsRes.data;
-            const data = parseICSToTasks(icstext, "morel");
-            return data;
-        }));
-        console.log(task);
-        return "success";
-    }
-    catch (error) {
-        return "error";
-    }
-});
-export function convertTasksToIcsFormat(tasks) {
-    const ics = tasks.reduce((previousIcs, task) => {
-        previousIcs += `
-
-        BEGIN:VCALENDAR
-        VERSION:1.0
-        BEGIN:VEVENT
-        DTSTART:${task.taskStart}
-        DTEND:${task.taskEnd}
-        LOCATION:
-        DESCRIPTION:Purpose: Provide example of this file type Document file type: ICS Version: 1.0 Created by http://www.online-convert.com More example files: http://www.online-convert.com/file-type License: http://creativecommons.org/licenses Feel free to use & share the file according to the license above.
-        SUMMARY:ICS test file
-        PRIORITY:3
-        END:VEVENT
-        END:VCALENDAR
-
-    `;
-        return previousIcs;
-    }, "");
-    return ics;
-}
-test("the fetch fails with an error", () => {
-    return convert([
-        "https://firebasestorage.googleapis.com/v0/b/ashtonv2.appspot.com/o/example.ics?alt=media&token=679cab97-cde2-4074-b96f-b63c10f1b7e2",
-        "https://firebasestorage.googleapis.com/v0/b/ashtonv2.appspot.com/o/example.ics?alt=media&token=679cab97-cde2-4074-b96f-b63c10f1b7e2",
-    ]).catch((error) => expect(error).toMatch("error"));
-});

package/__tests__/page.test.tsx

@@ -1,129 +0,0 @@
-import { render } from "@testing-library/react";
-import Calendar from "..";
-import "@testing-library/jest-dom";
-import { TaskFeildsType } from "../definitions";
-import { icsToJson } from "ics-to-json";
-
-import ical from "ical";
-
-export function parseICSToTasks(
-  icsData: string,
-  group: string
-): TaskFeildsType[] {
-  const events = ical.parseICS(icsData);
-  const tasks: TaskFeildsType[] = [];
-
-  for (const key in events) {
-    const event = events[key];
-
-    if (event.type === "VEVENT") {
-      const taskStart = event.start
-        ? new Date(event.start).getTime()
-        : new Date().getTime();
-      const taskEnd = event.end
-        ? new Date(event.end).getTime()
-        : new Date().getTime();
-      const taskDate = event.start ? new Date(event.start) : new Date();
-      const taskSummary = event.summary || "";
-      const taskLocation = event.location || "";
-      const taskTimezone = "";
-      const taskCreatedAt = event.created
-        ? new Date(event.created)
-        : new Date();
-      const taskExpiryDate = event.rrule?.options.until
-        ? new Date(event.rrule.options.until)
-        : new Date();
-
-      const task: TaskFeildsType[][number] = {
-        taskStart,
-        taskEnd,
-        taskDate,
-        taskSummary,
-        taskLocation,
-        taskTimzone: taskTimezone,
-        groupId: group,
-        dayIndex: taskDate.getDay() || 0,
-        taskId: event.uid || "",
-        taskCreatedAt,
-        taskExpiryDate,
-      };
-
-      tasks.push(task);
-
-      if (!event.start) return [];
-
-      // Gestion des occurrences récurrentes
-      if (event.rrule) {
-        const occurrences = event.rrule.between(
-          event.start,
-          taskExpiryDate || new Date()
-        );
-
-        occurrences.forEach((occurrence) => {
-          tasks.push({
-            ...task,
-            taskStart: occurrence.getTime(),
-            taskEnd: occurrence.getTime() + (taskEnd - taskStart),
-            taskDate: new Date(occurrence.getTime()),
-            dayIndex: new Date(occurrence.getTime()).getDay(),
-          });
-        });
-      }
-    }
-  }
-
-  return tasks;
-}
-
-import axios from "axios";
-// Get ICS text however you like, example below
-// Make sure you have the right CORS settings if needed
-const convert = async (fileLocation: string[]) => {
-
-  try {
-    const task = fileLocation.map(async (link)  => {
-      const icsRes = await axios.get(link);
-      const icstext:string = await icsRes.data;
-      const data = parseICSToTasks(icstext, "morel");
-      return data;
-    });
-
-    console.log(task);
-    return "success";
-  } catch (error) {
-    return "error";
-  }
-};
-
-
-export function convertTasksToIcsFormat(tasks: TaskFeildsType[]) {
-  const ics = tasks.reduce((previousIcs: string, task: TaskFeildsType) => {
-    previousIcs += `
-
-        BEGIN:VCALENDAR
-        VERSION:1.0
-        BEGIN:VEVENT
-        DTSTART:${task.taskStart}
-        DTEND:${task.taskEnd}
-        LOCATION:
-        DESCRIPTION:Purpose: Provide example of this file type Document file type: ICS Version: 1.0 Created by http://www.online-convert.com More example files: http://www.online-convert.com/file-type License: http://creativecommons.org/licenses Feel free to use & share the file according to the license above.
-        SUMMARY:ICS test file
-        PRIORITY:3
-        END:VEVENT
-        END:VCALENDAR
-
-    `;
-
-    return previousIcs;
-  }, "");
-
-  return ics;
-}
-
-
-test("the fetch fails with an error", () => {
-  return convert([
-    "https://firebasestorage.googleapis.com/v0/b/ashtonv2.appspot.com/o/example.ics?alt=media&token=679cab97-cde2-4074-b96f-b63c10f1b7e2",
-    "https://firebasestorage.googleapis.com/v0/b/ashtonv2.appspot.com/o/example.ics?alt=media&token=679cab97-cde2-4074-b96f-b63c10f1b7e2",
-  ]).catch((error) => expect(error).toMatch("error"));
-});