diff --git a/force-app/main/default/classes/CourseRegistrationController.cls b/force-app/main/default/classes/CourseRegistrationController.cls index 8e6560d..19cbcf9 100644 --- a/force-app/main/default/classes/CourseRegistrationController.cls +++ b/force-app/main/default/classes/CourseRegistrationController.cls @@ -2,9 +2,9 @@ public without sharing class CourseRegistrationController { @AuraEnabled public static String createRegistration(String fields, String courseId) { try { - Boolean duplicate = checkForDuplicates(fields, courseId ); - if ( duplicate ) { - return 'Du er allerede påmeldt dette kurset, vennligst bruk en annen e-postadresse.'; + Boolean duplicate = checkForDuplicates(fields, courseId); + if (duplicate) { + return 'Du er allerede påmeldt dette kurset, vennligst bruk en annen e-postadresse.'; } Boolean courseIsFull = checkIfCourseIsFull(courseId); if (fields != null) { @@ -18,7 +18,7 @@ public without sharing class CourseRegistrationController { return 'Det oppsto en feil. Prøv igjen senere.'; } } - + @AuraEnabled public static Course__c getCourseFields(String courseId) { return [ @@ -71,11 +71,11 @@ public without sharing class CourseRegistrationController { registration.CompanyName__c = model.companyName; registration.Role__c = model.role; - registration.Allergies__c=model.allergies; - registration.Workplace__c=model.workplace; - registration.Invoice_address__c=model.invoiceAdress; - registration.Invoice_reference__c=model.invoiceReference; - registration.AdditionalInformation__c=model.additionalInformation; + registration.Allergies__c = model.allergies; + registration.Workplace__c = model.workplace; + registration.Invoice_address__c = model.invoiceAdress; + registration.Invoice_reference__c = model.invoiceReference; + registration.AdditionalInformation__c = model.additionalInformation; if (courseIsFull) { registration.Status__c = 'Venteliste'; @@ -86,15 +86,16 @@ public without sharing class CourseRegistrationController { insert registration; } } - - public static Boolean checkForDuplicates( String fields, Id courseId ) { + + public static Boolean checkForDuplicates(String fields, Id courseId) { CourseRegistrationModel model = CourseRegistrationModel.parse(fields); - List existingRecord = - [SELECT Id, Course__c, CourseParticipant__r.Email - FROM CourseRegistration__c - WHERE Course__c =: courseId - AND CourseParticipant__r.Email =: model.email LIMIT 1]; + List existingRecord = [ + SELECT Id, Course__c, CourseParticipant__r.Email + FROM CourseRegistration__c + WHERE Course__c = :courseId AND CourseParticipant__r.Email = :model.email + LIMIT 1 + ]; return existingRecord.size() > 0; - } + } } diff --git a/force-app/main/default/classes/CourseRegistrationControllerTest.cls b/force-app/main/default/classes/CourseRegistrationControllerTest.cls index 33827ab..55a1673 100644 --- a/force-app/main/default/classes/CourseRegistrationControllerTest.cls +++ b/force-app/main/default/classes/CourseRegistrationControllerTest.cls @@ -47,6 +47,10 @@ private with sharing class CourseRegistrationControllerTest { 'Registration successfull' ); System.assertEquals('Det oppsto en feil. Prøv igjen senere.', result2, 'Course id missing'); - System.assertEquals('Du er allerede påmeldt dette kurset, vennligst bruk en annen e-postadresse.', resultOfDuplicateReg, 'Duplicate registration'); + System.assertEquals( + 'Du er allerede påmeldt dette kurset, vennligst bruk en annen e-postadresse.', + resultOfDuplicateReg, + 'Duplicate registration' + ); } } diff --git a/force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml index 42a1448..f380b8d 100644 --- a/force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml @@ -112,6 +112,16 @@ RecordNotify_me_new_participants_cField + + + + uiBehavior + none + + Record.PublishWithoutRegistrationForm__c + RecordPublishWithoutRegistrationForm_cField + + diff --git a/force-app/main/default/layouts/Course__c-Course Layout.layout-meta.xml b/force-app/main/default/layouts/Course__c-Course Layout.layout-meta.xml index d74b170..84185fa 100644 --- a/force-app/main/default/layouts/Course__c-Course Layout.layout-meta.xml +++ b/force-app/main/default/layouts/Course__c-Course Layout.layout-meta.xml @@ -23,6 +23,10 @@ Required MaxNumberOfParticipants__c + + Edit + PublishWithoutRegistrationForm__c + Edit ShowCompany__c @@ -191,9 +195,9 @@ false true - - - + + + @@ -254,4 +258,4 @@ 0 Default - + \ No newline at end of file diff --git a/force-app/main/default/objectTranslations/Course__c-no/PublishWithoutRegistrationForm__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/Course__c-no/PublishWithoutRegistrationForm__c.fieldTranslation-meta.xml new file mode 100644 index 0000000..1cdb380 --- /dev/null +++ b/force-app/main/default/objectTranslations/Course__c-no/PublishWithoutRegistrationForm__c.fieldTranslation-meta.xml @@ -0,0 +1,5 @@ + + + + PublishWithoutRegistrationForm__c + diff --git a/force-app/main/default/objects/Course__c/fields/PublishWithoutRegistrationForm__c.field-meta.xml b/force-app/main/default/objects/Course__c/fields/PublishWithoutRegistrationForm__c.field-meta.xml new file mode 100644 index 0000000..1f0b5f1 --- /dev/null +++ b/force-app/main/default/objects/Course__c/fields/PublishWithoutRegistrationForm__c.field-meta.xml @@ -0,0 +1,9 @@ + + + PublishWithoutRegistrationForm__c + false + false + + false + Checkbox + diff --git a/force-app/main/default/permissionsets/Course_Admin.permissionset-meta.xml b/force-app/main/default/permissionsets/Course_Admin.permissionset-meta.xml index fd729ec..dba6144 100644 --- a/force-app/main/default/permissionsets/Course_Admin.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/Course_Admin.permissionset-meta.xml @@ -455,6 +455,11 @@ Course__c.PindenaId__c true + + true + Course__c.PublishWithoutRegistrationForm__c + true + true Course__c.Region2__c diff --git a/force-app/main/default/permissionsets/Ekstern_Kurs.permissionset-meta.xml b/force-app/main/default/permissionsets/Ekstern_Kurs.permissionset-meta.xml index 42ccec0..05477b9 100644 --- a/force-app/main/default/permissionsets/Ekstern_Kurs.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/Ekstern_Kurs.permissionset-meta.xml @@ -153,6 +153,11 @@ Course__c.NumberOfParticipants__c true + + false + Course__c.PublishWithoutRegistrationForm__c + true + false Course__c.Region2__c