Skip to content

BugFix/SCAT-5899 #1638

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
dhivya-cognizant merged 1 commit into from
Jul 29, 2022
Merged

BugFix/SCAT-5899 #1638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 25 additions & 18 deletions src/main/features/event-management/controller/eventManagement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
});

Expand Down Expand Up @@ -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") {
Expand Down