Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion webapp/src/Controller/Jury/SubmissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1207,13 +1207,17 @@
* @param SubmissionFile[] $files
* @param SubmissionFile[] $oldFiles
* @return array{'changed': string[], 'changedfiles': array<SubmissionFile[]>,
* 'unchanged': string[], 'added': string[], 'removed': string[]}
* 'unchanged': string[], 'added': string[], 'removed': string[],
* 'unchangedfiles' : array<SubmissionFile>,
* 'addedfiles' : array<SubmissionFile>}
*/
protected function determineFileChanged(array $files, array $oldFiles): array
{
$result = [
'changed' => [],
'changedfiles' => [], // These will be shown, so we will add pairs of files here.
'unchangedfiles' => [],
'addedfiles' => [],
'unchanged' => [],
];

Expand All @@ -1223,16 +1227,22 @@
$result['removed'] = array_diff($oldFilenames, $newFilenames);

foreach ($files as $newfile) {
$isNewFile = true;
foreach ($oldFiles as $oldFile) {
if ($newfile->getFilename() === $oldFile->getFilename()) {
$isNewFile = false;
if ($oldFile->getSourcecode() === $newfile->getSourcecode()) {
$result['unchanged'][] = $newfile->getFilename();
$result['unchangedfiles'][] = $newfile;
} else {
$result['changed'][] = $newfile->getFilename();
$result['changedfiles'][] = [$newfile, $oldFile];
}
}
}
if($isNewFile) {

Check failure on line 1243 in webapp/src/Controller/Jury/SubmissionController.php

View workflow job for this annotation

GitHub Actions / phpcs

Expected 1 space(s) after IF keyword; 0 found
$result['addedfiles'][] = $newfile;
}
}

// Special case: if there's just a single file (before and after) that has been renamed, use that for diffing.
Expand Down
70 changes: 57 additions & 13 deletions webapp/templates/jury/partials/submission_diff.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,78 @@
</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>
</li>
{%- 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>
</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>
</li>
{%- endfor %}

</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 %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
role="tabpanel">
<div class="mb-1">
<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
href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: filePair.1.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: filePair.1.rank}) }}">
<i class="fas fa-pencil-alt"></i> Edit
</a>
{% endif %}
</div>
{{ showDiff("diff" ~ filePair.1.submitfileid, filePair.0, filePair.1) }}
</div>

<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ filePair.1.submitfileid }}"
{%- endfor %}
{%- for file in oldFileStats.unchangedfiles %}
<div class="tab-pane fade {% if loop.first %}show active{% endif %}" id="diff-{{ file.submitfileid }}"
role="tabpanel">
{{ showDiff("diff" ~ filePair.1.submitfileid, filePair.0, filePair.1) }}
<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 %}
<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>
</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="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 %}
<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>
</div>
{%- endfor %}
</div>
Loading