Merge branch 'main' into feat_optional_inputs

app/grandchallenge/admins/templates/admins/admins_list.html

@@ -29,7 +29,7 @@ <h2>Admins for {{ challenge.short_name }}</h2>
 {% endblock %}
 
 {% block tableExtraHeaders %}
-    <th>Remove</th>
+    <th class="nonSortable">Remove</th>
 {% endblock tableExtraHeaders %}
 
 {% block tableExtraBody %}

app/grandchallenge/algorithms/templates/algorithms/algorithmpermissionrequest_list.html

@@ -36,7 +36,7 @@ <h2>Permission Requests for {{ algorithm.title }}</h2>
                 <th>Department</th>
                 <th>Location</th>
                 <th>Website</th>
-                <th>Status</th>
+                <th class="nonSortable">Status</th>
             </tr>
             </thead>
             <tbody>

app/grandchallenge/archives/templates/archives/archivepermissionrequest_list.html

@@ -35,7 +35,7 @@ <h2>Permission Requests for {{ archive.title }}</h2>
                 <th>Department</th>
                 <th>Location</th>
                 <th>Website</th>
-                <th>Status</th>
+                <th class="nonSortable">Status</th>
             </tr>
             </thead>
             <tbody>

app/grandchallenge/challenges/forms.py

@@ -193,43 +193,6 @@ class Meta:
         widgets = {
             "start_date": forms.TextInput(attrs={"type": "date"}),
             "end_date": forms.TextInput(attrs={"type": "date"}),
-            "long_term_commitment": forms.CheckboxInput(
-                attrs={
-                    "onchange": "updateExtraField('long_term_commitment', 'support this challenge long-term');"
-                }
-            ),
-            "data_license": forms.CheckboxInput(
-                attrs={
-                    "onchange": "updateExtraField('data_license', 'use a CC-BY license for your data');"
-                }
-            ),
-            "expected_number_of_teams": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "number_of_tasks": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "average_size_of_test_image_in_mb": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "inference_time_limit_in_minutes": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "phase_1_number_of_submissions_per_team": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "phase_2_number_of_submissions_per_team": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "phase_1_number_of_test_images": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "phase_2_number_of_test_images": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
-            "budget_for_hosting_challenge": forms.NumberInput(
-                attrs={"oninput": "validity.valid||(value='');"}
-            ),
         }
         labels = {
             "short_name": "Acronym",

app/grandchallenge/challenges/migrations/0045_challengerequest_algorithm_maximum_settable_memory_gb_and_more.py

@@ -81,7 +81,6 @@ class Migration(migrations.Migration):
             model_name="challengerequest",
             name="budget_for_hosting_challenge",
             field=models.PositiveIntegerField(
-                default=0,
                 help_text="What is your budget for hosting this challenge? Please be reminded of our <a href='/challenge-policy-and-pricing/'>challenge pricing policy</a>.",
             ),
         ),

app/grandchallenge/challenges/models.py

@@ -951,7 +951,6 @@ class ChallengeRequestStatusChoices(models.TextChoices):
         validators=[MinValueValidator(limit_value=1)],
     )
     budget_for_hosting_challenge = models.PositiveIntegerField(
-        default=0,
         help_text="What is your budget for hosting this challenge? Please be reminded of our <a href='/challenge-policy-and-pricing/'>challenge pricing policy</a>.",
     )
     long_term_commitment = models.BooleanField(

app/grandchallenge/challenges/static/js/challenges/challenge_costs_overview.mjs

@@ -1,14 +1,10 @@
 document.addEventListener("DOMContentLoaded", event => {
     $("#challengeCostsOverviewTable").DataTable({
-        order: [[2, "desc"]],
+        order: [
+            [2, "desc"],
+            [3, "desc"],
+        ],
         lengthChange: false,
         pageLength: 100,
-        columnDefs: [
-            {
-                targets: "datatables-non-sortable",
-                searchable: false,
-                orderable: false,
-            },
-        ],
     });
 });

app/grandchallenge/challenges/static/js/challenges/challenge_request_dynamic_fields.js → app/grandchallenge/challenges/static/js/challenges/challenge_request_dynamic_fields.mjs

@@ -17,7 +17,22 @@ function updateExtraField(fieldName, helpText) {
     }
 }
 
