Add some admin inlines; Replace manager_confirmed and person_confirmed fields with single validated field; Remove appointed_by field in manager relations; other minor changes

Author: MaKleSoft

admin.py

@@ -27,16 +27,53 @@ class GroupTeamInline(admin.TabularInline):
     extra = 1
 
 
+class UnionManagerInline(admin.TabularInline):
+    model = handball.models.UnionManagerRelation
+    extra = 1
+
+
+class DistrictManagerInline(admin.TabularInline):
+    model = handball.models.DistrictManagerRelation
+    extra = 1
+
+
+class GroupManagerInline(admin.TabularInline):
+    model = handball.models.GroupManagerRelation
+    extra = 1
+
+
+class ClubManagerInline(admin.TabularInline):
+    model = handball.models.ClubManagerRelation
+    extra = 1
+
+
+class TeamManagerInline(admin.TabularInline):
+    model = handball.models.TeamManagerRelation
+    extra = 1
+
+
 class PersonAdmin(admin.ModelAdmin):
     inlines = (ClubMemberInline, TeamPlayerInline, TeamCoachInline, GamePlayerInline)
 
 
+class UnionAdmin(admin.ModelAdmin):
+    inlines = (UnionManagerInline,)
+
+
+class DistrictAdmin(admin.ModelAdmin):
+    inlines = (DistrictManagerInline,)
+
+
+class GroupAdmin(admin.ModelAdmin):
+    inlines = (GroupManagerInline,)
+
+
 class ClubAdmin(admin.ModelAdmin):
-    inlines = (ClubMemberInline,)
+    inlines = (ClubMemberInline, ClubManagerInline)
 
 
 class TeamAdmin(admin.ModelAdmin):
-    inlines = (TeamPlayerInline, TeamCoachInline, GroupTeamInline)
+    inlines = (TeamPlayerInline, TeamCoachInline, GroupTeamInline, TeamManagerInline)
 
 
 class GameAdmin(admin.ModelAdmin):
@@ -52,6 +89,5 @@ class GameAdmin(admin.ModelAdmin):
 admin.site.register(handball.models.Team, TeamAdmin)
 admin.site.register(handball.models.Site)
 admin.site.register(handball.models.Event)
-admin.site.register(handball.models.EventType)
 admin.site.register(handball.models.GamePlayerRelation)
 admin.site.register(handball.models.LeagueLevel)

api.py

@@ -152,7 +152,7 @@ def dehydrate(self, bundle):
 
         bundle.data['players'] = []
         resource = PersonResource()
-        for membership in TeamPlayerRelation.objects.filter(player=bundle.obj, manager_confirmed=True):
+        for membership in TeamPlayerRelation.objects.filter(player=bundle.obj, validated=True):
             playerBundle = resource.build_bundle(obj=membership.player, request=bundle.request)
             bundle.data['players'].append(resource.full_dehydrate(playerBundle))
         return bundle
@@ -189,17 +189,9 @@ def hydrate_m2m(self, bundle):
         return super(GameResource, self).hydrate_m2m(bundle)
 
 
-class EventTypeResource(ModelResource):
-    class Meta:
-        queryset = EventType.objects.all()
-        authorization = Authorization()
-        authentication = Authentication()
-
-
 class EventResource(ModelResource):
     person = fields.ForeignKey(PersonResource, 'person', full=True)
     game = fields.ForeignKey(GameResource, 'game')
-    event_type = fields.ForeignKey(EventTypeResource, 'event_type')
     team = fields.ForeignKey(TeamResource, 'team')
 
     class Meta:
