From 47477dc4065bf4724e9f0998aae1c50b0785c5f0 Mon Sep 17 00:00:00 2001 From: Eugene Fox Date: Mon, 6 Feb 2023 14:21:39 +0300 Subject: [PATCH] Revert "- Updated first week of the first semester start date" This reverts commit 423646eed53ac6f1db8bd225e0d2f2b13dc308e5. --- .../GUTSchedule.Droid/Activities/MainActivity.cs | 10 +++++----- .../GUTSchedule.Droid/Resources/layout/Main.xml | 8 +++----- .../GUTSchedule.Test/AnonymousScheduleUnitTest.cs | 6 +++--- .../android/en-IN/changelogs/android-changelog.txt | 5 +++-- .../android/ru-RU/changelogs/android-changelog.txt | 5 +++-- changelogs/github.md | 5 ++--- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs index e6d0c9a..e4dcbc3 100644 --- a/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs +++ b/GUT.Schedule/GUTSchedule.Droid/Activities/MainActivity.cs @@ -92,19 +92,19 @@ namespace GUTSchedule.Droid.Activities start.Text = startDate.ToShortDateString(); groupTitle.Checked = prefs.GetBoolean("AddGroupToHeader", false); - authorize.Checked = false; // prefs.GetBoolean("Authorize", true); + authorize.Checked = prefs.GetBoolean("Authorize", true); - //email.Text = prefs.GetString("email", ""); - //password.Text = prefs.GetString("password", ""); + email.Text = prefs.GetString("email", ""); + password.Text = prefs.GetString("password", ""); - /*try + try { AvailableOccupations = await Parser.CheckAvailableOccupations(email.Text, password.Text); } catch { AvailableOccupations = new List<(string, string)>(); - }*/ + } } private void Export_Click(object sender, EventArgs e) diff --git a/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml b/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml index d154ed8..56d8b1c 100644 --- a/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml +++ b/GUT.Schedule/GUTSchedule.Droid/Resources/layout/Main.xml @@ -32,7 +32,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:checked="true" - android:visibility="gone" android:text="@string/authorizeCheckbox"/> + android:visibility="gone"> + android:orientation="vertical"> - \ No newline at end of file + diff --git a/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs b/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs index 5fd3460..8ea7ed3 100644 --- a/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs +++ b/GUT.Schedule/GUTSchedule.Test/AnonymousScheduleUnitTest.cs @@ -69,8 +69,8 @@ namespace GUTSchedule.Test var list = await Parser.GetSchedule(new DefaultExportParameters { Course = "0", - FacultyId = "50005", - GroupId = "54222", + FacultyId = faculty.id, + GroupId = group.id, EndDate = DateTime.Today.AddDays(7), StartDate = DateTime.Today }); @@ -95,4 +95,4 @@ namespace GUTSchedule.Test } } } -} \ No newline at end of file +} diff --git a/changelogs/android/en-IN/changelogs/android-changelog.txt b/changelogs/android/en-IN/changelogs/android-changelog.txt index 914af6b..3a588e4 100644 --- a/changelogs/android/en-IN/changelogs/android-changelog.txt +++ b/changelogs/android/en-IN/changelogs/android-changelog.txt @@ -1,3 +1,4 @@ - Updated first week of the first semester start date for anonymous timetable export -- Disabled the ability to sign in with an account -This is a temporary measure as at the time this feature is blocked by DDoS protection software that was recently installed on the SPbSUT website +Since anonymous schedule on SPbSUT website is based on week numbers, it is crucial to manually set the date of first week's monday to get correct dates for the timetable +- Re-enabled the ability to sign in with an account +You can sign in with your SPbSUT profile to have access to correct timetable anytime diff --git a/changelogs/android/ru-RU/changelogs/android-changelog.txt b/changelogs/android/ru-RU/changelogs/android-changelog.txt index 2544422..470280c 100644 --- a/changelogs/android/ru-RU/changelogs/android-changelog.txt +++ b/changelogs/android/ru-RU/changelogs/android-changelog.txt @@ -1,3 +1,4 @@ - Обновлена дата начала первой недели семестра для анонимного экспорта расписания -- Отключена возможность входа с помощью аккаунта -Это временное решение, так как на данный момент данная функция заблокирована защитой от DDoS, которая была недавно установлена на сайте СПбГУТ +Так как анонимное расписание на сайте СПбГУТ представлено по номерам недели, перед началом каждого семестра необходимо вручную обновлять дату понедельника первой недели для корректного указания даты в расписании +- Вход с помощью аккаунта снова работает +Чтобы всегда иметь возможность узнать правильное расписание, пользуйтесь авторизацией через Личный кабинет diff --git a/changelogs/github.md b/changelogs/github.md index 5bbc588..cfff14b 100644 --- a/changelogs/github.md +++ b/changelogs/github.md @@ -2,9 +2,8 @@ - Updated first week of the first semester start date for anonymous timetable export Since anonymous schedule on SPbSUT website is based on week numbers, it is crucial to manually set the date of first week's monday to get correct dates for the timetable ## Android -- Updated target SDK to 31 (Android 12) -- Disabled the ability to sign in with an account -This is a temporary measure as at the time this feature is blocked by DDoS protection software that was recently installed on the SPbSUT website. We are working on a solution to this problem +- Re-activated account sign in +Note: this feature at the time might be unstable. If you have any issues with it, use anonymous export instead ## Windows At this time UWP version of the app is not being supported