imp - Finalized legacy calendar for non-Sunday weeks

--- We've finalized the legacy calendar for working with calendars that don't use Sunday as the first day of the week. --- Type: imp Breaking: False Doc Required: False Part: 1/1
Aptivi · Feb 26, 2024 · 695d5d0 · 695d5d0
1 parent 93008a7
commit 695d5d0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarPrint.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Calendar/Calendar/CalendarPrint.cs
@@ -101,7 +101,7 @@ public static void PrintCalendar(int Year, int Month, CalendarTypes calendar = C
                 // Dim out the weekends
                 if (IsWeekend)
                 {
-                    var WeekendOptions = new CellOptions((int)CurrentDate.DayOfWeek + 1, CurrentWeek)
+                    var WeekendOptions = new CellOptions(currentDay, CurrentWeek)
                     {
                         ColoredCell = true,
                         CellColor = KernelColorTools.GetColor(KernelColorType.WeekendDay),
@@ -113,7 +113,7 @@ public static void PrintCalendar(int Year, int Month, CalendarTypes calendar = C
                 // Highlight today
                 if (IsToday)
                 {
-                    var TodayOptions = new CellOptions((int)CurrentDate.DayOfWeek + 1, CurrentWeek)
+                    var TodayOptions = new CellOptions(currentDay, CurrentWeek)
                     {
                         ColoredCell = true,
                         CellColor = KernelColorTools.GetColor(KernelColorType.TodayDay),
@@ -146,7 +146,7 @@ public static void PrintCalendar(int Year, int Month, CalendarTypes calendar = C
                     if (((EventInstance.IsYearly && CurrentDate >= sDate && CurrentDate <= eDate) ||
                          (!EventInstance.IsYearly && CurrentDate == nDate)) && !EventMarked)
                     {
-                        var EventCell = new CellOptions((int)CurrentDate.DayOfWeek + 1, CurrentWeek)
+                        var EventCell = new CellOptions(currentDay, CurrentWeek)
                         {
                             ColoredCell = true,
                             CellColor = KernelColorTools.GetColor(KernelColorType.EventDay),
@@ -159,9 +159,9 @@ public static void PrintCalendar(int Year, int Month, CalendarTypes calendar = C
                 string markStart = ReminderMarked && EventMarked ? "[" : ReminderMarked ? "(" : EventMarked ? "<" : " ";
                 string markEnd = ReminderMarked && EventMarked ? "]" : ReminderMarked ? ")" : EventMarked ? ">" : " ";
                 CurrentDayMark = $"{markStart}{CurrentDay}{markEnd}";
-                CalendarData[CurrentWeekIndex, (int)CurrentDate.DayOfWeek] = CurrentDayMark;
+                CalendarData[CurrentWeekIndex, currentDay - 1] = CurrentDayMark;
             }
-            TableColor.WriteTable(CalendarDays, CalendarData, 2, true, CalendarCellOptions);
+            TableColor.WriteTable(mappedDays.Keys.Select((dow) => $"{CalendarDays[(int)dow]}").ToArray(), CalendarData, 2, true, CalendarCellOptions);
         }
 
     }