Skip to content

Issue #463 registration #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Issue #463 registration #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0da6154
Temporary Changes to Registration (still in progress)
Apr 2, 2025
9c3c328
Fixes #463 (Still in progress)
Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions oioioi/base/templates/admin/edit_inline/tabular.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,28 @@
<div class="card mb-2">
<div class="card-header py-2">
{% if inline_admin_formset.formset.max_num == 1 %}
<h5 class="mb-0">{{ inline_admin_formset.opts.verbose_name|capfirst }}</h5>
<h5 class="mb-0">
{{ inline_admin_formset.opts.verbose_name|capfirst }}
{% if inline_admin_formset.formset.disable_config %}
<div class="alert alert-danger d-inline-block ml-2 mb-0" role="alert">
This type of contest does not enable registration
</div>
{% endif %}
</h5>

{% else %}
<h5 class="mb-0">{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h5>
<h5 class="mb-0">
{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}
{% if inline_admin_formset.formset.disable_config %}
<div class="alert alert-danger d-inline-block ml-2 mb-0" role="alert">
This type of contest does not enable registration
</div>
{% endif %}
</h5>
{% endif %}
</div>
<div class="card-body py-2">
<div class="card-body py-2"
style="{% if inline_admin_formset.formset.disable_config %}opacity: 0.5; pointer-events:none;{% endif %}">
{{ inline_admin_formset.formset.non_form_errors }}
<table class="table table-sm">
<thead class="table-borderless"><tr>
Expand Down
7 changes: 7 additions & 0 deletions oioioi/contests/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ class ContestAdmin(admin.ModelAdmin):
list_display_links = ['id', 'name']
ordering = ['-creation_date']

""" todo: add a js to change
class Media:
js = [
'js/contest_admin.js', #todo!
]
"""

def has_add_permission(self, request):
return request.user.is_superuser

Expand Down
4 changes: 3 additions & 1 deletion oioioi/contests/controllers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ def filter_users_with_accessible_personal_data(self, queryset):
"""
raise NotImplementedError


class PublicContestRegistrationController(RegistrationController):
description = _("Public contest")

Expand Down Expand Up @@ -974,6 +973,9 @@ def _is_partial_score(self, test_report):
def show_default_fields(self, problem_instance):
return problem_instance.problem.controller.show_default_fields(problem_instance)

def registration_is_enabeld(self):
return False


class PastRoundsHiddenContestControllerMixin(object):
"""ContestController mixin that hides past rounds
Expand Down
7 changes: 7 additions & 0 deletions oioioi/contests/static/contests/registration_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
document.addEventListener('DOMContentLoaded', function() {
const contestTypeField = document.querySelector('#id_controller_name');
const registrationAlert = document.querySelector('#registration_alert');
const registrationInlineBody = document.querySelector('#registration_inline_body');
//...

});
136 changes: 136 additions & 0 deletions oioioi/contests/templates/admin/contests/contest/registrationavailabilityconfig_tabular.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
{% load i18n admin_urls static admin_modify %}

<div class="js-inline-admin-formset"
id="{{ inline_admin_formset.formset.prefix }}-group"
data-inline-type="tabular"
data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">

<div class="tabular inline-related">
{{ inline_admin_formset.formset.management_form }}
<fieldset class="module {{ inline_admin_formset.classes }}">
<div class="card mb-2">

<div class="card-header py-2 d-flex align-items-center">

<h5 class="mb-0">
{{ inline_admin_formset.opts.verbose_name|capfirst }}
<div class="alert alert-danger d-inline-block ml-3 mb-0" role="alert">
This type of contest does not enable registration
</div>
</h5>
</div>

<div style="opacity: 0.5; pointer-events: none;">
<div class="card-body py-2">
{{ inline_admin_formset.formset.non_form_errors }}
<table class="table table-sm">
<thead class="table-borderless">
<tr>
<th class="original"></th>
{% for field in inline_admin_formset.fields %}
{% if not field.widget.is_hidden %}
<th class="column-{{ field.name }}{% if field.required %} required{% endif %}">
{{ field.label|capfirst }}
{% if field.help_text %}
<img src="{% static "admin/img/icon-unknown.svg" %}"
class="help help-tooltip"
width="14" height="14"
alt="({{ field.help_text|striptags }})"
title="{{ field.help_text|striptags }}">
{% endif %}
</th>
{% endif %}
{% endfor %}
{% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
<th>{% translate "Delete?" %}</th>
{% endif %}
</tr>
</thead>

<tbody>
{% for inline_admin_form in inline_admin_formset %}
{% if inline_admin_form.form.non_field_errors %}
<tr class="row-form-errors">
<td colspan="{{ inline_admin_form|cell_count }}">
{{ inline_admin_form.form.non_field_errors }}
</td>
</tr>
{% endif %}

<tr class="form-row
{% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}
{% if forloop.last and inline_admin_formset.has_add_permission %}empty-form{% endif %}"
id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">

<td class="original">
{% if inline_admin_form.original or inline_admin_form.show_url %}
{% if inline_admin_form.original %}
{{ inline_admin_form.original }}
{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}
<a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}"
class="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %}">
{% if inline_admin_formset.has_change_permission %}
{% translate "Change" %}
{% else %}
{% translate "View" %}
{% endif %}
</a>
{% endif %}
{% endif %}
{% if inline_admin_form.show_url %}
<a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>
{% endif %}
{% endif %}
{% if inline_admin_form.needs_explicit_pk_field %}
{{ inline_admin_form.pk_field.field }}
{% endif %}
{% if inline_admin_form.fk_field %}
{{ inline_admin_form.fk_field.field }}
{% endif %}
{% spaceless %}
{% for fieldset in inline_admin_form %}
{% for line in fieldset %}
{% for field in line %}
{% if not field.is_readonly and field.field.is_hidden %}
{{ field.field }}
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endspaceless %}
</td>

{% for fieldset in inline_admin_form %}
{% for line in fieldset %}
{% for field in line %}
{% if field.is_readonly or not field.field.is_hidden %}
<td{% if field.field.name %} class="field-{{ field.field.name }}"{% endif %}>
{% if field.is_readonly %}
{{ field.contents }}
{% else %}
{{ field.field.errors.as_ul }}
{{ field.field }}
{% endif %}
</td>
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}

{% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %}
<td class="delete">
{% if inline_admin_form.original %}
{{ inline_admin_form.deletion_field.field }}
{% endif %}
</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</fieldset>
</div>
</div>
9 changes: 9 additions & 0 deletions oioioi/contests/templates/contests/registration_closed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% extends "base-with-menu.html" %}
{% load i18n %}

{% block title %}{% trans "Registration Form" %}{% endblock %}

{% block main-content %}
<h1>{% trans "Registration Closed" %}</h1>
<p>{% trans "Contact organizers if this is a bug" %}</p>
{% endblock %}
Loading
Loading