+ {% blocktrans with site.name as site_name %}Please sign in with one
+ of your existing third party accounts. Or, sign up
+ for a {{site_name}} account and sign in below:{% endblocktrans %}
+
+
+
+
+ {% include "socialaccount/snippets/provider_list.html" %}
+
To participate in this competition, you must accept its specific terms and conditions.
- After you register, the competition organizer will review your application and notify you
- when your participation is approved.
-
You've already requested to participate in this challenge and your status is pending.
+ {% elif my_status == "denied" %}
+
Your request to register for this competition was denied.
+ {% elif my_status == "approved" %}
{% include "web/competitions/_participate.html" with tab=tab contents=contents %}
{% endif %}
{% endif %}
{% else %}
- {% if tab.codename == "results" and user.is_authenticated and participant %}
+ {% if tab.codename == "results" %}
{% include "web/competitions/_results.html" with tab=tab contents=contents %}
{% endif %}
{% include "web/competitions/_participate.html" with tab=tab contents=contents %}
@@ -98,17 +104,65 @@
{{ competition.title }}
{% endblock %}
{% block js %}
+
+ function fnFormatDetails ( prTable, nTr )
+ {
+ var aData = prTable.fnGetData( nTr );
+ var sOut = '
';
+ sOut += '
Rendering engine:
'+aData[1]+' '+aData[4]+'
';
+ sOut += '
Link to source:
Could provide a link here
';
+ sOut += '
Extra info:
And any further details here (images etc)
';
+ sOut += '
';
+
+ return sOut;
+ }
+
$('document').ready(function() {
// This helps make sections appear with Foundation
$(this).foundation('section', 'reflow');
- $("#participate_form").validate();
- $("#user_results").dataTable({
+
+ // Validate the form (ensure they have checked accept terms and conditions)
+ $("#participate_form").validate({
+ errorPlacement: function(error, element) {
+ error.appendTo("#terms");
+ }
+ });
+
+ /* attach a submit handler to the form */
+ $("#participate_form").submit(function(event) {
+
+ /* stop form from submitting normally */
+ event.preventDefault();
+
+ /*clear result div*/
+ $("#result").html('');
+
+ /* get some values from elements on the page: */
+ var values = $(this).serialize();
+
+ /* Send the data using post and put the results in a div */
+ request = $.ajax({
+ url: "/api/competition/{{competition.id}}/participate/",
+ type: "post",
+ dataType: "text",
+ data: values,
+ success: function(response, textStatus, jqXHR) {
+ $('.content form').replaceWith('
Your request to participate was successfully submitted.
');
+ },
+ error: function(jsXHR, textStatus, errorThrown) {
+ alert("There was a problem registering for this competition.");;
+ }
+ });
+ });
+
+ // In partials loaded, initialize the data tables
+ var prTable = $("#user_results").dataTable({
'bPaginate' : false,
'bInfo' : false,
'bFilter' : false,
'bAutoWidth': false
});
- $("#competition_results").dataTable({
+ var crTable = $("#competition_results").dataTable({
'bPaginate' : false,
'bInfo' : false,
'bFilter' : false
diff --git a/codalab/apps/web/templates/web/help/about.html b/codalab/apps/web/templates/web/help/about.html
index d09f0813b..dbdc024d6 100644
--- a/codalab/apps/web/templates/web/help/about.html
+++ b/codalab/apps/web/templates/web/help/about.html
@@ -5,7 +5,7 @@
CodaLab competitions provide an opportunity for researchers, developers and algorithmists to
diff --git a/codalab/apps/web/templates/web/index.html b/codalab/apps/web/templates/web/index.html
index b1b40c32d..8218d8a47 100644
--- a/codalab/apps/web/templates/web/index.html
+++ b/codalab/apps/web/templates/web/index.html
@@ -49,7 +49,9 @@
{% endblock content %}
@@ -40,11 +40,5 @@
$('document').ready(function() {
// This helps make sections appear with Foundation
$(this).foundation('section', 'reflow');
-
- // Ajax load the participating competitions when the section title is clicked
- $('#participating').click(function() {
- console.log("Fetching particpating...");
- $('.my_participating').html(' ').load('/my/_partials/_competitions_entered');
- });
});
{% endblock js %}
diff --git a/codalab/apps/web/templates/web/my/participants.html b/codalab/apps/web/templates/web/my/participants.html
index 91ff1f16f..1f88aea81 100644
--- a/codalab/apps/web/templates/web/my/participants.html
+++ b/codalab/apps/web/templates/web/my/participants.html
@@ -2,130 +2,87 @@
{% load staticfiles %}
{% block title %}Participants{% endblock %}
{% block extra_head %}
-
{% endblock %}
+{% block subheader %}
+
Participants
+{% endblock subheader %}
{% block content %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
My Username
-
-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sodales viverra tellus vitae rutrum. Nunc vehicula luctus mauris, vel gravida quam cursus quis. Nam blandit elit nec leo congue eu rhoncus dolor fermentum.Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sodales viverra tellus vitae rutrum. Nunc vehicula luctus mauris, vel gravida quam cursus quis. Nam blandit elit nec leo congue eu rhoncus dolor fermentum.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {% if not object_list %}
+
There are no participants.
+ {% else %}
+ {% for item in object_list %}
+
+
+
+ {% if item.status.codename == 'pending' %}
+
-
+
+ {% endfor %}
+ {% endif %}
{% endblock %}
{% block js %}
- $("#deny").change(function() {
- $("#deny_reason").toggle(this.checked)
- });
+/* $("#process_request").validate(); */
+
+
+/* attach a submit handler to the form */
+$("form").submit(function(event) {
+
+ /* stop form from submitting normally */
+ event.preventDefault();
+
+ /* get some values from elements on the page: */
+ var values = $(this).serialize();
+ var fid = $(this).attr('id');
- $("#process_request").validate({
- rules : {
- 'deny_reason' : {
- required: {
- depends : function(element) {
- return $("input[name='deny_reason']").is(":checked");
- }
- }
- }
+ /* Send the data using post and put the results in a div */
+ request = $.ajax({
+ url: "/api/competition/{{competition_id}}/participation_status/",
+ type: "post",
+ dataType: "text",
+ data: values,
+ success: function(response, textStatus, jqXHR) {
+ $(fid).remove();
+ },
+ error: function(jsXHR, textStatus, errorThrown) {
+ alert("There was a problem processing this request for this competition.");;
}
});
+});
{% endblock js %}
diff --git a/codalab/apps/web/views.py b/codalab/apps/web/views.py
index e6f3431b7..7e947c0b5 100644
--- a/codalab/apps/web/views.py
+++ b/codalab/apps/web/views.py
@@ -26,8 +26,8 @@ def competition_index(request):
def my_index(request):
template = loader.get_template("web/my/index.html")
context = RequestContext(request, {
- 'my_competitions' : models.Competition.objects.all(),
- 'competitions_im_in' : models.Competition.objects.all()
+ 'my_competitions' : models.Competition.objects.filter(creator=request.user),
+ 'competitions_im_in' : request.user.participation.all()
})
return HttpResponse(template.render(context))
@@ -62,7 +62,7 @@ class PhasesInline(InlineFormSet):
class CompetitionEdit(UpdateWithInlinesView):
model = models.Competition
inlines = [PhasesInline, ]
- template_name = 'web/my/edit.html'
+ template_name = 'web/competition/edit.html'
def get_context_data(self, **kwargs):
context = super(CompetitionEdit,self).get_context_data(**kwargs)
@@ -70,7 +70,8 @@ def get_context_data(self, **kwargs):
class CompetitionDelete(DeleteView):
model = models.Competition
- success_url = reverse_lazy('competition-list')
+ # success_url = reverse_lazy('competition-list')
+ template_name = 'web/competitions/confirm-delete.html'
class CompetitionDetailView(DetailView):
queryset = models.Competition.objects.all()
@@ -92,8 +93,11 @@ def get_context_data(self, **kwargs):
context['tabs'] = side_tabs
try:
- if self.request.user.is_authenticated():
- context['participant'] = self.request.user in [x.user for x in context['object'].participants.all()]
+ if self.request.user.is_authenticated() and self.request.user in [x.user for x in context['object'].participants.all()]:
+ context['my_status'] = [x.status for x in context['object'].participants.all() if x.user == self.request.user][0].codename
+ else:
+ context['my_status'] = "unknown"
+
except ObjectDoesNotExist:
pass
diff --git a/codalab/codalab/settings/base.py b/codalab/codalab/settings/base.py
index b0890ca05..b63a560cb 100644
--- a/codalab/codalab/settings/base.py
+++ b/codalab/codalab/settings/base.py
@@ -214,7 +214,6 @@ class Base(Settings):
('text/typescript', 'tsc {infile} --out {outfile}'),
)
-
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.
diff --git a/codalab/initial_data.json b/codalab/initial_data.json
index 1938fb4de..2652cb0e0 100644
--- a/codalab/initial_data.json
+++ b/codalab/initial_data.json
@@ -73,6 +73,7 @@
"fields": {
"category": 1,
"initial_visibility": 1,
+ "codename": "page1",
"required": true,
"rank": 0,
"label": "Overview"
@@ -84,6 +85,7 @@
"fields": {
"category": 1,
"initial_visibility": 1,
+ "codename": "page2",
"required": true,
"rank": 1,
"label": "Evaluate"
@@ -95,6 +97,7 @@
"fields": {
"category": 1,
"initial_visibility": 1,
+ "codename": "page3",
"required": true,
"rank": 2,
"label": "Terms and Conditions"
@@ -106,6 +109,7 @@
"fields": {
"category": 2,
"initial_visibility": 1,
+ "codename": "page4",
"required": true,
"rank": 0,
"label": "Get data"
diff --git a/codalab/scripts/brats2012_overview.html b/codalab/scripts/brats2012_overview.html
index 2e06e6e14..85c47b3e3 100644
--- a/codalab/scripts/brats2012_overview.html
+++ b/codalab/scripts/brats2012_overview.html
@@ -7,9 +7,9 @@
Background
Challenge Format
- Teams wishing to participate in the challenge should download the training data for algorithmic tweaking and tuning. The teams should then evaluate their segmentation performance on the training data, and submit a short paper describing the results and the segmentation method that was used. On the day of the challenge itself, an independent set of test scans will be made available and analyzed on the spot by each team, after which the methods will be ranked according to their performance. The challenge day will conclude with a round-table discussion of the obtained results as well as invited talks by clinical experts.
+ Teams wishing to participate in the challenge should download the training data for algorithmic tweaking and tuning. The teams should then evaluate their segmentation performance on the training data, and submit a short paper describing the results and the segmentation method that was used. On the day of the challenge itself, an independent set of test scans will be made available and analyzed on the spot by each team, after which the methods will be ranked according to their performance. The challenge day will conclude with a round-table discussion of the obtained results as well as invited talks by clinical experts.
In the weeks following the challenge participating teams will be invited to contribute to a joint paper describing and summarizing the challenge outcome, which we will then submit to a high-impact journal in the field.
-