diff --git a/src/main/common/middlewares/event-management/activeevents.ts b/src/main/common/middlewares/event-management/activeevents.ts index 6ae48104ef..daba1b5ba2 100644 --- a/src/main/common/middlewares/event-management/activeevents.ts +++ b/src/main/common/middlewares/event-management/activeevents.ts @@ -85,7 +85,8 @@ export class EventEngagementMiddleware { //singleEvent=events[i]; //singleEvent.activeEvent=getEventsData[j]; if (singleEvent.activeEvent != undefined && singleEvent.activeEvent?.status != undefined && (singleEvent.activeEvent.eventType == 'RFI' || singleEvent.activeEvent.eventType == 'EOI')) { - if (singleEvent.activeEvent?.dashboardStatus == 'COMPLETE' || singleEvent.activeEvent?.dashboardStatus == 'CLOSED') { + if (singleEvent.activeEvent?.dashboardStatus == 'COMPLETE' || singleEvent.activeEvent?.dashboardStatus == 'CLOSED' + || (singleEvent.activeEvent?.dashboardStatus=='UNKNOWN' && singleEvent.activeEvent?.status=='withdrawn')) { // Historical Events historicalEvents.push(singleEvent) } else if (singleEvent.activeEvent?.dashboardStatus == 'IN-PROGRESS') { diff --git a/src/main/features/event-management/controller/evaluateSuppliers.ts b/src/main/features/event-management/controller/evaluateSuppliers.ts index 4c634c2f61..ad6db5c460 100644 --- a/src/main/features/event-management/controller/evaluateSuppliers.ts +++ b/src/main/features/event-management/controller/evaluateSuppliers.ts @@ -87,20 +87,26 @@ export const EVALUATE_SUPPLIERS = async (req: express.Request, res: express.Resp const ScoresAndFeedbackURL =`tenders/projects/${projectId}/events/${eventId}/scores` const ScoresAndFeedbackURLdata = await TenderApi.Instance(SESSION_ID).get(ScoresAndFeedbackURL) const supplierInterestURL = `tenders/projects/${projectId}/events/${eventId}/responses` - const supplierdata = await TenderApi.Instance(SESSION_ID).get(supplierInterestURL) + const supplierdata= await TenderApi.Instance(SESSION_ID).get(supplierInterestURL) + var submittedCount = 0 + for (let i = 0; i < supplierdata.data.responders.length; i++) { + if(supplierdata.data.responders[i].responseState == 'Submitted') + { + submittedCount++ + } + } let supData = []; let supplierName = []; let showallDownload = false; for (let i = 0; i < ScoresAndFeedbackURLdata.data.length; i++) { - for(let j=0;j{a.supplier.id==ScoresAndFeedbackURLdata.data[i].organisationId}); //let commentData=supplierdata.data.responders[i].supplier.filter((a:any)=>{a.organisationId==supplierdata.data.responders[i].supplier.id}); @@ -115,7 +121,7 @@ export const EVALUATE_SUPPLIERS = async (req: express.Request, res: express.Resp completion = "Yes" } - + let dataPrepared = { "id": supData[i].supplier.id, @@ -126,24 +132,26 @@ export const EVALUATE_SUPPLIERS = async (req: express.Request, res: express.Resp "responseDate": supData[i].responseDate, "completionStatus":completion, } - + if (supplierdata.data.responders[i].responseState == 'Submitted') { showallDownload = true; } supplierName.push(dataPrepared) } + } + const supplierSummary = supplierdata.data; var count =0; let ConfirmFlag = false; //count of completionstatus="yes" == count of responders for (let k = 0; k < supplierName.length; k++) { - if(supplierName[k].completionStatus == "Yes") + if(supplierName[k].completionStatus == "Yes" && supplierName[k].responseState == "Submitted" ) { count++; } } - if(count == supplierName.length) + if(count == submittedCount) { ConfirmFlag = true; } diff --git a/src/main/features/event-management/controller/eventManagement.ts b/src/main/features/event-management/controller/eventManagement.ts index f84d585530..e5854581f3 100644 --- a/src/main/features/event-management/controller/eventManagement.ts +++ b/src/main/features/event-management/controller/eventManagement.ts @@ -194,7 +194,7 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon const supplierAwardDetail = await (await TenderApi.Instance(SESSION_ID).get(supplierAwardDetailURL)).data; supplierAwardDetail?.suppliers?.map((item: any) => { - supplierDetailsDataList.filter(x => x.supplierId == item.id)[0].supplierState = item.state; + supplierDetailsDataList.filter(x => x.supplierId == item.id)[0].supplierState = "Awarded"; supplierDetails = supplierDetailsDataList.filter(x => x.supplierId == item.id)[0]; }); @@ -552,15 +552,15 @@ export const SUPPLIER_ANSWER_DOWNLOAD = async (req: express.Request, res: expres } } -//supplieranswer?download=1 +//supplieranswerall?supplierid=1 export const SUPPLIER_ANSWER_DOWNLOAD_ALL = async (req: express.Request, res: express.Response) => { const { SESSION_ID } = req.cookies; //jwt const { projectId } = req.session; const { eventId } = req.session; - const { download, download_all } = req.query; + const { supplierid, download_all } = req.query; try { - if (download != undefined) { + if (supplierid != undefined) { const FileDownloadURL = `/tenders/projects/${projectId}/events/${eventId}/responses/export`; const FetchDocuments = await DynamicFrameworkInstance.file_dowload_Instance(SESSION_ID).get(FileDownloadURL, { responseType: 'arraybuffer', diff --git a/src/main/features/event-management/controller/steps-to-continue.ts b/src/main/features/event-management/controller/steps-to-continue.ts index 69256f52c0..4064a44b48 100644 --- a/src/main/features/event-management/controller/steps-to-continue.ts +++ b/src/main/features/event-management/controller/steps-to-continue.ts @@ -2,6 +2,7 @@ import * as express from 'express' import { LoggTracer } from '@common/logtracer/tracer' import { TokenDecoder } from '@common/tokendecoder/tokendecoder' import * as data from '../../../resources/content/event-management/steps-to-continue.json' +import { TenderApi } from './../../../common/util/fetch/procurementService/TenderApiInstance'; /** * @@ -56,6 +57,21 @@ export const POST_STEPS_TO_CONTINUE = async (req: express.Request, res: express. try { const rfi_next_steps = req.body.rfi_next_steps_to_continue; + + let baseUrl = `/tenders/projects/${req.session.projectId}/events`; + let body = { + "name": "Further Competition Event", + "eventType": "FCA" + } + const { data } = await TenderApi.Instance(SESSION_ID).post(baseUrl, body); + if(data != null && data !=undefined) + { + req.session['eventId'] = data.id; + req.session.procurements[0]['eventId'] = data.id; + req.session.procurements[0]['eventType'] = data.eventType; + req.session.procurements[0]['started'] = false; + } + if (rfi_next_steps) { switch (rfi_next_steps) { case '[DA]': diff --git a/src/main/features/event-management/views/awardDocumentComplete.njk b/src/main/features/event-management/views/awardDocumentComplete.njk index 47235c463f..08aeda2521 100644 --- a/src/main/features/event-management/views/awardDocumentComplete.njk +++ b/src/main/features/event-management/views/awardDocumentComplete.njk @@ -2,7 +2,7 @@ {% from "macros/csrf.njk" import csrfProtection %} {% from "components/support/macro.njk" import howToGetSupport %} -{% set title = 'Award documents ' %} +{% set title = 'Your project ' %} {% block breadCrumb %} {{ CCSBreadcrumbs({ items:[ @@ -21,6 +21,14 @@ {% block content %}
+
+
+

+ {{title}} +

+
+
+
@@ -55,7 +63,7 @@

Awarded supplier contract templates

-

If you have not already complete the order form and call off schedules template, you must download and complete it before continuing.

+

If you have not already completed the order form and call off schedules template, you must download and complete it before continuing.

@@ -63,8 +71,8 @@ - - + + {% for supplier in eventManagementData.documentTemplateDataList %} diff --git a/src/main/features/event-management/views/awardEventManagement.njk b/src/main/features/event-management/views/awardEventManagement.njk index 4e76364fc2..2eb80c4765 100644 --- a/src/main/features/event-management/views/awardEventManagement.njk +++ b/src/main/features/event-management/views/awardEventManagement.njk @@ -43,9 +43,9 @@ or messages in your inbox.See supplier's answer to your published project.

{{status}}

- {% if(showCloseProject) and status.toLowerCase !== "complete" %} + {#{% if(showCloseProject) and status.toLowerCase !== "complete" %}#} {{ data.subsection2_content }} - {% endif %} + {#{% endif %}#}

@@ -181,7 +181,7 @@ or messages in your inbox.See supplier's answer to your published project.

{% for supplier in supplierDetailsDataList %} - {# {% if supplier.responseState =='Draft' %} #} + {% if supplier.responseState.toLowerCase() =='submitted' %} @@ -197,7 +197,7 @@ or messages in your inbox.See supplier's answer to your published project.

+ {% endif %} {% endfor %}
Supplier's nameDocuments TemplateOrder from and call of schedules templateDocument templatesOrder form and call off schedules template
- Review evaluation + Review evaluation @@ -214,6 +214,7 @@ or messages in your inbox.See supplier's answer to your published project.
diff --git a/src/main/features/event-management/views/awardSupplier.njk b/src/main/features/event-management/views/awardSupplier.njk index 60bcdf0c2a..c0e600d026 100644 --- a/src/main/features/event-management/views/awardSupplier.njk +++ b/src/main/features/event-management/views/awardSupplier.njk @@ -2,7 +2,7 @@ {% from "macros/csrf.njk" import csrfProtection %} {% from "components/support/macro.njk" import howToGetSupport %} -{% set title = 'Award Supplier ' %} +{% set title = 'Your project ' %} {% block breadCrumb %} {{ CCSBreadcrumbs({ items:[ @@ -32,6 +32,14 @@ }) }} {% endif %} +
+
+

+ {{title}} +

+
+
+
@@ -120,11 +128,11 @@ - Download + Download - Review evaluation + Review evaluation

{{supplier.score}}

diff --git a/src/main/features/event-management/views/confirmSupplier.njk b/src/main/features/event-management/views/confirmSupplier.njk index b76aeae52a..02e19b7bf8 100644 --- a/src/main/features/event-management/views/confirmSupplier.njk +++ b/src/main/features/event-management/views/confirmSupplier.njk @@ -2,7 +2,7 @@ {% from "macros/csrf.njk" import csrfProtection %} {% from "components/support/macro.njk" import howToGetSupport %} -{% set title = 'Event management ' %} +{% set title = 'Your project' %} {% block breadCrumb %} {{ CCSBreadcrumbs({ items:[ @@ -21,6 +21,14 @@ {% block content %}
+
+
+

+ {{title}} +

+
+
+
@@ -107,7 +115,7 @@ - Review evaluation + Review evaluation

{{supplier.score}}

diff --git a/src/main/features/event-management/views/enterEvaluation.njk b/src/main/features/event-management/views/enterEvaluation.njk index df93d8c4e8..e0b961caa0 100644 --- a/src/main/features/event-management/views/enterEvaluation.njk +++ b/src/main/features/event-management/views/enterEvaluation.njk @@ -13,7 +13,7 @@ }, { "text": "Your Project", - "href": "/dashboard" + "href": "/event/management?id="+eventId }, { "text": "Evaluate Suppliers", diff --git a/src/main/features/event-management/views/evaluateSuppliers-readOnly.njk b/src/main/features/event-management/views/evaluateSuppliers-readOnly.njk index b99bfd24ee..069a9accde 100644 --- a/src/main/features/event-management/views/evaluateSuppliers-readOnly.njk +++ b/src/main/features/event-management/views/evaluateSuppliers-readOnly.njk @@ -3,7 +3,7 @@ {% from "macros/csrf.njk" import csrfProtection %} {% from "components/support/macro.njk" import howToGetSupport %} -{% set title = 'Event management ' %} +{% set title = 'Review your supplier evaluation ' %} {% block breadCrumb %} {{ CCSBreadcrumbs({ items:[ @@ -94,25 +94,15 @@
- {{ CCSInput({ - label: { - text: "Final Feedback ", - classes: "govuk-label--m", - name: "enter_evaluation_readOnly" - }, - value:supplierDetails.supplierFeedBack, - id: "enter_evaluation_feedback_readOnly", - name: "enter_evaluation_feedback", - spellcheck: true, - classes: "govuk-input", - maxlength: "5000" - }) - }} +

Final Feedback

+ + +

{% set returnLink = "/event/management?id="+supplierDetails.eventId %} - Return to project + Return to your project
diff --git a/src/main/features/event-management/views/evaluateSuppliers.njk b/src/main/features/event-management/views/evaluateSuppliers.njk index d9daaa18a1..27ceb0c888 100644 --- a/src/main/features/event-management/views/evaluateSuppliers.njk +++ b/src/main/features/event-management/views/evaluateSuppliers.njk @@ -8,12 +8,12 @@ {{ CCSBreadcrumbs({ items:[ { - "text": "Dashboard", + "text": "Your Dashboard", "href": "/dashboard" }, { "text": "Your Project", - "href": "#" + "href": "/event/management?id="+eventId }, { "text": "Evaluate Suppliers", @@ -70,7 +70,7 @@ {% for supplier in supplierName %} - {#{% if supplier.responseState =='Submitted' %} #} + {% if supplier.responseState =='Submitted' %} @@ -81,7 +81,7 @@ {#

#} - {{ supplier.responseDate }} + {{ supplier.responseDate |dateddmmyyyy }} {{ data.Downloadresponse[0].text }} @@ -89,7 +89,7 @@ {{supplier.completionStatus}} - {#{% endif %} #} + {% endif %} {% endfor %}

diff --git a/src/main/features/event-management/views/eventManagement.njk b/src/main/features/event-management/views/eventManagement.njk index ed613a9daa..94006be9c3 100644 --- a/src/main/features/event-management/views/eventManagement.njk +++ b/src/main/features/event-management/views/eventManagement.njk @@ -7,7 +7,7 @@ {{ CCSBreadcrumbs({ items:[ { - "text": "Dashboard", + "text": "Your Dashboard", "href": "/dashboard" }, { @@ -224,7 +224,7 @@ {{supplier.name}}

- {{ supplier.responseDate }} + {{ supplier.responseDate |dateddmmyyyy }} {% endif %} {% endfor %} @@ -270,7 +270,7 @@ {# {% if status.toUpperCase() ==='TO-BE-EVALUATED'%}#} - {{ supplier.responseDate|date('DD/MM/YYYY') }} + {{ supplier.responseDate |dateddmmyyyy }} {#{%endif%}#} {% if status.toUpperCase() !=='EVALUATED'%} @@ -307,7 +307,7 @@
{% if(showallDownload) %}

- Download all + Download all

{% endif %} @@ -341,7 +341,7 @@

- {{ supplier.responseDate }} + {{ supplier.responseDate |dateddmmyyyy }} {{ data.Downloadresponse[0].text }} diff --git a/src/main/features/event-management/views/eventManagementDetails.njk b/src/main/features/event-management/views/eventManagementDetails.njk index a138965916..0fc204b17b 100644 --- a/src/main/features/event-management/views/eventManagementDetails.njk +++ b/src/main/features/event-management/views/eventManagementDetails.njk @@ -7,7 +7,7 @@ {{ CCSBreadcrumbs({ items:[ { - "text": "Dashboard", + "text": "Your Dashboard", "href": "/dashboard" }, { diff --git a/src/main/features/event-management/views/eventManagementNextStep.njk b/src/main/features/event-management/views/eventManagementNextStep.njk index 0a1b7d466b..6d08de9822 100644 --- a/src/main/features/event-management/views/eventManagementNextStep.njk +++ b/src/main/features/event-management/views/eventManagementNextStep.njk @@ -7,7 +7,7 @@ {{ CCSBreadcrumbs({ items:[ { - "text": "Dashboard", + "text": "Your Dashboard", "href": "/dashboard" }, { diff --git a/src/main/features/event-management/views/standstillPeriodDecision.njk b/src/main/features/event-management/views/standstillPeriodDecision.njk index de583245fe..b3de8a89c8 100644 --- a/src/main/features/event-management/views/standstillPeriodDecision.njk +++ b/src/main/features/event-management/views/standstillPeriodDecision.njk @@ -3,7 +3,7 @@ {% from "components/support/macro.njk" import howToGetSupport %} {% from "components/dialog/macro.njk" import CCSDialog %} -{% set title = 'Event management ' %} +{% set title = 'Your project ' %} {% block breadCrumb %} {{ CCSBreadcrumbs({ items:[ @@ -39,6 +39,14 @@ }) }} {%endif %} +
+
+

+ {{title}} +

+
+
+

@@ -60,11 +68,11 @@ {# {{status}} #}

- {% if(showCloseProject) %} + {#{% if(showCloseProject) %}#} Close Event - {% else %} + {# {% else %} Close Event - {% endif %} + {% endif %} #}

diff --git a/src/main/features/event-management/views/steps-to-continue.njk b/src/main/features/event-management/views/steps-to-continue.njk index b2d444f1a3..6694f08cfe 100644 --- a/src/main/features/event-management/views/steps-to-continue.njk +++ b/src/main/features/event-management/views/steps-to-continue.njk @@ -7,19 +7,19 @@ {{ CCSBreadcrumbs({ items:[ { - "text": "Dashboard", + "text": "[Dashboard]", "href": "/dashboard" }, { - "text": "Event Management", - "href": "/event/management?id="+eventId + "text": "Your project", + "href": "/event/management?id="+ eventId }, { "text":"Next Steps", - "href":"#" + "href":"/rfi/nextsteps" }, { - "text":"What next step would you like to undertake to continue your project?" + "text":"What event would you like to start after closing the current one" } ] diff --git a/src/main/features/requirements/controller/rfp-questions-yourassesstment.ts b/src/main/features/requirements/controller/rfp-questions-yourassesstment.ts index 3dfad054eb..c9aa70688a 100644 --- a/src/main/features/requirements/controller/rfp-questions-yourassesstment.ts +++ b/src/main/features/requirements/controller/rfp-questions-yourassesstment.ts @@ -743,7 +743,7 @@ const mapTitle = groupId => { let title = ''; switch (groupId) { case 'Group 4': - title = 'techinical'; + title = 'technical'; break; case 'Group 5': title = 'cultural'; diff --git a/src/main/features/requirements/views/da-resourcesVettingWeightings.njk b/src/main/features/requirements/views/da-resourcesVettingWeightings.njk index 9faaad2c48..cb2ae9eba5 100644 --- a/src/main/features/requirements/views/da-resourcesVettingWeightings.njk +++ b/src/main/features/requirements/views/da-resourcesVettingWeightings.njk @@ -21,7 +21,7 @@ "href": "/da/task-list?path="+ choosenViewPath }, { - "text": "Set your resources and vetting weightings", + "text": "Select resources and set weightings", "href": "#" }] }) }} diff --git a/src/main/features/requirements/views/rfp-review.njk b/src/main/features/requirements/views/rfp-review.njk index aa9d012aa2..6775a151a6 100644 --- a/src/main/features/requirements/views/rfp-review.njk +++ b/src/main/features/requirements/views/rfp-review.njk @@ -161,7 +161,7 @@
-

Add colleagues to your project

+

Add members to your project

{% if procurementColleagues !=undefined and procurementColleagues !=null and procurementColleagues | length > 0 %}
@@ -402,7 +402,8 @@
-

Work done so far (optional)

+

Provide details of any work completed

+ {#

Work done so far (optional)

#}

{{workcompletedsofar}}

@@ -417,7 +418,11 @@
-

Which phase the project is in

+

+ {# Which phase the project is in #} +Current phase of the project + +

{{currentphaseofproject}}

@@ -432,7 +437,10 @@
-

Which phases of the project you need resource for

+

+ {# Which phases of the project you need resource for #} + Phase resource is required for +

{% if phaseResource !=undefined and phaseResource !=null and phaseResource | length >0 %} @@ -451,8 +459,18 @@
-

Expected duration of the project


-

The date you want the project to start


How long you think the project will run for (optional)


+

+ {# Expected duration of the project #} + Duration of work / resource required from /to +


+

+ {# The date you want the project to start #} + Enter indicative start date + +


+ {# How long you think the project will run for (optional) #} + Enter indicative duration (optional) +





@@ -468,8 +486,8 @@
-

Who the buying organisation is (optional)


-

Name of the organisation doing the procurement


Name of the organisation using the products or services

+

The buying organisation is (optional)


+

Name of the contracting authority


Organisation you are buying on behalf of (Optional)




@@ -500,7 +518,10 @@
-

Choose if this will be a new, replacement or expanded service or product

+

+ {# Choose if this will be a new, replacement or expanded service or product #} + New, replacement or expanded service or product +

{{newreplace}}

@@ -515,7 +536,7 @@
-

Tell us if there is an existing supplier

+

Is there an incumbent supplier

{{incumbentoption}}

{{suppliername}}

@@ -530,7 +551,12 @@
-

Management information and reporting requirements

+

+ {# Management information and reporting requirements #} + Please insert any specific details relating to the provision of +management information or reporting by the Supplier + +

{{managementinfo}}

@@ -545,15 +571,17 @@
-

Your service levels and KPIs

+

Your service levels and performance

{% set i=1 %} {%if serviceLevel !=undefined and serviceLevel !=null and serviceLevel | length >0 %} {% for data in serviceLevel %} {% set text=numberWordBig[i] + " service level requirement/KPI" %}

{{text}}

-

Name of requirement


-

Description of the criteria


-

Your success target



+

+ Enter the service area +


+

Enter the service area / KPI description


+

Insert the required target



{% set i=i+1 %} {% endfor %} {%endif%} @@ -603,7 +631,7 @@
-

Your project budget (optional)


+

How the supplier will deliver within the budgetary constraints (Optional)


Maximum estimated contract value (optional)


Minimum estimated contract value (optional)


@@ -622,7 +650,7 @@
-

Your project requirements


+

Add your requirements


{%if reqGroup !=undefined and reqGroup !=null and numberWordSmall !=undefined and numberWordSmall !=null and numberWordSmall !='' and reqGroup | length >0%} {% set i=1 %} @@ -636,14 +664,6 @@ {% set i=i+1 %} {% endfor %} {% endif %} - {#

Requirement title

-

Requirement description



-

Requirement group

-

Requirement title

-

Requirement description



-

Requirement group

-

Requirement title

-

Requirement description



#}



@@ -655,14 +675,7 @@ {% endfor %} {%endif%} - {#

Answer

-

Answer



-

Answer

-

Answer

-

Answer



-

Answer

-

Answer

-

Answer



#} +
{% if eventStatus != "published"%} @@ -681,7 +694,7 @@ {%block People_skills_security_and_location%} -

4. People, skills, security and location

+

4. Additional requirements

@@ -727,7 +740,10 @@

Your highest security and vetting requirements


Highest level of security clearance that supplied staff may need to have


-

Number of staff that will need a lower level of clearance

+

+ {# Number of staff that will need a lower level of clearance #} + How many resources need a lower security and vetting requirement? +





@@ -744,8 +760,8 @@
-

Essential skills and capabilities


-

Total number of skills and capabilities added

+

Select your service capabilities


+

Total number of added capabilities

Skills and capabilities added for each section

@@ -812,7 +828,7 @@
-

The overall weighting for quality and price


+

Set the overall ratio between quality and price


Quality


Price


@@ -831,10 +847,10 @@
-

The overall weighting for the quality categories


-

Technical


-

Cultural


-

Social value


+

Set the specific ratio of quality groups


+

Technical group


+

Cultural group


+

Social value group






@@ -852,23 +868,15 @@
-

Your technical questions


+

Add your technical questions


{%if techGroup !=undefined and techGroup !=null and techGroup | length >0%} {% for data in techGroup%}

Your question


-

Enter more details about your question


+

Provide additional detail for your question


Explain how good looks like


Enter a weighting for this question



{% endfor %} {%endif%} - {#

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question



-

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question


#}



@@ -881,15 +889,6 @@

{{data.weight}}%



{% endfor %} {%endif%} - - {#

Answer


-

Answer


-

Answer


-

XX%



-

Answer


-

Answer


-

Answer


-

XX%



#}
{% if eventStatus != "published"%} @@ -901,25 +900,17 @@
-

Your cultural fit questions



+

Add your cultural questions



{%if techGroup !=undefined and techGroup !=null and techGroup | length >0%} {% for data in techGroup%}

Your question


-

Enter more details about your question


+

Provide additional detail for your question


Explain how good looks like


Enter a weighting for this question



{% endfor %} {% endif %} - {#

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question



-

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question


#}




@@ -932,14 +923,6 @@

{{data.weight}}%



{% endfor %} {%endif%} - {#

Answer


-

Answer


-

Answer


-

XX%



-

Answer


-

Answer


-

Answer


-

XX%



#}
{% if eventStatus != "published"%} @@ -951,24 +934,16 @@
-

Your social value questions



+

Add your social value questions



{%if socialGroup !=undefined and socialGroup !=null and socialGroup | length >0%} {% for data in socialGroup%}

Your question


-

Enter more details about your question


+

Provide additional detail for your question


Explain how good looks like


Enter a weighting for this question



{% endfor %} {% endif %} - {#

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question



-

Your question


-

Provide additional detail for your question


-

Explain how good looks like


-

Enter a weighting for this question


#}




@@ -981,14 +956,7 @@

{{data.weight}}%



{% endfor %} {% endif %} - {#

Answer


-

Answer


-

Answer


-

XX%



-

Answer


-

Answer


-

Answer


-

XX%



#} +
{% if eventStatus != "published"%} @@ -1019,17 +987,27 @@

How you will score suppliers



{%if tierData !=undefined and tierData !=null and tierData | length >0%} {% for data in tierData%} -

Level name


+ {%if loop.index ==1%} +
+ {%endif%} + {%if loop.index !=1%} +



+ {%endif%} +

Level Name


Score


Description


{% endfor %} {%endif%}
-



+ {%if tierData !=undefined and tierData !=null and tierData | length >0%} {% for data in tierData %} + {%if loop.index ==1%} +

+ {%endif%} +

{{data.name}}


{{data.id}}


{{data.text}}



@@ -1166,7 +1144,7 @@

-

Publish your {%if(selectedeventtype=='DA')%}requirements{%else%}further competition{%endif%}

+

Publish your {%if(selectedeventtype=='DA')%}requirements{%else%} 1-stage further competition{%endif%}

After publishing{%if(selectedeventtype!='DA')%} this event{%endif%}, you can still cancel all or part of it at any time, or amend, clarify, add to or withdraw all or any part of it. diff --git a/src/main/features/rfi/controller/nextsteps.ts b/src/main/features/rfi/controller/nextsteps.ts index 71b7ba8b68..76b1439217 100644 --- a/src/main/features/rfi/controller/nextsteps.ts +++ b/src/main/features/rfi/controller/nextsteps.ts @@ -1,6 +1,5 @@ import * as express from 'express'; import * as cmsData from '../../../resources/content/RFI/nextsteps.json'; -import { TenderApi } from './../../../common/util/fetch/procurementService/TenderApiInstance'; import { TokenDecoder } from '../../../common/tokendecoder/tokendecoder'; import { LoggTracer } from '../../../common/logtracer/tracer'; import { ObjectModifiers } from '../util/operations/objectremoveEmptyString'; @@ -63,20 +62,6 @@ export const RFI_POST_NEXT_STEPS = async (req: express.Request, res: express.Res switch (rfi_next_steps) { case 'I want to close this event, and move to the next stage of the project': - let baseUrl = `/tenders/projects/${req.session.projectId}/events`; - let body = { - "name": "Further Competition Event", - "eventType": "FCA" - } - const { data } = await TenderApi.Instance(SESSION_ID).post(baseUrl, body); - if(data != null && data !=undefined) - { - req.session['eventId'] = data.id; - req.session.procurements[0]['eventId'] = data.id; - req.session.procurements[0]['eventType'] = data.eventType; - req.session.procurements[0]['started'] = false; - } - //await TenderApi.Instance(SESSION_ID).put(`journeys/${eventIId}/steps/54`, 'Completed'); res.redirect('/steps-to-continue');//scat-5012 break; diff --git a/src/main/public/assets/scripts/validations/ca_vetting_validation.js b/src/main/public/assets/scripts/validations/ca_vetting_validation.js index 9a5916f967..08c9f699eb 100644 --- a/src/main/public/assets/scripts/validations/ca_vetting_validation.js +++ b/src/main/public/assets/scripts/validations/ca_vetting_validation.js @@ -19,6 +19,7 @@ document.addEventListener('DOMContentLoaded', () => { var rolevalidation=[]; var staffval=[]; var vettval=[]; + var rolebox_validation=[]; let totalStaff=0; let totalVetting=0; @@ -93,7 +94,7 @@ if(totalVetting<100 || totalVetting>100) else if (classTarget.value > 99 && classTarget.value != '') { document.getElementsByClassName("weight_class")[a - 1].classList.add('govuk-input--error') document.getElementsByClassName("ca_weight_class_error")[a - 1].innerHTML = 'Please enter number <100 and >0'; - preventDefaultState.push(true); + rolebox_validation.push(true); } else if (classTarget.value <= 0 && classTarget.value !== '') { document.getElementsByClassName("weight_class")[a - 1].classList.add('govuk-input--error') @@ -180,7 +181,7 @@ if(totalVetting<100 || totalVetting>100) - switch (true) { + /* switch (true) { case (preventDefaultState.length > 0 && decimalnumber.length > 0 && nonnumerical.length > 0): e.preventDefault(); @@ -267,9 +268,71 @@ if(totalVetting<100 || totalVetting>100) default: console.log("If all else fails"); break; - } + }*/ - + let errormsg=''; + if(preventDefaultState.length > 0 || decimalnumber.length > 0 || nonnumerical.length > 0 || rolevalidation.length>0 || staffval.length>0 || vettval.length> 0 || rolebox_validation.length>0) +{ + if(preventDefaultState.length > 0 && decimalnumber.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'

  • The input field must be a number less than 100 and greater than 0

  • The input field should not contain decimal values

  • The input field must be a number
    • '; + + if(preventDefaultState.length > 0 && decimalnumber.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0

  • The input field should not contain decimal values
    • '; + + if (preventDefaultState.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0

  • The input field must be a number
    • '; + + if (decimalnumber.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field should not contain decimal values

  • The input field must be a number
    • '; + + if (preventDefaultState.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0
    • '; + + if (nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number
    • '; + + if (decimalnumber.length > 0) + + + errormsg=errormsg+'
  • The input field should not contain decimal values
    • '; + + if (rolevalidation.length>0) + + errormsg=errormsg+'
  • At least 1 DDaT role must be populated with a quantity value
    • '; + + if(staffval.length>0) + + errormsg=errormsg+'
  • Sum of all [Weighting for number of staff] values for all Role Families in all groups = 100%
    • '; + + if(vettval.length>0) + + errormsg=errormsg+'
  • Sum of all [Weighting for related vetting requirement] values for all Role Families in all groups = 100%
    • '; + + if(rolebox_validation.length>0) + + errormsg=errormsg+'
  • Value entered in [How many people you need for this role family?] <= 99
    • '; + + + + e.preventDefault(); + $('#ca_vetting_error_summary').removeClass('hide-block'); + $('.govuk-error-summary__title').text('There is a problem'); + $("#ca_summary_list").html(errormsg); + $('html, body').animate({ scrollTop: 0 }, 'fast'); + + } diff --git a/src/main/public/assets/scripts/validations/da_vetting_validation.js b/src/main/public/assets/scripts/validations/da_vetting_validation.js index 51f1544398..4a42941c7b 100644 --- a/src/main/public/assets/scripts/validations/da_vetting_validation.js +++ b/src/main/public/assets/scripts/validations/da_vetting_validation.js @@ -19,6 +19,7 @@ document.addEventListener('DOMContentLoaded', () => { var rolevalidation=[]; var staffval=[]; var vettval=[]; + var rolebox_validation=[]; let totalStaff=0; let totalVetting=0; @@ -96,7 +97,7 @@ if(totalVetting<100 || totalVetting>100) else if (classTarget.value > 99 && classTarget.value != '') { document.getElementsByClassName("weight_class")[a - 1].classList.add('govuk-input--error') document.getElementsByClassName("da_weight_class_error")[a - 1].innerHTML = 'Please enter number <100 and >0'; - preventDefaultState.push(true); + rolebox_validation.push(true); } else if (classTarget.value <= 0 && classTarget.value !== '') { document.getElementsByClassName("weight_class")[a - 1].classList.add('govuk-input--error') @@ -181,7 +182,7 @@ if(totalVetting<100 || totalVetting>100) * */ - switch (true) { + /*switch (true) { case (preventDefaultState.length > 0 && decimalnumber.length > 0 && nonnumerical.length > 0): e.preventDefault(); @@ -266,6 +267,69 @@ if(totalVetting<100 || totalVetting>100) default: console.log("If all else fails"); break; + }*/ + let errormsg=''; + if(preventDefaultState.length > 0 || decimalnumber.length > 0 || nonnumerical.length > 0 || rolevalidation.length>0 || staffval.length>0 || vettval.length> 0 || rolebox_validation.length>0) + { + if(preventDefaultState.length > 0 && decimalnumber.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0

  • The input field should not contain decimal values

  • The input field must be a number
    • '; + + if(preventDefaultState.length > 0 && decimalnumber.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0

  • The input field should not contain decimal values
    • '; + + if (preventDefaultState.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0

  • The input field must be a number
    • '; + + if (decimalnumber.length > 0 && nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field should not contain decimal values

  • The input field must be a number
    • '; + + if (preventDefaultState.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number less than 100 and greater than 0
    • '; + + if (nonnumerical.length > 0) + + + errormsg=errormsg+'
  • The input field must be a number
    • '; + + if (decimalnumber.length > 0) + + + errormsg=errormsg+'
  • The input field should not contain decimal values
    • '; + + if (rolevalidation.length>0) + + errormsg=errormsg+'
  • At least 1 DDaT role must be populated with a quantity value
    • '; + + if(staffval.length>0) + + errormsg=errormsg+'
  • Sum of all [Weighting for number of staff] values for all Role Families in all groups = 100%
    • '; + + if(vettval.length>0) + + errormsg=errormsg+'
  • Sum of all [Weighting for related vetting requirement] values for all Role Families in all groups = 100%
    • '; + + if(rolebox_validation.length>0) + + errormsg=errormsg+'
  • Value entered in [How many people you need for this role family?] <= 99
    • '; + + e.preventDefault(); + $('#da_vetting_error_summary').removeClass('hide-block'); + $('.govuk-error-summary__title').text('There is a problem'); + $("#da_summary_list").html(errormsg); + $('html, body').animate({ scrollTop: 0 }, 'fast'); + + + } if (!inputtedtext.length > 0) { diff --git a/src/main/public/assets/scripts/validations/validate_award.js b/src/main/public/assets/scripts/validations/validate_award.js index de0f70b913..ffa3596836 100644 --- a/src/main/public/assets/scripts/validations/validate_award.js +++ b/src/main/public/assets/scripts/validations/validate_award.js @@ -18,6 +18,7 @@ const ccsZvalidateStandStillPeriod = (event) => { const radioButtonYes = document.getElementById("standstill_period_yes").checked; const radioButtonNo = document.getElementById("standstill_period_no").checked; + if (radioButtonYes || radioButtonNo) { document.forms["ccs_standstill_period_form"].submit(); } @@ -29,6 +30,16 @@ const ccsZvalidateStandStillPeriod = (event) => { document.addEventListener('DOMContentLoaded', () => { + $('#standstill_period_yes').on('click', function (){ + $('#standstill_period_yes').prop('checked',true); + $('#standstill_period_no').prop('checked', false); + }); + + $('#standstill_period_no').on('click', function (){ + $('#standstill_period_no').prop('checked',true); + $('#standstill_period_yes').prop('checked',false); + }); + if ($("#enter_evaluation_score_readOnly") !=undefined && $("#enter_evaluation_score_readOnly") !=null && $("#enter_evaluation_score_readOnly").length >0 ) { document.getElementById("enter_evaluation_score_readOnly").readOnly = "true"; document.getElementById("enter_evaluation_feedback_readOnly").readOnly = "true"; diff --git a/src/main/resources/content/event-management/event-management.json b/src/main/resources/content/event-management/event-management.json index cd705ac437..fbd3ac2bdd 100644 --- a/src/main/resources/content/event-management/event-management.json +++ b/src/main/resources/content/event-management/event-management.json @@ -14,7 +14,7 @@ } ], "title": "Your Project", - "subtitle": "Manage your project from this page including responding to supplier's clarification questions or messages in your inbox. See supplier's answers to your published project.", + "subtitle": "You can manage your project from this page including responding to supplier's clarification questions or messages in your inbox. See supplier's answers to your published project.", "subtitle1":"You can close this project using the link under the project name below.", "subsection2_title": "Project ID/name", "subsection2_content": "Close this project", @@ -64,16 +64,18 @@ "subsection4_title3": "How many suppliers will respond to your published project", "subsection4_title3_descriiption": "You can find out how many suppliers are interested in responding to your project in the section below.", "subsection4_title3_task1":"Total number of suppliers who received your published project", - "subsection4_title3_task2":"Number of suppliers who have responded", - "subsection4_title3_task3":"Number of suppliers who do not want to submit an answer", + "subsection4_title3_task2":"Number of suppliers who intend to respond", + "subsection4_title3_task3":"Number of suppliers who do not want to respond", "subsection4_title3_task4":"Number of suppliers who have not responded", + + "subsection4_title3_eval": "Suppliers who responded to your published project", "subsection4_title3_eval_descriiption": "Find out how many suppliers are interested in responding to your project in the section below.", "subsection4_title3_eval_task1":"Total number of suppliers who received your published project", - "subsection4_title3_eval_task2":"Number of suppliers who want to respond", + "subsection4_title3_eval_task2":"Number of suppliers who intend to respond", "subsection4_title3_eval_task3":"Number of suppliers who do not want to respond", - "subsection4_title3_eval_task4":"Remaining supplier with no response", + "subsection4_title3_eval_task4":"Number of suppliers who have not responded", "subsection4_title4": "Supplier responses", diff --git a/src/main/resources/content/event-management/steps-to-continue.json b/src/main/resources/content/event-management/steps-to-continue.json index 95ccb16db6..d11df8e7e4 100644 --- a/src/main/resources/content/event-management/steps-to-continue.json +++ b/src/main/resources/content/event-management/steps-to-continue.json @@ -14,7 +14,7 @@ } ], - "title": "What next step would you like to undertake to continue your project?", + "title": "What event would you like to start after closing the current one?", "subtitle": "[ Instructions for this page ]", "form": [ { @@ -56,7 +56,7 @@ } ], "backJump": { - "title": "Return to [Event Management]", + "title": "Return to Your project", "href": "/event/management?id=" } diff --git a/src/main/resources/content/requirements/daTaskList-B1.json b/src/main/resources/content/requirements/daTaskList-B1.json index 4cfb92dd03..e673845e16 100644 --- a/src/main/resources/content/requirements/daTaskList-B1.json +++ b/src/main/resources/content/requirements/daTaskList-B1.json @@ -79,7 +79,7 @@ { "Task": 4, "link": "/da/resources-vetting-weightings", - "title": " Select the resources you need and set weighting for vetting and resources ", + "title": " Set your resources and vetting weightings", "required": "mandatory", "status": "Cannot start yet" }, diff --git a/src/main/resources/content/requirements/rfp-review.json b/src/main/resources/content/requirements/rfp-review.json index 32b882106c..5efcc48527 100644 --- a/src/main/resources/content/requirements/rfp-review.json +++ b/src/main/resources/content/requirements/rfp-review.json @@ -20,7 +20,7 @@ "text": "Review and publish" } ], - "title": " Review and publish", + "title": " Review and publish your 1-stage further competition", "subtitle": "You should review your further competition before publishing it for suppliers to see. You can make changes to any sections.", "subtitleDA": "You should review your before publishing it for suppliers to see. You can make changes to any sections.", "data": {