From b1270e097803067215009c606f683907b2bc4c58 Mon Sep 17 00:00:00 2001
From: dtuantran <anhbanvuitinh@gmail.com>
Date: Mon, 21 Aug 2023 15:45:42 +0200
Subject: [PATCH 01/10] upgrade rabbitmq always to the latest management
 version

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 703568166..a435b305e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -125,7 +125,7 @@ services:
   #   Rabbitmq & Flower monitoring tool
   #-----------------------------------------------
   rabbit:
-    image: rabbitmq:3.6-management
+    image: rabbitmq:management
     # setting hostname here makes data persist properly between
     # containers being destroyed..!
     hostname: rabbit

From 32f9b2bfb36834fa595f54713a1ce2cc155a76df Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Mon, 21 Aug 2023 21:11:21 +0500
Subject: [PATCH 02/10] Server status - Show to all users (#1098)

* give access of server status page to all users

* unused import removed

* button added in queue page to go to server status page
---
 src/apps/pages/views.py                | 20 ++++++++++++++++----
 src/static/riot/queues/management.tag  |  5 +++++
 src/templates/base.html                |  3 ++-
 src/templates/pages/server_status.html |  7 +++++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index bf32519b7..c68ef0a86 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -1,6 +1,4 @@
 from datetime import timedelta
-
-from django.http import HttpResponse
 from django.utils.timezone import now
 from django.views.generic import TemplateView
 from django.db.models import Count, Q
@@ -59,15 +57,29 @@ class ServerStatusView(TemplateView):
     template_name = 'pages/server_status.html'
 
     def get_context_data(self, *args, **kwargs):
-        if not self.request.user.is_staff:
-            raise HttpResponse(status=404)
 
         show_child_submissions = self.request.GET.get('show_child_submissions', False)
 
+        # Get all submissions
         qs = Submission.objects.all()
+
+        # If user is not super user then:
+        # filter this user's own submissions
+        # and
+        # submissions running on queue which belongs to this user
+        if not self.request.user.is_superuser:
+            qs = qs.filter(
+                Q(owner=self.request.user) |
+                Q(phase__competition__queue__isnull=False, phase__competition__queue__owner=self.request.user)
+            )
+
+        # filter for fetching last 2 days submissions
         qs = qs.filter(created_when__gte=now() - timedelta(days=2))
+
+        # filter out child submissions i.e. submission has no parent
         if not show_child_submissions:
             qs = qs.filter(parent__isnull=True)
+
         qs = qs.order_by('-created_when')
         qs = qs.select_related('phase__competition', 'owner')
 
diff --git a/src/static/riot/queues/management.tag b/src/static/riot/queues/management.tag
index fafb43ede..be74a5132 100644
--- a/src/static/riot/queues/management.tag
+++ b/src/static/riot/queues/management.tag
@@ -89,6 +89,11 @@
         </tfoot>
     </table>
 
+    <!--  Server status page button  -->
+    <a href="/server_status" target="_blank">
+        <div class="ui blue right floated button">Open Server status page</div>
+    </a>
+
     <div class="ui modal" ref="modal">
         <div class="header">
             Queue Form
diff --git a/src/templates/base.html b/src/templates/base.html
index e6530429f..565f51943 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -123,10 +123,11 @@
                             </div>
                             <i class="dropdown icon"></i>
                             <div class="menu">
-                                {% if request.user.is_staff %}
+                                
                                     <div class="header">Admin management</div>
 {#                                    <a class="item" href="#">Customize Codalab</a>#}
                                     <a class="item" href="{% url "pages:server_status" %}">Server Status</a>
+                                {% if request.user.is_staff %}
                                     <a class="item" href="{% url "admin:index" %}">Django Admin</a>
                                     <a class="item" href="{% url "su_login" %}">Change User</a>
                                     <a class="item" href="{% url "analytics:analytics" %}">Analytics</a>
diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index a6dbc741f..561353b21 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -31,8 +31,8 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             </thead>
             <tbody>
                 {% if not submissions %}
-                <tr>
-                    <td colspan="5"><i>No submissions, yet!</i></td>
+                <tr class="center aligned">
+                    <td colspan="100%"><em>No submissions, yet!</em></td>
                 </tr>
                 {% endif %}
                 {% for submission in submissions %}
@@ -53,6 +53,8 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
             </tbody>
         </table>
 
+
+        {% if user.is_superuser %}
         <h1>Monitor queues</h1>
         <div id="external_monitors" class="ui two column grid">
             <div class="column">
@@ -90,6 +92,7 @@ <h1>Monitor queues</h1>
                 </div>
             </div>
         </div>
+        {% endif %}
     </div>
 
     <script>

From b11b579eff1c4c50bf1cb4451f243c1419b725cb Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 22 Aug 2023 17:21:19 +0500
Subject: [PATCH 03/10] test added for leaderboards fetch all. Returned empty
 list

---
 src/apps/api/tests/test_leaderboards.py | 13 ++++++++++++-
 src/apps/api/views/leaderboards.py      |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/apps/api/tests/test_leaderboards.py b/src/apps/api/tests/test_leaderboards.py
index 5d54ab0e9..5455ef173 100644
--- a/src/apps/api/tests/test_leaderboards.py
+++ b/src/apps/api/tests/test_leaderboards.py
@@ -23,7 +23,18 @@ def test_getting_many_submissions_doesnt_cause_too_many_queries(self):
             assert resp.status_code == 200
 
 
-# TODO: Test listing all leaderboards isn't a thing?
+class LeaderboardTest(APITestCase):
+    def setUp(self):
+        leaderboard1 = factories.LeaderboardFactory()
+        leaderboard2 = factories.LeaderboardFactory()
+        _ = factories.ColumnFactory(leaderboard=leaderboard1, index=0)
+        _ = factories.ColumnFactory(leaderboard=leaderboard2, index=0)
+
+    def test_get_all_leaderboards(self):
+        url = reverse('leaderboard-list')
+        resp = self.client.get(url)
+        assert resp.status_code == 200
+        assert resp.data == []
 
 
 class HiddenLeaderboardTests(APITestCase):
diff --git a/src/apps/api/views/leaderboards.py b/src/apps/api/views/leaderboards.py
index 315b1c1ff..2b7ed2524 100644
--- a/src/apps/api/views/leaderboards.py
+++ b/src/apps/api/views/leaderboards.py
@@ -1,5 +1,6 @@
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.viewsets import ModelViewSet
+from rest_framework.response import Response
 from api.permissions import LeaderboardNotHidden, LeaderboardIsOrganizerOrCollaborator
 from api.serializers.leaderboards import LeaderboardEntriesSerializer
 from api.serializers.submissions import SubmissionScoreSerializer
@@ -23,6 +24,10 @@ def get_permissions(self):
 
         return [permission() for permission in self.permission_classes]
 
+    def list(self, request, *args, **kwargs):
+        # Return an empty list for the leaderboard-list endpoint
+        return Response([])
+
 
 class SubmissionScoreViewSet(ModelViewSet):
     queryset = SubmissionScore.objects.all()

From 20ed2e646bccb2854a57ddc6bbf98c426918d16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Tue, 22 Aug 2023 15:54:53 +0200
Subject: [PATCH 04/10] Revert "upgrade rabbitmq always to the latest
 management version"

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a435b305e..703568166 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -125,7 +125,7 @@ services:
   #   Rabbitmq & Flower monitoring tool
   #-----------------------------------------------
   rabbit:
-    image: rabbitmq:management
+    image: rabbitmq:3.6-management
     # setting hostname here makes data persist properly between
     # containers being destroyed..!
     hostname: rabbit

From fb9e852fedc3ed996bb577790340cc4a99e1a95c Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 22 Aug 2023 19:07:32 +0500
Subject: [PATCH 05/10] Submission update test - Task update (#1102)

* task update test added for submission

* circle ci space resolved
---
 src/apps/api/serializers/submissions.py |  8 ++++++-
 src/apps/api/tests/test_submissions.py  | 28 +++++++++++++++++++++++++
 src/apps/api/views/submissions.py       |  2 ++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/apps/api/serializers/submissions.py b/src/apps/api/serializers/submissions.py
index db4b91e91..8207de686 100644
--- a/src/apps/api/serializers/submissions.py
+++ b/src/apps/api/serializers/submissions.py
@@ -181,10 +181,16 @@ def validate(self, attrs):
         return data
 
     def update(self, submission, validated_data):
-        # TODO: Test, could you change the phase of a submission?
+
+        # Cannot change submission if secret key is not valid
         if submission.secret != validated_data.get('secret'):
             raise PermissionDenied("Submission secret invalid")
 
+        # Task of a submission cannot be updated
+        if "task" in validated_data:
+            raise PermissionDenied("Task of a submission cannot be update")
+
+        # Update status if it is there in validated data
         if "status" in validated_data:
             # Received a status update, let the frontend know
             from channels.layers import get_channel_layer
diff --git a/src/apps/api/tests/test_submissions.py b/src/apps/api/tests/test_submissions.py
index 0d8e54bc6..e91a64ecb 100644
--- a/src/apps/api/tests/test_submissions.py
+++ b/src/apps/api/tests/test_submissions.py
@@ -243,6 +243,34 @@ def test_who_can_see_detailed_result_when_visualization_is_true(self):
         assert resp.status_code == 403
 
 
+class SubmissionUpdateTest(APITestCase):
+    def setUp(self):
+        self.user = UserFactory(username='test')
+        self.task1 = TaskFactory(created_by=self.user)
+        self.task2 = TaskFactory(created_by=self.user)
+        self.competition = CompetitionFactory(created_by=self.user)
+        self.phase = PhaseFactory(competition=self.competition, tasks=[self.task1])
+        self.secret = '7df3600c-1234-5678-bbc8-bbe91f42d875'
+        self.submission = SubmissionFactory(
+            task=self.task1,
+            phase=self.phase,
+            status=Submission.FINISHED,
+            secret=self.secret
+        )
+
+    def test_submission_task_update(self):
+        url = reverse('submission-detail', args=(self.submission.pk,))
+
+        # Update task
+        resp = self.client.patch(url, {
+            "task": self.task2.id,
+            "secret": self.secret
+        })
+        assert resp.status_code == 403
+        assert resp.data["detail"] == "Submission task cannot be updated"
+        assert self.submission.task.id == self.task1.id  # task not updated
+
+
 class OrganizationSubmissionTests(APITestCase):
     def setUp(self):
         # Competition and creator
diff --git a/src/apps/api/views/submissions.py b/src/apps/api/views/submissions.py
index 896b4731e..7e6b5970f 100644
--- a/src/apps/api/views/submissions.py
+++ b/src/apps/api/views/submissions.py
@@ -53,6 +53,8 @@ def check_object_permissions(self, request, obj):
                 try:
                     if request.data.get('secret') is None or uuid.UUID(request.data.get('secret')) != obj.secret:
                         raise PermissionDenied("Submission secrets do not match")
+                    if request.data.get('task'):
+                        raise PermissionDenied("Submission task cannot be updated")
                 except TypeError:
                     raise ValidationError(f"Secret: ({request.data.get('secret')}) not a valid UUID")
 

From 38585d99f5baafd520281350de7316a4a72a291b Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 22 Aug 2023 21:32:34 +0500
Subject: [PATCH 06/10] Competition - reward, contact_email, report (#1063)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* competition model updated with reward, contact email and report

* reward functionality added

* contact email and report functionality added

* report url style changed

* forum contact email color changed

* 0026 migation updated

---------

Co-authored-by: Adrien Pavão <adrien.pavao@gmail.com>
---
 src/apps/api/serializers/competitions.py      |   9 +++
 .../migrations/0026_auto_20201110_1932.py     |  17 +++---
 .../migrations/0035_auto_20230806_0715.py     |  28 +++++++++
 src/apps/competitions/models.py               |   4 ++
 src/apps/competitions/unpackers/v2.py         |   2 +
 src/static/img/trophy.png                     | Bin 0 -> 6557 bytes
 .../riot/competitions/detail/_header.tag      |  54 ++++++++++++++++++
 .../editor/_competition_details.tag           |  18 ++++++
 src/static/riot/competitions/editor/form.tag  |   6 +-
 src/static/riot/competitions/public-list.tag  |   3 +-
 .../competitions/tile/competition_tile.tag    |   3 +-
 src/static/stylus/forum.styl                  |   8 ++-
 src/templates/forums/base_forum.html          |  10 ++++
 13 files changed, 150 insertions(+), 12 deletions(-)
 create mode 100644 src/apps/competitions/migrations/0035_auto_20230806_0715.py
 create mode 100644 src/static/img/trophy.png

diff --git a/src/apps/api/serializers/competitions.py b/src/apps/api/serializers/competitions.py
index 81e233523..7d157e103 100644
--- a/src/apps/api/serializers/competitions.py
+++ b/src/apps/api/serializers/competitions.py
@@ -242,6 +242,9 @@ class Meta:
             'allow_robot_submissions',
             'competition_type',
             'fact_sheet',
+            'reward',
+            'contact_email',
+            'report',
         )
 
     def validate_phases(self, phases):
@@ -330,6 +333,9 @@ class Meta:
             'competition_type',
             'fact_sheet',
             'forum',
+            'reward',
+            'contact_email',
+            'report',
         )
 
     def get_leaderboards(self, instance):
@@ -359,6 +365,9 @@ class Meta:
             'logo',
             'description',
             'competition_type',
+            'reward',
+            'contact_email',
+            'report',
         )
 
 
diff --git a/src/apps/competitions/migrations/0026_auto_20201110_1932.py b/src/apps/competitions/migrations/0026_auto_20201110_1932.py
index b6496c0ba..eb23c9663 100644
--- a/src/apps/competitions/migrations/0026_auto_20201110_1932.py
+++ b/src/apps/competitions/migrations/0026_auto_20201110_1932.py
@@ -1,18 +1,19 @@
 # Generated by Django 2.2.13 on 2020-11-10 19:32
+# Manual edit on 2023-08-22 by Adrien Pavao
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations
 
-from competitions.models import Competition
 
+def set_blank_fact_sheet_to_null(apps, schema_editor):
+    Competition = apps.get_model('competitions', 'Competition')
+    for comp in Competition.objects.all():
+        if comp.fact_sheet == "":
+            comp.fact_sheet = None
+            comp.save()
 
-class Migration(migrations.Migration):
 
-    def set_blank_fact_sheet_to_null(self, schema_editor):
-        for comp in Competition.objects.all():
-            if comp.fact_sheet == "":
-                comp.fact_sheet = None
-                comp.save()
+class Migration(migrations.Migration):
 
     dependencies = [
         ('competitions', '0025_submission_is_specific_task_re_run'),
@@ -24,5 +25,5 @@ def set_blank_fact_sheet_to_null(self, schema_editor):
             name='fact_sheet',
             field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=None, max_length=4096, null=True),
         ),
