Skip to content

Update TimeTool.cs #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update TimeTool.cs #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions TimePeriod/TimeTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ public static DateTime GetStartOfYearWeek( int year, int weekOfYear, CultureInfo
int currentYear;
int currentWeek;
GetWeekOfYear( dateTime, culture, weekRule, firstDayOfWeek, yearWeekType, out currentYear, out currentWeek );


// get last week day of the week
DayOfWeek lastDayOfWeek = (DayOfWeek)(((int)firstDayOfWeek + TimeSpec.DaysPerWeek - 1) % TimeSpec.DaysPerWeek);

// end date of week
while ( currentWeek != weekOfYear )
Expand All @@ -358,8 +360,8 @@ public static DateTime GetStartOfYearWeek( int year, int weekOfYear, CultureInfo
GetWeekOfYear( dateTime, culture, weekRule, firstDayOfWeek, yearWeekType, out currentYear, out currentWeek );
}

// end of previous week
while ( currentWeek == weekOfYear )
// end of previous week => keep on going until got last week day
while (currentWeek == weekOfYear || dateTime.DayOfWeek != lastDayOfWeek)
{
dateTime = dateTime.AddDays( -1 );
GetWeekOfYear( dateTime, culture, weekRule, firstDayOfWeek, yearWeekType, out currentYear, out currentWeek );
Expand Down