Skip to content

Commit

Permalink
Merge pull request #559 from SFDO-Community/april_fix_before
Browse files Browse the repository at this point in the history 
April 2024 fix before
  • Loading branch information
@rdblake21
rdblake21 authored Apr 9, 2024
2 parents f4b3eec + 733893d commit 240a5fa
Show file tree
Hide file tree
Showing 4 changed files with 130 additions and 84 deletions.
13 changes: 12 additions & 1 deletion force-app/main/default/classes/SummitEventsAdditionalQuestionsCtlr.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public with sharing class SummitEventsAdditionalQuestionsCtlr {
eventInformation = SummitEventsShared.getSummitEventsInfo();
questionWrapper = new List<questionItem>();
Map<String, String> hiddenValues = new Map<String, String>();
Map<String, String> defaultValues = new Map<String, String>();

//eventInformation is an object gathered from the encrypted client cookie that contains event id and instance ids without which thou shall not pass
if (String.isNotBlank(eventInformation.eventId) && String.isNotBlank(eventInformation.instanceId)) {
Expand Down Expand Up @@ -299,8 +300,11 @@ public with sharing class SummitEventsAdditionalQuestionsCtlr {
//add question to question wrapper if it is visible, otherwise apply default value to the event registration.
if (question.Is_Visible__c) {
questionWrapper.add(quest);
} else {
if (String.isNotBlank(question.Default_Value__c)) {
defaultValues.put(mapToField, question.Default_Value__c);
}
} else {
if (String.isNotBlank(question.Default_Value__c) && question.Question_Field_Type__c != 'Picklist') {
hiddenValues.put(mapToField, question.Default_Value__c);
}
}
Expand Down Expand Up @@ -334,6 +338,13 @@ public with sharing class SummitEventsAdditionalQuestionsCtlr {
eventRegistration.put(key, hiddenValues.get(key));
}

//Apply default values if registration value is not blank
for (String key : defaultValues.keySet()) {
if (String.isBlank((String) eventRegistration.get(key))) {
eventRegistration.put(key, defaultValues.get(key));
}
}

//Get the holding values if there are any
for (String key : lookUpDisplayValue.keySet()) {
String lookupField = key.trim();
Expand Down
39 changes: 21 additions & 18 deletions force-app/main/default/classes/SummitEventsCancelReviewController.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

public with sharing class SummitEventsCancelReviewController {
public Summit_Events_Registration__c eventRegistration { get; set; }
public Summit_Events__c eventPage { get; set; }
public SummitEventsInfo eventInformation { get; set; }
public List<Summit_Events_Appointments__c> appointments { get; set; }
public String templateSelected { get; set; }
public Boolean eventOver { get; set; }
public Boolean eventIsClosed { get; set; }
public Boolean eventNotFound { get; set; }
public String formattedNavDate { get; set; }
public String eventParameter { get; set; }
Expand All @@ -17,7 +18,9 @@ public with sharing class SummitEventsCancelReviewController {
public SummitEventsCancelReviewController() {
eventParameter = ApexPages.currentPage().getParameters().get('eventInfo');
eventNotFound = true;
eventOver = false;
eventIsClosed = false;
eventRegistration = new Summit_Events_Registration__c();
templateSelected = SummitEventsShared.getTemplate('');

if (!String.isBlank(eventParameter)) {
String decryptedParameter = SummitEventsShared.decryptString(eventParameter, false);
Expand All @@ -30,24 +33,14 @@ public with sharing class SummitEventsCancelReviewController {

if (String.isNotBlank(eventInformation.registrationId)) {
eventRegistration = [
SELECT Id, Status__c, Name, Event__r.Name, Event_Instance__c, Event__r.Event_Name__c, Event__r.Event_description__c,
Event__r.Event_Footer__c, Event__r.Event_Cancel_Review_Title__c, Event_Name__c, Event_Instance__r.Instance_Title__c,
Event__r.Event_Cancel_Review_Description__c, Event__r.Event_Cancelled_Notification_Text__c,
Event__r.Template__c, Event__r.Event_Home_Link_Title__c, Event__r.Event_Home_Link_URL__c,
Event_Instance__r.Instance_Start_Date__c, Event_Instance__r.Instance_Start_Time__c,
Event_Instance__r.Instance_End_Date__c, Event_Instance__r.Instance_End_Time__c, Event_Instance__r.Instance_Time_Zone__c,
Event__r.Tracking_Cancel_Registration__c, Event__r.Account__r.Name, Event__r.Audience__c,
Event__r.Filter_Category__c, Event__r.Event_Sponsor__c
SELECT Id, Status__c, Name, Event_Instance__c, Event_Name__c, Event_Instance__r.Instance_Title__c, Event__c
FROM Summit_Events_Registration__c
WHERE Id = :eventInformation.registrationId
WITH SECURITY_ENFORCED
];


if (eventRegistration != null) {

templateSelected = SummitEventsShared.getTemplate(eventRegistration.Event__r.Template__c);

appointments = [
SELECT Id, Appointment_Title__c, Appointment_Category__c, Appointment_Type__c
FROM Summit_Events_Appointments__c
Expand All @@ -56,20 +49,30 @@ public with sharing class SummitEventsCancelReviewController {
];

eventInstance = [
SELECT Id, Event__r.Event_Name__c, Instance_Title__c,
Instance_Start_Date__c, Instance_End_Date__c, Instance_Start_Time__c, Instance_End_Time__c, Instance_Time_Zone__c
SELECT Id, Instance_Title__c, Instance_Start_Date__c, Instance_End_Date__c, Instance_Start_Time__c, Instance_End_Time__c, Instance_Time_Zone__c,
Registration_Close_Date__c, Current_Available_Capacity__c, Active_Status__c
FROM Summit_Events_Instance__c W
WHERE Id = :eventRegistration.Event_Instance__c
WITH SECURITY_ENFORCED
];

if (SummitEventsShared.convertDateToDatetime(eventRegistration.Event_Instance__r.Instance_End_Date__c, null, '') < SummitEventsShared.adjustForTimeZone(Datetime.now(), eventRegistration.Event_Instance__r.Instance_Time_Zone__c)) {
eventOver = true;
}
eventPage = [
SELECT Id, Event_Name__c, Event_description__c, Event_Footer__c, Event_Cancel_Review_Title__c, Event_Cancel_Review_Description__c,
Event_Cancelled_Notification_Text__c, Event_Home_Link_Title__c, Event_Home_Link_URL__c, Tracking_Cancel_Registration__c,
Account__r.Name, Audience__c, Filter_Category__c, Event_Sponsor__c, Event_Full_Text__c, Template__c
FROM Summit_Events__c
WHERE Id = :eventRegistration.Event__c
WITH SECURITY_ENFORCED
];

templateSelected = SummitEventsShared.getTemplate(eventPage.Template__c);

eventIsClosed = SummitEventsShared.isEventClosed(eventInstance);

if (eventInstance != null) {
formattedNavDate = SummitEventsShared.navBreadcrumbBuilder(eventInstance);
}

eventNotFound = false;
}
}
Expand Down
Loading

0 comments on commit 240a5fa

Please sign in to comment.