Skip to content
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

Improve source diff viewer. #2945

Merged
merged 1 commit into from
Mar 2, 2025
Merged

Improve source diff viewer. #2945

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: 13 additions & 3 deletions webapp/templates/jury/partials/submission_diff.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% if files | length > 1 or oldFiles | length > 1 %}

<table class="table table-sm table-striped file-diff-table">
<tr>
<th class="diff-add">Files added</th>
Expand All @@ -19,9 +18,9 @@
</tr>
</table>
{% endif %}

<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"
href="#diff-{{ filePair.1.submitfileid }}" role="tab">{{ filePair.0.filename }}</a>
Expand All @@ -31,11 +30,22 @@
</ul>
<div class="tab-content source-tab">
{%- for filePair in oldFileStats.changedfiles %}
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: filePair.1.rank}) }}">
<i class="fas fa-download"></i> Download
</a>
{% if allowEdit %}
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: filePair.1.rank}) }}">
<i class="fas fa-pencil-alt"></i> Edit
</a>
{% endif %}
</div>

<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
role="tabpanel">
{{ showDiff("diff" ~ filePair.1.submitfileid, filePair.0, filePair.1) }}
</div>
{%- endfor %}

</div>
81 changes: 35 additions & 46 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 @@ -25,71 +25,60 @@
)
{% endif %}

{% if oldSubmission %}
and diff to previous submission
<a href="{{ path('jury_submission', {submitId: oldSubmission.submitid}) }}">
s{{ oldSubmission.submitid }}
</a>
{% endif %}
</h1>

{%- if submission.entryPoint %}

<p><b>Entry point</b>: {{ submission.entryPoint }}</p>
{%- endif %}

{%- if oldSubmission is not null %}

<p><a href="#diff">Go to diff to previous submission</a></p>
{%- endif %}

{%- if submission.originalSubmission %}

<p><a href="#origdiff">Go to diff to original submission</a></p>
{%- endif %}

<ul class="nav nav-tabs source-tab-nav">
{%- for file in files %}

<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
href="#source-{{ file.rank }}" role="tab">{{ file.filename }}</a>
</li>
{%- endfor %}

</ul>
<div class="tab-content source-tab">
{%- for file in files %}

<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="source-{{ file.rank }}"
role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
<i class="fas fa-download"></i> Download
</a>
{% if allowEdit %}
{% if not oldSubmission %}
<ul class="nav nav-tabs source-tab-nav">
{%- for file in files %}
<li class="nav-item">
<a class="nav-link {% if loop.first %}active{% endif %}" data-bs-toggle="tab"
href="#source-{{ file.rank }}" role="tab">{{ file.filename }}</a>
</li>
{%- endfor %}

</ul>
<div class="tab-content source-tab">
{%- for file in files %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="source-{{ file.rank }}"
role="tabpanel">
<div class="mb-1">
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: file.rank}) }}">
<i class="fas fa-pencil-alt"></i> Edit
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
<i class="fas fa-download"></i> Download
</a>
{% endif %}
{% if allowEdit %}
<a class="btn btn-secondary btn-sm"
href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: file.rank}) }}">
<i class="fas fa-pencil-alt"></i> Edit
</a>
{% endif %}
</div>

{{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
</div>

{{ file.sourcecode | codeEditor(file.rank, submission.language.editorLanguage) }}
</div>
{%- endfor %}

</div>
{%- endfor %}
</div>
{% endif %}

{%- if oldSubmission is not null %}

<h2 id="diff" class="mt-3">
Diff to submission
<a href="{{ path('jury_submission', {submitId: oldSubmission.submitid}) }}">
s{{ oldSubmission.submitid }}
</a>
</h2>

{%- 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
<a href="{{ path('jury_submission', {submitId: originalSubmission.submitid}) }}">
Expand Down
Loading