@@ -220,7 +212,8 @@ class Meta:
         always_return_data = True
         filtering = {
             'member': ALL_WITH_RELATIONS,
-            'club': ALL_WITH_RELATIONS
+            'club': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
 
@@ -247,7 +240,8 @@ class Meta:
         always_return_data = True
         filtering = {
             'player': ALL_WITH_RELATIONS,
-            'team': ALL_WITH_RELATIONS
+            'team': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
 
@@ -262,14 +256,14 @@ class Meta:
         always_return_data = True
         filtering = {
             'coach': ALL_WITH_RELATIONS,
-            'team': ALL_WITH_RELATIONS
+            'team': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
 
 class ClubManagerRelationResource(ModelResource):
     club = fields.ForeignKey(ClubResource, 'club', full=True)
     manager = fields.ForeignKey(PersonResource, 'manager', full=True)
-    appointed_by = fields.ForeignKey(UserResource, 'appointed_by', null=True, blank=True)
 
     class Meta:
         queryset = ClubManagerRelation.objects.all()
@@ -278,21 +272,14 @@ class Meta:
         always_return_data = True
         filtering = {
             'club': ALL_WITH_RELATIONS,
-            'manager': ALL_WITH_RELATIONS
+            'manager': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
-    def obj_create(self, bundle, request=None, **kwargs):
-        if request.user:
-            user_resource = UserResource()
-            bundle.data['appointed_by'] = user_resource.get_resource_uri(request.user)
-
-        return super(ClubManagerRelationResource, self).obj_create(bundle, request)
-
 
 class TeamManagerRelationResource(ModelResource):
     team = fields.ForeignKey(TeamResource, 'team', full=True)
     manager = fields.ForeignKey(PersonResource, 'manager', full=True)
-    appointed_by = fields.ForeignKey(UserResource, 'appointed_by', null=True, blank=True)
 
     class Meta:
         queryset = TeamManagerRelation.objects.all()
@@ -301,16 +288,10 @@ class Meta:
         always_return_data = True
         filtering = {
             'team': ALL_WITH_RELATIONS,
-            'manager': ALL_WITH_RELATIONS
+            'manager': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
-    def obj_create(self, bundle, request=None, **kwargs):
-        if request.user:
-            user_resource = UserResource()
-            bundle.data['appointed_by'] = user_resource.get_resource_uri(request.user)
-
-        return super(TeamManagerRelationResource, self).obj_create(bundle, request)
-
 
 class LeagueLevelResource(ModelResource):
     class Meta:
@@ -332,7 +313,8 @@ class Meta:
         always_return_data = True
         filtering = {
             'group': ALL_WITH_RELATIONS,
-            'team': ALL_WITH_RELATIONS
+            'team': ALL_WITH_RELATIONS,
+            'validated': ALL
         }
 
 

models.py

@@ -45,7 +45,6 @@ class Team(models.Model):
 
     players = models.ManyToManyField('Person', blank=True, related_name='teams', through='TeamPlayerRelation')
     coaches = models.ManyToManyField('Person', blank=True, related_name='teams_coached', through='TeamCoachRelation')
-    # league = models.ForeignKey('League', related_name='league', blank=True)
     club = models.ForeignKey('Club', related_name='teams')
     managers = models.ManyToManyField('Person', blank=True, related_name='teams_managed', through='TeamManagerRelation')
 
@@ -67,6 +66,7 @@ class Group(models.Model):
     name = models.CharField(max_length=50)
     kind = models.CharField(max_length=20, choices=(('league', _('league')), ('cup', _('cup')), ('tournament', _('tournament'))))
     gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))), default='male')
+    validated = models.BooleanField(default=False)
 
     level = models.ForeignKey('LeagueLevel', blank=True, null=True)
     age_group = models.CharField(max_length=20, choices=(('adults', _('adults')), ('juniors_a', _('juniors a')),
@@ -85,6 +85,7 @@ class GroupTeamRelation(models.Model):
     team = models.ForeignKey('Team')
 
     score = models.IntegerField(default=0)
+    validated = models.BooleanField(default=False)
 
 
 class Person(models.Model):
@@ -99,6 +100,7 @@ class Person(models.Model):
     pass_number = models.IntegerField(null=True, blank=True)
     gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))), default='male')
     mobile_number = models.CharField(max_length=20, blank=True)
+    validated = models.BooleanField(default=False)
 
     def __unicode__(self):
         return self.first_name + ' ' + self.last_name
@@ -110,6 +112,9 @@ class Game(models.Model):
     score_home = models.IntegerField()
     score_away = models.IntegerField()
     duration = models.IntegerField(default=60)
+    home_validated = models.BooleanField(default=False)
+    away_validated = models.BooleanField(default=False)
+    referee_validated = models.BooleanField(default=False)
 
     home = models.ForeignKey('Team', related_name='games_home')
     away = models.ForeignKey('Team', related_name='games_away')
