From 164abed0a8300b0cb7acb2cd9e75f638853eedb0 Mon Sep 17 00:00:00 2001
From: KrishnaKanth1729 <rkrishnakanth1729@gmail.com>
Date: Tue, 14 Dec 2021 19:27:00 +0530
Subject: [PATCH 1/5] Added Table for Marks Breakdown in view_team

---
 TWT/apps/timathon/views/view_team.py |  6 ++--
 TWT/static/css/timathonTeam.css      | 50 +++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/TWT/apps/timathon/views/view_team.py b/TWT/apps/timathon/views/view_team.py
index f332849..0e3a71d 100644
--- a/TWT/apps/timathon/views/view_team.py
+++ b/TWT/apps/timathon/views/view_team.py
@@ -6,7 +6,7 @@
 from django.views import View
 from random import randint
 from TWT.apps.challenges.models import Challenge
-from TWT.apps.timathon.models import Team
+from TWT.apps.timathon.models import Team, Vote
 from TWT.context import get_discord_context
 from ..models import Submission
 
@@ -45,9 +45,11 @@ def get_context(self, request: WSGIRequest, team_ID) -> dict:
         context["challenge"] = team.challenge
         if team.submitted:
             try:
-                context["submission"] = Submission.objects.get(
+                team_submission = Submission.objects.get(
                     team=team, challenge=team.challenge
                 )
+                context["submission"] = team_submission
+                context["votes"] = Vote.objects.filter(submission=team_submission)
             except:
                 pass
         print(context["challenge"].submissions_status)
diff --git a/TWT/static/css/timathonTeam.css b/TWT/static/css/timathonTeam.css
index 760b22b..7d0671b 100644
--- a/TWT/static/css/timathonTeam.css
+++ b/TWT/static/css/timathonTeam.css
@@ -1,5 +1,7 @@
 
 
+
+
  .team-container {
  color:#F9F9FA;
  font-family:Roboto;
@@ -114,6 +116,53 @@ padding: 10px;
     height:auto;
 }
 
+table{
+    color: white;
+    border: 2px solid red;
+    margin-left: auto;
+    margin-right: auto;
+    border-radius: .5rem;
+    width: 70vw;
+}
+
+tr{
+    border: 2px solid orange;
+    
+}
+
+th{
+    border: 4px solid orange;
+    font-size: 1.5rem;
+    text-align: center;
+    padding: .5rem;
+}
+
+td{
+    border: 4px solid orange;
+    font-size: 1.1rem;
+    text-align: center;
+    padding: .5rem;
+    word-wrap: break-word;
+}
+
+/* @media (max-width: 900px){
+    table{
+        width: 80vw;
+    }
+}
+
+@media (max-width: 800px){
+    table{
+        width: 550px;
+    }
+}
+
+@media (max-width: 700px) {
+    table{
+        width: 500px;
+    }
+} */
+
 @media screen and (max-width: 768px){
     .members-card{
         flex: 1;
@@ -130,4 +179,3 @@ padding: 10px;
 }
 
 
-

From ad7a06e0f8e48d118832c1b30666744db1997fcb Mon Sep 17 00:00:00 2001
From: KrishnaKanth1729 <rkrishnakanth1729@gmail.com>
Date: Tue, 14 Dec 2021 19:29:51 +0530
Subject: [PATCH 2/5] Made some changes

---
 TWT/static/css/timathonTeam.css       | 17 -----------------
 TWT/templates/timathon/view_team.html | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/TWT/static/css/timathonTeam.css b/TWT/static/css/timathonTeam.css
index 7d0671b..18cc79a 100644
--- a/TWT/static/css/timathonTeam.css
+++ b/TWT/static/css/timathonTeam.css
@@ -145,23 +145,6 @@ td{
     word-wrap: break-word;
 }
 
-/* @media (max-width: 900px){
-    table{
-        width: 80vw;
-    }
-}
-
-@media (max-width: 800px){
-    table{
-        width: 550px;
-    }
-}
-
-@media (max-width: 700px) {
-    table{
-        width: 500px;
-    }
-} */
 
 @media screen and (max-width: 768px){
     .members-card{
diff --git a/TWT/templates/timathon/view_team.html b/TWT/templates/timathon/view_team.html
index 9a28b47..5fe3efe 100644
--- a/TWT/templates/timathon/view_team.html
+++ b/TWT/templates/timathon/view_team.html
@@ -59,6 +59,29 @@ <h6 style="margin-left: 2px">{{ submission.description }}</h6>
 
         </div>
     {% endif %}
+
+    {% if not challenge.voting_status and votes %}
+        <h2 align="center" style="color:white">Marks Breakdown</h2>
+        <table>
+            <tr>
+                <th>C1</th>
+                <th>C2</th>
+                <th>C3</th>
+                <th>C4</th>
+                <th>Notes</th>
+            </tr>
+            {% for vote in votes %}
+                <tr>
+                    <td>{{ vote.c1 }}</td>
+                    <td>{{ vote.c2 }}</td>
+                    <td>{{ vote.c3 }}</td>
+                    <td>{{ vote.c4 }}</td>
+                    <td>{{ vote.notes }}</td>
+                </tr>
+            {% endfor %}
+        </table>
+    {% endif %}
+    
     <script type="text/javascript">
         function Copy()
         {

From 2a3347f8d8f6e8d793801f2784b03db756c12cb4 Mon Sep 17 00:00:00 2001
From: KrishnaKanth1729 <rkrishnakanth1729@gmail.com>
Date: Wed, 15 Dec 2021 09:43:45 +0530
Subject: [PATCH 3/5] Made the breakdown of scores private to only team members

---
 TWT/templates/timathon/view_team.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TWT/templates/timathon/view_team.html b/TWT/templates/timathon/view_team.html
index 5fe3efe..5b0fb59 100644
--- a/TWT/templates/timathon/view_team.html
+++ b/TWT/templates/timathon/view_team.html
@@ -60,7 +60,7 @@ <h6 style="margin-left: 2px">{{ submission.description }}</h6>
         </div>
     {% endif %}
 
-    {% if not challenge.voting_status and votes %}
+    {% if not challenge.voting_status and votes and user in team.members.all %}
         <h2 align="center" style="color:white">Marks Breakdown</h2>
         <table>
             <tr>

From 862303de7593fd32827619aaab9fe3f135b6bb11 Mon Sep 17 00:00:00 2001
From: KrishnaKanth1729 <rkrishnakanth1729@gmail.com>
Date: Tue, 28 Dec 2021 18:13:19 +0530
Subject: [PATCH 4/5] Average Score in each category and Total Score

---
 TWT/apps/timathon/views/view_team.py  | 11 ++++++++++-
 TWT/templates/timathon/view_team.html | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/TWT/apps/timathon/views/view_team.py b/TWT/apps/timathon/views/view_team.py
index 0e3a71d..da9e66f 100644
--- a/TWT/apps/timathon/views/view_team.py
+++ b/TWT/apps/timathon/views/view_team.py
@@ -49,7 +49,16 @@ def get_context(self, request: WSGIRequest, team_ID) -> dict:
                     team=team, challenge=team.challenge
                 )
                 context["submission"] = team_submission
-                context["votes"] = Vote.objects.filter(submission=team_submission)
+
+                votes = Vote.objects.filter(submission=team_submission)
+
+                context['avg_1'] = sum(map(lambda x: x.c1, votes)) / len(votes)
+                context['avg_2'] = sum(map(lambda x: x.c2, votes)) / len(votes)
+                context['avg_3'] = sum(map(lambda x: x.c3, votes)) / len(votes)
+                context['avg_4'] = sum(map(lambda x: x.c4, votes)) / len(votes)
+
+                context['total_score'] = context['avg_1'] + context['avg_2'] + context['avg_3'] + context['avg_4']
+                context['votes'] = votes
             except:
                 pass
         print(context["challenge"].submissions_status)
diff --git a/TWT/templates/timathon/view_team.html b/TWT/templates/timathon/view_team.html
index 5b0fb59..b5aefca 100644
--- a/TWT/templates/timathon/view_team.html
+++ b/TWT/templates/timathon/view_team.html
@@ -80,6 +80,23 @@ <h2 align="center" style="color:white">Marks Breakdown</h2>
                 </tr>
             {% endfor %}
         </table>
+        <table>
+            <tr>
+                <th>Avg C1</th>
+                <th>Avg C2</th>
+                <th>Avg C3</th>
+                <th>Avg C4</th>
+                <th>Total Score</th>
+            </tr>
+            <br>
+            <tr>
+                <td>{{ avg_1 }}</td>
+                <td>{{ avg_2 }}</td>
+                <td>{{ avg_3 }}</td>
+                <td>{{ avg_4 }}</td>
+                <th>{{ total_score }}</th>
+            </tr>
+        </table>
     {% endif %}
     
     <script type="text/javascript">

From 864fea4bd629399a37880a251c6d54ab68dd0f0a Mon Sep 17 00:00:00 2001
From: KrishnaKanth1729 <rkrishnakanth1729@gmail.com>
Date: Thu, 30 Dec 2021 09:33:56 +0530
Subject: [PATCH 5/5] Changed color of table to match theme

---
 TWT/static/css/timathonTeam.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/TWT/static/css/timathonTeam.css b/TWT/static/css/timathonTeam.css
index 18cc79a..8f632bf 100644
--- a/TWT/static/css/timathonTeam.css
+++ b/TWT/static/css/timathonTeam.css
@@ -118,7 +118,6 @@ padding: 10px;
 
 table{
     color: white;
-    border: 2px solid red;
     margin-left: auto;
     margin-right: auto;
     border-radius: .5rem;
@@ -126,19 +125,19 @@ table{
 }
 
 tr{
-    border: 2px solid orange;
+    border: 2px solid #FF7746;
     
 }
 
 th{
-    border: 4px solid orange;
+    border: 4px solid #FF7746;
     font-size: 1.5rem;
     text-align: center;
     padding: .5rem;
 }
 
 td{
-    border: 4px solid orange;
+    border: 4px solid #FF7746;
     font-size: 1.1rem;
     text-align: center;
     padding: .5rem;