From f178bc0bfebd7c23fb1523ddc08196da4e54d9cf Mon Sep 17 00:00:00 2001 From: Eugene Fox Date: Thu, 20 Jan 2022 15:00:30 +0300 Subject: [PATCH] Fixed semester determination for anonymous schedule --- GUT.Schedule/GUTSchedule/Parser.cs | 8 +++++--- changelogs/android/en-IN/changelogs/android-changelog.txt | 3 +-- changelogs/android/ru-RU/changelogs/android-changelog.txt | 3 +-- changelogs/github.md | 4 +--- changelogs/windows/en/baseListing/releaseNotes.txt | 2 +- changelogs/windows/ru/baseListing/releaseNotes.txt | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/GUT.Schedule/GUTSchedule/Parser.cs b/GUT.Schedule/GUTSchedule/Parser.cs index 35f2c36..c05d6f0 100644 --- a/GUT.Schedule/GUTSchedule/Parser.cs +++ b/GUT.Schedule/GUTSchedule/Parser.cs @@ -153,10 +153,12 @@ namespace GUTSchedule { DateTime now = DateTime.Today; - if (now.Month > 1 && now.Month < 9) - return $"205.{now.Year - 2001}{now.Year - 2000}/2"; + string semester = now.Month >= 8 || now.Month < 2 ? "1" : "2"; + + if (now.Month >= 8) + return $"205.{now.Year - 2000}{now.Year - 1999}/{semester}"; else - return $"205.{now.Year - 2000}{now.Year - 1999}/1"; + return $"205.{now.Year - 2001}{now.Year - 2000}/{semester}"; } private static DateTime[] GetDatesFromWeeks(DateTime date, int weekday, string[] weeks) diff --git a/changelogs/android/en-IN/changelogs/android-changelog.txt b/changelogs/android/en-IN/changelogs/android-changelog.txt index 993fdcb..7f5d1c7 100644 --- a/changelogs/android/en-IN/changelogs/android-changelog.txt +++ b/changelogs/android/en-IN/changelogs/android-changelog.txt @@ -1,2 +1 @@ -- Fixed SSL error -- Turned back on anonymous schedule export \ No newline at end of file +- Fixed semester determination for anonymous schedule \ No newline at end of file diff --git a/changelogs/android/ru-RU/changelogs/android-changelog.txt b/changelogs/android/ru-RU/changelogs/android-changelog.txt index 4bc87fc..c4c181f 100644 --- a/changelogs/android/ru-RU/changelogs/android-changelog.txt +++ b/changelogs/android/ru-RU/changelogs/android-changelog.txt @@ -1,2 +1 @@ -- Исправлена проблема с SSL сетрификатами -- Анонимный экспорт расписания снова работает \ No newline at end of file +- Исправлено определение текущего семестра для анонимного расписания \ No newline at end of file diff --git a/changelogs/github.md b/changelogs/github.md index f65e872..592158a 100644 --- a/changelogs/github.md +++ b/changelogs/github.md @@ -1,4 +1,2 @@ ## Core -- Anonymous schedule export is temporarly disabled -- Fixed export failing -- Remote lessons are now appropriately marked \ No newline at end of file +- Fixed semester determination for anonymous schedule \ No newline at end of file diff --git a/changelogs/windows/en/baseListing/releaseNotes.txt b/changelogs/windows/en/baseListing/releaseNotes.txt index be6e7dd..7f5d1c7 100644 --- a/changelogs/windows/en/baseListing/releaseNotes.txt +++ b/changelogs/windows/en/baseListing/releaseNotes.txt @@ -1 +1 @@ -- Turned back on anonymous schedule export \ No newline at end of file +- Fixed semester determination for anonymous schedule \ No newline at end of file diff --git a/changelogs/windows/ru/baseListing/releaseNotes.txt b/changelogs/windows/ru/baseListing/releaseNotes.txt index ea19c3b..c4c181f 100644 --- a/changelogs/windows/ru/baseListing/releaseNotes.txt +++ b/changelogs/windows/ru/baseListing/releaseNotes.txt @@ -1 +1 @@ -- Анонимный экспорт расписания снова работает \ No newline at end of file +- Исправлено определение текущего семестра для анонимного расписания \ No newline at end of file