Skip to content

Always display all files (even unchanged) for a submission. #3129

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 1 commit into from
Closed

Always display all files (even unchanged) for a submission. #3129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 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 @@ -18,30 +18,32 @@
</tr>
</table>
{% endif %}
{% set is_first_tab = true %}
<ul class="nav nav-tabs source-tab-nav">
{%- for filePair in oldFileStats.changedfiles %}
<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
<a class="nav-link {% if is_first_tab %}active{% set is_first_tab = false %}{% endif %}" data-bs-toggle="tab"
href="#diff-{{ filePair.1.submitfileid }}" role="tab">{{ filePair.0.filename }}</a>
</li>
{%- endfor %}
{%- for file in oldFileStats.unchangedfiles %}
<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
<a class="nav-link {% if is_first_tab %}active{% set is_first_tab = false %}{% 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"
<a class="nav-link {% if is_first_tab %}active{% set is_first_tab = false %}{% endif %}" data-bs-toggle="tab"
href="#diff-{{ file.submitfileid }}" role="tab">{{ file.filename }}</a>
</li>
{%- endfor %}

</ul>
{% set is_first_pane = true %}
<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 }}"
<div class="tab-pane fade {% if is_first_pane %}show active{% set is_first_pane = false %}{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
role="tabpanel">
{% set diff_id = "diff" ~ filePair.1.submitfileid %}
<div class="mb-1">
Expand All @@ -67,7 +69,7 @@
</div>
{%- endfor %}
{%- for file in oldFileStats.unchangedfiles %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
<div class="tab-pane fade {% if is_first_pane %}show active{% set is_first_pane = false %}{% endif %}" id="diff-{{ file.submitfileid }}"
role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
Expand All @@ -81,10 +83,11 @@
</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 }}"
<div class="tab-pane fade {% if is_first_pane %}show active{% set is_first_pane = false %}{% endif %}" id="diff-{{ file.submitfileid }}"
role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
Expand All @@ -98,6 +101,7 @@
</a>
{% endif %}
</div>
{{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
</div>
{%- endfor %}
</div>
10 changes: 4 additions & 6 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 All @@ -89,4 +87,4 @@
{%- include 'jury/partials/submission_diff.html.twig' with {oldSubmission: originalSubmission, oldFiles: originalFiles, oldFileStats: originalFileStats} %}
{%- endif %}

{% endblock %}
{% endblock %}
Loading