v2.7.1 #24

tossnet · Feb 15, 2025 · c17717a · c17717a
1 parent 507fdf8
commit c17717a
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 93 deletions.
diff --git a/BlazorCalendar/AnnualView.razor b/BlazorCalendar/AnnualView.razor
@@ -4,21 +4,21 @@
 @inherits CalendarBase
 
 @{
-    string labelMonth = "";
-    string labelDay = "";
-    string? CSSbackground = null;
-    string taskContent = "";
-    string? taskColor = null;
-    string? taskComment = null;
-    string? classPin = null;
-    string? classPointer = null;
+    string labelMonth = string.Empty;
+    string labelDay = string.Empty;
+    string? CSSbackground;
+    string taskContent = string.Empty;
+    string? taskColor;
+    string? taskComment;
+    string? classPin;
+    string? classPointer;
     int tasksCounter;
     bool draggable = false;
-    string? ondragover = null;
-    string? disabled = null;   
+    string? ondragover;
+    string? disabled;   
     string? isHidden = DisplayedView == DisplayedView.Annual ? null : "hidden-element";
     bool NotbeDraggeble = false; 
-    string borderStyle = "";
+    string borderStyle = string.Empty;
 }
 <div class="frame">
 
@@ -43,8 +43,8 @@
                 if (j.Month != m.Month)
                 {
                     j = default;
-                    labelDay = "";
-                    taskContent = "";
+                    labelDay = string.Empty;
+                    taskContent = string.Empty;
                     taskColor = null;
                     taskComment = null;
                     classPin = null;
@@ -58,31 +58,19 @@
                 else
                 {
                     disabled = null;
-                    int d = (int)j.DayOfWeek;
-                    if (d == 6)
-                    {
-                        CSSbackground = $"background:{SaturdayColor}";
-                    }
-                    else if (d == 0)
-                    {
-                        CSSbackground = $"background:{SundayColor}";
-                    }
-                    else
-                    {
-                        CSSbackground = $"background:{WeekDaysColor}";
-                    }
+                    CSSbackground = GetBackground(j);
 
                     string jour = j.ToString("ddd").Substring(0, 1).ToUpper();
                     labelDay = $"{jour} {j.Day.ToString()}";
 
-                    taskContent = "";
+                    taskContent = string.Empty;
                     taskColor = null;
                     taskComment = null;
                     classPin = null;
                     classPointer = null;
                     tasksCounter = 0;    
                     ondragover = "event.preventDefault();";
-                    borderStyle = "";
+                    borderStyle = string.Empty;
                     if ( TasksList is not null )
                     {
                         for (var k = 0; k < TasksList.Length; k++)

diff --git a/BlazorCalendar/AnnualView.razor.cs b/BlazorCalendar/AnnualView.razor.cs
@@ -1,9 +1,8 @@
-namespace BlazorCalendar;
-
-using BlazorCalendar.Models;
+using BlazorCalendar.Models;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
+namespace BlazorCalendar;
 
 partial class AnnualView : CalendarBase
 {

diff --git a/BlazorCalendar/Base/CalendarBase.cs b/BlazorCalendar/Base/CalendarBase.cs
@@ -45,4 +45,26 @@ public abstract class CalendarBase : ComponentBase
     /// </summary>
     [Parameter]
     public string SundayColor { get; set; } = "#DBE7F8";
+
+    /// <summary>
+    /// Allows the user to change the sunday background color
+    /// </summary>
+    [Parameter]
+    public string DisabledDayColor { get; set; } = "#DBE7F8";
+
+    public string GetBackground(DateTime day)
+    {
+        int d = (int)day.DayOfWeek;
+
+        if (d == 6)
+        {
+            return $"background:{SaturdayColor}";
+        }
+        else if (d == 0)
+        {
+            return $"background:{SundayColor}";
+        }
+
+        return $"background:{WeekDaysColor}";
+    }
 }
diff --git a/BlazorCalendar/BlazorCalendar.csproj b/BlazorCalendar/BlazorCalendar.csproj
@@ -13,7 +13,7 @@
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>blazor, calendar, schedule, component</PackageTags>
 		<PackageReleaseNotes>https://github.com/tossnet/Blazor-Calendar#release-notes</PackageReleaseNotes>
-		<Version>2.7.0</Version>
+		<Version>2.7.1</Version>
 		<Authors>Christophe Peugnet</Authors>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
@@ -31,11 +31,11 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/BlazorCalendar/Models/Enums.cs → BlazorCalendar/Enums/Enums.cs b/BlazorCalendar/Models/Enums.cs → BlazorCalendar/Enums/Enums.cs
diff --git a/BlazorCalendar/MonthlyView.razor b/BlazorCalendar/MonthlyView.razor
@@ -7,6 +7,7 @@
 @{
     FirstDate = new DateTime(FirstDate.Year, FirstDate.Month, 1);
     int firstDayWeek = (int)FirstDate.DayOfWeek;
+
     StateCase State = StateCase.Before; 
     DateTime LastDay = new DateTime(FirstDate.Year, FirstDate.Month, 1).AddMonths(1);
     DateTime DayCounter = FirstDate;
@@ -39,9 +40,9 @@
 
     @for ( var i = 0; i < 40; i++ )
     {   
-        if ( State == StateCase.Before ) 
+        if (State == StateCase.Before) 
         {
-            if ( firstDayWeek == Dates.GetNumOfDay(i) )  // Cell is first day?
+            if (firstDayWeek == Dates.GetNumOfDay(i))  // Cell is first day?
             {
                 State = StateCase.InMonth; // Start filling days
                 var dayClick = DayCounter;
@@ -64,9 +65,9 @@
                 </div>
             }
         }
-        if ( State == StateCase.InMonth )
+        if (State == StateCase.InMonth)
         {
-            if ( DayCounter >= LastDay ) // Stop at last day
+            if (DayCounter >= LastDay) // Stop at last day
             {
                 State = StateCase.After;
                 // Again empty cells from here on
@@ -93,10 +94,11 @@
                 DayCounter = DayCounter.AddDays(1);
             }
         }
-        if ( State == StateCase.After )
+        if (State == StateCase.After)
         {
             <div class="monthly-day monthly-day--disabled cursor-bottom" 
-                 @onclick="() => HandleClickOutsideCurrentMonthClick(1)"></div>
+                 @onclick="() => HandleClickOutsideCurrentMonthClick(1)">
+            </div>
         }
     }
 
@@ -110,7 +112,7 @@
         }
 
         string? classPosition;
-        string taskContent = "";  
+        string taskContent = string.Empty;  
         string? taskComment = null;   
         bool onmMultiLine = false;  
         bool draggable = false;
@@ -226,7 +228,7 @@
                         y = (Start.Day + OffsetCell - 1) / 7 + 2;
                         s = (int)(End.Date - Start.Date).TotalDays + 1;
 
-                        borderClass = "";
+                        borderClass = string.Empty;
                     }
 
                 } while ( onmMultiLine );

diff --git a/BlazorCalendar/MonthlyView.razor.cs b/BlazorCalendar/MonthlyView.razor.cs
@@ -172,19 +172,4 @@ private async Task HandleDayOnDrop(DateTime day)
         TaskDragged = null;
     }
 