@@ -144,86 +149,76 @@ class GamePlayerRelation(models.Model):
 
     team = models.ForeignKey('Team')
     shirt_number = models.IntegerField(blank=True, null=True)
-    # goals = models.IntegerField()
-    # warnings = models.IntegerField()
-    # penalties = models.IntegerField()
-    # disqualifications = models.IntegerField()
-    # team_penalties = models.IntegerField()
-    # penalty_shots_hit = models.IntegerField()
-    # penalty_shots_miss = models.IntegerField()
 
 
 class ClubMemberRelation(models.Model):
     member = models.ForeignKey('Person')
     club = models.ForeignKey('Club')
 
-    primary = models.BooleanField()
-    member_confirmed = models.BooleanField(default=False)
-    manager_confirmed = models.BooleanField(default=False)
+    primary = models.BooleanField(default=False)
+    validated = models.BooleanField(default=False)
 
 
 class TeamPlayerRelation(models.Model):
     player = models.ForeignKey('Person')
     team = models.ForeignKey('Team')
 
-    player_confirmed = models.BooleanField(default=False)
-    manager_confirmed = models.BooleanField(default=False)
+    validated = models.BooleanField(default=False)
 
 
 class TeamCoachRelation(models.Model):
     coach = models.ForeignKey('Person')
     team = models.ForeignKey('Team')
 
-    coach_confirmed = models.BooleanField(default=False)
-    manager_confirmed = models.BooleanField(default=False)
+    validated = models.BooleanField(default=False)
 
 
 class ClubManagerRelation(models.Model):
     club = models.ForeignKey('Club')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_club_managers_appointed', blank=True, null=True)
+
+    validated = models.BooleanField(default=False)
 
 
 class TeamManagerRelation(models.Model):
     team = models.ForeignKey('Team')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_team_managers_appointed', blank=True, null=True)
+
+    validated = models.BooleanField(default=False)
 
 
 class GroupManagerRelation(models.Model):
     group = models.ForeignKey('Group')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_group_managers_appointed', blank=True, null=True)
+
+    validated = models.BooleanField(default=False)
 
 
 class DistrictManagerRelation(models.Model):
     district = models.ForeignKey('District')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_district_managers_appointed', blank=True, null=True)
+
+    validated = models.BooleanField(default=False)
 
 
 class UnionManagerRelation(models.Model):
     union = models.ForeignKey('Union')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_union_managers_appointed', blank=True, null=True)
+
+    validated = models.BooleanField(default=False)
 
 
 class Event(models.Model):
     time = models.IntegerField()
+    event_type = models.CharField(max_length=20, choices=(('goal', _('goal')), ('warning', _('yellow card')),
+        ('disqualification', _('disqualification')), ('time_penalty', _('time penalty')), ('team_time_penalty', _('team time penalty')),
+        ('penalty_shot_goal', _('penalty shot (goal)')), ('penalty_shot_miss', _('penalty shot (miss)'))))
 
     person = models.ForeignKey('Person')
-    event_type = models.ForeignKey('EventType')
     game = models.ForeignKey('Game', related_name='events')
     team = models.ForeignKey('Team')
 
 
-class EventType(models.Model):
-    name = models.CharField(max_length=20)
-
-    def __unicode__(self):
-        return self.name
-
-
 def set_union_by_district(sender, instance, **kwargs):
     # If district is set, set according union
     if instance.district:
@@ -256,7 +251,7 @@ def add_player_to_team(sender, instance, created, **kwargs):
 def club_member_to_manager(sender, instance, created, **kwargs):
     managers = ClubManagerRelation.objects.filter(club=instance.club)
     if len(managers) == 0:
-        ClubManagerRelation.objects.create(club=instance.club, manager=instance.member)
+        ClubManagerRelation.objects.create(club=instance.club, manager=instance.member, validated=True)
 
 
 def team_player_to_manager(sender, instance, created, **kwargs):

urls.py

@@ -14,7 +14,6 @@
 v1_api.register(SiteResource())
 v1_api.register(GroupResource())
 v1_api.register(EventResource())
-v1_api.register(EventTypeResource())
 v1_api.register(GamePlayerRelationResource())
 v1_api.register(TeamPlayerRelationResource())
 v1_api.register(TeamCoachRelationResource())