Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ClientServer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
YAPEX
ClientServer
Commits
acffb812
Commit
acffb812
authored
5 years ago
by
Janis Daniel Dähne
Browse files
Options
Downloads
Patches
Plain Diff
- enabled release controll get releases for execises sorting by automaticEndAt and releasedAt
parent
5f009dee
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ClientServer/Config/Constants.cs
+1
-1
1 addition, 1 deletion
src/ClientServer/Config/Constants.cs
src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs
+24
-11
24 additions, 11 deletions
...entServer/Controllers/Core/Exercises/ReleaseController.cs
with
25 additions
and
12 deletions
src/ClientServer/Config/Constants.cs
+
1
−
1
View file @
acffb812
...
...
@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
/// </summary>
public
static
class
Constants
{
public
static
string
VersionString
=
"2.6.
1
"
;
public
static
string
VersionString
=
"2.6.
2
"
;
/// <summary>
/// this is only set once at program.cs!!
...
...
This diff is collapsed.
Click to expand it.
src/ClientServer/Controllers/Core/Exercises/ReleaseController.cs
+
24
−
11
View file @
acffb812
...
...
@@ -870,6 +870,19 @@ namespace ClientServer.Controllers.Core.Exercises
string
orderByProp
=
""
;
Expression
<
Func
<
ExerciseRelease
,
object
>>
orderByFunc
=
null
;
//when we want to sort nulls first/last
//see https://stackoverflow.com/questions/2814742/how-to-order-by-column-with-null-values-last-in-entity-framework
//so we just do
/*
var result = context.Users.OrderBy(u => u.LastName == null)
.ThenBy(u => u.LastName)
.ThenBy(u => u.FirstName == null)
.ThenBy(u => u.FirstName);
//works because false sorts before true
*/
//but performance...?
//not all props are sortable via the frontend
if
(
String
.
IsNullOrWhiteSpace
(
pagination
.
OrderByProp
)
==
false
)
{
...
...
@@ -883,11 +896,11 @@ namespace ClientServer.Controllers.Core.Exercises
orderByFunc
=
p
=>
p
.
IsReleased
;
orderByProp
=
"IsReleased"
.
ToLower
();
}
//
else if (pagination.OrderByProp.ToLower() == "ReleasedAt".ToLower())
//
{
//
orderByFunc = p => p.ReleasedAt;
//
orderByProp = "ReleasedAt".ToLower();
//
}
else
if
(
pagination
.
OrderByProp
.
ToLower
()
==
"ReleasedAt"
.
ToLower
())
{
orderByFunc
=
p
=>
p
.
ReleasedAt
;
orderByProp
=
"ReleasedAt"
.
ToLower
();
}
else
if
(
pagination
.
OrderByProp
.
ToLower
()
==
"IsOnlyVisibleToMe"
.
ToLower
())
{
orderByFunc
=
p
=>
p
;
...
...
@@ -898,11 +911,11 @@ namespace ClientServer.Controllers.Core.Exercises
orderByFunc
=
p
=>
p
.
IsVisibleToAllAfterRelease
;
orderByProp
=
"IsVisibleToAllAfterRelease"
.
ToLower
();
}
//
else if (pagination.OrderByProp.ToLower() == "AutomaticEndAt".ToLower())
//
{
//
orderByFunc = p => p.AutomaticEndAt;
//
orderByProp = "AutomaticEndAt".ToLower();
//
}
else
if
(
pagination
.
OrderByProp
.
ToLower
()
==
"AutomaticEndAt"
.
ToLower
())
{
orderByFunc
=
p
=>
p
.
AutomaticEndAt
;
orderByProp
=
"AutomaticEndAt"
.
ToLower
();
}
else
if
(
pagination
.
OrderByProp
.
ToLower
()
==
"solutionsCount"
.
ToLower
())
{
orderByFunc
=
p
=>
p
.
ExerciseReleaseWithUserAsParticipations
.
Count
;
...
...
@@ -928,7 +941,7 @@ namespace ClientServer.Controllers.Core.Exercises
GeneratedCode
=
p
.
GeneratedCode
,
//TODO PERFORMANCE does this really slows down performance??... this needs to be executed in the memory (i think so)
//if no performance impact enable this and remove the loop below
//
AutomaticStartAt = DateTimeHelper.SetKind(p.AutomaticStartAt, DateTimeKind.Unspecified),
//
AutomaticStartAt = DateTimeHelper.SetKind(p.AutomaticStartAt, DateTimeKind.Unspecified),
//AutomaticEndAt = DateTimeHelper.SetKind(p.AutomaticEndAt, DateTimeKind.Unspecified),
//ReleasedAt = DateTimeHelper.SetKind(p.ReleasedAt, DateTimeKind.Unspecified),
AutomaticStartAt
=
p
.
AutomaticStartAt
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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