fix for task resizing not working after merge, and fix for all-day view for initial task-nodes (i.e. if you just created task node and checked all-day, cal view was previously showing task 1 day early)

1 files changed, 18 insertions, 4 deletions

diff --git a/src/client/views/nodes/calendarBox/CalendarBox.tsx b/src/client/views/nodes/calendarBox/CalendarBox.tsx
index 26aed72c3..92b3224e9 100644
--- a/src/client/views/nodes/calendarBox/CalendarBox.tsx
+++ b/src/client/views/nodes/calendarBox/CalendarBox.tsx
@@ -22,6 +22,7 @@ import './CalendarBox.scss';
 import { DateField } from '../../../../fields/DateField';
 import { undoable } from '../../../util/UndoManager';
 import { DocumentType } from '../../../documents/DocumentTypes';
+import { truncate } from 'fs/promises';
 
 type CalendarView = 'multiMonth' | 'dayGridMonth' | 'timeGridWeek' | 'timeGridDay';
 
@@ -74,8 +75,20 @@ export class CalendarBox extends CollectionSubView() {
 
     @computed get calendarEvents(): EventSourceInput | undefined {
         return this.childDocs.map(doc => {
-            const { start, end } = dateRangeStrToDates(StrCast(doc.$task_dateRange));
-            const isCompleted = BoolCast(doc.$task_completed); // AARAV ADD
+            // const { start, end } = dateRangeStrToDates(StrCast(doc.$task_dateRange));
+            const isCompleted = BoolCast(doc.$task_completed);
+
+            const rangeStr = StrCast(doc.$task_dateRange);
+            const [startStr, endStr] = rangeStr.split('|');
+            let start: string | Date, end: string | Date;
+
+            if (BoolCast(doc.$task_allDay)) {
+                start = startStr;
+                end = endStr;
+            } else {
+                ({ start, end } = dateRangeStrToDates(rangeStr));
+            }
+
             return {
                 title: StrCast(doc.title),
                 start,
@@ -157,7 +170,7 @@ export class CalendarBox extends CollectionSubView() {
             delete doc.$task_endTime;
         } else {
             doc.$task_startTime = new DateField(startDate);
-            doc.task_endTime = new DateField(endDate);
+            doc.$task_endTime = new DateField(endDate);
         }
     }, 'change event date');
 
@@ -220,7 +233,7 @@ export class CalendarBox extends CollectionSubView() {
                 }}
                 initialDate={untracked(() => this.dateSelect.start)}
                 navLinks={true}
-                editable={false}
+                editable={true}
                 // expandRows={true}
                 // handleWindowResize={true}
                 displayEventTime={false}
@@ -231,6 +244,7 @@ export class CalendarBox extends CollectionSubView() {
                 events={this.calendarEvents}
                 eventClick={this.handleEventClick}
                 eventDrop={this.handleEventDrop}
+                eventResize={this.handleEventDrop}
                 unselectAuto={false}
                 // unselect={() => {}}
                 select={(info: DateSelectArg) => {