-        migrations.RunPython(set_blank_fact_sheet_to_null),
+        migrations.RunPython(set_blank_fact_sheet_to_null, migrations.RunPython.noop),
     ]
diff --git a/src/apps/competitions/migrations/0035_auto_20230806_0715.py b/src/apps/competitions/migrations/0035_auto_20230806_0715.py
new file mode 100644
index 000000000..68b33c11d
--- /dev/null
+++ b/src/apps/competitions/migrations/0035_auto_20230806_0715.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.2.17 on 2023-08-06 07:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0034_auto_20230727_1147'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='competition',
+            name='contact_email',
+            field=models.EmailField(blank=True, max_length=256, null=True),
+        ),
+        migrations.AddField(
+            model_name='competition',
+            name='report',
+            field=models.CharField(blank=True, max_length=256, null=True),
+        ),
+        migrations.AddField(
+            model_name='competition',
+            name='reward',
+            field=models.CharField(blank=True, max_length=256, null=True),
+        ),
+    ]
diff --git a/src/apps/competitions/models.py b/src/apps/competitions/models.py
index b30988106..063914268 100644
--- a/src/apps/competitions/models.py
+++ b/src/apps/competitions/models.py
@@ -54,6 +54,10 @@ class Competition(ChaHubSaveMixin, models.Model):
 
     fact_sheet = JSONField(blank=True, null=True, max_length=4096, default=None)
 
