Skip to content

Commit 6c3cc66

Browse files
authored
feat: integrate complex form fields in speaker, sessions, attendee (#3503)
1 parent f58911e commit 6c3cc66

File tree

3 files changed

+41
-37
lines changed

3 files changed

+41
-37
lines changed

app/models/attendee.js

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,33 @@ export default ModelBase.extend({
77
/**
88
* Attributes
99
*/
10-
city : attr('string'),
11-
firstname : attr('string'),
12-
lastname : attr('string'),
13-
isCheckedIn : attr('boolean', { defaultValue: false }),
14-
checkinTimes : attr('string'),
15-
state : attr('string'),
16-
address : attr('string'),
17-
pdfUrl : attr('string'),
18-
country : attr('string'),
19-
email : attr('string'),
20-
jobTitle : attr('string'),
21-
phone : attr('string'),
22-
company : attr('string'),
23-
taxBusinessInfo : attr('string'),
24-
billingAddress : attr('string'),
25-
homeAddress : attr('string'),
26-
shippingAddress : attr('string'),
27-
workAddress : attr('string'),
28-
workPhone : attr('string'),
29-
website : attr('string'),
30-
blog : attr('string'),
31-
twitter : attr('string'),
32-
facebook : attr('string'),
33-
github : attr('string'),
34-
gender : attr('string'),
35-
birthDate : attr('moment'),
10+
city : attr('string'),
11+
firstname : attr('string'),
12+
lastname : attr('string'),
13+
isCheckedIn : attr('boolean', { defaultValue: false }),
14+
checkinTimes : attr('string'),
15+
state : attr('string'),
16+
address : attr('string'),
17+
pdfUrl : attr('string'),
18+
country : attr('string'),
19+
email : attr('string'),
20+
jobTitle : attr('string'),
21+
phone : attr('string'),
22+
company : attr('string'),
23+
taxBusinessInfo : attr('string'),
24+
billingAddress : attr('string'),
25+
homeAddress : attr('string'),
26+
shippingAddress : attr('string'),
27+
workAddress : attr('string'),
28+
workPhone : attr('string'),
29+
website : attr('string'),
30+
blog : attr('string'),
31+
twitter : attr('string'),
32+
facebook : attr('string'),
33+
github : attr('string'),
34+
gender : attr('string'),
35+
birthDate : attr('moment'),
36+
complexFieldValues : attr(),
3637

3738
/**
3839
* Relationships

app/models/session.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,18 @@ export default ModelBase.extend({
2828
isLocked : attr('boolean', { defaultValue: false }),
2929
isMailSent : attr('boolean', { defaultValue: false }),
3030

31-
createdAt : attr('string'),
32-
deletedAt : attr('string'),
33-
submittedAt : attr('moment', { defaultValue: () => moment.tz(detectedTimezone) }),
34-
lastModifiedAt : attr('string'),
35-
sessionType : belongsTo('session-type'),
36-
microlocation : belongsTo('microlocation'),
37-
track : belongsTo('track'),
38-
speakers : hasMany('speaker'),
39-
feedbacks : hasMany('feedback'),
40-
event : belongsTo('event'), // temporary
41-
creator : belongsTo('user'),
31+
createdAt : attr('string'),
32+
deletedAt : attr('string'),
33+
submittedAt : attr('moment', { defaultValue: () => moment.tz(detectedTimezone) }),
34+
lastModifiedAt : attr('string'),
35+
complexFieldValues : attr(),
36+
sessionType : belongsTo('session-type'),
37+
microlocation : belongsTo('microlocation'),
38+
track : belongsTo('track'),
39+
speakers : hasMany('speaker'),
40+
feedbacks : hasMany('feedback'),
41+
event : belongsTo('event'), // temporary
42+
creator : belongsTo('user'),
4243

4344
status: computed('state', 'deletedAt', function() {
4445
if (this.deletedAt !== null) {

app/models/speaker.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ export default ModelBase.extend({
3333
city : attr('string'),
3434
gender : attr('string'),
3535
heardFrom : attr('string'),
36+
complexFieldValues : attr(),
3637

3738
segmentedLinkWebsite : computedSegmentedLink.bind(this)('website'),
3839
segmentedLinkTwitter : computedSegmentedLink.bind(this)('twitter'),
3940
segmentedLinkGithub : computedSegmentedLink.bind(this)('github'),
4041
segmentedLinkFacebook : computedSegmentedLink.bind(this)('facebook'),
4142
segmentedLinkLinkedIn : computedSegmentedLink.bind(this)('linkedin'),
43+
4244
/**
4345
* Relationships
4446
*/

0 commit comments

Comments
 (0)