Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,32 @@ void LessonsServiceOnPostMainTimerTicked(object? sender,EventArgs e) {
int GetWeekInSemester(DateTime? current = null) {
current ??= _exactTimeService.GetCurrentLocalDateTime();
DateTime orientation = (DateTime)((dynamic)AppBase.Current).Settings.SingleWeekStartTime;
int oriWeek = orientation.DayOfWeek == DayOfWeek.Sunday ? 6 : Convert.ToInt32(orientation.DayOfWeek) - 1;

//regulate
DateTime startMonday = orientation.AddDays(-oriWeek);
int lastDelta = current.Value.DayOfWeek != DayOfWeek.Sunday ? 7 - Convert.ToInt32(current.Value.DayOfWeek) : 0;
DateTime lastEnd = current.Value.AddDays(lastDelta);
// 计算学期开始时间所在周的第一天(根据配置)
DayOfWeek firstDayOfWeek = ConvertToDayOfWeek(Settings.FirstDayOfWeek);

TimeSpan totalWeekDelta = lastEnd - startMonday;
// 计算从学期开始日期到本周第一天的天数差
int daysToStartOfWeek = ((int)orientation.DayOfWeek - (int)firstDayOfWeek + 7) % 7;
DateTime startDay = orientation.AddDays(-daysToStartOfWeek);

// 计算当前日期所在周的最后一天
int daysToEndOfWeek = ((int)firstDayOfWeek - (int)current.Value.DayOfWeek + 6) % 7;
DateTime lastEnd = current.Value.AddDays(daysToEndOfWeek);

TimeSpan totalWeekDelta = lastEnd - startDay;
return Convert.ToInt32(totalWeekDelta.Days + 1) / 7;
}

DayOfWeek ConvertToDayOfWeek(FirstDayOfWeek firstDayOfWeek) {
return firstDayOfWeek switch {
FirstDayOfWeek.Sunday => DayOfWeek.Sunday,
FirstDayOfWeek.Monday => DayOfWeek.Monday,
FirstDayOfWeek.Tuesday => DayOfWeek.Tuesday,
FirstDayOfWeek.Wednesday => DayOfWeek.Wednesday,
FirstDayOfWeek.Thursday => DayOfWeek.Thursday,
FirstDayOfWeek.Friday => DayOfWeek.Friday,
FirstDayOfWeek.Saturday => DayOfWeek.Saturday,
_ => DayOfWeek.Sunday
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,31 @@ public partial class ProfileInformationConfig : ObservableObject {

[ObservableProperty]
bool _isShortModeEnabled;

[ObservableProperty]
FirstDayOfWeek _firstDayOfWeek = FirstDayOfWeek.Sunday;
}

public enum ProfileInformationType {
[Description("周数")]
WeekOfSemester,
[Description("单双周")]
ParityOfWeek
}

public enum FirstDayOfWeek {
[Description("周日")]
Sunday,
[Description("周一")]
Monday,
[Description("周二")]
Tuesday,
[Description("周三")]
Wednesday,
[Description("周四")]
Thursday,
[Description("周五")]
Friday,
[Description("周六")]
Saturday
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@
<ToggleSwitch IsChecked="{Binding Settings.IsShortModeEnabled, Mode=TwoWay}"/>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
<controls:SettingsExpander IconSource="{ci:FluentIconSource &#xE787;}"
Header="每周第一天"
Description="设置每周的第一天是周几">
<controls:SettingsExpander.Footer>
<ComboBox
MinWidth="20"
SelectedItem="{Binding Settings.FirstDayOfWeek, Mode=TwoWay}"
ItemsSource="{Binding FirstDayOfWeekOptions}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Converter={StaticResource EnumDescriptionConverter}}" />
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可考虑直接使用周内日期enum转为string的值转换器

</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:SettingsExpander.Footer>
</controls:SettingsExpander>
<Label HorizontalAlignment="Center"
Foreground="{DynamicResource MaterialDesignBodyLight}">
Added by ExtraIsland
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,14 @@ public ProfileInformationSettings() {
ProfileInformationType.WeekOfSemester,
ProfileInformationType.ParityOfWeek
];

public List<FirstDayOfWeek> FirstDayOfWeekOptions { get; } = [
FirstDayOfWeek.Sunday,
FirstDayOfWeek.Monday,
FirstDayOfWeek.Tuesday,
FirstDayOfWeek.Wednesday,
FirstDayOfWeek.Thursday,
FirstDayOfWeek.Friday,
FirstDayOfWeek.Saturday
];
}