+    contact_email = models.EmailField(max_length=256, null=True, blank=True)
+    reward = models.CharField(max_length=256, null=True, blank=True)
+    report = models.CharField(max_length=256, null=True, blank=True)
+
     def __str__(self):
         return f"competition-{self.title}-{self.pk}-{self.competition_type}"
 
diff --git a/src/apps/competitions/unpackers/v2.py b/src/apps/competitions/unpackers/v2.py
index 4f5488f22..bce1e3bf5 100644
--- a/src/apps/competitions/unpackers/v2.py
+++ b/src/apps/competitions/unpackers/v2.py
@@ -18,6 +18,8 @@ def __init__(self, *args, **kwargs):
             "description": self.competition_yaml.get("description", ""),
             "competition_type": self.competition_yaml.get("competition_type", "competition"),
             "fact_sheet": self.competition_yaml.get("fact_sheet", None),
+            "reward": self.competition_yaml.get("reward", None),
+            "contact_email": self.competition_yaml.get("contact_email", None),
             "pages": [],
             "phases": [],
             "leaderboards": [],
diff --git a/src/static/img/trophy.png b/src/static/img/trophy.png
new file mode 100644
index 0000000000000000000000000000000000000000..c810f3408731f91541bb58e35bb5d9bc076c36d5
GIT binary patch
literal 6557
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
P00000NkvXXu0mjfw545>

