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
6b4ff46f
Commit
6b4ff46f
authored
6 years ago
by
Bodor Máté
Browse files
Options
Downloads
Patches
Plain Diff
Change event visitors filed
parent
1c602ae8
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/stats/migrations/0005_auto_20190114_1713.py
+30
-0
30 additions, 0 deletions
src/stats/migrations/0005_auto_20190114_1713.py
src/stats/models.py
+19
-3
19 additions, 3 deletions
src/stats/models.py
src/stats/serializers.py
+4
-1
4 additions, 1 deletion
src/stats/serializers.py
with
53 additions
and
4 deletions
src/stats/migrations/0005_auto_20190114_1713.py
0 → 100644
+
30
−
0
View file @
6b4ff46f
# Generated by Django 2.0.1 on 2019-01-14 16:13
import
common.middleware
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
stats
'
,
'
0004_auto_20190113_1239
'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'
event
'
,
name
=
'
created_by
'
,
field
=
models
.
ForeignKey
(
default
=
common
.
middleware
.
CurrentUserMiddleware
.
get_current_user_profile
,
on_delete
=
django
.
db
.
models
.
deletion
.
DO_NOTHING
,
related_name
=
'
created_event
'
,
to
=
'
account.Profile
'
),
),
migrations
.
AlterField
(
model_name
=
'
event
'
,
name
=
'
visitors
'
,
field
=
models
.
ManyToManyField
(
blank
=
True
,
null
=
True
,
related_name
=
'
events
'
,
to
=
'
account.Profile
'
),
),
migrations
.
AlterField
(
model_name
=
'
note
'
,
name
=
'
created_by
'
,
field
=
models
.
ForeignKey
(
default
=
common
.
middleware
.
CurrentUserMiddleware
.
get_current_user_profile
,
on_delete
=
django
.
db
.
models
.
deletion
.
DO_NOTHING
,
related_name
=
'
created_notes
'
,
to
=
'
account.Profile
'
),
),
]
This diff is collapsed.
Click to expand it.
src/stats/models.py
+
19
−
3
View file @
6b4ff46f
from
django.db
import
models
from
django.db
import
models
from
account.models
import
Profile
from
account.models
import
Profile
from
common.middleware
import
CurrentUserMiddleware
from
django.utils
import
timezone
from
django.utils
import
timezone
from
django.core.exceptions
import
ValidationError
from
django.core.exceptions
import
ValidationError
...
@@ -7,8 +8,18 @@ from django.core.exceptions import ValidationError
...
@@ -7,8 +8,18 @@ from django.core.exceptions import ValidationError
class
Event
(
models
.
Model
):
class
Event
(
models
.
Model
):
name
=
models
.
CharField
(
max_length
=
255
)
name
=
models
.
CharField
(
max_length
=
255
)
date
=
models
.
DateTimeField
(
null
=
False
)
date
=
models
.
DateTimeField
(
null
=
False
)
visitors
=
models
.
ManyToManyField
(
Profile
,
related_name
=
'
visitor
'
)
visitors
=
models
.
ManyToManyField
(
created_by
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
created_event
'
,
on_delete
=
models
.
DO_NOTHING
)
Profile
,
related_name
=
'
events
'
,
blank
=
True
,
null
=
True
,
)
created_by
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
created_event
'
,
on_delete
=
models
.
DO_NOTHING
,
default
=
CurrentUserMiddleware
.
get_current_user_profile
,
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
,
editable
=
False
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
,
editable
=
False
)
updated_at
=
models
.
DateTimeField
(
auto_now
=
True
,
editable
=
False
)
updated_at
=
models
.
DateTimeField
(
auto_now
=
True
,
editable
=
False
)
...
@@ -20,7 +31,12 @@ class Note(models.Model):
...
@@ -20,7 +31,12 @@ class Note(models.Model):
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'
notes
'
,
on_delete
=
models
.
CASCADE
,
blank
=
True
,
null
=
True
,)
event
=
models
.
ForeignKey
(
Event
,
related_name
=
'
notes
'
,
on_delete
=
models
.
CASCADE
,
blank
=
True
,
null
=
True
,)
profile
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
notes
'
,
on_delete
=
models
.
CASCADE
,
blank
=
True
,
null
=
True
,)
profile
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
notes
'
,
on_delete
=
models
.
CASCADE
,
blank
=
True
,
null
=
True
,)
note
=
models
.
TextField
()
note
=
models
.
TextField
()
created_by
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
created_notes
'
,
on_delete
=
models
.
DO_NOTHING
)
created_by
=
models
.
ForeignKey
(
Profile
,
related_name
=
'
created_notes
'
,
on_delete
=
models
.
DO_NOTHING
,
default
=
CurrentUserMiddleware
.
get_current_user_profile
,
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
,
editable
=
False
)
created_at
=
models
.
DateTimeField
(
auto_now_add
=
True
,
editable
=
False
)
updated_at
=
models
.
DateTimeField
(
auto_now
=
True
,
editable
=
False
)
updated_at
=
models
.
DateTimeField
(
auto_now
=
True
,
editable
=
False
)
...
...
This diff is collapsed.
Click to expand it.
src/stats/serializers.py
+
4
−
1
View file @
6b4ff46f
...
@@ -4,9 +4,9 @@ from . import models
...
@@ -4,9 +4,9 @@ from . import models
class
EventSerializer
(
serializers
.
ModelSerializer
):
class
EventSerializer
(
serializers
.
ModelSerializer
):
created_by
=
serializers
.
HiddenField
(
default
=
CurrentUserProfileDefault
())
created_by_name
=
serializers
.
SerializerMethodField
()
created_by_name
=
serializers
.
SerializerMethodField
()
visitor_number
=
serializers
.
SerializerMethodField
()
visitor_number
=
serializers
.
SerializerMethodField
()
# visitors = serializers.SerializerMethodField()
class
Meta
:
class
Meta
:
model
=
models
.
Event
model
=
models
.
Event
...
@@ -19,6 +19,9 @@ class EventSerializer(serializers.ModelSerializer):
...
@@ -19,6 +19,9 @@ class EventSerializer(serializers.ModelSerializer):
def
get_visitor_number
(
self
,
obj
):
def
get_visitor_number
(
self
,
obj
):
return
obj
.
visitors
.
all
().
count
()
return
obj
.
visitors
.
all
().
count
()
# def get_visitors(self, obj):
# return obj.visitors.all()
class
NoteSerializer
(
serializers
.
ModelSerializer
):
class
NoteSerializer
(
serializers
.
ModelSerializer
):
created_by
=
serializers
.
HiddenField
(
default
=
CurrentUserProfileDefault
())
created_by
=
serializers
.
HiddenField
(
default
=
CurrentUserProfileDefault
())
...
...
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