diff --git a/src/kszkepzes/settings.py b/src/kszkepzes/settings.py index be7b4e1e2e7c17066b653afedf37c9205119af1b..3669aa55234dd90a9aa584318f061a3e0df4fa55 100644 --- a/src/kszkepzes/settings.py +++ b/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', diff --git a/src/stats/admin.py b/src/stats/admin.py index 733d363aa84248d3b2d586011ce605038333cef7..a782c32b40a02addd3b1c05fb8af73892670d307 100644 --- a/src/stats/admin.py +++ b/src/stats/admin.py @@ -1,6 +1,17 @@ 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') diff --git a/src/stats/migrations/0002_auto_20171023_2320.py b/src/stats/migrations/0002_auto_20171023_2320.py new file mode 100644 index 0000000000000000000000000000000000000000..a523d0bc7c94e8e0faa261d61edb281c4f204100 --- /dev/null +++ b/src/stats/migrations/0002_auto_20171023_2320.py @@ -0,0 +1,26 @@ +# -*- 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), + ), + ] diff --git a/src/stats/models.py b/src/stats/models.py index 8bbc7af66c9440efd90956d64c58d158f5f43bf3..2c73f5b436667e72ec1231dcbb77357e265c9e09 100644 --- a/src/stats/models.py +++ b/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()