From ee50953d4aa5e50041d2337e69ff632cc6a2c853 Mon Sep 17 00:00:00 2001 From: Charunya Date: Mon, 25 Jul 2022 22:01:40 +0530 Subject: [PATCH] BugFix/5926/5924 --- .../controller/evaluateSuppliers.ts | 24 ++++++++++++------- .../views/enterEvaluation.njk | 2 +- .../views/evaluateSuppliers.njk | 10 ++++---- .../views/eventManagement.njk | 8 +++---- .../views/eventManagementDetails.njk | 2 +- .../views/eventManagementNextStep.njk | 2 +- .../event-management/event-management.json | 10 ++++---- 7 files changed, 34 insertions(+), 24 deletions(-) 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/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.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..c55ab8ab25 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'%} @@ -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/resources/content/event-management/event-management.json b/src/main/resources/content/event-management/event-management.json index cd705ac437..f19c46a247 100644 --- a/src/main/resources/content/event-management/event-management.json +++ b/src/main/resources/content/event-management/event-management.json @@ -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",