literal 0
HcmV?d00001

diff --git a/src/static/riot/competitions/detail/_header.tag b/src/static/riot/competitions/detail/_header.tag
index 3b34c066f..7b1314c40 100644
--- a/src/static/riot/competitions/detail/_header.tag
+++ b/src/static/riot/competitions/detail/_header.tag
@@ -15,6 +15,12 @@
                             </div>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="reward-container" if="{competition.reward}">
+                            <img class="reward-icon" src="/static/img/trophy.png">
+                            <div class="reward-text">{competition.reward}</div>
+                        </div>
+                    </div>
                     <div if="{competition.admin}">
                         <a href="{URLS.COMPETITION_EDIT(competition.id)}" class="ui button">Edit</a>
                         <button class="ui small button" onclick="{show_modal.bind(this, '.manage-participants.modal')}">
@@ -36,6 +42,7 @@
                             <div>
                                 <span class="detail-label">Organized by:</span>
                                 <span class="detail-item">{competition.created_by}</span>
+                                <span if="{competition.contact_email}">(<span class="contact-email">{competition.contact_email}</span>)</span>
                             </div>
                             <div>
                                 <span class="detail-label">Current phase ends:</span>
@@ -61,6 +68,15 @@
                                     <i class="ui copy icon"></i>
                                 </span>
                             </div>
+                            <!-- Competition Report -->
+                            <div class="competition-secret-key" if="{competition.report}">
+                                <span class="report-label">Competition Report:</span>
+                                <span id="report-url">{ competition.report }</span>
+                                <span onclick="{copy_report_url}" class="ui send-pop-report" data-content="Copied!">
+                                    <i class="ui copy icon"></i>
+                                </span>
+
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -230,6 +246,16 @@
             $('.send-pop-docker').popup('toggle')
         }
 
