Skip to content

Commit 376383d

Browse files
olsenrasmusolsenrasmus
authored
Merge pull request #338 from navikt/ny
TOLK-2360 : Tekstfelt hvor bruker kan legge inn ekstra behov
2 parents fef44e3 + d0d9ca9 commit 376383d

14 files changed

+233
-2
lines changed

‎force-app/main/default/classes/CourseRegistrationController.cls

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public with sharing class CourseRegistrationController {
4040
ShowInvoiceAdress__c,
4141
ShowInvoiceReference__c,
4242
ShowAllergies__c,
43-
ShowWorkplace__c
43+
ShowWorkplace__c,
44+
ShowAdditionalInformation__c
4445
FROM Course__c
4546
WHERE Id = :courseId
4647
];
@@ -74,6 +75,7 @@ public with sharing class CourseRegistrationController {
7475
registration.Workplace__c=model.workplace;
7576
registration.Invoice_address__c=model.invoiceAdress;
7677
registration.Invoice_reference__c=model.invoiceReference;
78+
registration.AdditionalInformation__c=model.additionalInformation;
7779

7880
if (courseIsFull) {
7981
registration.Status__c = 'Venteliste';

‎force-app/main/default/classes/CourseRegistrationModel.cls

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public with sharing class CourseRegistrationModel {
1212
public String invoiceAdress;
1313
public String invoiceReference;
1414
public String allergies;
15+
public String additionalInformation;
1516

1617
public static CourseRegistrationModel parse(String json) {
1718
return (CourseRegistrationModel) System.JSON.deserialize(json, CourseRegistrationModel.class);

‎force-app/main/default/flexipages/Course_Record_Page.flexipage-meta.xml

+134
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,20 @@
6060
</itemInstances>
6161
<itemInstances>
6262
<fieldInstance>
63+
<fieldInstanceProperties>
64+
<name>uiBehavior</name>
65+
<value>none</value>
66+
</fieldInstanceProperties>
6367
<fieldItem>Record.Type__c</fieldItem>
6468
<identifier>RecordType__cField</identifier>
6569
</fieldInstance>
6670
</itemInstances>
6771
<itemInstances>
6872
<fieldInstance>
73+
<fieldInstanceProperties>
74+
<name>uiBehavior</name>
75+
<value>none</value>
76+
</fieldInstanceProperties>
6977
<fieldItem>Record.MaxNumberOfParticipants__c</fieldItem>
7078
<identifier>RecordMaxNumberOfParticipants__cField</identifier>
7179
</fieldInstance>
@@ -86,6 +94,10 @@
8694
</itemInstances>
8795
<itemInstances>
8896
<fieldInstance>
97+
<fieldInstanceProperties>
98+
<name>uiBehavior</name>
99+
<value>none</value>
100+
</fieldInstanceProperties>
89101
<fieldItem>Record.Cancel__c</fieldItem>
90102
<identifier>RecordCancel__cField</identifier>
91103
</fieldInstance>
@@ -112,6 +124,10 @@
112124
</itemInstances>
113125
<itemInstances>
114126
<fieldInstance>
127+
<fieldInstanceProperties>
128+
<name>uiBehavior</name>
129+
<value>none</value>
130+
</fieldInstanceProperties>
115131
<fieldItem>Record.NumberOfParticipants__c</fieldItem>
116132
<identifier>RecordNumberOfParticipants__cField</identifier>
117133
<visibilityRule>
@@ -125,6 +141,10 @@
125141
</itemInstances>
126142
<itemInstances>
127143
<fieldInstance>
144+
<fieldInstanceProperties>
145+
<name>uiBehavior</name>
146+
<value>none</value>
147+
</fieldInstanceProperties>
128148
<fieldItem>Record.Waitinglist__c</fieldItem>
129149
<identifier>RecordWaitinglist__cField</identifier>
130150
<visibilityRule>
@@ -166,6 +186,10 @@
166186
<flexiPageRegions>
167187
<itemInstances>
168188
<fieldInstance>
189+
<fieldInstanceProperties>
190+
<name>uiBehavior</name>
191+
<value>none</value>
192+
</fieldInstanceProperties>
169193
<fieldItem>Record.DescriptionInternal__c</fieldItem>
170194
<identifier>RecordDescriptionInternal__cField</identifier>
171195
</fieldInstance>
@@ -190,12 +214,20 @@
190214
<flexiPageRegions>
191215
<itemInstances>
192216
<fieldInstance>
217+
<fieldInstanceProperties>
218+
<name>uiBehavior</name>
219+
<value>none</value>
220+
</fieldInstanceProperties>
193221
<fieldItem>Record.DescriptionShort2__c</fieldItem>
194222
<identifier>RecordDescriptionShort2__cField</identifier>
195223
</fieldInstance>
196224
</itemInstances>
197225
<itemInstances>
198226
<fieldInstance>
227+
<fieldInstanceProperties>
228+
<name>uiBehavior</name>
229+
<value>none</value>
230+
</fieldInstanceProperties>
199231
<fieldItem>Record.DescriptionFormatted__c</fieldItem>
200232
<identifier>RecordDescriptionFormatted__cField</identifier>
201233
</fieldInstance>
@@ -282,6 +314,10 @@
282314
<flexiPageRegions>
283315
<itemInstances>
284316
<fieldInstance>
317+
<fieldInstanceProperties>
318+
<name>uiBehavior</name>
319+
<value>none</value>
320+
</fieldInstanceProperties>
285321
<fieldItem>Record.RegistrationPlaceName__c</fieldItem>
286322
<identifier>RecordRegistrationPlaceName__cField</identifier>
287323
</fieldInstance>
@@ -330,6 +366,10 @@
330366
<flexiPageRegions>
331367
<itemInstances>
332368
<fieldInstance>
369+
<fieldInstanceProperties>
370+
<name>uiBehavior</name>
371+
<value>none</value>
372+
</fieldInstanceProperties>
333373
<fieldItem>Record.GenerateInvitationCode__c</fieldItem>
334374
<identifier>RecordGenerateInvitationCode__cField</identifier>
335375
</fieldInstance>
@@ -340,6 +380,10 @@
340380
<flexiPageRegions>
341381
<itemInstances>
342382
<fieldInstance>
383+
<fieldInstanceProperties>
384+
<name>uiBehavior</name>
385+
<value>none</value>
386+
</fieldInstanceProperties>
343387
<fieldItem>Record.InvitationCode__c</fieldItem>
344388
<identifier>RecordInvitationCode__cField</identifier>
345389
</fieldInstance>
@@ -378,6 +422,10 @@
378422
<name>columns</name>
379423
<value>Facet-cd424b70-b32d-4660-a56a-0e9a9efdbd11</value>
380424
</componentInstanceProperties>
425+
<componentInstanceProperties>
426+
<name>horizontalAlignment</name>
427+
<value>false</value>
428+
</componentInstanceProperties>
381429
<componentInstanceProperties>
382430
<name>label</name>
383431
<value>Generelt</value>
@@ -392,6 +440,10 @@
392440
<name>columns</name>
393441
<value>Facet-18a0cb3f-3a73-438a-80bd-2efc28a4697b</value>
394442
</componentInstanceProperties>
443+
<componentInstanceProperties>
444+
<name>horizontalAlignment</name>
445+
<value>false</value>
446+
</componentInstanceProperties>
395447
<componentInstanceProperties>
396448
<name>label</name>
397449
<value>Intern beskrivelse (vises kun i Salesforce)</value>
@@ -406,6 +458,10 @@
406458
<name>columns</name>
407459
<value>Facet-76bd053f-2cd2-4f37-b74c-955aa29292b4</value>
408460
</componentInstanceProperties>
461+
<componentInstanceProperties>
462+
<name>horizontalAlignment</name>
463+
<value>false</value>
464+
</componentInstanceProperties>
409465
<componentInstanceProperties>
410466
<name>label</name>
411467
<value>Kursbeskrivelse</value>
@@ -420,6 +476,10 @@
420476
<name>columns</name>
421477
<value>Facet-06adc4db-5a7d-42a3-bc28-d24e67144d62</value>
422478
</componentInstanceProperties>
479+
<componentInstanceProperties>
480+
<name>horizontalAlignment</name>
481+
<value>false</value>
482+
</componentInstanceProperties>
423483
<componentInstanceProperties>
424484
<name>label</name>
425485
<value>Tidspunkt</value>
@@ -434,6 +494,10 @@
434494
<name>columns</name>
435495
<value>Facet-9acda128-cd34-48f9-93fc-fabc74f172c3</value>
436496
</componentInstanceProperties>
497+
<componentInstanceProperties>
498+
<name>horizontalAlignment</name>
499+
<value>false</value>
500+
</componentInstanceProperties>
437501
<componentInstanceProperties>
438502
<name>label</name>
439503
<value>Sted</value>
@@ -448,6 +512,10 @@
448512
<name>columns</name>
449513
<value>Facet-ce6d2b1f-5897-4e3b-9cf8-bf037602807b</value>
450514
</componentInstanceProperties>
515+
<componentInstanceProperties>
516+
<name>horizontalAlignment</name>
517+
<value>false</value>
518+
</componentInstanceProperties>
451519
<componentInstanceProperties>
452520
<name>label</name>
453521
<value>Invitasjonskode</value>
@@ -535,6 +603,16 @@
535603
<identifier>RecordShowInvoiceReference__cField</identifier>
536604
</fieldInstance>
537605
</itemInstances>
606+
<itemInstances>
607+
<fieldInstance>
608+
<fieldInstanceProperties>
609+
<name>uiBehavior</name>
610+
<value>none</value>
611+
</fieldInstanceProperties>
612+
<fieldItem>Record.ShowAdditionalInformation__c</fieldItem>
613+
<identifier>RecordShowAdditionalInformation_cField</identifier>
614+
</fieldInstance>
615+
</itemInstances>
538616
<name>Facet-4ce9dcee-5f5d-4ab4-8a97-c60926c27b77</name>
539617
<type>Facet</type>
540618
</flexiPageRegions>
@@ -589,6 +667,10 @@
589667
<name>columns</name>
590668
<value>Facet-e2809c43-8c8e-49a1-865e-0a4186ed80f6</value>
591669
</componentInstanceProperties>
670+
<componentInstanceProperties>
671+
<name>horizontalAlignment</name>
672+
<value>false</value>
673+
</componentInstanceProperties>
592674
<componentInstanceProperties>
593675
<name>label</name>
594676
<value>Tilleggsfelter</value>
@@ -620,6 +702,10 @@
620702
</itemInstances>
621703
<itemInstances>
622704
<fieldInstance>
705+
<fieldInstanceProperties>
706+
<name>uiBehavior</name>
707+
<value>none</value>
708+
</fieldInstanceProperties>
623709
<fieldItem>Record.EmailBeforeStatus__c</fieldItem>
624710
<identifier>RecordEmailBeforeStatus__cField</identifier>
625711
<visibilityRule>
@@ -650,6 +736,10 @@
650736
</itemInstances>
651737
<itemInstances>
652738
<fieldInstance>
739+
<fieldInstanceProperties>
740+
<name>uiBehavior</name>
741+
<value>none</value>
742+
</fieldInstanceProperties>
653743
<fieldItem>Record.EmailBeforeDate__c</fieldItem>
654744
<identifier>RecordEmailBeforeDate__cField</identifier>
655745
</fieldInstance>
@@ -684,6 +774,10 @@
684774
</itemInstances>
685775
<itemInstances>
686776
<fieldInstance>
777+
<fieldInstanceProperties>
778+
<name>uiBehavior</name>
779+
<value>none</value>
780+
</fieldInstanceProperties>
687781
<fieldItem>Record.EmailReminderStatus__c</fieldItem>
688782
<identifier>RecordEmailReminderStatus__cField</identifier>
689783
<visibilityRule>
@@ -714,6 +808,10 @@
714808
</itemInstances>
715809
<itemInstances>
716810
<fieldInstance>
811+
<fieldInstanceProperties>
812+
<name>uiBehavior</name>
813+
<value>none</value>
814+
</fieldInstanceProperties>
717815
<fieldItem>Record.EmailReminderDate__c</fieldItem>
718816
<identifier>RecordEmailReminderDate__cField</identifier>
719817
</fieldInstance>
@@ -748,12 +846,20 @@
748846
</itemInstances>
749847
<itemInstances>
750848
<fieldInstance>
849+
<fieldInstanceProperties>
850+
<name>uiBehavior</name>
851+
<value>none</value>
852+
</fieldInstanceProperties>
751853
<fieldItem>Record.EmailAfterURL__c</fieldItem>
752854
<identifier>RecordEmailAfterURL__cField</identifier>
753855
</fieldInstance>
754856
</itemInstances>
755857
<itemInstances>
756858
<fieldInstance>
859+
<fieldInstanceProperties>
860+
<name>uiBehavior</name>
861+
<value>none</value>
862+
</fieldInstanceProperties>
757863
<fieldItem>Record.EmailAfterStatus__c</fieldItem>
758864
<identifier>RecordEmailAfterStatus__cField</identifier>
759865
<visibilityRule>
@@ -784,6 +890,10 @@
784890
</itemInstances>
785891
<itemInstances>
786892
<fieldInstance>
893+
<fieldInstanceProperties>
894+
<name>uiBehavior</name>
895+
<value>none</value>
896+
</fieldInstanceProperties>
787897
<fieldItem>Record.EmailAfterDate__c</fieldItem>
788898
<identifier>RecordEmailAfterDate__cField</identifier>
789899
</fieldInstance>
@@ -818,6 +928,10 @@
818928
</itemInstances>
819929
<itemInstances>
820930
<fieldInstance>
931+
<fieldInstanceProperties>
932+
<name>uiBehavior</name>
933+
<value>none</value>
934+
</fieldInstanceProperties>
821935
<fieldItem>Record.EmailManualStatus__c</fieldItem>
822936
<identifier>RecordEmailManualStatus__cField</identifier>
823937
<visibilityRule>
@@ -848,6 +962,10 @@
848962
</itemInstances>
849963
<itemInstances>
850964
<fieldInstance>
965+
<fieldInstanceProperties>
966+
<name>uiBehavior</name>
967+
<value>none</value>
968+
</fieldInstanceProperties>
851969
<fieldItem>Record.EmailManualDate__c</fieldItem>
852970
<identifier>RecordEmailManualDate__cField</identifier>
853971
</fieldInstance>
@@ -895,6 +1013,10 @@
8951013
<name>columns</name>
8961014
<value>Facet-262e8db9-efeb-40ea-80bd-d5477b267307</value>
8971015
</componentInstanceProperties>
1016+
<componentInstanceProperties>
1017+
<name>horizontalAlignment</name>
1018+
<value>false</value>
1019+
</componentInstanceProperties>
8981020
<componentInstanceProperties>
8991021
<name>label</name>
9001022
<value>Informasjon før kurset (sendes en uke før kurset)</value>
@@ -936,6 +1058,10 @@
9361058
<name>columns</name>
9371059
<value>Facet-c3e42f34-5d41-40d9-9d27-fc5c7a51ce5f</value>
9381060
</componentInstanceProperties>
1061+
<componentInstanceProperties>
1062+
<name>horizontalAlignment</name>
1063+
<value>false</value>
1064+
</componentInstanceProperties>
9391065
<componentInstanceProperties>
9401066
<name>label</name>
9411067
<value>Påminnelse (sendes dagen før kurset)</value>
@@ -977,6 +1103,10 @@
9771103
<name>columns</name>
9781104
<value>Facet-ab7e3140-97d4-45d3-9606-f2c389bda66d</value>
9791105
</componentInstanceProperties>
1106+
<componentInstanceProperties>
1107+
<name>horizontalAlignment</name>
1108+
<value>false</value>
1109+
</componentInstanceProperties>
9801110
<componentInstanceProperties>
9811111
<name>label</name>
9821112
<value>Evaluering av kurset (sendes dagen etter kurset)</value>
@@ -1018,6 +1148,10 @@
10181148
<name>columns</name>
10191149
<value>Facet-60b499b9-da89-4ac4-8c1e-6558ce7b085d</value>
10201150
</componentInstanceProperties>
1151+
<componentInstanceProperties>
1152+
<name>horizontalAlignment</name>
1153+
<value>false</value>
1154+
</componentInstanceProperties>
10211155
<componentInstanceProperties>
10221156
<name>label</name>
10231157
<value>Egendefinert tidspunkt (sendes ved valgfritt tidspunkt)</value>

0 commit comments

Comments
 (0)