Skip to content

Display all files of the submission #3126

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

Closed
wants to merge 3 commits into from
Closed

Display all files of the submission #3126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d6969
Simplify template
vmcj Sep 28, 2025
49efb21
Only display one sourcecode tab at a time
vmcj Sep 28, 2025
86725a7
Display all files for a submission
vmcj Sep 28, 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
25 changes: 15 additions & 10 deletions webapp/templates/jury/partials/submission_diff.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,23 @@
{%- endfor %}
{%- for file in oldFileStats.unchangedfiles %}
<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
<a class="nav-link {% if loop.first and oldFileStats.changedfiles == [] %}active{% endif %}"
data-bs-toggle="tab" href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
</li>
{%- endfor %}
{%- for file in oldFileStats.addedfiles %}
<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
<a class="nav-link {% if loop.first and oldFileStats.changedfiles == [] and oldFileStats.addedfiles == [] %}active{% endif %}"
data-bs-toggle="tab" href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
</li>
{%- endfor %}

</ul>
<div class="tab-content source-tab">
{%- for filePair in oldFileStats.changedfiles %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
role="tabpanel">
<div class="tab-pane fade
{% if loop.first %}show active{% endif %}"
id="diff-{{ filePair.1.submitfileid }}" role="tabpanel">
{% set diff_id = "diff" ~ filePair.1.submitfileid %}
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
Expand All @@ -67,8 +68,9 @@
</div>
{%- endfor %}
{%- for file in oldFileStats.unchangedfiles %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
role="tabpanel">
<div class="tab-pane fade
{% if loop.first and (oldFileStats.changedfiles == []) %}show active{% endif %}"
id="diff-{{ file.submitfileid }}" role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
Expand All @@ -81,11 +83,13 @@
</a>
{% endif %}
</div>
{{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
</div>
{%- endfor %}
{%- for file in oldFileStats.addedfiles %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
role="tabpanel">
<div class="tab-pane fade
{% if loop.first and (oldFileStats.changedfiles == []) and (oldFileStats.addedfiles == []) %}show active{% endif %}"
id="diff-{{ file.submitfileid }}" role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
Expand All @@ -98,6 +102,7 @@
</a>
{% endif %}
</div>
{{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
</div>
{%- endfor %}
</div>
8 changes: 3 additions & 5 deletions webapp/templates/jury/submission_source.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
<p><a href="#origdiff">Go to diff to original submission</a></p>
{%- endif %}

{% if not oldSubmission %}
{%- if oldSubmission %}
{%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFiles: oldFiles, oldFileStats: oldFileStats} %}
{% else %}
<ul class="nav nav-tabs source-tab-nav">
{%- for file in files %}
<li class="nav-item">
Expand Down Expand Up @@ -74,10 +76,6 @@
</div>
{% endif %}

{%- if oldSubmission is not null %}
{%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: oldSubmission, oldFiles: oldFiles, oldFileStats: oldFileStats} %}
{%- endif %}

{%- if originalSubmission is not null %}
<h2 id="origdiff" class="mt-3">
Diff to original submission
Expand Down
Loading