+        self.copy_report_url = function () {
+            let range = document.createRange();
+            range.selectNode(document.getElementById("report-url"));
+            window.getSelection().removeAllRanges(); // clear current selection
+            window.getSelection().addRange(range); // to select text
+            document.execCommand("copy");
+            window.getSelection().removeAllRanges();// to deselect
+            $('.send-pop-report').popup('toggle')
+        }
+
         self.get_end_date = function (competition) {
             let end_date = _.get(_.find(competition.phases, {status: 'Current'}), 'end')
             return end_date ? pretty_date(end_date) : 'Never'
@@ -269,12 +295,20 @@
         .competition-secret-key
             font-size 13px
 
+        .contact-email
+            font-size 1em
+            color $teal
+            font-family 'Overpass Mono', monospace
+
         .secret-label
             color $red
 
         .docker-label
             color $teal
 
+        .report-label
+            color $teal
+
         .secret-url
             color $blue
 
@@ -313,5 +347,25 @@
             thead > tr > th
                 color $blue !important
                 background-color $lightblue !important
+
+        .reward-container
+            background linear-gradient(to right, #ff9966, #ff5e62)
+            color #fff
+            border 1px solid #E6E9EB
+            border-radius 5px
+            padding 10px
+            display flex
+            align-items center
+            margin-left 1rem
+
+        .reward-icon
+            width 40px
+            height 40px
+            margin-right 10px
+
+        .reward-text
+            font-size 24px
+            font-weight 900
+            display inline-block
     </style>
 </comp-detail-header>
diff --git a/src/static/riot/competitions/editor/_competition_details.tag b/src/static/riot/competitions/editor/_competition_details.tag
index 6ed3f5427..c09643f3a 100644
--- a/src/static/riot/competitions/editor/_competition_details.tag
+++ b/src/static/riot/competitions/editor/_competition_details.tag
@@ -115,6 +115,18 @@
                 </a>
             </sup>
         </div>
+        <div class="field">
+            <label>Competition Reward</label>
+            <input type="text" ref="reward" placeholder="Example: $1000 for the top participant" onchange="{form_updated}">
+        </div>
+        <div class="field">
+            <label>Organizer Contact Email</label>
+            <input type="email" ref="contact_email" placeholder="Example: email@example.com" onchange="{form_updated}">
+        </div>
+        <div class="field">
+            <label>Competition Report</label>
+            <input type="text" ref="report" placeholder="Example: https://example.com/report.pdf" onchange="{form_updated}">
+        </div>
     </div>
 
     <script>
@@ -183,6 +195,9 @@
             self.data["docker_image"] = $(self.refs.docker_image).val()
             self.data["competition_type"] = $(self.refs.competition_type).dropdown('get value')
             self.data['fact_sheet'] = self.serialize_fact_sheet_questions()
+            self.data['reward'] = $(self.refs.reward).val()
+            self.data['contact_email'] = $(self.refs.contact_email).val()
+            self.data['report'] = $(self.refs.report).val()
             if (self.data.fact_sheet === false){
                 is_valid = false
             }
@@ -309,6 +324,9 @@
             }
             self.refs.detailed_results.checked = competition.enable_detailed_results
             $(self.refs.docker_image).val(competition.docker_image)
+            $(self.refs.reward).val(competition.reward)
+            $(self.refs.contact_email).val(competition.contact_email)
+            $(self.refs.report).val(competition.report)
             if(competition.fact_sheet !== null){
                 for(question in competition.fact_sheet){
                     var q_json = competition.fact_sheet[question]
diff --git a/src/static/riot/competitions/editor/form.tag b/src/static/riot/competitions/editor/form.tag
index 6a877d383..015949810 100644
--- a/src/static/riot/competitions/editor/form.tag
+++ b/src/static/riot/competitions/editor/form.tag
@@ -271,7 +271,11 @@
 
                         self.update({errors: errors})
                     }
-                    toastr.error("Creation failed, error occurred")
+                    if(self.opts.competition_id){
+                        toastr.error("Creation failed, error occurred")
+                    }else{
+                        toastr.error("Updation failed, error occurred")
+                    }
                 })
 
         }
diff --git a/src/static/riot/competitions/public-list.tag b/src/static/riot/competitions/public-list.tag
index 813165df8..3b51ddbc9 100644
--- a/src/static/riot/competitions/public-list.tag
+++ b/src/static/riot/competitions/public-list.tag
@@ -26,7 +26,8 @@
                 </div>
                 <div class="comp-stats">
                     {pretty_date(competition.created_when)}
-                    <div class="ui divider"></div>
+                    <div if="{!competition.reward}" class="ui divider"></div>
+                    <div if="{competition.reward}"><img width="30" height="30" src="/static/img/trophy.png"></div>
                     <strong>{competition.participant_count}</strong> Participants
                 </div>
             </div>
