Skip to content

Commit 8c2be3c

Browse files
ropalkoropalko
committed
bugfix: radiobuttons, take correct registration infos
1 parent 4bb264b commit 8c2be3c

File tree

5 files changed

+92
-36
lines changed

5 files changed

+92
-36
lines changed

‎.data/app.xml‎

Lines changed: 76 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
2-
<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.00.00" ModuleVersion="11.03.00" ExportDate="2020-07-09T15:42:16.8264344+02:00">
2+
<SexyContent FileVersion="07.00.00" MinimumRequiredVersion="07.00.00" ModuleVersion="11.11.05" ExportDate="2021-03-11T13:38:59.0805742+01:00">
33
<Header>
44
<App Guid="39d5e0dc-5dfc-4e6e-b67b-5b8b041691ac" />
5-
<Language Default="en-US" />
5+
<Language Default="en-us" />
66
<Dimensions>
77
<Dimension DimensionID="45" Name="English (United States)" SystemKey="" ExternalKey="en-US" Active="true" />
88
<Dimension DimensionID="46" Name="Deutsch (Deutschland)" SystemKey="" ExternalKey="de-DE" Active="true" />
@@ -5515,26 +5515,10 @@
55155515
</Value>
55165516
</Entity>
55175517
<Entity AssignmentObjectType="EAV Field Properties" AttributeSetStaticName="@Number" AttributeSetName="@Number" EntityGUID="f7af35f2-c9e2-4b53-aecf-0c2361d8b0be" Json="True" KeyNumber="2526">
5518-
<Value Key="AddressMask" Value="" Type="String">
5519-
<Dimension DimensionID="46" ReadOnly="false" />
5520-
<Dimension DimensionID="45" ReadOnly="false" />
5521-
</Value>
55225518
<Value Key="Decimals" Value="0" Type="Number">
55235519
<Dimension DimensionID="46" ReadOnly="false" />
55245520
<Dimension DimensionID="45" ReadOnly="false" />
55255521
</Value>
5526-
<Value Key="InputType" Value="" Type="String">
5527-
<Dimension DimensionID="46" ReadOnly="false" />
5528-
<Dimension DimensionID="45" ReadOnly="false" />
5529-
</Value>
5530-
<Value Key="ValidationRegEx" Value="" Type="String">
5531-
<Dimension DimensionID="46" ReadOnly="false" />
5532-
<Dimension DimensionID="45" ReadOnly="false" />
5533-
</Value>
5534-
<Value Key="ValidationRegExJavaScript" Value="" Type="String">
5535-
<Dimension DimensionID="46" ReadOnly="false" />
5536-
<Dimension DimensionID="45" ReadOnly="false" />
5537-
</Value>
55385522
</Entity>
55395523
</Attribute>
55405524
<Attribute StaticName="IsCancelled" Type="Boolean" IsTitle="false">
@@ -5661,21 +5645,9 @@
56615645
</Value>
56625646
</Entity>
56635647
<Entity AssignmentObjectType="EAV Field Properties" AttributeSetStaticName="@Number" AttributeSetName="@Number" EntityGUID="2fe06b8c-2cb3-459a-9633-0525b07caace" Json="True" KeyNumber="2816">
5664-
<Value Key="AddressMask" Value="" Type="String">
5665-
<Dimension DimensionID="45" ReadOnly="false" />
5666-
</Value>
56675648
<Value Key="Decimals" Value="0" Type="Number">
56685649
<Dimension DimensionID="45" ReadOnly="false" />
56695650
</Value>
5670-
<Value Key="InputType" Value="" Type="String">
5671-
<Dimension DimensionID="45" ReadOnly="false" />
5672-
</Value>
5673-
<Value Key="ValidationRegEx" Value="" Type="String">
5674-
<Dimension DimensionID="45" ReadOnly="false" />
5675-
</Value>
5676-
<Value Key="ValidationRegExJavaScript" Value="" Type="String">
5677-
<Dimension DimensionID="45" ReadOnly="false" />
5678-
</Value>
56795651
</Entity>
56805652
</Attribute>
56815653
</Attributes>
@@ -6759,7 +6731,7 @@
67596731
<Dimension DimensionID="46" ReadOnly="false" />
67606732
<Dimension DimensionID="45" ReadOnly="false" />
67616733
</Value>
6762-
<Value Key="Version" Value="05.00.00" Type="String">
6734+
<Value Key="Version" Value="05.00.01" Type="String">
67636735
<Dimension DimensionID="46" ReadOnly="false" />
67646736
<Dimension DimensionID="45" ReadOnly="false" />
67656737
</Value>
@@ -9494,6 +9466,63 @@
94949466
<Dimension DimensionID="45" ReadOnly="false" />
94959467
</Value>
94969468
</Entity>
9469+
<Entity AssignmentObjectType="Default" AttributeSetStaticName="e92a4857-276f-45de-9363-b052684e65fe" AttributeSetName="Registration" EntityGUID="3c82f989-47a0-4312-bfd0-c06ec1e8f808">
9470+
<Value Key="Country" Value="Switzerland" Type="String">
9471+
<Dimension DimensionID="45" ReadOnly="false" />
9472+
</Value>
9473+
<Value Key="Course" Value="83a9fd59-7a8d-476d-b8a2-29cace397fe5" Type="Entity" />
9474+
<Value Key="EventDateEntity" Value="174513f9-d96a-4d47-af85-15000bce8b7f" Type="Entity" />
9475+
<Value Key="FirstName" Value="Roman" Type="String">
9476+
<Dimension DimensionID="45" ReadOnly="false" />
9477+
</Value>
9478+
<Value Key="LastName" Value="Opalko" Type="String">
9479+
<Dimension DimensionID="45" ReadOnly="false" />
9480+
</Value>
9481+
<Value Key="Mail" Value="roman.opalko@2sic.com" Type="String">
9482+
<Dimension DimensionID="45" ReadOnly="false" />
9483+
</Value>
9484+
<Value Key="MobilePhone" Value="" Type="String">
9485+
<Dimension DimensionID="45" ReadOnly="false" />
9486+
</Value>
9487+
<Value Key="Phone" Value="" Type="String">
9488+
<Dimension DimensionID="45" ReadOnly="false" />
9489+
</Value>
9490+
<Value Key="Salutation" Value="Mr" Type="String">
9491+
<Dimension DimensionID="45" ReadOnly="false" />
9492+
</Value>
9493+
<Value Key="SenderIp" Value="194.0.212.23" Type="String">
9494+
<Dimension DimensionID="45" ReadOnly="false" />
9495+
</Value>
9496+
<Value Key="Status" Value="registered" Type="String">
9497+
<Dimension DimensionID="45" ReadOnly="false" />
9498+
</Value>
9499+
<Value Key="Street" Value="Langäulistrasse 62" Type="String">
9500+
<Dimension DimensionID="45" ReadOnly="false" />
9501+
</Value>
9502+
<Value Key="SubmitDate" Value="2020-09-04T13:06:54" Type="DateTime">
9503+
<Dimension DimensionID="45" ReadOnly="false" />
9504+
</Value>
9505+
<Value Key="ZIPCity" Value="Buchs" Type="String">
9506+
<Dimension DimensionID="45" ReadOnly="false" />
9507+
</Value>
9508+
</Entity>
9509+
<Entity AssignmentObjectType="Default" AttributeSetStaticName="d21cdde4-28fa-458e-b395-586fde923411" AttributeSetName="SystemProtocol" EntityGUID="ed84f6c3-541d-401e-8efc-46311d61a32c">
9510+
<Value Key="ModuleId" Value="3692" Type="Number">
9511+
<Dimension DimensionID="45" ReadOnly="false" />
9512+
</Value>
9513+
<Value Key="RawData" Value="{&quot;CourseNumber&quot;:&quot;&quot;,&quot;CourseName&quot;:&quot;Demo Kurs&quot;,&quot;CourseLocation&quot;:&quot;Musterstrasse 1, CH-0000 Musterstadt&quot;,&quot;Date&quot;:&quot;7/19/2022 - 7/30/2022&quot;,&quot;Salutation&quot;:&quot;Mr&quot;,&quot;FirstName&quot;:&quot;Roman&quot;,&quot;LastName&quot;:&quot;Opalko&quot;,&quot;Street&quot;:&quot;Langäulistrasse 62&quot;,&quot;ZIPCity&quot;:&quot;Buchs&quot;,&quot;Country&quot;:&quot;Switzerland&quot;,&quot;Phone&quot;:&quot;&quot;,&quot;MobilePhone&quot;:&quot;&quot;,&quot;Mail&quot;:&quot;roman.opalko@2sic.com&quot;,&quot;AGB&quot;:&quot;on&quot;,&quot;Accept&quot;:&quot;on&quot;,&quot;&quot;:&quot;&quot;,&quot;EventDateEntity&quot;:&quot;174513f9-d96a-4d47-af85-15000bce8b7f&quot;,&quot;Course&quot;:&quot;83a9fd59-7a8d-476d-b8a2-29cace397fe5&quot;,&quot;SubmitDate&quot;:&quot;2020-09-04T13:06:54.0798992+02:00&quot;,&quot;SenderIp&quot;:&quot;194.0.212.23&quot;,&quot;Status&quot;:&quot;registered&quot;,&quot;Timestamp&quot;:&quot;2020-09-04T13:06:54.5174002+02:00&quot;,&quot;ModuleId&quot;:3692,&quot;Title&quot;:&quot;Form 2020-09-04T13:06:54&quot;}" Type="Custom">
9514+
<Dimension DimensionID="45" ReadOnly="false" />
9515+
</Value>
9516+
<Value Key="SenderIp" Value="194.0.212.23" Type="String">
9517+
<Dimension DimensionID="45" ReadOnly="false" />
9518+
</Value>
9519+
<Value Key="Timestamp" Value="2020-09-04T13:06:54" Type="DateTime">
9520+
<Dimension DimensionID="45" ReadOnly="false" />
9521+
</Value>
9522+
<Value Key="Title" Value="Form 2020-09-04T13:06:54" Type="String">
9523+
<Dimension DimensionID="45" ReadOnly="false" />
9524+
</Value>
9525+
</Entity>
94979526
</Entities>
94989527
<PortalFiles>
94999528
<File Id="4564" RelativePath="adam\Events and Courses 5\r5NOpxGsUkmx5uQodtskbA\PlaceHolderImg\placeholder.svg" />
@@ -9505,9 +9534,25 @@
95059534
<Folder Id="10189" RelativePath="adam/Events and Courses 5/E1UBfLSAYUekGYJM99kXDg/Document/" />
95069535
<Folder Id="10184" RelativePath="adam/Events and Courses 5/Wf2pg416bUe4oinKzjl_5Q/Image/" />
95079536
<Folder Id="10182" RelativePath="adam/Events and Courses 5/" />
9537+
<Folder Id="10252" RelativePath="adam/Events and Courses 5/bGP4EbxSckupFhiUDi8CJw/" />
9538+
<Folder Id="10254" RelativePath="adam/Events and Courses 5/bGP4EbxSckupFhiUDi8CJw/Document/" />
9539+
<Folder Id="10253" RelativePath="adam/Events and Courses 5/bGP4EbxSckupFhiUDi8CJw/Image/" />
95089540
<Folder Id="10187" RelativePath="adam/Events and Courses 5/E1UBfLSAYUekGYJM99kXDg/" />
95099541
<Folder Id="10188" RelativePath="adam/Events and Courses 5/E1UBfLSAYUekGYJM99kXDg/Image/" />
9542+
<Folder Id="10249" RelativePath="adam/Events and Courses 5/NUQEYX_wQ0aqnX-EdhdqRw/" />
9543+
<Folder Id="10251" RelativePath="adam/Events and Courses 5/NUQEYX_wQ0aqnX-EdhdqRw/Document/" />
9544+
<Folder Id="10250" RelativePath="adam/Events and Courses 5/NUQEYX_wQ0aqnX-EdhdqRw/Image/" />
9545+
<Folder Id="10255" RelativePath="adam/Events and Courses 5/PiWDmGvCYEGhjFloPkvl2g/" />
9546+
<Folder Id="10257" RelativePath="adam/Events and Courses 5/PiWDmGvCYEGhjFloPkvl2g/Document/" />
9547+
<Folder Id="10256" RelativePath="adam/Events and Courses 5/PiWDmGvCYEGhjFloPkvl2g/Image/" />
95109548
<Folder Id="10185" RelativePath="adam/Events and Courses 5/r5NOpxGsUkmx5uQodtskbA/" />
9549+
<Folder Id="10215" RelativePath="adam/Events and Courses 5/-RNFF2rZR02vhRUAC86Lfw/" />
9550+
<Folder Id="10216" RelativePath="adam/Events and Courses 5/-RNFF2rZR02vhRUAC86Lfw/Document/" />
9551+
<Folder Id="10258" RelativePath="adam/Events and Courses 5/sgY8SiGzZEiMs3PqYPj0ew/" />
9552+
<Folder Id="10259" RelativePath="adam/Events and Courses 5/sgY8SiGzZEiMs3PqYPj0ew/Document/" />
9553+
<Folder Id="10246" RelativePath="adam/Events and Courses 5/VQa5FBLcLUyYYfcHxK7ZvQ/" />
9554+
<Folder Id="10248" RelativePath="adam/Events and Courses 5/VQa5FBLcLUyYYfcHxK7ZvQ/Document/" />
9555+
<Folder Id="10247" RelativePath="adam/Events and Courses 5/VQa5FBLcLUyYYfcHxK7ZvQ/Image/" />
95119556
<Folder Id="10183" RelativePath="adam/Events and Courses 5/Wf2pg416bUe4oinKzjl_5Q/" />
95129557
</PortalFolders>
95139558
</SexyContent>