-$(document).ready(() => {
+document.addEventListener("DOMContentLoaded", () => {
+    const longTermCommitmentCheckbox = document.getElementById(
+        "id_long_term_commitment",
+    );
+    longTermCommitmentCheckbox.addEventListener("change", () => {
+        updateExtraField(
+            "long_term_commitment",
+            "support this challenge long-term",
+        );
+    });
+
+    const dataLicenseCheckbox = document.getElementById("id_data_license");
+    dataLicenseCheckbox.addEventListener("change", () => {
+        updateExtraField("data_license", "use a CC-BY license for your data");
+    });
+
     updateExtraField(
         "long_term_commitment",
         "support this challenge long-term",

app/grandchallenge/challenges/static/js/challenges/challengerequest_list_table.mjs

@@ -2,13 +2,5 @@ document.addEventListener("DOMContentLoaded", event => {
     $("#challengeRequestsTable").DataTable({
         order: [[3, "desc"]],
         lengthChange: false,
-        pageLength: 50,
-        columnDefs: [
-            {
-                targets: "datatables-non-sortable",
-                searchable: false,
-                orderable: false,
-            },
-        ],
     });
 });

app/grandchallenge/challenges/templates/challenges/challengerequest_form.html

@@ -21,6 +21,6 @@ <h2>Request a Challenge</h2>
 
 {% block script %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static "js/challenges/challenge_request_dynamic_fields.js" type="module" defer %}"></script>
+    <script type="module" src="{% static "js/challenges/challenge_request_dynamic_fields.mjs" %}"></script>
     <script type="text/javascript" src="{% static "js/unsavedform.js" %}"></script>
 {% endblock %}

app/grandchallenge/challenges/templates/challenges/challengerequest_list.html

@@ -22,7 +22,7 @@ <h2>{% if not perms.challenges.change_challengerequest %}Your{% endif %} Challen
         <table class="table table-hover table-borderless table-sm w-100" id="challengeRequestsTable">
             <thead class="thead-light">
             <tr>
-                <th class="datatables-non-sortable"></th>
+                <th class="nonSortable"></th>
                 <th class="text-center">Acronym</th>
                 <th class="text-center">Creator</th>
                 <th class="text-center">Planned start date</th>

app/grandchallenge/challenges/views.py

@@ -268,9 +268,6 @@ def get_queryset(self):
             .with_available_compute()
             .with_most_recent_submission_datetime()
             .prefetch_related("phase_set")
-            .order_by(
-                F("most_recent_submission_datetime").desc(nulls_last=True)
-            )
         )
 
 

app/grandchallenge/core/static/css/base.scss

@@ -18,6 +18,7 @@ $pagination-disabled-bg: lighten($blue, 15%) !default;
 @import "../vendored/bootswatch/dist/flatly/variables";
 @import "../vendored/bootstrap/scss/bootstrap";
 @import "../vendored/bootswatch/dist/flatly/bootswatch";
+@import "datatables";
 
 // Fix https://github.com/comic/grand-challenge.org/issues/1201
 .custom-select {
@@ -42,3 +43,10 @@ $pagination-disabled-bg: lighten($blue, 15%) !default;
 .btn {
     margin: $btn-focus-width;
 }
+
+blockquote {
+    padding: 0 $spacer;
+    font-size: inherit !important;
+    border-left: $spacer * .25 solid $primary;
+    color: $primary;
+}

app/grandchallenge/core/static/css/datatables.scss

@@ -0,0 +1,25 @@
+
+.dt-layout-start,
+.dt-layout-end {
+    padding-top: $spacer * 0.5;
+    padding-bottom: $spacer * 0.5;
+}
+
+.dt-container ul.pagination {
+    justify-content: right;
+}
+
+.dt-layout-full,
+.dt-layout-start,
+.dt-layout-end {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+}
+
+.dt-scroll-body {
+    border-bottom: none !important;
+}
+
+.dt-orderable-none .dt-column-order {
+    display: none;
+}

app/grandchallenge/core/static/js/datatables.defaults.mjs

@@ -1,15 +1,47 @@
-$.extend(true, DataTable.defaults, {
+$.extend($.fn.dataTable.defaults, {
     scrollX: true,
+    lengthChange: false,
     language: {
         paginate: {
             next: "Next",
             previous: "Previous",
         },
     },
     pagingType: "simple_numbers",
+    columnDefs: [
+        {
+            // Prevents unexpected styling for dt-*-type datatypes
+            // Only applies to client-side tables
+            type: "string",
+            targets: "_all",
+        },
+        {
+            targets: "nonSortable",
+            searchable: false,
+            orderable: false,
+        },
+    ],
+    drawCallback: function () {
+        const api = this.api();
+        api.columns().every(function () {
+            if (this.orderable) {
+                this.header().setAttribute(
+                    "title",
+                    "Activate to sort. Hold Shift to sort by multiple columns.",
+                );
+            }
+        });
+    },
 });
 
 $(document).on("init.dt", () => {
-    // Set up floating scroll, note that the target class only shows up when scrollX is set to true
-    $(".dataTables_scrollBody").floatingScroll();
+    const element = $(".dt-scroll-body");
+
+    if (element.length === 0) {
+        console.warn(
+            "Warning: Element for floating-scroll attachment could not be located",
+        );
+    }
+
+    element.floatingScroll();
 });

app/grandchallenge/core/static/js/permission_request_display_table.mjs

@@ -5,12 +5,5 @@ $(document).ready(() => {
             [0, "desc"],
         ],
         pageLength: 25,
-        columnDefs: [
-            {
-                targets: [-1],
-                searchable: false,
-                orderable: false,
-            },
-        ],
     });
 });

app/grandchallenge/core/static/js/sort_tables.js

@@ -1,11 +1,8 @@
 $(document).ready(() => {
     $("table.sortable").dataTable({
-        bJQueryUI: false,
-        sPaginationType: "full_numbers",
-        bPaginate: false,
-        bLengthChange: false,
-        bFilter: false,
-        bInfo: false,
-        bAutoWidth: false,
+        paginate: false,
+        lengthChange: false,
+        filter: false,
+        info: false,
     });
 });

app/grandchallenge/datatables/static/js/datatables/list.mjs

@@ -20,11 +20,7 @@ document.addEventListener("DOMContentLoaded", () => {
         pageLength: 25,
         serverSide: true,
         columnDefs: [
-            {
-                targets: "nonSortable",
-                searchable: false,
-                orderable: false,
-            },
+            ...$.fn.dataTable.defaults.columnDefs,
             {
                 className: `align-middle text-${textAlign}`,
                 targets: "_all",

app/grandchallenge/documentation/templates/documentation/docpage_detail.html

@@ -138,8 +138,7 @@
             {% if search_results %}
                 {% for result in search_results %}
                     <div class="card rounded border-light my-1">
-                        <a href="{% url 'documentation:detail' slug=result.slug %}"><h5 class="pl-3 pt-3">{{ result.title }}</h5></a>
-                        <div class="mb-3 pl-3">{{ result.headline|clean }}</div>
+                        <a href="{% url 'documentation:detail' slug=result.slug %}"><h5 class="p-3 m-0">{{ result.title }}</h5></a>
                     </div>
                 {% endfor %}
             {% else %}

app/grandchallenge/documentation/views.py

@@ -1,6 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.postgres.search import (
-    SearchHeadline,
     SearchQuery,
     SearchRank,
     SearchVector,
@@ -44,10 +43,8 @@ def get_context_data(self, **kwargs):
         if keywords:
             query = SearchQuery(keywords)
             vector = SearchVector("title", "content")
-            headline = SearchHeadline("content", query)
             qs = (
-                qs.annotate(headline=headline)
-                .annotate(rank=SearchRank(vector, query))
+                qs.annotate(rank=SearchRank(vector, query))
                 .annotate(
                     similarity=TrigramSimilarity("title", keywords)
                     + TrigramSimilarity("content", keywords)

app/grandchallenge/evaluation/static/js/evaluation/combined_ranks_table.mjs

@@ -5,6 +5,5 @@ document.addEventListener("DOMContentLoaded", event => {
             [2, "asc"],
         ],
         lengthChange: false,
-        pageLength: 50,
     });
 });

app/grandchallenge/evaluation/static/js/evaluation/groundtruths_table.mjs

@@ -1,11 +1,3 @@
 $(document).ready(() => {
-    $("#groundtruthsTable").DataTable({
-        columnDefs: [
-            {
-                targets: "nonSortable",
-                searchable: false,
-                orderable: false,
-            },
-        ],
-    });
+    $("#groundtruthsTable").DataTable();
 });