Skip to content

Bug fix/scat 5303/5770 #1651

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
CharunyaSP merged 2 commits into from
Aug 1, 2022
Merged

Bug fix/scat 5303/5770 #1651

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
e994daf
5303/5770
CharunyaSP Jul 28, 2022
c0975a4
SCAT-5303-Set_Scoring_Criteria
CharunyaSP Jul 29, 2022
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 src/main/features/requirements/controller/rfp-scoringCriteria.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ export const RFP_GET_SCORING_CRITERIA = async (req: express.Request, res: expres
});
TemporaryObjStorage = TemporaryObjStorage.slice(0, 2);
}
//swap tier details - SCAT-5303
let temptierdata = TemporaryObjStorage[0].nonOCDS.options[0]
TemporaryObjStorage[0].nonOCDS.options[0] = TemporaryObjStorage[0].nonOCDS.options[1]
TemporaryObjStorage[0].nonOCDS.options[1] = temptierdata
// res.json(POSITIONEDELEMENTS)
const { isFieldError } = req.session;
const data = {
Expand Down
14 changes: 7 additions & 7 deletions src/main/features/requirements/views/rfp-scoringCriteria.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,24 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<h1 id="page-heading" class="govuk-heading-xl">
{{rfpTitle}}
<strong> {{rfpTitle}}</strong>
</h1>
</div>
</div>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{% include "includes/project_header.njk" %}
{# {%if (form_name === 'ccs_rfp_scoring_criteria')%}
<div class="govuk-inset-text">
<p class="govuk-body">[Instruction for this page]</p>
<p class="govuk-body">[You can create your scoring criteria from or use/ modify the 4-tier or 5-tier template below]</p>
{%if (form_name === 'ccs_rfp_scoring_criteria')%}
<div class="govuk-grid-column-two-thirds">
<p class="govuk-body">You must tell suppliers what scoring criteria you are using to evaluate their responses.You must also use this scoring criteria for all suppliers,to make sure you have evaluated them fairly.</p>
<p class="govuk-body">You can select one of the two scoring criteria below or use one of the existingscoring criteria to create your own.</p>

</div>
{%endif%}#}
{%endif%}
<form id="{{form_name}}" name="{{form_name}}" class="form {{form_name}} rfp_form" action="/rfp/set-scoring-criteria?agreement_id={{agreement_id}}&proc_id={{proc_id}}&event_id={{event_id}}&id={{criterian_id}}&group_id={{group_id}}&section={{section}}" method="post">
{{ csrfProtection(csrf) }}
<input type="hidden" agreementEndDate="{{agreementEndDate}}" id="rpf_section_3_aggrimentEndDate">
{%if(prompt.length>0)%}
{%if(prompt.length>0) and (form_name !== 'ccs_rfp_scoring_criteria') %}
<p class="govuk-body">{{prompt[0] | safe}}</p>
{%endif%}
{%if(prompt.length>1)%}
Expand Down
18 changes: 18 additions & 0 deletions src/main/public/assets/styles/application.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions src/main/resources/content/requirements/caTaskList-A1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,7 @@
"eventDescription2": "You will then need to decide how many suppliers you want to take to further competition, before reviewing suitabe suppliers and choosing your next steps.",

"eventTask": [
{
"Task": 1,
"title": "What is a capability assessment",
"required": "optional",
"link": "/ca/learn-about-capability-assessment",
"status": "Optional"
},

{
"Task": 2,
"link": "/ca/enter-your-weightings",
Expand All @@ -80,7 +74,7 @@
{
"Task": 4,
"link": "/ca/resources-vetting-weightings",
"title": "Select resources and set weightings",
"title": "Select the resources you need and set weightings for vetting and resources",
"required": "mandatory",
"status": "Cannot start yet"
},
Expand Down Expand Up @@ -147,7 +141,7 @@
{
"eventno": 1,
"eventTitle": "Upload pricing schedules and other supporting documents ",
"eventDescription": "YYou will also need to confirm if you require a contracted out service or a supply of resource.",
"eventDescription": "You will also need to confirm if you require a contracted out service or a supply of resource.",
"eventTask": [
{
"Task": 1,
Expand Down
2 changes: 1 addition & 1 deletion src/main/views/components/questions/template.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% block RPFScoringCriteriaTable %}
{%if requirement.nonOCDS.questionType === 'Table' and form_name == 'ccs_rfp_scoring_criteria'%}
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<div class="govuk-grid-column-full">
{% for table in requirement.nonOCDS.options %}
<input type="hidden" class="tierLable" tierLable="{{table.text}}" id="tiersTableData" value="{{table.optiontableDefinationJsonString}}" >
{%if(table.text !=='Create your own scoring criteria')%}
Expand Down
10 changes: 5 additions & 5 deletions src/main/views/components/table/template.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
{%- if params.captionClasses %} {{ params.captionClasses }}{% endif %}">{{ params.caption }}</caption>
{% endif %}
{% if params.head %}
<thead class="govuk-table__head">
<thead class="govuk-table__header__scoring ">
<tr class="govuk-table__row">
{% for item in params.head %}
<th scope="col" class="govuk-table__header
{%- if item.format %} govuk-table__header--{{ item.format }}{% endif %}
<th scope="col" class="govuk-table__header__scoring
{%- if item.format %} table__header__scoring--{{ item.format }}{% endif %}
{%- if item.classes %} {{ item.classes }}{% endif %}"
{%- if item.colspan %} colspan="{{ item.colspan }}"{% endif %}
{%- if item.rowspan %} rowspan="{{ item.rowspan }}"{% endif %}{% for attribute, value in item.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>{{ item.html |safe if item.html else item.text }}</th>
Expand All @@ -27,11 +27,11 @@
{%- if cell.rowspan %} rowspan="{{ cell.rowspan }}"{% endif %}{% for attribute, value in cell.attributes %} {{ attribute }}="{{ value }}"{% endfor %}
{% endset %}
{% if loop.first and params.firstCellIsHeader %}
<th scope="row" class="govuk-table__header{%- if cell.classes %} {{ cell.classes }}{% endif %}"
<th scope="row" class="govuk-table__scoring__cell--border govuk-table__header{%- if cell.classes %} {{ cell.classes }}{% endif %}"
{{- commonAttributes | safe -}}
>{{ cell.html | safe if cell.html else cell.text }}</th>
{% else %}
<td class="govuk-table__cell
<td class="govuk-table__scoring__cell--border govuk-table__cell
{%- if cell.format %} govuk-table__cell--{{ cell.format }}{% endif %}
{%- if cell.classes %} {{ cell.classes }}{% endif %}"
{{- commonAttributes | safe -}}
Expand Down