Add GroupTeamRelationResource; Other minor changes

Author: MaKleSoft

Diff for: admin.py

@@ -22,6 +22,11 @@ class GamePlayerInline(admin.TabularInline):
     extra = 1
 
 
+class GroupTeamInline(admin.TabularInline):
+    model = handball.models.GroupTeamRelation
+    extra = 1
+
+
 class PersonAdmin(admin.ModelAdmin):
     inlines = (ClubMemberInline, TeamPlayerInline, TeamCoachInline, GamePlayerInline)
 
@@ -31,7 +36,7 @@ class ClubAdmin(admin.ModelAdmin):
 
 
 class TeamAdmin(admin.ModelAdmin):
-    inlines = (TeamPlayerInline, TeamCoachInline)
+    inlines = (TeamPlayerInline, TeamCoachInline, GroupTeamInline)
 
 
 class GameAdmin(admin.ModelAdmin):
@@ -50,4 +55,3 @@ class GameAdmin(admin.ModelAdmin):
 admin.site.register(handball.models.EventType)
 admin.site.register(handball.models.GamePlayerRelation)
 admin.site.register(handball.models.LeagueLevel)
-admin.site.register(handball.models.AgeGroup)

Diff for: api.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from tastypie.resources import ModelResource, ALL_WITH_RELATIONS
+from tastypie.resources import ModelResource, ALL_WITH_RELATIONS, ALL
 from tastypie import fields
 from handball.models import *
 from django.contrib.auth.models import User
@@ -31,7 +31,7 @@ def obj_create(self, bundle, request=None, **kwargs):
 
 
 class DistrictResource(ModelResource):
-    union = fields.ForeignKey(UnionResource, 'union')
+    union = fields.ForeignKey(UnionResource, 'union', full=True)
 
     class Meta:
         queryset = District.objects.all()
@@ -53,8 +53,8 @@ def dehydrate(self, bundle):
 
 
 class GroupResource(ModelResource):
-    union = fields.ForeignKey(UnionResource, 'union', blank=True, null=True)
-    district = fields.ForeignKey(DistrictResource, 'district', blank=True, null=True)
+    union = fields.ForeignKey(UnionResource, 'union', blank=True, null=True, full=True)
+    district = fields.ForeignKey(DistrictResource, 'district', blank=True, null=True, full=True)
 
     class Meta:
         queryset = Group.objects.all()
@@ -63,7 +63,8 @@ class Meta:
         authorization = Authorization()
         filtering = {
             'union': ALL_WITH_RELATIONS,
-            'district': ALL_WITH_RELATIONS
+            'district': ALL_WITH_RELATIONS,
+            'kind': ALL
         }
 
 
@@ -320,6 +321,21 @@ class Meta:
         allowed_methods = ['get']
 
 
+class GroupTeamRelationResource(ModelResource):
+    team = fields.ForeignKey(TeamResource, 'team', full=True)
+    group = fields.ForeignKey(GroupResource, 'group', full=True)
+
+    class Meta:
+        queryset = GroupTeamRelation.objects.all()
+        authorization = Authorization()
+        authentication = Authentication()
+        always_return_data = True
+        filtering = {
+            'group': ALL_WITH_RELATIONS,
+            'team': ALL_WITH_RELATIONS
+        }
+
+
 # class LeagueManagerRelationResource(ModelResource):
 #     league = fields.ForeignKey(LeagueResource, 'league', full=True)
 #     manager = fields.ForeignKey(PersonResource, 'manager', full=True)

Diff for: models.py

@@ -59,12 +59,8 @@ class LeagueLevel(models.Model):
     union_specific = models.BooleanField(default=False)
     district_specific = models.BooleanField(default=False)
 
-
-class AgeGroup(models.Model):
-    name = models.CharField(max_length=20)
-
-    min_age = models.IntegerField()
-    max_age = models.IntegerField()
+    def __unicode__(self):
+        return self.name
 
 
 class Group(models.Model):
@@ -81,15 +77,14 @@ class Group(models.Model):
     managers = models.ManyToManyField('Person', blank=True, related_name='groups_managed', through='GroupManagerRelation')
 
     def __unicode__(self):
-        return u'{0}: {1} {2} {3}'.format(self.kind, self.name, self.gender, self.age_group.name)
+        return u'{0}: {1} {2} {3}'.format(self.kind, self.name, self.gender, self.age_group)
 
 
 class GroupTeamRelation(models.Model):
     group = models.ForeignKey('Group')
     team = models.ForeignKey('Team')
 
-    points = models.IntegerField()
-    position = models.IntegerField()
+    score = models.IntegerField(default=0)
 
 
 class Person(models.Model):

Diff for: urls.py

@@ -21,6 +21,7 @@
 v1_api.register(ClubManagerRelationResource())
 v1_api.register(TeamManagerRelationResource())
 v1_api.register(LeagueLevelResource())
+v1_api.register(GroupTeamRelationResource())
 
 urlpatterns = patterns('', (r'^', include(v1_api.urls)))