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

Council table fixes #726

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

Council table fixes #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f92c30
[Scorecards] Added fix for overflowing how is marked question section
lucascumsille Feb 11, 2025
86886b1
[Scorecards] Created 'visit question' link council/section table
lucascumsille Feb 11, 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
4 changes: 4 additions & 0 deletions scoring/static/scoring/scss/table-question-council.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
background: lighten($color-scorecard-yellow, 30%) !important;
}
}

.how-is-marked-section {
max-width: 350px;
}
}

.top-tier-score {
Expand Down
25 changes: 12 additions & 13 deletions scoring/templates/scoring/includes/question-content-table-cell.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@
<span class="badge bg-secondary p-1 question-no">{{ pretty_code }}</span>
</div>
<div class="col-11">
<a href="{% url 'scoring:question' code %}{% if council %}?type={{ council_type_slug }}{% endif %}">
{{ question_text.strip | linebreaks }}
</a>
{{ question_text.strip | linebreaks }}

{% if question_type == "negative" %}
<div class="d-flex mb-3 fs-7 text-red-500">
{% include 'caps/icons/warning.html' with classes='mt-1 me-2 flex-shrink-0 flex-grow-0' width='1em' height='1em' role='presentation' %}
<p class="mb-0">
<strong>Penalty marks:</strong>
The maximum number of points for this question is 0.
<a href="{% url 'year_scoring:methodology' plan_year %}#section-question-weighting-within" style="color: inherit;">Read more about penalty mark questions.</a>
</p>
</div>
{% endif %}
{% if question_type == "negative" %}
<div class="d-flex mb-3 fs-7 text-red-500">
{% include 'caps/icons/warning.html' with classes='mt-1 me-2 flex-shrink-0 flex-grow-0' width='1em' height='1em' role='presentation' %}
<p class="mb-0">
<strong>Penalty marks:</strong>
The maximum number of points for this question is 0.
<a href="{% url 'year_scoring:methodology' plan_year %}#section-question-weighting-within" style="color: inherit;">Read more about penalty mark questions.</a>
</p>
</div>
{% endif %}

<div class="d-flex align-items-center gap-3">
<button type="button" class="btn btn-outline-secondary btn-sm js-hidden-toggle" aria-controls="section-{{ forloop.parentloop.counter }}-question-{{ forloop.counter }}">
Expand All @@ -26,6 +24,7 @@
<button type="button" class="btn btn-outline-secondary btn-sm" data-bs-toggle="modal" data-bs-target="#criteria-section-{{ forloop.parentloop.counter }}-question-{{ forloop.counter }}">
View criteria
</button>
<a href="{% url 'scoring:question' code %}{% if council %}?type={{ council_type_slug }}{% endif %}">Visit question &#8594;</a>
</div>

<div class="text-muted fs-7" id="section-{{ forloop.parentloop.counter }}-question-{{ forloop.counter }}" hidden="true">
Expand Down
Loading