From 7e5d751aeffeb4414da9de635e1df66b26087fd5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 8 Feb 2017 15:42:11 +0100 Subject: [PATCH] model changes to support team --- rowers/admin.py | 8 ++++++-- rowers/models.py | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rowers/admin.py b/rowers/admin.py index c5dd467e..887bbd25 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User from .models import ( Rower, Workout,GraphImage,FavoriteChart,SiteAnnouncement, - Team, + Team,TeamInvite ) # Register your models here so you can use them in the Admin module @@ -29,7 +29,10 @@ class SiteAnnouncementAdmin(admin.ModelAdmin): list_display = ('announcement','created','modified','expires','dotweet') class TeamAdmin(admin.ModelAdmin): - list_display = ('name',) + list_display = ('name','manager') + +class TeamInviteAdmin(admin.ModelAdmin): + list_display = ('issuedate','team','user') admin.site.unregister(User) admin.site.register(User,UserAdmin) @@ -38,3 +41,4 @@ admin.site.register(GraphImage) admin.site.register(Team,TeamAdmin) admin.site.register(FavoriteChart,FavoriteChartAdmin) admin.site.register(SiteAnnouncement,SiteAnnouncementAdmin) +admin.site.register(TeamInvite,TeamInviteAdmin) diff --git a/rowers/models.py b/rowers/models.py index 29fd5a4e..18591001 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -90,6 +90,13 @@ class Team(models.Model): def __unicode__(self): return self.name +class TeamInvite(models.Model): + team = models.ForeignKey(Team) + user = models.ForeignKey(User) + issuedate = models.DateField(default=timezone.now) + code = models.CharField(max_length=150) + + # Extension of User with rowing specific data class Rower(models.Model): weightcategories = ( @@ -149,6 +156,7 @@ class Rower(models.Model): choices=plans) planexpires = models.DateField(default=timezone.now) + clubsize = models.IntegerField(default=0) # Friends/Team friends = models.ManyToManyField("self",blank=True)