Calendar styling, add todo and goals

LifelogBb/Controllers/HomeController.cs

@@ -84,6 +84,14 @@ public async Task<IActionResult> Calendar(DateTime? date)
             var habits = calculateHabits(allHabits, forDay, forDay.AddDays(1).Date.AddTicks(-1));
             model.Events.AddRange(habits.ConvertAll(h => new CalendarViewModelEvent { Type = EntityType.Habit, Text = h.Name, StartDate = h.StartDate, EndDate = h.EndDate }).OrderBy(s => s.StartDate));
 
+            // Add Due date for todos on forDay (Set start date and end date to due date to show as block)
+            var todos = await _context.Todos.Where(t => !t.IsCompleted && t.DueDate != null && t.DueDate.Value.Date == forDay).ToListAsync();
+            model.Events.AddRange(todos.ConvertAll(t => new CalendarViewModelEvent { Type = EntityType.Todo, Text = t.Title, StartDate = t.DueDate.Value, EndDate = t.DueDate.Value }));
+
+            // Add End date for goals on forDay (Set start date to end date to show as block)
+            var goals = await _context.Goals.Where(t => !t.IsCompleted && t.EndDate != null && t.EndDate.Value.Date == forDay).ToListAsync();
+            model.Events.AddRange(goals.ConvertAll(g => new CalendarViewModelEvent { Type = EntityType.Goal, Text = g.Name, StartDate = g.EndDate.Value, EndDate = g.EndDate.Value }));
+
             return View(model);
         }
 

LifelogBb/Views/Home/Calendar.cshtml

@@ -11,7 +11,9 @@
     {
         return type switch
         {
-            EntityType.Habit => "text-bg-danger",
+            EntityType.Habit => "text-bg-info",
+            EntityType.Todo => "text-bg-danger",
+            EntityType.Goal => "text-bg-warning",
             _ => "text-bg-secondary"
         };
     }
@@ -41,7 +43,7 @@
         <div class="col">
             <div class="card">
                 <div class="card-body">
-                    <table border="0" cellpadding="0" cellspacing="0">
+                    <table class="table">
                         @for (var timeSegment = DateTime.Now.Date; timeSegment < DateTime.Now.AddDays(1).Date.AddTicks(-1); timeSegment = timeSegment.AddHours(1))
                         {
                             <tr>

TODO.md

@@ -39,6 +39,7 @@ Dedicated views and filters (as primary view, keep table as overview for everyth
 ### Done :heavy_check_mark:
 
 - [x] Dashboard
+- [x] Calendar
 - [x] [iCal](https://github.com/rianjs/ical.net) feed
   - VTODO for Goals/Todos
   - VEVENT for Habits (Time Boxing/Blocking)