diff --git a/src/static/riot/competitions/tile/competition_tile.tag b/src/static/riot/competitions/tile/competition_tile.tag
index 0d2455f30..5d2dbbf7b 100644
--- a/src/static/riot/competitions/tile/competition_tile.tag
+++ b/src/static/riot/competitions/tile/competition_tile.tag
@@ -17,7 +17,8 @@
             </div>
             <div class="comp-stats">
                 {pretty_date(created_when)}
-                <div class="ui divider"></div>
+                <div if="{!reward}" class="ui divider"></div>
+                <div if="{reward}"><img width="30" height="30" src="/static/img/trophy.png"></div>
                 <strong>{participant_count}</strong> Participants
             </div>
         </div>
diff --git a/src/static/stylus/forum.styl b/src/static/stylus/forum.styl
index 8cc4d6598..2a2713653 100644
--- a/src/static/stylus/forum.styl
+++ b/src/static/stylus/forum.styl
@@ -1,3 +1,9 @@
+.forum-contact
+    margin-top 20px
+
+.forum-contact-email
+    color: #4183c4
+
 .forum-post
   background-color #fff
   padding 10px
@@ -44,4 +50,4 @@
   border-radius: 2px
 
 .forum-pin-icon
-  color #017BFE
\ No newline at end of file
+  color #017BFE
diff --git a/src/templates/forums/base_forum.html b/src/templates/forums/base_forum.html
index bbedca296..7c52a4c9b 100644
--- a/src/templates/forums/base_forum.html
+++ b/src/templates/forums/base_forum.html
@@ -41,6 +41,16 @@ <h1>{{ forum.competition.title }} Forum</h1>
             </div>
         </div>
 
+        {% if forum.competition.contact_email %}
+        <div class="row">
+            <div class="forum-contact">
+                <span>Contact Email: </span>
+                <span class="forum-contact-email">{{ forum.competition.contact_email }}</span>
+
+            </div>
+        </div>
+        {% endif %}
+
         <div class="row">
             <div class="col-lg-12">
                 <div class="panel forum-panel">

From bfb682023c953ca591e19b70d42a18a307fe8b6f Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Wed, 23 Aug 2023 13:03:08 +0500
Subject: [PATCH 07/10] leaderboard download 500 error resolved

---
 src/apps/api/views/competitions.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index 8fcb69a4b..e1b74758f 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -409,11 +409,15 @@ def results(self, request, pk, format=None):
             raise PermissionDenied("You are not a competition admin or superuser")
         selected_phase = request.GET.get('phase')
         data = self.collect_leaderboard_data(competition, selected_phase)
-
         if format == 'zip':
             with SpooledTemporaryFile() as tmp:
                 with zipfile.ZipFile(tmp, 'w', zipfile.ZIP_DEFLATED) as archive:
                     for leaderboard in data:
+
+                        # Check if the leaderboard is empty
+                        if not data[leaderboard]:
+                            continue
+
                         stringIO = StringIO()
                         columns = list(data[leaderboard][list(data[leaderboard].keys())[0]])
                         dict_writer = csv.DictWriter(stringIO, fieldnames=(["Username", "fact_sheet_answers"] + columns))
@@ -437,6 +441,14 @@ def results(self, request, pk, format=None):
             elif len(data) == 0:
                 raise ValidationError("No Matching Leaderboard")
             leaderboard_title = list(data.keys())[0]
+
+            # Check if the leaderboard data is empty
+            if not data[leaderboard_title]:
+                # Return an empty CSV
+                response = HttpResponse(content_type='text/csv')
+                response['Content-Disposition'] = f'attachment; filename="{leaderboard_title}.csv"'
+                return response
+
             response = HttpResponse(content_type='text/csv')
             response['Content-Disposition'] = f'attachment; filename="{leaderboard_title}.csv"'
             columns = list(data[leaderboard_title][list(data[leaderboard_title].keys())[0]].keys())

From 193d75372ce7cf4ad3161f6f347203cb4a29e78e Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Wed, 23 Aug 2023 23:04:01 +0500
Subject: [PATCH 08/10] forum: usernames are clickable links

---
 src/templates/forums/thread_detail.html | 2 +-
 src/templates/forums/thread_list.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/forums/thread_detail.html b/src/templates/forums/thread_detail.html
index 14a154e0e..715dddc9a 100644
--- a/src/templates/forums/thread_detail.html
+++ b/src/templates/forums/thread_detail.html
@@ -18,7 +18,7 @@
                             {% endif %}
                         </div>
                         <div class="post-user-name-date">
-                            <div class="poster-name">{{ post.posted_by }}</div>
+                            <div class="poster-name"><a href="/profiles/user/{{ post.posted_by }}" target="_blank">{{ post.posted_by }}</a></div>
                             <div class="posted-date">{{ post.date_created }}</div>
                         </div>
                         <div class="post-actions">
