Skip to content
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

Jump to bottom

[UPDATE] Change some design #245

Closed
wants to merge 1 commit into from
Closed

[UPDATE] Change some design #245

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions source/EduCATS/Localization/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"contributor_julia_popova": "Julia Popova",

"role_student": "Student",
"role_professor": "Professor",
"role_professor": "Lecturer",

"address_building": "b.",
"address_room": "а.",

"type_activity_lecture": "Lecture",
"type_activity_lab": "Lab work",
"type_activity_practical": "Practical work",
"type_activity_lab": "Lab",
"type_activity_practical": "Workshop",

"server_test": "Test server",
"server_local": "Local server",
Expand Down Expand Up @@ -84,7 +84,7 @@
"lectures_fetch_error": "Error occurred during retrieving lectures. Please try to refresh page or contact support.",

"learning_card_tests": "Tests",
"learning_card_eemc": "EEMC",
"learning_card_eemc": "Educational Complex",
"learning_card_files": "Files",
"learning_card_adaptive": "Adaptive learning",

Expand Down Expand Up @@ -213,7 +213,7 @@
"empty_fields_forgot_password": "Required fields (Login, Specific question, Answer, New Password, Confirm Password) must be filled!",

"set_marks": "Set marks",
"set_visiting": "Put up gaps",
"set_visiting": "Mark attendance",

"save_marks": "Save",
"practiсe_visiting": "Practiсe visiting",
Expand All @@ -226,7 +226,7 @@
"show_for_student": "Show for student",
"skipped_hours": "Skipped hours",

"demo_eemc_open_error": "Viewing EEMC documents is not available for a demo account.",
"demo_eemc_open_error": "Viewing Educational Complex documents is not available for a demo account.",
"demo_files_download_error": "Downloading tutorials is not available for a demo account.",
"demo_delete_account_error": "Deleting a demo account is not possible."
}
7 changes: 4 additions & 3 deletions source/EduCATS/Localization/lt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
"address_building": "p.",
"address_room": "a.",

"type_activity_lecture": "Lezione",
"type_activity_lab": "Lavoro di laboratorio",
"type_activity_practical": "Lavoro pratico",
"type_activity_lecture": "Paskaita",

"type_activity_lab": "Laboratoriniai darbai",
"type_activity_practical": "Praktinė pamoka",

"server_test": "Testavimo serveris",
"server_local": "Vietinis serveris",
Expand Down
2 changes: 2 additions & 0 deletions source/EduCATS/Localization/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"type_activity_lecture": "Лекция",
"type_activity_lab": "Лаб. работа",
"type_activity_practical": "Практ. занятие",
"type_activity_kconsultation": "КП",
"type_activity_dconsultation": "ДП",

"server_test": "Тестовый сервер",
"server_local": "Локальный сервер",
Expand Down
2 changes: 2 additions & 0 deletions source/EduCATS/Pages/SaveLabsAndPracticeMarks/ViewModels/SavePracticeAndLabsPageView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ void createLabsMarks()
Style = AppStyles.GetLabelStyle(),
Font = Font.SystemFontOfSize(NamedSize.Large),
Text = CrossLocalization.Translate("choose_group") + " " + _groupName,
HorizontalOptions = LayoutOptions.Center,
};

var stackLayout = new StackLayout();
Expand Down Expand Up @@ -136,6 +137,7 @@ Picker subGroupPicker()
var subGroupPicker = new Picker
{
BackgroundColor = Color.White,
HeightRequest = 70,
};
subGroupPicker.SetBinding(Picker.ItemsSourceProperty, "SubGroup");
subGroupPicker.SetBinding(Picker.SelectedItemProperty, new Binding("SelectedSubGroup"));
Expand Down
20 changes: 2 additions & 18 deletions source/EduCATS/Pages/SaveLabsAndPracticeMarks/Views/SaveSingleStudentMarkPageView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class SaveSingleStudentMarkPageView : ContentPage
const double _heightRequest = 40;

static Thickness _padding = new Thickness(10, 1);
static Thickness _margin = new Thickness(0, 10);
public List<int> Marks = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
public List<string> NameOfLabOrPractice = new List<string>();
public string _title { get; set; }
Expand Down Expand Up @@ -57,11 +56,10 @@ public SaveSingleStudentMarkPageView(string title, string name, LabsVisitingList
var inicials = new Label
{
VerticalOptions = LayoutOptions.CenterAndExpand,
Margin = _margin,
HorizontalOptions = LayoutOptions.CenterAndExpand,
TextColor = Color.FromHex(Theme.Current.StatisticsDetailsTitleColor),
Style = AppStyles.GetLabelStyle(),
Font = Font.SystemFontOfSize(NamedSize.Large).WithSize(20).WithAttributes(FontAttributes.None),
Font = Font.SystemFontOfSize(NamedSize.Large).WithSize(20).WithAttributes(FontAttributes.Bold),
Text = name,
};

Expand Down Expand Up @@ -99,7 +97,7 @@ public SaveSingleStudentMarkPageView(string title, string name, LabsVisitingList
Style = AppStyles.GetLabelStyle(),
Text = CrossLocalization.Translate("comment"),
};

var showCommentLabel = new Label
{
VerticalOptions = LayoutOptions.CenterAndExpand,
Expand Down Expand Up @@ -144,20 +142,6 @@ public SaveSingleStudentMarkPageView(string title, string name, LabsVisitingList

commentEntry.SetBinding(Entry.TextProperty, "Comment");

nameOfPrOrLb.PropertyChanged += delegate {
if (nameOfPrOrLb.SelectedItem is not null)
if (marks.Students.First(student => student.FullName == name).LabsMarks.First(labmarks => labmarks.LabId == prOrLabStat.Labs.First(lab => lab.ShortName == nameOfPrOrLb.SelectedItem as string).LabId).Mark != string.Empty)
{
markPicker.SelectedIndex = Convert.ToInt32(marks.Students.First(student => student.FullName == name).LabsMarks.First(labmarks => labmarks.LabId == prOrLabStat.Labs.First(lab => lab.ShortName == nameOfPrOrLb.SelectedItem as string).LabId).Mark) - 1;
commentEntry.Text = marks.Students.First(student => student.FullName == name).LabsMarks.First(labmarks => labmarks.LabId == prOrLabStat.Labs.First(lab => lab.ShortName == nameOfPrOrLb.SelectedItem as string).LabId).Comment;
}
else
{
markPicker.SelectedItem = null;
commentEntry.Text = string.Empty;
}
};

var gridLayout = new Grid
{
BackgroundColor = Color.FromHex(Theme.Current.BaseBlockColor),
Expand Down
2 changes: 1 addition & 1 deletion source/EduCATS/Pages/SaveMarks/SavePractSingle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace EduCATS.Pages.SaveMarks
{
public class SavePractSingle
{
[JsonProperty("Comment")]
[JsonProperty("comment")]
public string Comment { get; set; }
public string date { get; set; }
public int id { get; set; }
Expand Down
1 change: 1 addition & 0 deletions source/EduCATS/Pages/SaveMarks/Views/SaveMarksPageView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ void createView()
Style = AppStyles.GetLabelStyle(),
Font = Font.SystemFontOfSize(NamedSize.Large),
Text = CrossLocalization.Translate("choose_group") + " " + _groupName,
HorizontalOptions = LayoutOptions.Center,
};
var stackLayout = new StackLayout();
var resultsListView = new RoundedListView(typeof(VisitingPageViewCell));
Expand Down
Loading
Loading