-    private string GetBackground(DateTime day)
-    {
-        int d = (int)day.DayOfWeek;
-
-        if (d == 6)
-        {
-            return $"background:{SaturdayColor}";
-        }
-        else if (d == 0)
-        {
-            return $"background:{SundayColor}";
-        }
-
-        return $"background:{WeekDaysColor}";
-    }
 }
diff --git a/BlazorCalendar/MonthlyView.razor.css b/BlazorCalendar/MonthlyView.razor.css
@@ -74,8 +74,8 @@
     }
 
 .monthly-day--disabled {
-    color: rgba(#98a0a6, 0.6);
-    background-color: #ffffff;
+    /*color: rgba(#98a0a6, 0.6);
+    background-color: #ffffff;*/
     background-image: url("data:image/svg+xml,%3Csvg width='40' height='40' viewBox='0 0 40 40' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23f4f6f7' fill-opacity='1' fill-rule='evenodd'%3E%3Cpath d='M0 40L40 0H20L0 20M40 40V20L20 40'/%3E%3C/g%3E%3C/svg%3E");
 }
 
@@ -98,7 +98,6 @@
     height: 2vh;
 }
 
-
 @media (max-width: 767.98px) {
     .monthly-task {
         padding: 0px 8px 0px 4px;
@@ -131,4 +130,4 @@
     color: darkblue;
     align-self: end;
     margin-left: 10px;
-}
+}
diff --git a/BlazorCalendar/WeekView.razor b/BlazorCalendar/WeekView.razor
@@ -5,14 +5,14 @@
 @inherits CalendarBase
 
 @{
-    DateTime FirstDateWeek = new DateTime(FirstDate.Year, FirstDate.Month, FirstDate.Day).AddDays(-(Dates.GetNumOfDay((int)FirstDate.Date.DayOfWeek) - 2));
+    DateTime firstDateWeek = FirstDate.AddDays(-(int)(FirstDate.DayOfWeek - System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek + 7) % 7);
+
     string[] dayNames = CultureInfo.CurrentCulture.DateTimeFormat.AbbreviatedDayNames;
     string? isHidden = DisplayedView == DisplayedView.Weekly ? null : "hidden-element";
-    string? CSSbackground = null;
-    string? taskColor = null;
-    string? classPin = null;
-    string? classPointer = null;
-    string borderStyle = "";
+    string? CSSbackground;
+    string? taskColor;
+    string? classPin;
+    string? classPointer;
 
     // The sorting must be done each time we redraw in case the user moves the spots
     if (TasksList is not null)
@@ -28,13 +28,12 @@
     @for (var i = 0; i < 7; i++)
     {
         int d = Dates.GetNumOfDay(i);
-        DateTime day = FirstDateWeek.AddDays(i);
+        DateTime day = firstDateWeek.AddDays(i);
 
         <div class="day-column" style="grid-column-start: @(i+1)">
 
             <div class="day-header header-name noselect" style="@HeaderStyle">
                 @dayNames[d] @day.ToString("dd.MM")
-
             </div>
 
             <div class="hours">
@@ -62,7 +61,6 @@
                         {
                             Tasks t = TasksList[k];
 
-
                             if (t.DateEnd > hours && t.DateStart <= hours)
                             {
                                 column++;
@@ -89,7 +87,5 @@
             </div>
 
         </div>
-
     }
-
 </div>
diff --git a/BlazorCalendar/WeekView.razor.cs b/BlazorCalendar/WeekView.razor.cs
@@ -1,9 +1,9 @@
-namespace BlazorCalendar;
-
-using BlazorCalendar.Models;
+using BlazorCalendar.Models;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
+namespace BlazorCalendar;
+
 partial class WeekView : CalendarBase
 {
     [CascadingParameter(Name = "SelectedView")]
@@ -86,22 +86,6 @@ private async Task HandleDayOnDrop(DateTime day)
         TaskDragged = null;
     }
 
-    private string GetBackground(DateTime day)
-    {
-        int d = (int)day.DayOfWeek;
-
-        if (d == 6)
-        {
-            return $"background:{SaturdayColor}";
-        }
-        else if (d == 0)
-        {
-            return $"background:{SundayColor}";
-        }
-
-        return $"background:{WeekDaysColor}";
-    }
-
     private async Task ClickDayInternal(MouseEventArgs e, DateTime day)
     {
         if (!DayClick.HasDelegate)
@@ -137,5 +121,4 @@ private async Task ClickTaskInternal(MouseEventArgs e, int taskID, DateTime day)
 
         await TaskClick.InvokeAsync(clickTaskParameter);
     }
-
 }
diff --git a/README.md b/README.md
@@ -36,7 +36,12 @@ https://github.com/tossnet/Blazor-Calendar/wiki
 
 ## <a name="ReleaseNotes"></a>Release Notes
 
-<details open="open"><summary>Version 2.7.0</summary>
+<details open="open"><summary>Version 2.7.1</summary>
+
+>- In the Weekview, the component did not correctly display the first day of the week according to Culture [Issue #24](https://github.com/tossnet/Blazor-Calendar/issues/24)
+</details>
+
+<details><summary>Version 2.7.0</summary>
 
 >- Add .NET9 and remove .NET6.0 
 </details>

diff --git a/samples/BlazorServer/Program.cs b/samples/BlazorServer/Program.cs
@@ -1,12 +1,16 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
+using System.Globalization;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
 
+CultureInfo.DefaultThreadCurrentCulture = CultureInfo.GetCultureInfo("en-US");
+CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo("en-US");
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

diff --git a/samples/BlazorWebAssembly/Program.cs b/samples/BlazorWebAssembly/Program.cs
@@ -1,6 +1,7 @@
 using BlazorWebAssembly;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using System.Globalization;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.RootComponents.Add<App>("#app");