From 95635aa89c5acab378706f27cd6f3a18c71ba2c9 Mon Sep 17 00:00:00 2001
From: Dhivya <dhivya.pandiadurai@cognizant.com>
Date: Wed, 27 Jul 2022 18:43:36 +0530
Subject: [PATCH] BugFix/SCAT-5899

---
 .../controller/eventManagement.ts             | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/features/event-management/controller/eventManagement.ts b/src/main/features/event-management/controller/eventManagement.ts
index f1c9873a93..3f29c757b9 100644
--- a/src/main/features/event-management/controller/eventManagement.ts
+++ b/src/main/features/event-management/controller/eventManagement.ts
@@ -48,9 +48,9 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon
       res.redirect('/projects/create-or-choose');
     }
     else {
-      let agreementName: string, agreementLotName: string, projectId: string, lotid: string, title: string, agreementId_session: string, projectName: string, status: string, eventId: string, eventType: string
+      let agreementName: string, agreementLotName: string, projectId: string, lotid: string, title: string, agreementId_session: string, projectName: string, status: string, eventId: string, eventType: string, end_date:string;
 
-      events.forEach((element: { activeEvent: { id: string | ParsedQs | string[] | ParsedQs[]; status: string; eventType: string; title: string; }; agreementName: string; lotName: string; agreementId: string; projectName: string; projectId: string; lotId: string; }) => {
+      events.forEach((element: { activeEvent: { id: string | ParsedQs | string[] | ParsedQs[]; status: string; eventType: string; title: string; tenderPeriod:{startDate:string;endDate:string;}}; agreementName: string; lotName: string; agreementId: string; projectName: string; projectId: string; lotId: string; end_date:string;  }) => {
         if (element.activeEvent.id == id) {
           agreementName = element.agreementName
           agreementLotName = element.lotName
@@ -62,7 +62,7 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon
           projectId = element.projectId
           lotid = element.lotId
           title = element.activeEvent.title
-
+         end_date=element?.activeEvent?.tenderPeriod?.endDate
         }
       });
 
@@ -244,23 +244,30 @@ export const EVENT_MANAGEMENT = async (req: express.Request, res: express.Respon
       let filtervalues = "";
       try {
         //response date 
-      const apiData_baseURL = `/tenders/projects/${procurementId}/events/${eventId}/criteria/Criterion 1/groups/Key Dates/questions`;
-      const fetchQuestions = await DynamicFrameworkInstance.Instance(SESSION_ID).get(apiData_baseURL);
-      let fetchQuestionsData = fetchQuestions.data;
-
-      for (var l = 0; l < fetchQuestionsData.length; l++) {
-        if (fetchQuestionsData[l].OCDS.id == 'Question 4') {
-          var supplier_deadline = fetchQuestionsData[l].nonOCDS.options[0]?.value;
-          if (supplier_deadline != undefined && supplier_deadline != null) {
-            let day = supplier_deadline.substr(0, 10);
-            let time = supplier_deadline.substr(11, 5);
-            filtervalues = moment(day + "" + time, 'YYYY-MM-DD HH:mm',).format('DD MMMM YYYY, hh:mm a')
-          }
-        }
-      }
+        
+      // const apiData_baseURL = `/tenders/projects/${procurementId}/events/${eventId}/criteria/Criterion 1/groups/Key Dates/questions`;
+      // const fetchQuestions = await DynamicFrameworkInstance.Instance(SESSION_ID).get(apiData_baseURL);
+      // let fetchQuestionsData = fetchQuestions.data;
+      
+      // for (var l = 0; l < fetchQuestionsData.length; l++) {
+      //   if (fetchQuestionsData[l].OCDS.id == 'Question 4') {
+      //     var supplier_deadline = fetchQuestionsData[l].nonOCDS.options[0]?.value;
+      //     if (supplier_deadline != undefined && supplier_deadline != null) {
+      //       let day = supplier_deadline.substr(0, 10);
+      //       let time = supplier_deadline.substr(11, 5);
+      //       filtervalues = moment(day + "" + time, 'YYYY-MM-DD HH:mm',).format('DD MMMM YYYY, hh:mm a')
+      //     }
+      //   }
+      // }
+      if (end_date!= undefined && end_date != null) {
+             let day = end_date.substr(0, 10);
+             let time = end_date.substr(11, 5);
+               filtervalues = moment(day + "" + time, 'YYYY-MM-DD HH:mm',).format('DD MMMM YYYY, hh:mm a')
+             }
+
       } catch (error) {}
   
-      const appendData = { supplierDetails, data: eventManagementData, filtervalues, Colleagues: collaboratorData, status, projectName, eventId, eventType, apidata, supplierDetailsDataList, supplierSummary, showallDownload, QAs: fetchData.data, suppliers: localData, unreadMessage: unreadMessage }
+      const appendData = { supplierDetails, data: eventManagementData, filtervalues, Colleagues: collaboratorData, status, projectName, eventId, eventType, apidata,end_date, supplierDetailsDataList, supplierSummary, showallDownload, QAs: fetchData.data, suppliers: localData, unreadMessage: unreadMessage }
 
       let redirectUrl: string
       if (status.toLowerCase() == "in-progress") {