diff --git a/src/templates/forums/thread_list.html b/src/templates/forums/thread_list.html
index acd13c5fa..c5b0d88c1 100644
--- a/src/templates/forums/thread_list.html
+++ b/src/templates/forums/thread_list.html
@@ -38,7 +38,7 @@
                         <!-- Title -->
                         <a href="{% url 'forums:forum_thread_detail' forum_pk=forum.pk thread_pk=thread.pk %}">{{ thread.title }}</a>
                     </td>
-                    <td>{{ thread.started_by }}</td>
+                    <td><a href="/profiles/user/{{ thread.started_by }}" target="_blank">{{ thread.started_by }}</a></td>
                     <td>{{ thread.date_created|date:"M d, Y" }}</td>
                     <td>{{ thread.last_post_date|timesince }}</td>
                     {# date:"g:iA M d" #}

From 13a76e584cce520d5c71631512dc36f2d46fac69 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Wed, 23 Aug 2023 23:33:56 +0500
Subject: [PATCH 09/10] forum ui profile image displayed

---
 src/static/riot/profiles/profile_detail.tag | 57 ++-------------------
 src/templates/forums/thread_detail.html     |  5 +-
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/src/static/riot/profiles/profile_detail.tag b/src/static/riot/profiles/profile_detail.tag
index d035d8dd1..714a6e2ab 100644
--- a/src/static/riot/profiles/profile_detail.tag
+++ b/src/static/riot/profiles/profile_detail.tag
@@ -1,62 +1,11 @@
 <profile-detail>
-    <!-- ---------------------------------------- HTML ---------------------------------------- -->
+    <!--  HTML  -->
     <div class="background">
         <div id="profile_wrapper" class="ui two column doubling stackable grid container">
             <div class="column">
                 <div if="{!selected_user.photo}"><img id="avatar" class="ui centered small rounded image" src="/static/img/user-avatar.png"></div>
                 <div if="{selected_user.photo}"><img id="avatar" class="ui centered small rounded image" src="{selected_user.photo}"></div>
 
-<!--                &lt;!&ndash; Competition Divider &ndash;&gt;-->
-<!--                <div class="ui horizontal divider">Competitions</div>-->
-
-<!--                &lt;!&ndash; Competition Cards &ndash;&gt;-->
-<!--                <div class="ui fluid card">-->
-<!--                    <div class="comp_card center aligned image">-->
-<!--                        <div  class="comp_header center aligned header content">-->
-<!--                            <div class="comp_name">Competition Name</div>-->
-<!--                            <img class="ui centered circular image"-->
-<!--                                 src="http://via.placeholder.com/50x50">-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                    <div class="content">-->
-<!--                        <div class="description">-->
-<!--                            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci asperiores atque-->
-<!--                                distinct...</p>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                    <div class="right aligned extra content">-->
-<!--                        <a class="status">-->
-<!--                            <i class="exchange icon"></i>-->
-<!--                            In Progress-->
-<!--                        </a>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--                <div class="ui fluid card">-->
-<!--                    <div class="comp_card center aligned image">-->
-<!--                        <div  class="comp_header center aligned header content">-->
-<!--                            <div class="comp_name">Competition Name</div>-->
-<!--                            <img class="ui centered circular image"-->
-<!--                                 src="http://via.placeholder.com/50x50">-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                    <div class="content">-->
-<!--                        <div class="description">-->
-<!--                            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Adipisci asperiores atque-->
-<!--                                distinct...</p>-->
-<!--                        </div>-->
-<!--                    </div>-->
-<!--                    <div class="right aligned extra content">-->
-<!--                        <a class="status">-->
-<!--                            <i class="exchange icon"></i>-->
-<!--                            In Progress-->
-<!--                        </a>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--                <button class="ui basic fluid button">-->
-<!--                    See More Competitions...-->
-<!--                </button>-->
-<!--            </div>-->
-
                 <!-- Competition Divider -->
                 <div class="ui horizontal divider">Organizations</div>
 
@@ -131,9 +80,9 @@
     </div>
     <script>
         self.selected_user = selected_user
-        console.log('orgs', self.selected_user.organizations)
     </script>
-    <!------------------------------------------ CSS Styling ------------------------------------>
+  
+    <!--  CSS Styling   -->
     <style type="text/stylus">
         :scope
             margin-top 20px
diff --git a/src/templates/forums/thread_detail.html b/src/templates/forums/thread_detail.html
index 14a154e0e..f144d4e46 100644
--- a/src/templates/forums/thread_detail.html
+++ b/src/templates/forums/thread_detail.html
@@ -11,14 +11,13 @@
                     <div class="post-header">
                         <div class="post-user">
                             {% if post.posted_by.photo %}
-                            <img class="post-user-img" src="/static/img/user-avatar.png">
-                            <!-- <img class="post-user-img" src="{{ post.posted_by.photo }}"> -->
+                            <img class="post-user-img" src="{{ post.posted_by.photo.url }}">
                             {% else %}
                             <img class="post-user-img" src="/static/img/user-avatar.png">
                             {% endif %}
                         </div>
                         <div class="post-user-name-date">
-                            <div class="poster-name">{{ post.posted_by }}</div>
+                            <div class="poster-name"><a href="/profiles/user/{{ post.posted_by }}" target="_blank">{{ post.posted_by }}</a></div>
                             <div class="posted-date">{{ post.date_created }}</div>
                         </div>
                         <div class="post-actions">

From 9c8d16eed18fb2119f5634397accc96138f415c7 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 24 Aug 2023 13:05:26 +0500
Subject: [PATCH 10/10] queue added in submission

---
 src/apps/api/serializers/submissions.py       |  3 +++
 .../migrations/0036_submission_queue.py       | 20 +++++++++++++++++++
 src/apps/competitions/models.py               |  2 ++
 src/apps/pages/views.py                       |  4 ++--
 .../competitions/detail/submission_upload.tag |  1 +
 5 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/apps/competitions/migrations/0036_submission_queue.py

diff --git a/src/apps/api/serializers/submissions.py b/src/apps/api/serializers/submissions.py
index 8207de686..35800f300 100644
--- a/src/apps/api/serializers/submissions.py
+++ b/src/apps/api/serializers/submissions.py
@@ -16,6 +16,7 @@
 from utils.data import make_url_sassy
 
 from tasks.models import Task
+from queues.models import Queue
 
 
 class SubmissionScoreSerializer(serializers.ModelSerializer):
@@ -113,6 +114,7 @@ class SubmissionCreationSerializer(DefaultUserCreateMixin, serializers.ModelSeri
     filename = serializers.SerializerMethodField(read_only=True)
     tasks = serializers.PrimaryKeyRelatedField(queryset=Task.objects.all(), required=False, write_only=True, many=True)
     phase = serializers.PrimaryKeyRelatedField(queryset=Phase.objects.all(), required=True)
+    queue = serializers.PrimaryKeyRelatedField(queryset=Queue.objects.all(), required=False, allow_null=True)
 
     class Meta:
         model = Submission
@@ -130,6 +132,7 @@ class Meta:
             'tasks',
             'fact_sheet_answers',
             'organization',
+            'queue'
         )
         extra_kwargs = {
             'secret': {"write_only": True},
diff --git a/src/apps/competitions/migrations/0036_submission_queue.py b/src/apps/competitions/migrations/0036_submission_queue.py
new file mode 100644
index 000000000..8145013b5
--- /dev/null
+++ b/src/apps/competitions/migrations/0036_submission_queue.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.17 on 2023-08-24 07:44
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('queues', '0001_initial'),
+        ('competitions', '0035_auto_20230806_0715'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='queue',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='submissions', to='queues.Queue'),
+        ),
+    ]
diff --git a/src/apps/competitions/models.py b/src/apps/competitions/models.py
index 063914268..f1b17412a 100644
--- a/src/apps/competitions/models.py
+++ b/src/apps/competitions/models.py
@@ -460,6 +460,8 @@ class Submission(ChaHubSaveMixin, models.Model):
     is_public = models.BooleanField(default=False)
     is_specific_task_re_run = models.BooleanField(default=False)
     worker_hostname = models.CharField(max_length=255, blank=True, null=True)
