From cbdd660906319b9eba77736a49c91dd4f3a33106 Mon Sep 17 00:00:00 2001
From: Steve Colburn <steve@steve.su>
Date: Thu, 4 Jun 2020 11:18:01 -0400
Subject: [PATCH 1/9] Updates for Issue #83

Set of updates for Issue #83. These are small changes to push to take care of some user requests for clearer use for members.
---
 agagd/agagd_core/tables.py             | 6 +++---
 agagd/templates/agagd_core/member.html | 2 +-
 agagd/templates/base.html              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agagd/agagd_core/tables.py b/agagd/agagd_core/tables.py
index 6755f3a9..e7fa9950 100644
--- a/agagd/agagd_core/tables.py
+++ b/agagd/agagd_core/tables.py
@@ -85,7 +85,7 @@ class MemberTable(tables.Table):
         'member_detail',
         kwargs={"member_id": tables.A('member_id')})
     chapter_id  = tables.Column(
-        verbose_name="Chapters"
+        verbose_name="Chapter"
     )
     country = tables.LinkColumn(
         'country_detail',
@@ -109,8 +109,8 @@ def render_chapter_id(self, value):
     class Meta:
         model = Member
         attrs = {"class": "paleblue"}
-        fields = ('full_name', 'state', 'join_date', 'country')
-        sequence = ('full_name', 'chapter_id', 'country', 'state', 'join_date', 'member_id')
+        fields = ('full_name', 'state', 'rating', 'join_date', 'country')
+        sequence = ('full_name', 'rating', 'chapter_id', 'country', 'state', 'join_date', 'member_id')
 
 class TopDanTable(tables.Table):
     member_id = tables.LinkColumn(
diff --git a/agagd/templates/agagd_core/member.html b/agagd/templates/agagd_core/member.html
index 1df5594b..0cc64593 100644
--- a/agagd/templates/agagd_core/member.html
+++ b/agagd/templates/agagd_core/member.html
@@ -16,7 +16,7 @@ <h2> Player card for <b>{{player.full_name}}</b>, ID #{{player.member_id}}.</h2>
 <ps>Expiration Date: {{ player.renewal_due }} </ps>
 <ps>Membership type: {{ player.type }} </ps>
 <dl>
-  <dt> Rating: </dt> <dd> {{ rating.rating }} </dd>
+  <dt><h2> Rating: </h2></dt> <dd><h2> {{ rating.rating }} </h2></dd> 
   <dt> Sigma: </dt> <dd> {{ rating.sigma }} </dd>
   <dt> Last Rated At: </dt> <dd> {{ rating.elab_date }} </dd>
   <dt> Last Tournament: </dt> <dd> {{ rating.tournament }} </dd>
diff --git a/agagd/templates/base.html b/agagd/templates/base.html
index 31651f9f..b859ae6c 100644
--- a/agagd/templates/base.html
+++ b/agagd/templates/base.html
@@ -28,7 +28,7 @@ <h3><i><a href="/all_player_ratings/">All Player Ratings</a></i></h3>
         {% endblock content %} 
       </div>
       <div id="footer">
-      <p> The AGAGD is (c) 2019 the American Go Association. </p>
+      <p> The AGAGD is (c) 2020 the American Go Association. </p>
       <p> It is developed and maintained by volunteers.  <a href="http://github.com/usgo/agagd">Find us on github!</a></p>
       </div> 
     </div>

From 7d50818a72328f25fe5d18f5aa69d240f4c4ea59 Mon Sep 17 00:00:00 2001
From: Michael Hiiva <michaelhiiva@gmail.com>
Date: Sun, 7 Jun 2020 17:59:47 -0700
Subject: [PATCH 2/9] Added players rating to members_query.

---
 agagd/agagd_core/tables.py     |  7 +++++--
 agagd/agagd_core/views/core.py | 21 ++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/agagd/agagd_core/tables.py b/agagd/agagd_core/tables.py
index e7fa9950..638dd57e 100644
--- a/agagd/agagd_core/tables.py
+++ b/agagd/agagd_core/tables.py
@@ -87,6 +87,9 @@ class MemberTable(tables.Table):
     chapter_id  = tables.Column(
         verbose_name="Chapter"
     )
+    players__rating = tables.Column(
+        verbose_name="Rating"
+    )
     country = tables.LinkColumn(
         'country_detail',
         kwargs={"country_name": tables.A('country')})
@@ -109,8 +112,8 @@ def render_chapter_id(self, value):
     class Meta:
         model = Member
         attrs = {"class": "paleblue"}
-        fields = ('full_name', 'state', 'rating', 'join_date', 'country')
-        sequence = ('full_name', 'rating', 'chapter_id', 'country', 'state', 'join_date', 'member_id')
+        fields = ('full_name', 'state', 'players__rating', 'join_date', 'country')
+        sequence = ('full_name', 'players__rating', 'chapter_id', 'country', 'state', 'join_date', 'member_id')
 
 class TopDanTable(tables.Table):
     member_id = tables.LinkColumn(
diff --git a/agagd/agagd_core/views/core.py b/agagd/agagd_core/views/core.py
index 903e180e..07554806 100644
--- a/agagd/agagd_core/views/core.py
+++ b/agagd/agagd_core/views/core.py
@@ -52,10 +52,25 @@ def search(request):
                 reverse('member_detail', args=(member_id,))
             )
         except ValueError:
-            member_table = MemberTable(
-                Member.objects.filter(full_name__icontains=query).order_by('family_name')
-            )
+            members_query = Member.objects.filter(
+                Q(member_id=F('players__pin_player'))
+            ).filter(
+                full_name__icontains=query
+            ).values(
+                "member_id",
+                "chapter_id",
+                "join_date",
+                "state",
+                "players__rating",
+                "country",
+                "full_name",
+                "family_name"
+            ).order_by('family_name')
+
+            member_table = MemberTable(members_query)
+
             RequestConfig(request, paginate={'per_page': 100}).configure(member_table)
+
             return render(request, 'agagd_core/search_player.html',
                 {
                     'member_table': member_table,

From 3e73dc8ca6c389f8ec86aa551d9ea61ace6e1841 Mon Sep 17 00:00:00 2001
From: Steve Colburn <steve@steve.su>
Date: Sun, 7 Jun 2020 21:20:54 -0400
Subject: [PATCH 3/9] change size of rating

changed size because we are modifying h2 in css for other items.
---
 agagd/templates/agagd_core/member.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agagd/templates/agagd_core/member.html b/agagd/templates/agagd_core/member.html
index 0cc64593..f1a7a94d 100644
--- a/agagd/templates/agagd_core/member.html
+++ b/agagd/templates/agagd_core/member.html
@@ -16,7 +16,7 @@ <h2> Player card for <b>{{player.full_name}}</b>, ID #{{player.member_id}}.</h2>
 <ps>Expiration Date: {{ player.renewal_due }} </ps>
 <ps>Membership type: {{ player.type }} </ps>
 <dl>
-  <dt><h2> Rating: </h2></dt> <dd><h2> {{ rating.rating }} </h2></dd> 
+  <dt><h3> Rating: </h3></dt> <dd><h3> {{ rating.rating }} </h3></dd> 
   <dt> Sigma: </dt> <dd> {{ rating.sigma }} </dd>
   <dt> Last Rated At: </dt> <dd> {{ rating.elab_date }} </dd>
   <dt> Last Tournament: </dt> <dd> {{ rating.tournament }} </dd>

From fd4b7e83e826ea7fa2d136efcbb196413325949a Mon Sep 17 00:00:00 2001
From: Steve Colburn <steve@steve.su>
Date: Sun, 7 Jun 2020 22:17:14 -0400
Subject: [PATCH 4/9] adding h3 size

---
 agagd/static/css/agagd.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/agagd/static/css/agagd.css b/agagd/static/css/agagd.css
index 26945400..bd58baca 100644
--- a/agagd/static/css/agagd.css
+++ b/agagd/static/css/agagd.css
@@ -84,6 +84,12 @@ h2 {
     line-height:1.25em;
 }
 
+h3 {
+    font-size: 25px;
+    margin-bottom: 0.5em;
+    font-weight: bold;
+}
+
 body {
     font-family: Book Antiqua, Palatino Linotype, Palatino, Serif;
 }

From 3ed1dce88eade4c47a592533a95251f40ca1e1ed Mon Sep 17 00:00:00 2001
From: Michael Hiiva <michaelhiiva@gmail.com>
Date: Sun, 7 Jun 2020 19:22:36 -0700
Subject: [PATCH 5/9] Added clearboth to search_player.

---
 agagd/templates/agagd_core/search_player.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agagd/templates/agagd_core/search_player.html b/agagd/templates/agagd_core/search_player.html
index a5d9fccc..5dc9e482 100644
--- a/agagd/templates/agagd_core/search_player.html
+++ b/agagd/templates/agagd_core/search_player.html
@@ -9,7 +9,7 @@
 <h2>Search Results</h2>
 {% include "agagd_core/_search_pl_form.html" %}
 
-<hr>
+<hr class="clearboth">
   {% if member_table %}
     {% render_table member_table %}
   {% else %}

From bfbf3ff468d45d03ddd83f91b5f882c94216a22a Mon Sep 17 00:00:00 2001
From: Steve Colburn <steve@steve.su>
Date: Sun, 7 Jun 2020 22:33:28 -0400
Subject: [PATCH 6/9] Adjustments to the look of the player page

---
 agagd/static/css/agagd.css             | 7 -------
 agagd/templates/agagd_core/member.html | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/agagd/static/css/agagd.css b/agagd/static/css/agagd.css
index bd58baca..8d131364 100644
--- a/agagd/static/css/agagd.css
+++ b/agagd/static/css/agagd.css
@@ -84,12 +84,6 @@ h2 {
     line-height:1.25em;
 }
 
-h3 {
-    font-size: 25px;
-    margin-bottom: 0.5em;
-    font-weight: bold;
-}
-
 body {
     font-family: Book Antiqua, Palatino Linotype, Palatino, Serif;
 }
@@ -119,7 +113,6 @@ ps {
     margin-bottom:0.7em;
     text-align:justify;
     line-height:1.5em;
-    display: block;
 }
 
 ul, dl {
diff --git a/agagd/templates/agagd_core/member.html b/agagd/templates/agagd_core/member.html
index f1a7a94d..01239949 100644
--- a/agagd/templates/agagd_core/member.html
+++ b/agagd/templates/agagd_core/member.html
@@ -12,11 +12,11 @@
 {{ block.super }} 
 <h2> Player card for <b>{{player.full_name}}</b>, ID #{{player.member_id}}.</h2>
 {% include "agagd_core/ratings_graph.html" %}
-<p> AGA member since: {{ player.join_date }} <p>
+<ps> AGA member since: {{ player.join_date }} </ps>
 <ps>Expiration Date: {{ player.renewal_due }} </ps>
 <ps>Membership type: {{ player.type }} </ps>
 <dl>
-  <dt><h3> Rating: </h3></dt> <dd><h3> {{ rating.rating }} </h3></dd> 
+  <dt style="font-size: 24px"> Rating: </dt> <dd style="font-size: 24px"> {{ rating.rating }} </dd> 
   <dt> Sigma: </dt> <dd> {{ rating.sigma }} </dd>
   <dt> Last Rated At: </dt> <dd> {{ rating.elab_date }} </dd>
   <dt> Last Tournament: </dt> <dd> {{ rating.tournament }} </dd>

From af46fea62a43e29d5e02804e2e3ad0bed09775da Mon Sep 17 00:00:00 2001
From: Steve Colburn <steve@steve.su>
Date: Sun, 7 Jun 2020 22:45:48 -0400
Subject: [PATCH 7/9] missing some line returns

---
 agagd/templates/agagd_core/member.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/agagd/templates/agagd_core/member.html b/agagd/templates/agagd_core/member.html
index 01239949..d6e475eb 100644
--- a/agagd/templates/agagd_core/member.html
+++ b/agagd/templates/agagd_core/member.html
@@ -12,9 +12,9 @@
 {{ block.super }} 
 <h2> Player card for <b>{{player.full_name}}</b>, ID #{{player.member_id}}.</h2>
 {% include "agagd_core/ratings_graph.html" %}
-<ps> AGA member since: {{ player.join_date }} </ps>
-<ps>Expiration Date: {{ player.renewal_due }} </ps>
-<ps>Membership type: {{ player.type }} </ps>
+<ps> AGA member since: {{ player.join_date }} </ps><br>
+<ps>Expiration Date: {{ player.renewal_due }} </ps><br>
+<ps>Membership type: {{ player.type }} </ps><br>
 <dl>
   <dt style="font-size: 24px"> Rating: </dt> <dd style="font-size: 24px"> {{ rating.rating }} </dd> 
   <dt> Sigma: </dt> <dd> {{ rating.sigma }} </dd>

From 22a8723e2cdc6ef5aaf18bb9eabd493c41b8d40a Mon Sep 17 00:00:00 2001
From: Michael Hiiva <EarthSchlange@users.noreply.github.com>
Date: Sun, 7 Jun 2020 20:29:24 -0700
Subject: [PATCH 8/9] Removed padding for dt.

---
 agagd/static/css/agagd.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/agagd/static/css/agagd.css b/agagd/static/css/agagd.css
index 8d131364..30bb68ee 100644
--- a/agagd/static/css/agagd.css
+++ b/agagd/static/css/agagd.css
@@ -125,12 +125,13 @@ ol {
 
 
 dt {
-  padding-left: 20px;
+  /* padding-left: 20px; */
   font-variant: small-caps;
   font-weight: bold;
 }
 dd {
-  padding-left: 40px;   color: #666666;
+  padding-left: 40px;   
+  color: #666666;
 }
 
 li {

From 8b9fab0bdc4c6e8a97907e4332c5de5bd3a4186e Mon Sep 17 00:00:00 2001
From: Michael Hiiva <EarthSchlange@users.noreply.github.com>
Date: Sun, 7 Jun 2020 20:33:16 -0700
Subject: [PATCH 9/9] Cleared dl padding.

---
 agagd/static/css/agagd.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agagd/static/css/agagd.css b/agagd/static/css/agagd.css
index 30bb68ee..e67aa436 100644
--- a/agagd/static/css/agagd.css
+++ b/agagd/static/css/agagd.css
@@ -115,7 +115,7 @@ ps {
     line-height:1.5em;
 }
 
-ul, dl {
+ul {
     margin-left:1.5em;
 }