Skip to content

DEV to UAT #1955

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

Merged
Chee-Ng merged 2 commits into from
Dec 22, 2025
Merged

DEV to UAT #1955

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
ed07a03
added tag on framework schedules
Chee-Ng Dec 22, 2025
8396ea7
Merge pull request #1954 from Crown-Commercial-Service/WEB-3816-add-o…
Chee-Ng Dec 22, 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
2 changes: 2 additions & 0 deletions config/content/frameworks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ framework_schedules:
type: text
framework_schedule_document:
type: text
framework_schedule_document_type:
type: text
framework_schedule_document_usage:
type: text
framework_schedule_document_description:
Expand Down
13 changes: 6 additions & 7 deletions templates/frameworks/_cas-documents.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@
{% for jointSchedule in framework.content.joint_schedules %}
<p class="joint-schedule-title">
<a onclick="fileDownload('{{ jointSchedule.joint_schedule_document }}', '{{ jointSchedule.joint_schedule_document_name }}', '{{ jointSchedule.joint_schedule_file_size }}');" href={{ jointSchedule.joint_schedule_document}}><strong>{{ jointSchedule.joint_schedule_document_name }}</strong></a>

{% set type = jointSchedule.joint_schedule_document_type|trim('document')|spaceless %}
<strong class="govuk-tag govuk-tag--{{ type == 'Essential' ? 'blue' : 'grey' }} joint-schedule-title govuk-!-font-weight-regular cas-document-tag">{{ type }}</strong>
<strong class="govuk-tag govuk-tag--{{ jointSchedule.joint_schedule_document_type == 'Essential' ? 'blue' : 'grey' }} joint-schedule-title govuk-!-font-weight-regular cas-document-tag">{{ jointSchedule.joint_schedule_document_type }}</strong>
</p>
<p class="cas-document-usage"><strong>{{ jointSchedule.joint_schedule_document_usage}}</strong></p>
<div class="wysiwyg-content">{{ jointSchedule.joint_schedule_document_description|raw }}</div>
Expand All @@ -111,9 +109,7 @@
{% for callOffSchedule in framework.content.call_off_schedules %}
<p class="joint-schedule-title">
<a onclick="fileDownload('{{ callOffSchedule.call_off_schedule_document }}', '{{ callOffSchedule.call_off_schedule_document_name }}', '{{ callOffSchedule.call_off_schedule_file_size }}');" href={{ callOffSchedule.call_off_schedule_document}}><strong>{{ callOffSchedule.call_off_schedule_document_name }}</strong></a>

{% set type = callOffSchedule.call_off_schedule_document_type|trim('document')|spaceless %}
<strong class="govuk-tag govuk-tag--{{ type == 'Essential' ? 'blue' : 'grey' }} joint-schedule-title govuk-!-font-weight-regular cas-document-tag"> {{ type }} </strong>
<strong class="govuk-tag govuk-tag--{{ callOffSchedule.call_off_schedule_document_type == 'Essential' ? 'blue' : 'grey' }} joint-schedule-title govuk-!-font-weight-regular cas-document-tag"> {{ callOffSchedule.call_off_schedule_document_type }} </strong>
</p>
<p class="cas-document-usage"><strong>{{ callOffSchedule.call_off_schedule_document_usage }}</strong></p>
<div class="wysiwyg-content">{{ callOffSchedule.call_off_schedule_document_description|raw }}</div>
Expand All @@ -135,7 +131,10 @@
<p>Framework schedules are used by CCS to set up the agreement with suppliers.</p>

{% for frameworkSchedule in framework.content.framework_schedules %}
<p class="joint-schedule-title"><a onclick="fileDownload('{{ frameworkSchedule.framework_schedule_document }}', '{{ frameworkSchedule.framework_schedule_document_name }}', '{{ frameworkSchedule.framework_schedule_file_size }}');" href={{ frameworkSchedule.framework_schedule_document}}><strong>{{ frameworkSchedule.framework_schedule_document_name }}</strong></a></p>
<p class="joint-schedule-title">
<a onclick="fileDownload('{{ frameworkSchedule.framework_schedule_document }}', '{{ frameworkSchedule.framework_schedule_document_name }}', '{{ frameworkSchedule.framework_schedule_file_size }}');" href={{ frameworkSchedule.framework_schedule_document}}><strong>{{ frameworkSchedule.framework_schedule_document_name }}</strong></a>
<strong class="govuk-tag govuk-tag--{{ frameworkSchedule.framework_schedule_document_type == 'Essential' ? 'blue' : 'grey' }} joint-schedule-title govuk-!-font-weight-regular cas-document-tag">{{ frameworkSchedule.framework_schedule_document_type }}</strong>
</p>
<p class="cas-document-usage"><strong>{{ frameworkSchedule.framework_schedule_document_usage }}</strong></p>
<div class="wysiwyg-content">{{ frameworkSchedule.framework_schedule_document_description|raw }}</div>
{% endfor %}
Expand Down
Loading