Skip to content
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

TOLK-2362 : Som kurseier ønsker jeg å kunne velge å publisere kurs uten påmeldingsskjema #339

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

TOLK-2362 : Som kurseier ønsker jeg å kunne velge å publisere kurs uten påmeldingsskjema #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e818ca
nytt felt
olsenrasmus Apr 29, 2024
813f78b
Merge branch 'master' into TOLK-2362
olsenrasmus Sep 9, 2024
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
35 changes: 18 additions & 17 deletions force-app/main/default/classes/CourseRegistrationController.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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 [
Expand Down Expand Up @@ -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';
Expand All @@ -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<CourseRegistration__c> existingRecord =
[SELECT Id, Course__c, CourseParticipant__r.Email
FROM CourseRegistration__c
WHERE Course__c =: courseId
AND CourseParticipant__r.Email =: model.email LIMIT 1];
List<CourseRegistration__c> 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;
}
}
}
6 changes: 5 additions & 1 deletion force-app/main/default/classes/CourseRegistrationControllerTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
}
}
10 changes: 10 additions & 0 deletions force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,16 @@
<identifier>RecordNotify_me_new_participants_cField</identifier>
</fieldInstance>
</itemInstances>
<itemInstances>
<fieldInstance>
<fieldInstanceProperties>
<name>uiBehavior</name>
<value>none</value>
</fieldInstanceProperties>
<fieldItem>Record.PublishWithoutRegistrationForm__c</fieldItem>
<identifier>RecordPublishWithoutRegistrationForm_cField</identifier>
</fieldInstance>
</itemInstances>
<itemInstances>
<fieldInstance>
<fieldInstanceProperties>
Expand Down
12 changes: 8 additions & 4 deletions force-app/main/default/layouts/Course__c-Course Layout.layout-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
<behavior>Required</behavior>
<field>MaxNumberOfParticipants__c</field>
</layoutItems>
<layoutItems>
<behavior>Edit</behavior>
<field>PublishWithoutRegistrationForm__c</field>
</layoutItems>
<layoutItems>
<behavior>Edit</behavior>
<field>ShowCompany__c</field>
Expand Down Expand Up @@ -191,9 +195,9 @@
<detailHeading>false</detailHeading>
<editHeading>true</editHeading>
<label>Custom Links</label>
<layoutColumns/>
<layoutColumns/>
<layoutColumns/>
<layoutColumns />
<layoutColumns />
<layoutColumns />
<style>CustomLinks</style>
</layoutSections>
<miniLayout>
Expand Down Expand Up @@ -254,4 +258,4 @@
<sizeY>0</sizeY>
<summaryLayoutStyle>Default</summaryLayoutStyle>
</summaryLayout>
</Layout>
</Layout>
5 changes: 5 additions & 0 deletions ...jectTranslations/Course__c-no/PublishWithoutRegistrationForm__c.fieldTranslation-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
<label>Publiser uten påmeldingsskjema</label>
<name>PublishWithoutRegistrationForm__c</name>
</CustomFieldTranslation>
9 changes: 9 additions & 0 deletions ...pp/main/default/objects/Course__c/fields/PublishWithoutRegistrationForm__c.field-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>PublishWithoutRegistrationForm__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
<label>Publish Without Registration Form</label>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
</CustomField>
5 changes: 5 additions & 0 deletions force-app/main/default/permissionsets/Course_Admin.permissionset-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,11 @@
<field>Course__c.PindenaId__c</field>
<readable>true</readable>
</fieldPermissions>
<fieldPermissions>
<editable>true</editable>
<field>Course__c.PublishWithoutRegistrationForm__c</field>
<readable>true</readable>
</fieldPermissions>
<fieldPermissions>
<editable>true</editable>
<field>Course__c.Region2__c</field>
Expand Down
5 changes: 5 additions & 0 deletions force-app/main/default/permissionsets/Ekstern_Kurs.permissionset-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@
<field>Course__c.NumberOfParticipants__c</field>
<readable>true</readable>
</fieldPermissions>
<fieldPermissions>
<editable>false</editable>
<field>Course__c.PublishWithoutRegistrationForm__c</field>
<readable>true</readable>
</fieldPermissions>
<fieldPermissions>
<editable>false</editable>
<field>Course__c.Region2__c</field>
Expand Down
Loading