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

Jump to bottom

add js elements in results-table #528

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

add js elements in results-table #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1d74bb
ad js elements in results-table
MarinaProsche Apr 16, 2024
8e79ce5
Merge branch 'master' into fix_table_bug_in_results
MarinaProsche Apr 22, 2024
9ef61c5
fix conflicts
MarinaProsche Apr 22, 2024
26cb9b4
id name changed
MarinaProsche Apr 23, 2024
fc2e885
resolve conflicts
MarinaProsche Apr 24, 2024
df66c38
Merge branch 'master' into fix_table_bug_in_results
MarinaProsche Sep 30, 2024
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
114 changes: 56 additions & 58 deletions app/templates/results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ <h4 id="results_title" class="texteous ins">
<tr style="text-align: left;">
<tr>
{% for item in columns %}
<th>{{ item }}</th>
<th>{{ item }}</th>
{% endfor %}
</tr>
</thead>
<tbody>
</thead>
<tbody>
<tr>
<td><a class="id_check" href="{{ '/results/' ~ stats[0] }}">
{{ (stats[0] | string)[-5:] }}</a></td>
{{ (stats[0] | string)[-5:] }}</a></td>
{% for item in stats[1:] %}
<td>{{ item }}</td>
<td>{{ item }}</td>
{% endfor %}
</tr>
</tbody>
</table>
</tbody>
</table>

<!-- Download / statistic links -->
{% if not current_user.is_anonymous %}
Expand All @@ -58,60 +58,58 @@ <h4 id="results_title" class="texteous ins">
<a href="{{ url_for('check_list', filter_user=stats[1], filter_criteria=current_user.criteria) }}"
class="col text-center link">Cписок загрузок пользователя по критерию "{{current_user.criteria}}"</a>
{% endif %}
<!-- Checks table -->
{% if results.is_ended and not results.is_failed %}
<table class="table table-striped table-hover" id="results_table">
<thead>
<tr>
<th><button id="showAllVerdicts" class="btn btn-default btn-xs"><i class="bi bi-chevron-double-down"></i></button></th>
<th class="results_table_index ins" scope="col">#</th>
<th class="results_table_test ins" scope="col">Тест</th>
<th class="results_table_result ins" scope="col">Результат</th>
</tr>
</thead>
<tbody>
{% for criterion_info in results.enabled_checks %}
<tr data-toggle="collapse" data-target="#verd{{ loop.index }}" class="accordion-toggle">
<td>
<button class="btn btn-default btn-xs"><i class="bi bi-chevron-double-down"></i></button>
</td>
<th scope="row" class="ins">{{ loop.index }}</th>
<td class="ins">{{ criterion_info['name'] }}</td>
{% set colors = {0.0: 'table-danger', 1.0: 'table-success'} %}
{% set result_labels = {0.0: 'Не пройдена', 1.0: 'Пройдена'} %}
<td class="{{ colors.get(criterion_info['score'], 'table-warning') }} ins">
{{ result_labels.get(criterion_info['score'], 'Частично пройдена') }}
</td>
</tr>
<tr>
<td colspan="4" class="hiddenRow">
<div id="verd{{ loop.index }}" class="accordian-body collapse" style="margin-left: 2em;">
{% for item in criterion_info.get('verdict', ["Пройдена!"] if criterion_info.get('score')==1.0 else
<!-- Checks table -->
{% if results.is_ended and not results.is_failed %}
<table class="table table-striped table-hover" id="results_table">
<thead>
<tr>
<th><button id="toggleButtonResult" class="flat-button"><i class="bi bi-chevron-double-down"></button></th>
<th class="results_table_index ins" scope="col">#</th>
<th class="results_table_test ins" scope="col">Тест</th>
<th class="results_table_result ins" scope="col">Результат</th>
</tr>
</thead>
<tbody>
{% for criterion_info in results.enabled_checks %}
<tr>
<td class="toggleresult raw-button"><i class="bi bi-chevron-double-down"></td>
<th scope="row" class="ins">{{ loop.index }}</th>
<td class="ins">{{ criterion_info['name'] }}</td>
{% set colors = {0.0: 'table-danger', 1.0: 'table-success'} %}
{% set result_labels = {0.0: 'Не пройдена', 1.0: 'Пройдена'} %}
<td class="{{ colors.get(criterion_info['score'], 'table-warning') }} ins">
{{ result_labels.get(criterion_info['score'], 'Частично пройдена') }}
</td>
</tr>
<tr class="hidden">
<td colspan="4">

{% for item in criterion_info.get('verdict', ["Пройдена!"] if criterion_info.get('score')==1.0 else
["Не пройдена"]) %}
{{ item|safe }}
{% endfor %}
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}
{{ item|safe }}
{% endfor %}

<!-- PDF viewer -->
{% if not current_user.is_anonymous and results.conv_pdf_fs_id %}
<div style="text-align:center; width:100%">
<div class="top-bar">
<button class="btn" id="prev-page"><i class="bi bi-arrow-left"></i></button>
<button class="btn" id="next-page"><i class="bi bi-arrow-right"></i></button>
<span class="page-info">
Слайд <span id="page-num"></span> из <span id="page-count"></span>
</span>
</div>
<canvas id="the-canvas" style="border: 1px solid #000000; direction: ltr;"></canvas>
</div>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endif %}

<!-- PDF viewer -->
{% if not current_user.is_anonymous and results.conv_pdf_fs_id %}
<div style="text-align:center; width:100%">
<div class="top-bar">
<button class="btn" id="prev-page"><i class="bi bi-arrow-left"></i></button>
<button class="btn" id="next-page"><i class="bi bi-arrow-right"></i></button>
<span class="page-info">
Слайд <span id="page-num"></span> из <span id="page-count"></span>
</span>
</div>
<canvas id="the-canvas" style="border: 1px solid #000000; direction: ltr;"></canvas>
</div>
{% endif %}

</div>

{% endblock %}
33 changes: 33 additions & 0 deletions assets/scripts/results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,36 @@ $(function(){
recheckStatus()
}
});

document.querySelectorAll('.toggleresult').forEach(item => {
item.addEventListener('click', event => {
const nextRow = item.parentNode.nextElementSibling;
if (nextRow.classList.contains('hidden')) {
nextRow.classList.remove('hidden');
nextRow.classList.add('visible');
} else {
nextRow.classList.add('hidden');
nextRow.classList.remove('visible');
}
});
});

const toggleButtonResult = document.getElementById('toggleButtonResult');
if (toggleButtonResult) {
toggleButtonResult.addEventListener('click', () => {
const button = document.getElementById('toggleButtonResult');
if (button.innerHTML.trim() === '<i class="bi bi-chevron-double-down"></i>') {
button.innerHTML = '<i class="bi bi-chevron-double-up"></i>';
document.querySelectorAll('.hidden').forEach(row => {
row.classList.remove('hidden');
row.classList.add('visible');
});
} else {
button.innerHTML = '<i class="bi bi-chevron-double-down"></i>';
document.querySelectorAll('.visible').forEach(row => {
row.classList.remove('visible');
row.classList.add('hidden');
});
}
});
}
20 changes: 20 additions & 0 deletions assets/styles/results.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,23 @@
.table {
margin-bottom: 0 !important;
}

.hidden {
display: none;
}

.visible {
display: table-row;
}

.flat-button {
border: none;
background: none;
padding: 0;
margin: 0;
cursor: pointer;
}

.raw-button {
cursor: pointer;
}