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

feat: Add speaker and session custom form input #4549

Merged
merged 1 commit into from
Jul 13, 2020
Merged

feat: Add speaker and session custom form input #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion app/components/forms/orders/order-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default Component.extend(FormMixin, {
attendee.set('firstname', '');
attendee.set('lastname', '');
attendee.set('email', '');
attendee.set('complexFieldValues', {});
});
return this.data.attendees;
}),
Expand Down
20 changes: 19 additions & 1 deletion app/components/forms/session-speaker-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default Component.extend(FormMixin, {
newSessionSelected : false,

getValidationRules() {
return {
const validationRules = {
inline : true,
delay : false,
on : 'blur',
Expand Down Expand Up @@ -484,6 +484,24 @@ export default Component.extend(FormMixin, {
}
}
};

const addCustomFieldRules = form => {
this.allFields[form].filter(field => field.isComplex && field.isRequired).forEach(field => {
validationRules.fields[`${form}_${field.fieldIdentifier}_required`] = {
rules: [
{
type : 'empty',
prompt : this.l10n.t('Please enter ' + field.name)
}
]
};
});
};

addCustomFieldRules('speaker');
addCustomFieldRules('session');

return validationRules;
},

countries: orderBy(countries, 'name'),
Expand Down
8 changes: 7 additions & 1 deletion app/models/attendee.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,11 @@ export default ModelBase.extend({
event : belongsTo('event'),
order : belongsTo('order'),
ticket : belongsTo('ticket'),
user : belongsTo('user')
user : belongsTo('user'),

ready() {
if (!this.complexFieldValues) {
this.complexFieldValues = {};
}
}
});
7 changes: 6 additions & 1 deletion app/models/session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ export default ModelBase.extend({
segmentedLinkSlidesUrl : computedSegmentedLink.bind(this)('slidesUrl'),
segmentedLinkAudioUrl : computedSegmentedLink.bind(this)('audioUrl'),
segmentedLinkVideoUrl : computedSegmentedLink.bind(this)('videoUrl'),
segmentedLinkSignUpUrl : computedSegmentedLink.bind(this)('signUpUrl')
segmentedLinkSignUpUrl : computedSegmentedLink.bind(this)('signUpUrl'),

ready() {
if (!this.complexFieldValues) {
this.complexFieldValues = {};
}
}

});
8 changes: 7 additions & 1 deletion app/models/speaker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ export default ModelBase.extend({

user : belongsTo('user'),
event : belongsTo('event'),
sessions : hasMany('session')
sessions : hasMany('session'),

ready() {
if (!this.complexFieldValues) {
this.complexFieldValues = {};
}
}

});
12 changes: 6 additions & 6 deletions app/templates/components/forms/session-speaker-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{{else}}
<Input
@type={{field.type}}
@value={{mut (get this.data.session field.fieldIdentifier)}}
@value={{mut (get this.data.session field.identifierPath)}}
@id={{if field.isRequired (concat "session_" field.fieldIdentifier "_required") (concat "session_" field.fieldIdentifier)}} />
{{/if}}
{{/if}}
Expand Down Expand Up @@ -153,7 +153,7 @@
{{#if (not this.data.speaker.isEmailOverridden)}}
<Input
@type={{field.type}}
@value={{mut (get this.data.speaker field.fieldIdentifier)}}
@value={{mut (get this.data.speaker field.identifierPath)}}
@id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
{{/if}}
{{else}}
Expand All @@ -166,7 +166,7 @@
{{else}}
<Input
@type={{field.type}}
@value={{mut (get this.data.speaker field.fieldIdentifier)}}
@value={{mut (get this.data.speaker field.identifierPath)}}
@id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
{{/if}}
{{/if}}
Expand Down Expand Up @@ -268,7 +268,7 @@
{{#if (not this.data.speaker.isEmailOverridden)}}
<Input
@type={{field.type}}
@value={{mut (get this.data.speaker field.fieldIdentifier)}}
@value={{mut (get this.data.speaker field.identifierPath)}}
@id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
{{/if}}
{{else}}
Expand All @@ -281,7 +281,7 @@
{{else}}
<Input
@type={{field.type}}
@value={{mut (get this.data.speaker field.fieldIdentifier)}}
@value={{mut (get this.data.speaker field.identifierPath)}}
@id={{if field.isRequired (concat "speaker_" field.fieldIdentifier "_required") (concat "speaker_" field.fieldIdentifier)}} />
{{/if}}
{{/if}}
Expand Down Expand Up @@ -412,7 +412,7 @@
{{else}}
<Input
@type={{field.type}}
@value={{mut (get this.data.session field.fieldIdentifier)}}
@value={{mut (get this.data.session field.identifierPath)}}
@id={{if field.isRequired (concat "session_" field.fieldIdentifier "_required") (concat "session_" field.fieldIdentifier)}} />
{{/if}}
{{/if}}
Expand Down