‎live/_Event-Registration.cshtml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,13 @@
3636

3737
<div class="form event-form cform-id-@Dnn.Module.ModuleID">
3838
@* Inputs *@
39+
@{
40+
var additionalTitle = !String.IsNullOrEmpty(eventDate.TitleAddition) ? " " + resources.TitleAdditionPrefix + " " + eventDate.TitleAddition + " " + resources.TitleAdditionSuffix : "";
41+
var inputTitle = Text.First(eventDate.Title, course.Title) + additionalTitle;
42+
}
3943
@formParts.Textbox(resources.LabelCourseNumber, "CourseNumber", true, disabled: true, value: ((eventDate.Id != null) ? eventDate.Id : course.id))
40-
@formParts.Textbox(resources.LabelCourseName, "CourseName", true, disabled: true, value: course.Title )
41-
@formParts.Textbox(resources.LabelCourseLocation, "CourseLocation", true, disabled: true, value: course.Location)
44+
@formParts.Textbox(resources.LabelCourseName, "CourseName", true, disabled: true, value: inputTitle )
45+
@formParts.Textbox(resources.LabelCourseLocation, "CourseLocation", true, disabled: true, value: Text.First(eventDate.Location, course.Location))
4246

4347
@* Event Notes *@
4448
<div class="form-group row">

‎live/dist/scripts.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎live/dist/scripts.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ts/scripts.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ $(document).ready(function() {
1818
const obj: any = {};
1919
$.each(inputs, function(i: any, e: any) {
2020
const propName = e.name;
21-
obj[propName] = $(e).val();
21+
22+
if ($(e).attr('type') && $(e).attr('type').toLowerCase() == 'radio') { // For radio fields get checked values
23+
if ($(e).is(':checked')) {
24+
obj[propName] = $(e).val();
25+
}
26+
} else {
27+
obj[propName] = $(e).val();
28+
}
2229
});
2330

2431
const sxc = $2sxc(this);

0 commit comments

Comments
 (0)