Merge pull request #117 from The1029/master

added functionality to show ongoing multi-day events
cloud-atlas-ai · Mar 20, 2024 · 70116b3 · 70116b3
2 parents 1deb7b2 + 590238a
commit 70116b3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/manifest-beta.json b/manifest-beta.json
@@ -1,8 +1,8 @@
 {
   "id": "ics",
   "name": "ICS",
-  "version": "1.6.3",
-  "minAppVersion": "1.5.3",
+  "version": "1.6.4",
+  "minAppVersion": "1.5.11",
   "description": "Parse multiple ICS files to include in your notes. Designed for Daily Notes and the Day Planner format. Through templates you can customize it for other use cases.",
   "author": "Cloud Atlas",
   "authorUrl": "https://cloud-atlas.ai",

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/icalUtils.ts b/src/icalUtils.ts
@@ -38,7 +38,7 @@ function adjustDateToOriginalTimezone(originalDate: Date, currentDate: Date, tzi
   return momentCurrent.add(hourOffset, 'hours').add(minuteOffset, 'minutes').toDate();
 }
 
-export function filterMatchingEvents(icsArray: any[], dayToMatch: string) {
+export function filterMatchingEvents(icsArray: any[], dayToMatch: string, showOngoing: boolean) {
 
   return icsArray.reduce((matchingEvents, event) => {
     var hasRecurrenceOverride = false
@@ -103,6 +103,13 @@ export function filterMatchingEvents(icsArray: any[], dayToMatch: string) {
         matchingEvents.push(event);
       }
     }
+
+    if (showOngoing) {
+      if (moment(dayToMatch).isBetween(moment(event.start), moment(event.end), "day")) {
+        matchingEvents.push(event);
+      }
+    }
+
     return matchingEvents;
   }, []);;
 }

diff --git a/src/main.ts b/src/main.ts
@@ -96,7 +96,7 @@ export default class ICSPlugin extends Plugin {
 
       // Exception handling for parsing and filtering
       try {
-        dateEvents = filterMatchingEvents(icsArray, date);
+        dateEvents = filterMatchingEvents(icsArray, date, calendarSetting.format.showOngoing);
 
       } catch (filterError) {
         console.error(`Error filtering events for calendar ${calendarSetting.icsName}: ${filterError}`);

diff --git a/src/settings/ICSSettings.ts b/src/settings/ICSSettings.ts
@@ -18,6 +18,7 @@ export interface Calendar {
         location: boolean;
         description: boolean;
         showAttendees: boolean;
+        showOngoing: boolean;
     }
 }
 
@@ -30,6 +31,7 @@ export const DEFAULT_CALENDAR_FORMAT = {
     description: false,
     calendarType: 'remote', // Set the default type to 'remote'
     showAttendees: false,
+    showOngoing: false
 };
 
 export const DEFAULT_SETTINGS: ICSSettings = {

diff --git a/src/settings/ICSSettingsTab.ts b/src/settings/ICSSettingsTab.ts
@@ -215,7 +215,8 @@ class SettingsModal extends Modal {
     summary: boolean,
     location: boolean,
     description: boolean,
-    showAttendees: boolean
+    showAttendees: boolean,
+    showOngoing: boolean
   } = DEFAULT_CALENDAR_FORMAT;
   calendarType: string;
   constructor(app: App, plugin: ICSPlugin, setting?: Calendar) {
@@ -368,6 +369,15 @@ class SettingsModal extends Modal {
           this.format.showAttendees = value; // Set the new property
         }));
 
+    const showOngoingToggle = new Setting(settingDiv)
+      .setName('Show Ongoing')
+      .setDesc('Display multi-day events that include target date')
+      .addToggle(toggle => toggle
+        .setValue(this.format.showOngoing || true) // Use the new property
+        .onChange(value => {
+          this.format.showOngoing = value; // Set the new property
+        }));
+
     let footerEl = contentEl.createDiv();
     let footerButtons = new Setting(footerEl);
     footerButtons.addButton((b) => {