From e994daf33559f214895b377196d7d1f88fa7d5c5 Mon Sep 17 00:00:00 2001 From: Charunya Date: Thu, 28 Jul 2022 19:08:13 +0530 Subject: [PATCH 1/2] 5303/5770 --- .../requirements/controller/rfp-scoringCriteria.ts | 4 ++++ .../requirements/views/rfp-scoringCriteria.njk | 14 +++++++------- .../content/requirements/caTaskList-A1.json | 12 +++--------- src/main/views/components/questions/template.njk | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/features/requirements/controller/rfp-scoringCriteria.ts b/src/main/features/requirements/controller/rfp-scoringCriteria.ts index d541c014ff..9cc6d83488 100644 --- a/src/main/features/requirements/controller/rfp-scoringCriteria.ts +++ b/src/main/features/requirements/controller/rfp-scoringCriteria.ts @@ -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 = { diff --git a/src/main/features/requirements/views/rfp-scoringCriteria.njk b/src/main/features/requirements/views/rfp-scoringCriteria.njk index 8d39c52222..95f53b5613 100644 --- a/src/main/features/requirements/views/rfp-scoringCriteria.njk +++ b/src/main/features/requirements/views/rfp-scoringCriteria.njk @@ -41,24 +41,24 @@

- {{rfpTitle}} + {{rfpTitle}}

{% include "includes/project_header.njk" %} - {# {%if (form_name === 'ccs_rfp_scoring_criteria')%} -
-

[Instruction for this page]

-

[You can create your scoring criteria from or use/ modify the 4-tier or 5-tier template below]

+ {%if (form_name === 'ccs_rfp_scoring_criteria')%} +
+

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.

+

You can select one of the two scoring criteria below or use one of the existingscoring criteria to create your own.

- {%endif%}#} + {%endif%}
{{ csrfProtection(csrf) }} - {%if(prompt.length>0)%} + {%if(prompt.length>0) and (form_name !== 'ccs_rfp_scoring_criteria') %}

{{prompt[0] | safe}}

{%endif%} {%if(prompt.length>1)%} diff --git a/src/main/resources/content/requirements/caTaskList-A1.json b/src/main/resources/content/requirements/caTaskList-A1.json index f653f25182..291d890f0e 100644 --- a/src/main/resources/content/requirements/caTaskList-A1.json +++ b/src/main/resources/content/requirements/caTaskList-A1.json @@ -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", @@ -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" }, @@ -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, diff --git a/src/main/views/components/questions/template.njk b/src/main/views/components/questions/template.njk index 7a935a844e..0f59595e6e 100644 --- a/src/main/views/components/questions/template.njk +++ b/src/main/views/components/questions/template.njk @@ -24,7 +24,7 @@ {% block RPFScoringCriteriaTable %} {%if requirement.nonOCDS.questionType === 'Table' and form_name == 'ccs_rfp_scoring_criteria'%}
-
+
{% for table in requirement.nonOCDS.options %} {%if(table.text !=='Create your own scoring criteria')%} From c0975a4acdf939e586cc70b52454aa4525a3a5cc Mon Sep 17 00:00:00 2001 From: Charunya Date: Fri, 29 Jul 2022 20:19:27 +0530 Subject: [PATCH 2/2] SCAT-5303-Set_Scoring_Criteria --- src/main/public/assets/styles/application.css | 18 ++++++++++++++++++ src/main/views/components/table/template.njk | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/public/assets/styles/application.css b/src/main/public/assets/styles/application.css index 1b5abb215c..6ea63853c9 100644 --- a/src/main/public/assets/styles/application.css +++ b/src/main/public/assets/styles/application.css @@ -5745,6 +5745,18 @@ p + .govuk-heading-s, font-weight: 700; } +.govuk-table__header__scoring { + padding: 10px 20px 10px 0; + border-bottom: 1px solid black; + border-top: 1px solid black; + border-left: 1px solid black; + text-align: left; + vertical-align: top; + font-weight: 700; + background-color: black; + color: white; +} + .govuk-table__header, .govuk-table__cell { padding: 10px 20px 10px 0; @@ -5776,6 +5788,12 @@ p + .govuk-heading-s, } } +.govuk-table__scoring__cell--border { + border-left:1px solid black ; + border-right:1px solid black ; + border-bottom:1px solid #000000; +} + .govuk-table__header--numeric, .govuk-table__cell--numeric { text-align: right; diff --git a/src/main/views/components/table/template.njk b/src/main/views/components/table/template.njk index 0d7218ad30..bbc93d39cd 100644 --- a/src/main/views/components/table/template.njk +++ b/src/main/views/components/table/template.njk @@ -5,11 +5,11 @@ {%- if params.captionClasses %} {{ params.captionClasses }}{% endif %}">{{ params.caption }} {% endif %} {% if params.head %} - + {% for item in params.head %} - {{ item.html |safe if item.html else item.text }} @@ -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 %} - {{ cell.html | safe if cell.html else cell.text }} {% else %} -