react-weekly-planning 1.0.32 → 1.0.33
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/components/CalendarForday.js +9 -9
- package/components/CalendarForday.tsx +36 -36
- package/lib/utils.js +0 -5
- package/lib/utils.ts +4 -5
- package/package.json +1 -1
- package/style.css +23 -0
|
@@ -16,15 +16,15 @@ function CalendarForDay(props) {
|
|
|
16
16
|
const currentDailyHours = dailyHours[props.dayOffset || 0];
|
|
17
17
|
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 &&
|
|
18
18
|
props.groups.map((group, i) => {
|
|
19
|
-
return (_jsxs("div", { style: Object.assign({ width: "100%", height: "auto",
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
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) => {
|
|
20
|
+
if (task.dayIndex === (props.dayOffset || 0) &&
|
|
21
|
+
task.groupId === group.id &&
|
|
22
|
+
compareWeekOffset(props.date, props.weekOffset || 0, task.taskDate, props.timeZone)) {
|
|
23
|
+
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`));
|
|
24
|
+
}
|
|
25
|
+
else
|
|
26
|
+
return "";
|
|
27
|
+
}), _jsx(AddTask, { addTaskStyle: props.addTaskStyle, addTaskClassName: props.addTaskClassName, currentGroup: group, dayInfo: currentDailyHours, addTaskRender: props.addTaskRender, handleAddTask: props.handleAddTask })] })] }, i));
|
|
28
28
|
}) })] }));
|
|
29
29
|
}
|
|
30
30
|
export default memo(CalendarForDay, (prevProps, nextProps) => prevProps.tasks === nextProps.tasks &&
|
|
@@ -51,14 +51,13 @@ function CalendarForDay(props: CalendarTablePropsType) {
|
|
|
51
51
|
style={{
|
|
52
52
|
width: "100%",
|
|
53
53
|
height: "auto",
|
|
54
|
-
background: "#f2f8f8",
|
|
55
54
|
padding: "5px",
|
|
56
55
|
borderBottom: "1.5px solid #0f52737e",
|
|
57
56
|
borderRight: "0.74px solid rgba(198, 219, 225, 0.68)",
|
|
58
57
|
borderLeft: "0.74px solid rgba(198, 219, 225, 0.68)",
|
|
59
58
|
...props.rowsStyle,
|
|
60
59
|
}}
|
|
61
|
-
className={
|
|
60
|
+
className={`CalendarTableForDayRow ${props.rowsClassName}`}
|
|
62
61
|
>
|
|
63
62
|
<div
|
|
64
63
|
style={{
|
|
@@ -76,40 +75,41 @@ function CalendarForDay(props: CalendarTablePropsType) {
|
|
|
76
75
|
handleClickGroup={props.handleClickGroup}
|
|
77
76
|
/>
|
|
78
77
|
</div>
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
78
|
+
<div className="CalendarTableForDayGroupTasks">
|
|
79
|
+
{props.tasks.map((task, taskKey) => {
|
|
80
|
+
if (
|
|
81
|
+
task.dayIndex === (props.dayOffset || 0) &&
|
|
82
|
+
task.groupId === group.id &&
|
|
83
|
+
compareWeekOffset(
|
|
84
|
+
props.date,
|
|
85
|
+
props.weekOffset || 0,
|
|
86
|
+
task.taskDate,
|
|
87
|
+
props.timeZone
|
|
88
|
+
)
|
|
89
|
+
) {
|
|
90
|
+
return (
|
|
91
|
+
<TaskContainer
|
|
92
|
+
key={`${taskKey} task`}
|
|
93
|
+
handleDragTask={props.handleDragTask}
|
|
94
|
+
taskRender={props.taskRender}
|
|
95
|
+
handleDragTaskEnd={props.handleDragTaskEnd}
|
|
96
|
+
style={props.taskContainerStyle}
|
|
97
|
+
className={`${props.taskContainerClassName}`}
|
|
98
|
+
currentTask={task}
|
|
99
|
+
handleClickTask={props.handleClickTask}
|
|
100
|
+
/>
|
|
101
|
+
);
|
|
102
|
+
} else return "";
|
|
103
|
+
})}
|
|
104
|
+
<AddTask
|
|
105
|
+
addTaskStyle={props.addTaskStyle}
|
|
106
|
+
addTaskClassName={props.addTaskClassName}
|
|
107
|
+
currentGroup={group}
|
|
108
|
+
dayInfo={currentDailyHours}
|
|
109
|
+
addTaskRender={props.addTaskRender}
|
|
110
|
+
handleAddTask={props.handleAddTask}
|
|
111
|
+
/>
|
|
112
|
+
</div>
|
|
113
113
|
</div>
|
|
114
114
|
);
|
|
115
115
|
})}
|
package/lib/utils.js
CHANGED
|
@@ -229,10 +229,7 @@ export function compareWeekOffset(calendarDate, weekOffset, taskDate, timeZone)
|
|
|
229
229
|
// if (taskDate.getDay() === 0 && calculerEcartSemaine(taskDate) === -7) {
|
|
230
230
|
// return true;
|
|
231
231
|
// }
|
|
232
|
-
console.log(weekOffset, "WEEKOFFSET", calculerEcartSemaine(taskDate, timeZone) + 7);
|
|
233
|
-
console.log(calendarDate, "CALENDAR DATE");
|
|
234
232
|
const localTaskDate = getArbitraryDateInTimeZone(taskDate, timeZone);
|
|
235
|
-
console.log(localTaskDate.getDay(), "TASK DATE", localTaskDate);
|
|
236
233
|
// if (calendarDate)
|
|
237
234
|
// return (calculerEcartSemaine(calendarDate) === calculerEcartSemaine(taskDate));
|
|
238
235
|
const ecartTask = calculerEcartSemaine(taskDate, timeZone) + (localTaskDate.getDay() === 0 ? 7 : 0);
|
|
@@ -299,7 +296,6 @@ export const getSavedTasks = () => {
|
|
|
299
296
|
const tasksTable = JSON.parse(taskSavedString);
|
|
300
297
|
const savedTasks = tasksTable.map((task) => {
|
|
301
298
|
const { taskDate, taskExpiryDate } = task, rest = __rest(task, ["taskDate", "taskExpiryDate"]);
|
|
302
|
-
console.log("SAVED", taskDate);
|
|
303
299
|
if (taskExpiryDate) {
|
|
304
300
|
return Object.assign({ taskDate: new Date(taskDate), taskExpiryDate: new Date(taskExpiryDate) }, rest);
|
|
305
301
|
}
|
|
@@ -430,7 +426,6 @@ export function recurringTasks(allTasks, task, recurrenceType, occurrences, time
|
|
|
430
426
|
else if (recurrenceType === "monthly") {
|
|
431
427
|
monthly();
|
|
432
428
|
}
|
|
433
|
-
console.log(tasks);
|
|
434
429
|
// Return the list of generated tasks
|
|
435
430
|
return tasks;
|
|
436
431
|
}
|
package/lib/utils.ts
CHANGED
|
@@ -280,10 +280,9 @@ export function compareWeekOffset(
|
|
|
280
280
|
// }
|
|
281
281
|
|
|
282
282
|
|
|
283
|
-
|
|
284
|
-
console.log(calendarDate, "CALENDAR DATE");
|
|
283
|
+
|
|
285
284
|
const localTaskDate = getArbitraryDateInTimeZone(taskDate, timeZone);
|
|
286
|
-
|
|
285
|
+
|
|
287
286
|
|
|
288
287
|
// if (calendarDate)
|
|
289
288
|
// return (calculerEcartSemaine(calendarDate) === calculerEcartSemaine(taskDate));
|
|
@@ -380,7 +379,7 @@ export const getSavedTasks = () => {
|
|
|
380
379
|
const savedTasks: TasksType | any = tasksTable.map((task) => {
|
|
381
380
|
const { taskDate, taskExpiryDate, ...rest } = task;
|
|
382
381
|
|
|
383
|
-
|
|
382
|
+
|
|
384
383
|
|
|
385
384
|
if (taskExpiryDate) {
|
|
386
385
|
return {
|
|
@@ -578,7 +577,7 @@ export function recurringTasks(
|
|
|
578
577
|
monthly();
|
|
579
578
|
}
|
|
580
579
|
|
|
581
|
-
|
|
580
|
+
|
|
582
581
|
|
|
583
582
|
// Return the list of generated tasks
|
|
584
583
|
return tasks;
|
package/package.json
CHANGED
package/style.css
CHANGED
|
@@ -98,3 +98,26 @@
|
|
|
98
98
|
padding: 10px;
|
|
99
99
|
position: relative;
|
|
100
100
|
}
|
|
101
|
+
|
|
102
|
+
.CalendarTableForDayRow {
|
|
103
|
+
display: flex !important;
|
|
104
|
+
flex-direction: row !important;
|
|
105
|
+
gap: 15px;
|
|
106
|
+
align-items: flex-start;
|
|
107
|
+
padding: 15px !important;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
.CalendarTableForDayGroupTasks {
|
|
111
|
+
flex: 1;
|
|
112
|
+
display: grid;
|
|
113
|
+
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
|
|
114
|
+
gap: 10px;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
.CalendarTableForDayGroupTasks .taskContainer,
|
|
118
|
+
.CalendarTableForDayGroupTasks .addPlanStyle {
|
|
119
|
+
margin-bottom: 0px;
|
|
120
|
+
height: 100%;
|
|
121
|
+
min-height: 80px;
|
|
122
|
+
}
|
|
123
|
+
|