valami

src/kszkepzes/settings.py

@@ -39,15 +39,10 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_extensions',
     'rest_framework',
-<<<<<<< HEAD
-    'stats'
+    'stats',
     'social_django',
     'authsch',
 ]
-=======
-    'stats',
-    ]
->>>>>>> A kezdetleges modellek REST-esitve lettek
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',

src/stats/admin.py

 from django.contrib import admin
 from .models import Profile, KszkEvent
 
-admin.site.register(Profile)
-admin.site.register(KszkEvent)
-# Register your models here.
+
+@admin.register(Profile)
+class ProfileAdmin(admin.ModelAdmin):
+    list_display = ('user_username', 'year_of_join', 'pref_group')
+
+    def user_username(self, obj):
+        return obj.user.username
+
+    user_username.admin_order_field = 'user__username'
+
+
+@admin.register(KszkEvent)
+class KszkEventAdmin(admin.ModelAdmin):
+    list_display= ('date', 'num_of_pers')

src/stats/migrations/0002_auto_20171023_2320.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-10-23 21:20
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('stats', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='pref_group',
+            field=models.CharField(choices=[('DT', 'DevTeam'), ('NET', 'NeTeam'), ('ST', 'SecurITeam'), ('SYS', 'SysAdmin'), ('N', 'None')], default='None', max_length=10),
+        ),
+        migrations.AlterField(
+            model_name='kszkevent',
+            name='visitors',
+            field=models.ManyToManyField(related_name='visitor', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

src/stats/models.py

@@ -7,13 +7,13 @@ class Profile(models.Model):
     year_of_join = models.IntegerField()
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     TEAMS = (
-    ( 'DT', 'DevTeam'),
-    ('NET', 'NeTeam'),
-    ('ST','SecurITeam'),
-    ('SYS','SysAdmin'),
-    ('N','None'),
+     ('DT', 'DevTeam'),
+     ('NET', 'NeTeam'),
+     ('ST', 'SecurITeam'),
+     ('SYS', 'SysAdmin'),
+     ('N', 'None'),
     )
-    pref_group = models.CharField(max_length=10, choices = TEAMS, default = 'None')
+    pref_group = models.CharField(max_length=10, choices=TEAMS, default='None')
     # Homeworks=models.ForeignKey(Homework)
 
     def __str__(self):
@@ -22,6 +22,6 @@ class Profile(models.Model):
 
 class KszkEvent(models.Model):
     date = models.DateField()
-    visitors = models.ManyToManyField(User, related_name = 'visitor')
+    visitors = models.ManyToManyField(User, related_name='visitor')
 
     num_of_pers = models.IntegerField()