Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
arsnova-click-v2-backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
ARSnova
arsnova-click-v2-backend
Commits
f31d7612
Commit
f31d7612
authored
Nov 17, 2019
by
Christopher Mark Fullarton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes initializing the groups
parent
410b9c93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
src/db/MemberDAO.ts
src/db/MemberDAO.ts
+2
-7
src/routers/rest/QuizRouter.ts
src/routers/rest/QuizRouter.ts
+4
-2
No files found.
src/db/MemberDAO.ts
View file @
f31d7612
...
...
@@ -97,16 +97,11 @@ class MemberDAO extends AbstractDAO<Array<MemberEntity>> {
DbDAO
.
deleteMany
(
DbCollection
.
Members
,
{
currentQuizName
:
removedQuiz
.
name
});
}
public
getMemberAmountPerQuizGroup
(
name
:
string
):
object
{
public
getMemberAmountPerQuizGroup
(
name
:
string
,
groups
:
Array
<
string
>
):
object
{
const
result
=
{};
groups
.
forEach
(
g
=>
result
[
g
]
=
0
);
this
.
getMembersOfQuiz
(
name
).
forEach
(
member
=>
{
const
targetResult
=
result
[
member
.
groupName
];
if
(
!
targetResult
)
{
result
[
member
.
groupName
]
=
1
;
return
;
}
result
[
member
.
groupName
]
++
;
});
...
...
src/routers/rest/QuizRouter.ts
View file @
f31d7612
...
...
@@ -699,8 +699,10 @@ export class QuizRouter extends AbstractRouter {
let
groupName
=
'
Default
'
;
if
(
activeQuiz
.
sessionConfig
.
nicks
.
memberGroups
.
length
>
1
)
{
const
memberGroupLoad
=
MemberDAO
.
getMemberAmountPerQuizGroup
(
activeQuiz
.
name
);
groupName
=
Object
.
entries
(
memberGroupLoad
).
sort
((
a
,
b
)
=>
a
[
1
]
-
b
[
1
])[
0
][
0
];
const
memberGroupLoad
=
MemberDAO
.
getMemberAmountPerQuizGroup
(
activeQuiz
.
name
,
activeQuiz
.
sessionConfig
.
nicks
.
memberGroups
);
if
(
memberGroupLoad
)
{
groupName
=
Object
.
entries
(
memberGroupLoad
).
sort
((
a
,
b
)
=>
a
[
1
]
-
b
[
1
])[
0
][
0
];
}
}
return
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment