Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kszkepzes-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KSZK
DevTeam
kszkepzes
old
kszkepzes-backend
Commits
28f508ea
Commit
28f508ea
authored
5 years ago
by
Rafael László
Browse files
Options
Downloads
Patches
Plain Diff
get summary of bits
parent
a9517512
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2
Dev
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/account/serializers.py
+0
-12
0 additions, 12 deletions
src/account/serializers.py
src/account/urls.py
+10
-2
10 additions, 2 deletions
src/account/urls.py
src/account/views.py
+10
-0
10 additions, 0 deletions
src/account/views.py
with
20 additions
and
14 deletions
src/account/serializers.py
+
0
−
12
View file @
28f508ea
...
@@ -127,31 +127,19 @@ class ProfileSerializer_Staff(serializers.ModelSerializer):
...
@@ -127,31 +127,19 @@ class ProfileSerializer_Staff(serializers.ModelSerializer):
class
MonitoringSerializer
(
serializers
.
ModelSerializer
):
class
MonitoringSerializer
(
serializers
.
ModelSerializer
):
full_name
=
serializers
.
SerializerMethodField
()
email
=
serializers
.
SerializerMethodField
()
bits
=
serializers
.
SerializerMethodField
()
bits
=
serializers
.
SerializerMethodField
()
class
Meta
:
class
Meta
:
model
=
models
.
Profile
model
=
models
.
Profile
read_only_fields
=
(
read_only_fields
=
(
'
id
'
,
'
id
'
,
'
full_name
'
,
'
email
'
,
'
bits
'
,
'
bits
'
,
)
)
fields
=
(
fields
=
(
'
id
'
,
'
id
'
,
'
full_name
'
,
'
email
'
,
'
bits
'
,
'
bits
'
,
)
)
def
get_full_name
(
self
,
obj
):
return
obj
.
full_name
def
get_email
(
self
,
obj
):
return
obj
.
user
.
email
def
get_bits
(
self
,
obj
):
def
get_bits
(
self
,
obj
):
if
obj
.
homework_bits
is
None
:
if
obj
.
homework_bits
is
None
:
return
obj
.
events_visited
return
obj
.
events_visited
...
...
This diff is collapsed.
Click to expand it.
src/account/urls.py
+
10
−
2
View file @
28f508ea
...
@@ -3,7 +3,15 @@ from . import views
...
@@ -3,7 +3,15 @@ from . import views
router
=
routers
.
DefaultRouter
()
router
=
routers
.
DefaultRouter
()
router
.
register
(
r
'
profiles
'
,
views
.
ProfileViewSet
,
base_name
=
'
profile
'
)
router
.
register
(
router
.
register
(
r
'
monitoring/profiles
'
,
views
.
MonitorinViewSet
,
base_name
=
'
monitoring
'
)
r
'
profiles
'
,
views
.
ProfileViewSet
,
base_name
=
'
profile
'
)
router
.
register
(
r
'
monitoring/profiles
'
,
views
.
MonitorinViewSet
,
base_name
=
'
monitoring
'
)
urlpatterns
=
router
.
urls
urlpatterns
=
router
.
urls
This diff is collapsed.
Click to expand it.
src/account/views.py
+
10
−
0
View file @
28f508ea
...
@@ -5,6 +5,8 @@ from rest_framework.decorators import action
...
@@ -5,6 +5,8 @@ from rest_framework.decorators import action
from
common.permissions
import
IsSafeOrPatch
from
common.permissions
import
IsSafeOrPatch
from
rest_framework_api_key.permissions
import
HasAPIKey
from
rest_framework_api_key.permissions
import
HasAPIKey
from
django.db.models
import
Sum
from
.
import
models
from
.
import
models
from
.
import
serializers
from
.
import
serializers
...
@@ -16,6 +18,14 @@ class MonitorinViewSet(viewsets.ModelViewSet):
...
@@ -16,6 +18,14 @@ class MonitorinViewSet(viewsets.ModelViewSet):
def
get_queryset
(
self
):
def
get_queryset
(
self
):
return
models
.
Profile
.
objects
.
filter
(
role
=
'
Student
'
)
return
models
.
Profile
.
objects
.
filter
(
role
=
'
Student
'
)
@action
(
detail
=
False
)
def
totalbits
(
self
,
request
):
profiles
=
models
.
Profile
.
objects
.
filter
(
role
=
'
Student
'
)
bits
=
map
(
lambda
item
:
serializers
.
MonitoringSerializer
(
item
).
data
[
'
bits
'
],
profiles
)
return
Response
({
'
sum
'
:
sum
(
bits
)
})
class
ProfileViewSet
(
viewsets
.
ModelViewSet
):
class
ProfileViewSet
(
viewsets
.
ModelViewSet
):
serializer_class
=
serializers
.
ProfileSerializer_User
serializer_class
=
serializers
.
ProfileSerializer_User
...
...
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