From 56aba862bd14dc2225f393f62f3b1100886cbc3f Mon Sep 17 00:00:00 2001
From: Chif Gergo <chifgeri97@gmail.com>
Date: Mon, 25 Sep 2017 23:52:42 +0200
Subject: [PATCH] Ez egy teszt
---
src/stats/admin.py | 6 +--
.../migrations/0004_auto_20170925_2315.py | 53 +++++++++++++++++++
.../migrations/0005_auto_20170925_2329.py | 22 ++++++++
src/stats/models.py | 23 ++++----
4 files changed, 90 insertions(+), 14 deletions(-)
create mode 100644 src/stats/migrations/0004_auto_20170925_2315.py
create mode 100644 src/stats/migrations/0005_auto_20170925_2329.py
diff --git a/src/stats/admin.py b/src/stats/admin.py
index 2efd55f..9216300 100644
--- a/src/stats/admin.py
+++ b/src/stats/admin.py
@@ -1,6 +1,6 @@
from django.contrib import admin
-from .models import User, Kepzes_alkalom
+from .models import Profile, Kszk_training
-admin.site.register(User)
-admin.site.register(Kepzes_alkalom)
+admin.site.register(Profile)
+admin.site.register(Kszk_training)
# Register your models here.
diff --git a/src/stats/migrations/0004_auto_20170925_2315.py b/src/stats/migrations/0004_auto_20170925_2315.py
new file mode 100644
index 0000000..a480ef3
--- /dev/null
+++ b/src/stats/migrations/0004_auto_20170925_2315.py
@@ -0,0 +1,53 @@
+# -*- 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
new file mode 100644
index 0000000..94ce3c6
--- /dev/null
+++ b/src/stats/migrations/0005_auto_20170925_2329.py
@@ -0,0 +1,22 @@
+# -*- 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 cc03443..f9906f3 100644
--- a/src/stats/models.py
+++ b/src/stats/models.py
@@ -1,16 +1,17 @@
from django.db import models
-
+from django.contrib.auth.models import User
# Create your models here.
-class User(models.Model):
- felhasznalo_nev = models.CharField(max_length=50)
- kepzes_eve = models.IntegerField()
- email_cim = models.EmailField()
- profilkep = models.ImageField()
+
+
+class Profile(models.Model):
+ year_of_join = models.IntegerField() # mikor csatlakozott a kszkepzeshez
+ user = models.OneToOneField(User) # django beĂŠpĂtett user osztĂĄlya
def __str__(self):
- return self.felhasznalo_nev
+ return self.user.username
+
-class Kepzes_alkalom(models.Model):
- idopont = models.DateField()
- letszam = models.IntegerField()
- resztvevok = models.ManyToManyField(User)
+class Kszk_training(models.Model):
+ date = models.DateField()
+ num_of_pers = models.IntegerField()
+ visitors = models.ManyToManyField(User)
--
GitLab