+    queue = models.ForeignKey('queues.Queue', on_delete=models.SET_NULL, null=True, blank=True,
+                              related_name='submissions')
     is_migrated = models.BooleanField(default=False)
     created_by_migration = models.ForeignKey(Phase, related_name='migrated_submissions', on_delete=models.CASCADE,
                                              null=True,
diff --git a/src/apps/pages/views.py b/src/apps/pages/views.py
index c68ef0a86..a555e80fa 100644
--- a/src/apps/pages/views.py
+++ b/src/apps/pages/views.py
@@ -90,8 +90,8 @@ def get_context_data(self, *args, **kwargs):
         for submission in context['submissions']:
             # Get filesize from each submissions's data
             submission.file_size = self.format_file_size(submission.data.file_size)
-            # Get queue from each submission's competition
-            queue_name = "*" if submission.phase.competition.queue is None else submission.phase.competition.queue.name
+            # Get queue from each submission
+            queue_name = "*" if submission.queue is None else submission.queue.name
             submission.competition_queue = queue_name
 
         return context
diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index fe4211b77..1e2d89508 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -456,6 +456,7 @@
                         "fact_sheet_answers": self.get_fact_sheet_answers(),
                         "tasks": task_ids_to_run,
                         "organization": organization,
+                        "queue": self.opts.competition.queue ? self.opts.competition.queue.id : null
                     })
                         .done(function (data) {
                             CODALAB.events.trigger('new_submission_created', data)