fix bugs with calendar page, highlight next event

src/ViewModel/Pages/boardViewModel.ts

@@ -153,7 +153,6 @@ export default class BoardViewModel extends TaskContainingPageViewModel {
             this,
             taskFileContent,
         );
-        console.log("STILL HERE", taskFileContent.fileId);
         this.taskViewModels.set(taskFileContent.fileId, taskViewModel);
     };
 

src/ViewModel/Pages/calendarPageViewModel.ts

@@ -8,6 +8,7 @@ import CalendarModel, { MonthGrid } from "../../Model/Files/calendarModel";
 import BoardsAndTasksModel, {
     TaskFileContent,
 } from "../../Model/Files/boardsAndTasksModel";
+import {formatISO, formatTime} from "../../Model/Utility/utility";
 
 export const CALENDAR_EVENT_BOARD_ID = "events";
 
@@ -20,6 +21,12 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
         );
     }
 
+    get selectedDateString(): string {
+	return [this.selectedYear.value, this.selectedMonth.value, this.selectedDate.value]
+	    .map((x, i) => i == 0 ? x : CalendarModel.padDateOrMonth(x.toString()))
+	    .join("-");
+    }
+
     // paths
     getBasePath = (): string[] => {
         return [...this.calendarModel.getViewPath()];
@@ -34,6 +41,8 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
     monthGrid: React.State<
         MonthGrid<React.MapState<TaskViewModel>> | undefined
     > = new React.State<any>(undefined);
+    
+    nextTask: React.State<TaskViewModel|undefined> = new React.State(undefined);
 
     // methods
     createEvent = (): void => {
@@ -157,17 +166,37 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
         draggedObject.setDate(ISOString);
     };
 
+    handleChron = (): void => {
+	this.updateMonthGrid();
+	this.updateNextTask();
+    }
+
     updateMonthGrid = (): void => {
+        const today = formatISO(this.coreViewModel.todayDate.value)
         if (
-            this.currentTodayDate ==
-            this.coreViewModel.todayDate.value.toISOString()
+            this.currentTodayDate == today
         )
             return;
         this.loadMonthTasks();
-        this.currentTodayDate =
-            this.coreViewModel.todayDate.value.toISOString();
+        this.currentTodayDate = today;
+	this.selectedDate.callSubscriptions();
     };
 
+    updateNextTask = (): void => {
+	if (this.selectedDateString != this.currentTodayDate) {
+	    this.nextTask.value = undefined;
+	    return;
+	}
+
+	const tasks = this.getEventsForDate();
+	if (tasks == undefined) return;
+	for (const task of [...tasks.value.values()]) {
+	    if (task.time.value <= this.coreViewModel.time.value) continue;
+	    this.nextTask.value = task;
+	    break;
+	};
+    }
+
     // load
     loadMonthTasks = (): void => {
         this.monthGrid.value = this.calendarModel.generateMonthGrid(
@@ -189,7 +218,6 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
     };
 
     loadData = (): void => {
-        this.loadMonthTasks();
     };
 
     // init
@@ -209,6 +237,9 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
         React.bulkSubscribe([this.selectedYear, this.selectedMonth], () => {
             this.loadMonthTasks();
         });
+	this.selectedDate.subscribeSilent(()=>{
+	    this.updateNextTask();
+	})
 
         // handlers
         boardsAndTasksModel.taskHandlerManager.setHandler(
@@ -219,7 +250,7 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel {
         );
         this.coreViewModel.chronHandlerManager.setHandler(
             `calendar-${this.chatViewModel.chatModel.id}`,
-            this.updateMonthGrid,
+            this.handleChron,
         );
 
         // initiate

src/ViewModel/Pages/taskViewModel.ts

@@ -8,6 +8,7 @@ import { localeCompare, padZero } from "../../Model/Utility/utility";
 import BoardsAndTasksModel, {
     TaskFileContent,
 } from "../../Model/Files/boardsAndTasksModel";
+import CalendarPageViewModel from "./calendarPageViewModel";
 
 export default class TaskViewModel extends Context {
     // util
@@ -55,6 +56,8 @@ export default class TaskViewModel extends Context {
     date: React.State<string> = new React.State("");
     time: React.State<string> = new React.State("");
 
+    isNotNext: React.State<boolean> = new React.State(true);
+
     selectedVersionId: React.State<string> = new React.State("");
     versionIds: React.ListState<string> = new React.ListState();
 
@@ -196,6 +199,12 @@ export default class TaskViewModel extends Context {
     loadAllData = (): void => {
         this.loadTaskData();
         this.loadVersionIds();
+
+	if (this.containingViewModel instanceof CalendarPageViewModel) {
+	    this.containingViewModel.nextTask.subscribe((nextTask)=>{
+		this.isNotNext.value = nextTask != this;
+	    })
+	}
     };
 
     loadTaskData = (): void => {