diff --git a/src/kszkepzes/settings.py b/src/kszkepzes/settings.py
index ea5176c18a55603ac44c5c6f8ada448023d9daef..be7b4e1e2e7c17066b653afedf37c9205119af1b 100644
--- a/src/kszkepzes/settings.py
+++ b/src/kszkepzes/settings.py
@@ -39,10 +39,15 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'django_extensions',
'rest_framework',
+<<<<<<< HEAD
'stats'
'social_django',
'authsch',
]
+=======
+ 'stats',
+ ]
+>>>>>>> A kezdetleges modellek REST-esitve lettek
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
@@ -135,3 +140,5 @@ USE_TZ = True
# https://docs.djangoproject.com/en/1.11/howto/static-files/
STATIC_URL = '/static/'
+
+APPEND_SLASH = False
diff --git a/src/kszkepzes/urls.py b/src/kszkepzes/urls.py
index 5a143373854dc913626f7e7bfb539826c5cbe465..7d26d9b142492fc84a1fb37b63a8f822934854ef 100644
--- a/src/kszkepzes/urls.py
+++ b/src/kszkepzes/urls.py
@@ -19,4 +19,6 @@ from django.contrib import admin
urlpatterns = [
url(r'^admin/', admin.site.urls),
url('', include('social_django.urls', namespace='social')),
+ url(r'^api/v1/', include('stats.urls')),
+
]
diff --git a/src/stats/admin.py b/src/stats/admin.py
index 31d1790e269f151282692e54d64d504eb5af0cb7..733d363aa84248d3b2d586011ce605038333cef7 100644
--- a/src/stats/admin.py
+++ b/src/stats/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from .models import Profile, Event
+from .models import Profile, KszkEvent
admin.site.register(Profile)
-admin.site.register(Event)
+admin.site.register(KszkEvent)
# Register your models here.
diff --git a/src/stats/migrations/0001_initial.py b/src/stats/migrations/0001_initial.py
index 7223baaec1f309b9bb54b1e605f26594ea94f8b5..0932d6c5013dde3953fbdc3aa9d9ed2ada2e2154 100644
--- a/src/stats/migrations/0001_initial.py
+++ b/src/stats/migrations/0001_initial.py
@@ -1,8 +1,10 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-24 23:01
+# Generated by Django 1.11.5 on 2017-10-03 21:48
from __future__ import unicode_literals
+from django.conf import settings
from django.db import migrations, models
+import django.db.models.deletion
class Migration(migrations.Migration):
@@ -10,16 +12,25 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
- name='User',
+ name='KszkEvent',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('user_name', models.CharField(max_length=50)),
- ('year_of_kepzes', models.IntegerField()),
- ('megjegyzes', models.TextField()),
+ ('date', models.DateField()),
+ ('num_of_pers', models.IntegerField()),
+ ('visitors', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='Profile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('year_of_join', models.IntegerField()),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
diff --git a/src/stats/migrations/0002_auto_20170925_1936.py b/src/stats/migrations/0002_auto_20170925_1936.py
deleted file mode 100644
index 635748e98913007a92b38e3d43d8360d021cf61f..0000000000000000000000000000000000000000
--- a/src/stats/migrations/0002_auto_20170925_1936.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 17:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('stats', '0001_initial'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Kepzes_alkalom',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('idopont', models.DateField()),
- ('letszam', models.IntegerField()),
- ],
- ),
- migrations.RenameField(
- model_name='user',
- old_name='user_name',
- new_name='felhaszbalo_nev',
- ),
- migrations.RenameField(
- model_name='user',
- old_name='year_of_kepzes',
- new_name='kepzes_eve',
- ),
- migrations.RemoveField(
- model_name='user',
- name='megjegyzes',
- ),
- migrations.AddField(
- model_name='kepzes_alkalom',
- name='resztvevok',
- field=models.ManyToManyField(to='stats.User'),
- ),
- ]
diff --git a/src/stats/migrations/0003_auto_20170925_1938.py b/src/stats/migrations/0003_auto_20170925_1938.py
deleted file mode 100644
index 48c1c7ecd714a1d2c3f1cb08586f2677b1817234..0000000000000000000000000000000000000000
--- a/src/stats/migrations/0003_auto_20170925_1938.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 17:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('stats', '0002_auto_20170925_1936'),
- ]
-
- operations = [
- migrations.RenameField(
- model_name='user',
- old_name='felhaszbalo_nev',
- new_name='felhasznalo_nev',
- ),
- ]
diff --git a/src/stats/migrations/0004_auto_20170925_2315.py b/src/stats/migrations/0004_auto_20170925_2315.py
deleted file mode 100644
index a480ef3ba3969112a8dca28272df38750eedad4c..0000000000000000000000000000000000000000
--- a/src/stats/migrations/0004_auto_20170925_2315.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 21:15
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ('stats', '0003_auto_20170925_1938'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='Kszk_training',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('date', models.DateField()),
- ('num_of_pers', models.IntegerField()),
- ],
- ),
- migrations.CreateModel(
- name='Profile',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('year_of_join', models.IntegerField()),
- ],
- ),
- migrations.RemoveField(
- model_name='kepzes_alkalom',
- name='resztvevok',
- ),
- migrations.DeleteModel(
- name='Kepzes_alkalom',
- ),
- migrations.DeleteModel(
- name='User',
- ),
- migrations.AddField(
- model_name='profile',
- name='user',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
- ),
- migrations.AddField(
- model_name='kszk_training',
- name='visitors',
- field=models.ManyToManyField(to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/src/stats/migrations/0005_auto_20170925_2329.py b/src/stats/migrations/0005_auto_20170925_2329.py
deleted file mode 100644
index 94ce3c6bee6eb2f508509460c9d38d2c7d335b1b..0000000000000000000000000000000000000000
--- a/src/stats/migrations/0005_auto_20170925_2329.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-25 21:29
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('stats', '0004_auto_20170925_2315'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='profile',
- name='user',
- field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
- ),
- ]
diff --git a/src/stats/models.py b/src/stats/models.py
index eee16bb96ab4016ab5badc6ce53641c75e9565ea..37b40a61fad5b331d71e16060767ff6316f184d7 100644
--- a/src/stats/models.py
+++ b/src/stats/models.py
@@ -4,14 +4,15 @@ from django.contrib.auth.models import User
class Profile(models.Model):
- year_of_join = models.IntegerField() # mikor csatlakozott a kszkepzeshez
- user = models.OneToOneField(User) # django beĂŠpĂtett user osztĂĄlya
+ year_of_join = models.IntegerField()
+ user = models.OneToOneField(User)
+ # Homeworks=models.ForeignKey(Homework);
def __str__(self):
return self.user.username
-class Event(models.Model):
+class KszkEvent(models.Model):
date = models.DateField()
num_of_pers = models.IntegerField()
visitors = models.ManyToManyField(User)
diff --git a/src/stats/serializers.py b/src/stats/serializers.py
new file mode 100644
index 0000000000000000000000000000000000000000..1909a903d370d2eb4c7708f7ee487457862b5685
--- /dev/null
+++ b/src/stats/serializers.py
@@ -0,0 +1,14 @@
+from rest_framework import serializers
+from . import models
+
+
+class KszkEventSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.KszkEvent
+ fields = ('date', 'num_of_pers', 'visitors')
+
+
+class ProfileSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.Profile
+ fields = '__all__'
diff --git a/src/stats/urls.py b/src/stats/urls.py
new file mode 100644
index 0000000000000000000000000000000000000000..808c9e435d51a0f03d9e573575b0ec743efd87e9
--- /dev/null
+++ b/src/stats/urls.py
@@ -0,0 +1,11 @@
+from rest_framework import routers
+
+from . import views
+
+router = routers.DefaultRouter(trailing_slash=False)
+router.register(r'events', views.KszkEventViewSet)
+router.register(r'profiles', views.ProfileViewSet)
+
+
+# app_name = 'stats'
+urlpatterns = router.urls
diff --git a/src/stats/views.py b/src/stats/views.py
index 91ea44a218fbd2f408430959283f0419c921093e..31c9a8226ebaf978bd439b0e70fe6b56e5675c90 100644
--- a/src/stats/views.py
+++ b/src/stats/views.py
@@ -1,3 +1,14 @@
-from django.shortcuts import render
+from rest_framework import viewsets
-# Create your views here.
+from . import models
+from . import serializers
+
+
+class KszkEventViewSet(viewsets.ModelViewSet):
+ serializer_class = serializers.KszkEventSerializer
+ queryset = models.KszkEvent.objects.filter()
+
+
+class ProfileViewSet(viewsets.ModelViewSet):
+ serializer_class = serializers.ProfileSerializer
+ queryset = models.Profile.objects.all()