Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bwinf
medal
Commits
7e85d3fe
Commit
7e85d3fe
authored
Mar 23, 2021
by
Robert Czechowski
Browse files
Show grade of user in admin view (fixes
#132
)
parent
6f86aa72
Pipeline
#1178
failed with stages
in 3 minutes and 56 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/core.rs
View file @
7e85d3fe
...
@@ -1325,6 +1325,14 @@ pub fn admin_show_user<T: MedalConnection>(conn: &T, user_id: i32, session_token
...
@@ -1325,6 +1325,14 @@ pub fn admin_show_user<T: MedalConnection>(conn: &T, user_id: i32, session_token
fill_user_data
(
&
user
,
&
mut
data
);
fill_user_data
(
&
user
,
&
mut
data
);
data
.insert
(
"logincode"
.to_string
(),
to_json
(
&
user
.logincode
));
data
.insert
(
"logincode"
.to_string
(),
to_json
(
&
user
.logincode
));
data
.insert
(
"userid"
.to_string
(),
to_json
(
&
user
.id
));
data
.insert
(
"userid"
.to_string
(),
to_json
(
&
user
.id
));
let
grade
=
if
user
.grade
>=
200
{
format!
(
"Kein Schüler mehr"
)
}
else
if
user
.grade
>=
11
{
format!
(
"{} ({})"
,
user
.grade
%
100
,
if
user
.grade
>=
100
{
"G9"
}
else
{
"G8"
})
}
else
{
format!
(
"{}"
,
user
.grade
)
};
data
.insert
(
"grade"
.to_string
(),
to_json
(
&
grade
));
data
.insert
(
"oauthid"
.to_string
(),
to_json
(
&
user
.oauth_foreign_id
));
data
.insert
(
"oauthid"
.to_string
(),
to_json
(
&
user
.oauth_foreign_id
));
data
.insert
(
"oauthprovider"
.to_string
(),
to_json
(
&
user
.oauth_provider
));
data
.insert
(
"oauthprovider"
.to_string
(),
to_json
(
&
user
.oauth_provider
));
...
...
templates/default/admin_user.hbs
View file @
7e85d3fe
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
<strong>
Id:
{{
userid
}}
</strong><br>
<strong>
Id:
{{
userid
}}
</strong><br>
Vorname:
{{
firstname
}}
<br>
Vorname:
{{
firstname
}}
<br>
Nachname:
{{
lastname
}}
<br>
Nachname:
{{
lastname
}}
<br>
Jahrgangsstufe:
{{
grade
}}
<br>
{{#if
username
}}
Benutzername:
{{
username
}}
<br>
{{/if}}
{{#if
username
}}
Benutzername:
{{
username
}}
<br>
{{/if}}
{{#if
logincode
}}
Logincode:
{{
logincode
}}
<br>
{{/if}}
{{#if
logincode
}}
Logincode:
{{
logincode
}}
<br>
{{/if}}
{{#if
oauthid
}}
OAuth-Login:
{{
oauthprovider
}}
(
{{
oauthprovider
}}
-id:
{{
oauthid
}}
)
<br>
{{/if}}
{{#if
oauthid
}}
OAuth-Login:
{{
oauthprovider
}}
(
{{
oauthprovider
}}
-id:
{{
oauthid
}}
)
<br>
{{/if}}
...
...
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