Merge branch 'master' of github.com:jamesturk/fowl

fowl/game/models.py

@@ -103,9 +103,9 @@ class Match(models.Model):
         if self.title_at_stake:
             victors = list(self.teams.get(victorious=True).members.all())
             if len(victors) == 1:
-                victor[0].win_title(self.title_at_stake)
+                victors[0].win_title(self.title_at_stake)
             elif len(victors) == 2 and self.title_at_stake == 'tag':
-                victor[0].win_title(self.title_at_stake, victor[1])
+                victors[0].win_title(self.title_at_stake, victors[1])
             else:
                 raise ValueError('invalid number of victors for title change')
 
@@ -246,6 +246,7 @@ class League(models.Model):
 
 class Team(models.Model):
     name = models.CharField(max_length=100)
+    color = models.CharField(max_length=50)
     login = models.OneToOneField(User, related_name='team')
     league = models.ForeignKey(League, related_name='teams')
     stars = models.ManyToManyField(Star, related_name='teams')

fowl/game/templates/events.html

@@ -19,7 +19,7 @@ PPVs, since the creation of this league.</p>
         </a>
         <span class="score-container">
             {% for team,score in event.scores.iteritems %}
-                <span class="label" style="background-color: #00aa00;">{{team}}: {{score}}</span>
+                <span class="label" style="background-color: {{team.color}};">{{team}}: {{score}}</span>
             {% endfor %}
         </span>
     </div>

fowl/game/templates/stables.html

@@ -50,7 +50,7 @@
   <thead>
     <tr>
       {% for team in teams %}
-      <th>{{team}}</th>
+      <th style="background-color: {{team.color}}; color: #eeeeee;">{{team}}</th>
       {% endfor %}
     </tr>
   </thead>

fowl/game/tests.py

@@ -51,6 +51,40 @@ class MatchTest(TestCase):
         self.assertEqual(unicode(match), 'CM Punk (c) (v) vs. Rey Mysterio')
 
 
+    def test_do_title_change(self):
+        # title to punk
+        match = self.event.add_match('cmpunk', 'reymysterio', winner='cmpunk',
+                                     outcome='normal', title_at_stake='wwe')
+        match.do_title_change()
+        self.assertEqual(Star.objects.get(pk='cmpunk').title, 'wwe')
+
+        # title to mysterio
+        match = self.event.add_match('cmpunk', 'reymysterio',
+                                     winner='reymysterio', outcome='normal',
+                                     title_at_stake='wwe')
+        match.do_title_change()
+        self.assertEqual(Star.objects.get(pk='reymysterio').title, 'wwe')
+        self.assertEqual(Star.objects.get(pk='cmpunk').title, None)
+
+        # tag title
+        match = self.event.add_match(['kofikingston', 'rtruth'],
+                                     ['jackswagger', 'dolphziggler'],
+                                     winner='dolphziggler', outcome='normal',
+                                     title_at_stake='tag')
+        match.do_title_change()
+        self.assertEqual(Star.objects.get(pk='kofikingston').title, None)
+        self.assertEqual(Star.objects.get(pk='rtruth').title, None)
+        self.assertEqual(Star.objects.get(pk='dolphziggler').title, 'tag')
+        self.assertEqual(Star.objects.get(pk='jackswagger').title, 'tag')
+
+        match = self.event.add_match(['kofikingston', 'rtruth'],
+                                     ['jackswagger', 'dolphziggler'],
+                                     winner='dolphziggler', outcome='normal',
+                                     title_at_stake='diva')
+        # diva title on a tag match
+        with self.assertRaises(ValueError):
+            match.do_title_change()
+
     def test_scoring(self):
         # one on one : 2 points
         match = self.event.add_match('tripleh', 'undertaker',

fowl/game/views.py

@@ -16,8 +16,8 @@ def events(request, league_id):
             events[event_id].match_list = {}
         events[event_id].match_list.setdefault(tp.match, []
                                                ).append(tp)
-        events[event_id].scores.setdefault(tp.team.name, 0)
-        events[event_id].scores[tp.team.name] += tp.points
+        events[event_id].scores.setdefault(tp.team, 0)
+        events[event_id].scores[tp.team] += tp.points
     events = sorted(events.values(), key=lambda x: x.date, reverse=True)
     return render(request, "events.html", {'events': events, 'view': 'events'})
 

setup_league.py

@@ -19,9 +19,13 @@ james = User.objects.create_superuser('james', 'james.p.turk@gmail.com', 'james'
 erin = User.objects.create_user('erin', 'erin.braswell@gmail.com', 'erin')
 kevin = User.objects.create_user('kevin', 'kevin.wohlgenant@gmail.com', 'kevin')
 league = League.objects.create(name='Fire Pro Wrestling')
-gm_punk = Team.objects.create(name='GM Punk', login=james, league=league)
-awesome = Team.objects.create(name="I'm AWEsome!", login=kevin, league=league)
-cobra = Team.objects.create(name='COBRA!', login=erin, league=league)
+gm_punk = Team.objects.create(name='GM Punk', login=james, league=league,
+                              color='#1540a4')
+awesome = Team.objects.create(name="I'm AWEsome!", login=kevin, league=league,
+                              color='#f5a506')
+cobra = Team.objects.create(name='COBRA!', login=erin, league=league,
+                            color='#05c405')
+
 
 punks = ('cmpunk', 'markhenry', 'rtruth', 'codyrhodes',
          'tensai', 'antoniocesaro', 'wadebarrett', 'aj', 'bethphoenix',
@@ -86,7 +90,7 @@ event.add_match('alexriley', 'christian', 'curthawkins', 'darrenyoung',
 event.add_match(['kofikingston', 'rtruth'], ['dolphziggler', 'jackswagger'],
                 winner='kofikingston', outcome='normal', title_at_stake='tag')
 event.add_match('layla', 'bethphoenix', winner='layla',
-                outcome='normal', title_at_stake='divas')
+                outcome='normal', title_at_stake='diva')
 event.add_match('sheamus', 'randyorton', 'chrisjericho', 'albertodelrio',
                 winner='sheamus', outcome='normal',
                 title_at_stake='heavyweight')