Merge pull request #117 from vash3g/RatingsOpsUpdates

Updated AGAGD files for clarity

agagd/agagd_core/models.py

@@ -137,7 +137,7 @@ class Meta:
         verbose_name_plural = u'top_kyu_view'
 
 class MostRatedGamesPastYear(models.Model):
-    pin = models.IntegerField(primary_key=True, db_column=u'pin')
+    member_id = models.IntegerField(primary_key=True, db_column=u'pin')
     name = models.CharField(max_length=65, db_column=u'Name')
     total = models.BigIntegerField(db_column=u'Game_Count')
 
@@ -148,7 +148,7 @@ class Meta:
         verbose_name_plural = u'most_rated_games_view'
 
 class MostTournamentsPastYear(models.Model):
-    pin = models.IntegerField(primary_key=True, db_column=u'pin')
+    member_id = models.IntegerField(primary_key=True, db_column=u'pin')
     name = models.CharField(max_length=65, db_column=u'Name')
     total = models.BigIntegerField(db_column=u'Tournament_Count')
 

agagd/agagd_core/tables.py

@@ -142,29 +142,29 @@ class Meta:
         sequence = fields
 
 class MostRatedGamesPastYearTable(tables.Table):
-    pin = tables.LinkColumn(
+    member_id = tables.LinkColumn(
         'member_detail',
-        kwargs={'member_id': tables.A('pin')})
+        kwargs={'member_id': tables.A('member_id')})
     name = tables.LinkColumn(
        'member_detail',
-        kwargs={'member_id': tables.A('pin')})
+        kwargs={'member_id': tables.A('member_id')})
     class Meta:
         model = MostRatedGamesPastYear
         attrs = {"class": "paleblue"}
-        fields = ('pin', 'name', 'total')
+        fields = ('member_id', 'name', 'total')
         sequence = fields
 
 class MostTournamentsPastYearTable(tables.Table):
-    pin = tables.LinkColumn(
+    member_id = tables.LinkColumn(
         'member_detail',
-        kwargs={'member_id': tables.A('pin')})
+        kwargs={'member_id': tables.A('member_id')})
     name = tables.LinkColumn(
        'member_detail',
-        kwargs={'member_id': tables.A('pin')})
+        kwargs={'member_id': tables.A('member_id')})
     class Meta:
         model = MostTournamentsPastYear
         attrs = {"class": "paleblue"}
-        fields = ('pin', 'name', 'total')
+        fields = ('member_id', 'name', 'total')
         sequence = fields
 
 class AllPlayerRatingsTable(tables.Table):

agagd/templates/agagd_core/game_count_graph.html

@@ -5,8 +5,8 @@
 <script>
 
 var margin = {top: 20, right: 50, bottom: 30, left: 50},
-    width = 690 - margin.left - margin.right,
-    height = 300 - margin.top - margin.bottom;
+    width = 950 - margin.left - margin.right,
+    height = 350 - margin.top - margin.bottom;
 
 var parseDate = d3.time.format("%Y-%m-%d").parse;
 
@@ -82,7 +82,7 @@
       .attr("x", -height)
       .attr("y", -16)
       .attr("dy", ".71em")
-      .style("text-anchor", "start")
+      .style("text-anchor", "end")
       .text("total # of Games");
 
   svg.append("path")

agagd/templates/static_pages/qualifications.html

@@ -17,9 +17,6 @@ <h1>Qualifications for Rated Games</h1>
 {{ block.super }} 
 
 <div class="clearboth"></div>
-  <p> The AGA accepts game results for rating from recognized clubs and tournament organizers.</p>
-
-  <h1>Qualifications for Rated Games</h1>
   <p>
 	The AGA accepts game results for rating from recognized clubs and tournament organizers.
 	If you have not previously submitted data for rating, then you may need to introduce yourself and explain the context of the games.
@@ -31,14 +28,13 @@ <h1>Qualifications for Rated Games</h1>
 	Players deserve timely rating updates, and normally results should be submitted within a few days following a tournament. Data older than 30 days may be rejected, so do not delay and be disappointed. For example, if you run a monthly rating tournament, make sure that you submit results in time to update ratings before the next tournament.
 </p>
 <p>
-	The required format is so simple that, for a small number of games, you could just type the data as part of your e-mail message; larger tournaments typically use a computer program that does pairings and writes a results file which you can attach to your e-mail.
-	The following is a minimal example, reporting two even games played at a club.
+	The required format is so simple that, for a small number of games, you could just type the data as part of your e-mail message; larger tournaments typically use a computer program that does pairings and writes a results file which you can attach to your e-mail. Applications will normally export this as a ".txt" file. The following is a minimal example, reporting two even games played at a club.
 </p>
 <blockquote class="code">
-	Tourney Princeton Go Club Rated Games, Princeton, NJ, June 15-30, 2004<br>
+	Tourney Princeton Go Club Rated Games, Princeton, NJ<br>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;start=6/15/2004<br>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;finish=6/30/2004<br>
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;location'Princeton, NJ'<br>
+	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;location='Princeton, NJ'<br>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rules=AGA<br>
 	PLAYERS<br>
 	&nbsp;489 Matthews, Paul 4k<br>
@@ -52,16 +48,16 @@ <h1>Qualifications for Rated Games</h1>
 	including the event name, location, start and finish dates, and rules of play (e.g., AGA, Ing, Japanese). Headers similar to those above will best follow this format and have all information accurately recorded in the AGAGD. 
 </p>
 <p>
-	Each player must be identified by an AGA ID number, full name, and rank used for the event. You may NOT use a temporary member number when submitting. This will cause the tournament to be delayed until membership statuses are current.  We often have players with the same names, so include a postal address, email address or other information sufficient to identify the new member.
+	Each player must be identified by an AGA ID number, full name, and rank used for the event. You may NOT use a temporary member number when submitting. This will cause the tournament to be delayed until membership statuses and IDs are current.  We often have players with the same names, so include a postal address, email address or other information sufficient to identify the new member.
 	The <a href="https://agagd.usgo.org">AGAGD</a> can be used to look up individual players. All players MUST be AGA members in good standing at the time of the event.
-	Players can <a href="https://www.usgo.org/members">join/renew and update membership data online</a>, and should be encouraged to do so before the event.
+	Players can <a href="https://www.usgo.org/members">join/renew and update membership data online</a>, and <i>should be encouraged to do so before the event.</i>
 	In case a player needs to join at the tournament site, the tournament registration form should include essential data needed for AGA membership;
-	this also applies to so called "non members" who must provide the same data as members so that they can be clearly identified. <b>Members can sign up using the web form and generate an AGA ID innstanrtly.</b>
+	this also applies to so called "non members" who must provide the same data as members so that they can be clearly identified. <b>Members can sign up using the web form and generate an AGA ID instantly.</b> The updated TDList file will be generated ~10 minutes after signup.
 	Membership data can be sent together with other tournament data to <a href="mailto:[email protected]">[email protected]</a>.
 </p>
 <p>
 	Each game record comprises White's ID, followed by Black's ID, who won (B for Black, W for White), the number of handicap stones, and the komi
-	(recorded as integer equal to the number of prisoners Black would give White).
+	(recorded as integer equal to the number of prisoners Black would give White). These are seperated by spaces.
 </p>
 <p>
 	Not all games qualify for AGA rating. The following are basic guidelines.
@@ -91,7 +87,7 @@ <h1>Qualifications for Rated Games</h1>
 </p>
 </p>
 <p>
-	Updated 8/30/2020
+	Updated 8/31/2020
 </p>