Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
StudiApp
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OST
SEProj
StudiApp
Commits
87bab76b
Commit
87bab76b
authored
2 years ago
by
Lukas Domeisen
Browse files
Options
Downloads
Patches
Plain Diff
fixed test
parent
8fcaf292
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!17
Implement Marks Module
Pipeline
#2616
passed with stages
in 25 minutes and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
StudiApp/StudiApp.Test.Unit/ViewModelsTests/MarksOverviewViewModelTest.cs
+1
-3
1 addition, 3 deletions
...p.Test.Unit/ViewModelsTests/MarksOverviewViewModelTest.cs
StudiApp/StudiApp/ViewModels/MarksOverviewViewModel.cs
+11
-16
11 additions, 16 deletions
StudiApp/StudiApp/ViewModels/MarksOverviewViewModel.cs
with
12 additions
and
19 deletions
StudiApp/StudiApp.Test.Unit/ViewModelsTests/MarksOverviewViewModelTest.cs
+
1
−
3
View file @
87bab76b
...
...
@@ -73,10 +73,8 @@ public class MarksOverviewViewModelTest
[
Test
]
public
void
OnSelectedSemesterChangedTest
()
{
Thread
.
Sleep
(
1000
);
// wait for ContinueWith to finish in constructor (better alternative?)
vm
.
SelectedSemester
=
semester2
;
Thread
.
Sleep
(
1000
);
// wait for ContinueWith to finish in LoadSemesterOverview (better alternative?)
var
actualId
=
vm
.
Marks
[
0
].
Id
;
var
expectedId
=
semester2Marks
[
0
].
Id
;
Assert
.
That
(
actualId
,
Is
.
EqualTo
(
expectedId
));
...
...
This diff is collapsed.
Click to expand it.
StudiApp/StudiApp/ViewModels/MarksOverviewViewModel.cs
+
11
−
16
View file @
87bab76b
...
...
@@ -56,29 +56,24 @@ public partial class MarksOverviewViewModel : ObservableObject
LoadSemesterOverview
();
}
private
void
InitializeSemesterData
()
private
async
void
InitializeSemesterData
()
{
//CreateMockData(); // TODO: remove this when not needed anymore
_semesterRepository
.
GetAll
().
ContinueWith
(
t
=>
{
Semesters
=
new
ObservableCollection
<
Semester
>(
t
.
Result
);
SelectedSemester
=
Semesters
[
0
];
// TODO: get actual current semester
});
var
result
=
await
_semesterRepository
.
GetAll
();
Semesters
=
new
ObservableCollection
<
Semester
>(
result
);
SelectedSemester
=
Semesters
[
0
];
// TODO: get actual current
}
private
void
LoadSemesterOverview
()
private
async
void
LoadSemesterOverview
()
{
// TODO: if SelectedSemester is null, show text 'Select a semester'
var
result
=
await
_courseRepository
.
GetAll
();
var
semesterCourses
=
result
.
Where
(
c
=>
c
.
SemesterId
==
SelectedSemester
.
Id
).
ToList
();
var
semesterMarks
=
GetMarksFromCourses
(
semesterCourses
);
_courseRepository
.
GetAll
().
ContinueWith
(
t
=>
{
var
semesterCourses
=
t
.
Result
.
Where
(
c
=>
c
.
SemesterId
==
SelectedSemester
.
Id
).
ToList
();
var
semesterMarks
=
GetMarksFromCourses
(
semesterCourses
);
Marks
=
new
ObservableCollection
<
Mark
>(
semesterMarks
);
SemesterEcts
=
GetObtainedEcts
(
semesterCourses
);
SemesterAverageMark
=
AverageMarkConverter
.
MarksToAverage
(
semesterMarks
);
});
Marks
=
new
ObservableCollection
<
Mark
>(
semesterMarks
);
SemesterEcts
=
GetObtainedEcts
(
semesterCourses
);
SemesterAverageMark
=
AverageMarkConverter
.
MarksToAverage
(
semesterMarks
);
}
private
void
LoadTotalOverview
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment