From 5bd439ca240602801ae4e01205a2ca31679a0941 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 22 Jun 2023 13:48:41 +0500
Subject: [PATCH 1/5] organization message displayed

---
 src/static/riot/competitions/detail/submission_upload.tag | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index 792842582..b93b84dab 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -55,6 +55,9 @@
                         <option value="None">Yourself</option>
                         <option each="{org in organizations}" value="{org.id}">{org.name}</option>
                     </select>
+                    <span id="submit-as">You can either submit as yourself of as an organization.</span>
+                    <br>
+                    <span if="{_.size(organizations) === 0}"><a href="/profiles/organization/create/" target="_blank">Click to create an Organization</a></span>
                 </div>
 
                 <input-file name="data_file" ref="data_file" error="{errors.data_file}" accept=".zip"></input-file>
@@ -571,5 +574,9 @@
         .graph-container
             display block
             height 250px
+        
+        #submit-as
+            color #8c8c8c
+            font-style italic
     </style>
 </submission-upload>

From 5b2e73c696a402458122db3f21b7eefc9d5cf0f5 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 22 Jun 2023 13:51:45 +0500
Subject: [PATCH 2/5] spelling mistake fixed

---
 src/static/riot/competitions/detail/submission_upload.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index b93b84dab..d754eb57e 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -55,7 +55,7 @@
                         <option value="None">Yourself</option>
                         <option each="{org in organizations}" value="{org.id}">{org.name}</option>
                     </select>
-                    <span id="submit-as">You can either submit as yourself of as an organization.</span>
+                    <span id="submit-as">You can either submit as yourself or as an organization.</span>
                     <br>
                     <span if="{_.size(organizations) === 0}"><a href="/profiles/organization/create/" target="_blank">Click to create an Organization</a></span>
                 </div>

From ab6997294b81a5fb25e015a1271fc616c028a0fe Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 22 Jun 2023 17:34:37 +0500
Subject: [PATCH 3/5] add organization added in dropdown

---
 .../competitions/detail/submission_upload.tag | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index d754eb57e..fe4211b77 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -50,14 +50,20 @@
                 </div>
 
                 <div class="ui six wide field">
-                    <label>Submit as:</label>
+                    <label>Submit as:
+                    <span class="ui mini circular icon button"
+                        data-tooltip="You can either submit as yourself or as an organization"
+                        data-position="top center">
+                        <i class="question icon"></i>
+                    </span>
+                    </label>
+                    
                     <select name="organizations" id="organization_dropdown" class="ui dropdown">
                         <option value="None">Yourself</option>
                         <option each="{org in organizations}" value="{org.id}">{org.name}</option>
-                    </select>
-                    <span id="submit-as">You can either submit as yourself or as an organization.</span>
-                    <br>
-                    <span if="{_.size(organizations) === 0}"><a href="/profiles/organization/create/" target="_blank">Click to create an Organization</a></span>
+                        <option if="{_.size(organizations) === 0}" value="add_organization">+ Add New Organizaiton</option>
+                    </select> 
+                    
                 </div>
 
                 <input-file name="data_file" ref="data_file" error="{errors.data_file}" accept=".zip"></input-file>
@@ -182,8 +188,19 @@
             $(self.refs.data_file.refs.file_input).on('change', self.check_can_upload)
             self.setup_autoscroll()
             self.setup_websocket()
+        }) 
+        
+        // Function to capture change of `submit as` dropdown
+        // Redirect to Add organization if selected option is Add Organizaiton
+        $(document).on('change','#organization_dropdown',function(){
+            let selected_option_value = $('#organization_dropdown option:selected').val();
+            if(selected_option_value == 'add_organization'){
+                // Open Add organization in new tab
+                window.open('/profiles/organization/create/', '_blank')
+            }
         })
 
+
         self.setup_autoscroll = function () {
             if (!self.refs.autoscroll_checkbox) {
                 return
@@ -425,7 +442,9 @@
                     self.lines = {}
                     let dropdown = $('#organization_dropdown')
                     let organization = dropdown.dropdown('get value')
-                    organization = organization === 'None' ? null : organization
+                    if(organization === 'add_organization' | organization === 'None'){
+                        organization = null
+                    }
                     dropdown.attr('disabled', 'disabled')
 
 
@@ -574,9 +593,6 @@
         .graph-container
             display block
             height 250px
-        
-        #submit-as
-            color #8c8c8c
-            font-style italic
+
     </style>
 </submission-upload>

From a17036e65a68b0b361a13fdc1c27bb57ce942c89 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Wed, 2 Aug 2023 20:18:45 +0500
Subject: [PATCH 4/5] organization shown if submission is submitted by it

---
 src/static/riot/competitions/detail/leaderboards.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index d289060ef..d7f85c9ef 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -57,9 +57,9 @@
                 <virtual if="{index + 1 > 5}">{index + 1}</virtual>
             </td>
             <td if="{submission.organization === null}"><a href="{submission.slug_url}">{ submission.owner }</a></td>
+            <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
             <td>{submission.num_entries}</td>
             <td>{submission.last_entry_date}</td>
-            <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
             <td each="{ column in filtered_columns }">{ get_score(column, submission) } </td>
             <td if="{enable_detailed_results}"><a href="detailed_results/{submission.id}" target="_blank">Show detailed results</a></td>
         </tr>

From e10d9b9094533a94b03371e91b3047df2a504646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Thu, 10 Aug 2023 17:24:14 +0200
Subject: [PATCH 5/5] Update leaderboards.tag

---
 src/static/riot/competitions/detail/leaderboards.tag | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/static/riot/competitions/detail/leaderboards.tag b/src/static/riot/competitions/detail/leaderboards.tag
index 3230a2026..e21238b23 100644
--- a/src/static/riot/competitions/detail/leaderboards.tag
+++ b/src/static/riot/competitions/detail/leaderboards.tag
@@ -59,7 +59,6 @@
             <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
             <td>{submission.num_entries}</td>
             <td>{submission.last_entry_date}</td>
-            <td if="{submission.organization !== null}"><a href="{submission.organization.url}">{ submission.organization.name }</a></td>
             <td each="{ column in filtered_columns }">
                 <a if="{column.title == 'Detailed Results'}" href="detailed_results/{get_detailed_result_submisison_id(column, submission)}" target="_blank" class="eye-icon-link">
                     <i class="icon grey eye eye-icon"></i>