Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/controllers/admin/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
},
{
name : 'Sessions',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
cellComponent : 'ui-table/cell/cell-sessions',
width : 90

},
{
name : 'Speakers',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
cellComponent : 'ui-table/cell/cell-speakers-dashboard',
width : 90
},
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/admin/users/view/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
},
{
name : 'Sessions',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
width : 90,
isSortable : false,
cellComponent : 'ui-table/cell/cell-sessions-dashboard'
},
{
name : 'Speakers',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
cellComponent : 'ui-table/cell/cell-speakers-dashboard',
isSortable : false
},
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
},
{
name : 'Sessions',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
cellComponent : 'ui-table/cell/cell-sessions-dashboard'
},
{
name : 'Speakers',
valuePath : 'eventStatisticsGeneral',
valuePath : 'generalStatistics',
cellComponent : 'ui-table/cell/cell-speakers-dashboard'
},
{
Expand Down
42 changes: 21 additions & 21 deletions app/models/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,27 @@ export default ModelBase.extend(CustomPrimaryKeyMixin, {
/**
* Relationships
*/
type : belongsTo('event-type'),
topic : belongsTo('event-topic'),
subTopic : belongsTo('event-sub-topic'),
location : belongsTo('event-location'),
sessions : hasMany('session'),
sponsors : hasMany('sponsor'),
microlocations : hasMany('microlocation'),
tracks : hasMany('track'),
tickets : hasMany('ticket'),
orders : hasMany('order'),
socialLinks : hasMany('social-link'),
emailNotifications : hasMany('email-notification'),
speakers : hasMany('speaker'),
invoice : hasMany('event-invoice'),
speakersCall : belongsTo('speakers-call'),
stripeAuthorization : belongsTo('stripe-authorization'),
eventStatisticsGeneral : belongsTo('event-statistics-general'),
tax : belongsTo('tax'),
copyright : belongsTo('event-copyright'),
sessionTypes : hasMany('session-type'),
user : belongsTo('user', { inverse: 'events' }),
type : belongsTo('event-type'),
topic : belongsTo('event-topic'),
subTopic : belongsTo('event-sub-topic'),
location : belongsTo('event-location'),
sessions : hasMany('session'),
sponsors : hasMany('sponsor'),
microlocations : hasMany('microlocation'),
tracks : hasMany('track'),
tickets : hasMany('ticket'),
orders : hasMany('order'),
socialLinks : hasMany('social-link'),
emailNotifications : hasMany('email-notification'),
speakers : hasMany('speaker'),
invoice : hasMany('event-invoice'),
speakersCall : belongsTo('speakers-call'),
stripeAuthorization : belongsTo('stripe-authorization'),
generalStatistics : belongsTo('event-statistics-general'),
tax : belongsTo('tax'),
copyright : belongsTo('event-copyright'),
sessionTypes : hasMany('session-type'),
user : belongsTo('user', { inverse: 'events' }),

customForms : hasMany('custom-form'),
attendees : hasMany('attendee'),
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
roleInvites : await eventDetails.query('roleInvites', {}),
sessionTypes : await eventDetails.query('sessionTypes', {}),
socialLinks : await eventDetails.query('socialLinks', {}),
statistics : await eventDetails.query('eventStatisticsGeneral', {}),
statistics : await eventDetails.query('generalStatistics', {}),
orderStat : await eventDetails.query('orderStatistics', {}),
tickets : await eventDetails.query('tickets', {}),
roles : await this.store.findAll('role')
Expand Down
25 changes: 6 additions & 19 deletions app/serializers/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,13 @@ export default ApplicationSerializer.extend(CustomPrimaryKeyMixin, {
subTopic : 'event-sub-topic',
copyright : 'event-copyright'
},
normalize() {
const payload = this._super(...arguments);
payload.data = this.addLinks(payload.data);
return payload;
},

addLinks(event) {
event.relationships.eventStatisticsGeneral = {
links: {
related : `/v1/events/${event.id}/general-statistics`,
self : `/v1/events/${event.id}/general-statistics`
}
};
event.relationships.orderStatistics = {
links: {
related : `/v1/events/${event.id}/order-statistics`,
self : `/v1/events/${event.id}/order-statistics`
}
};
return event;
serialize() {
const json = this._super(...arguments);
delete json.data.relationships['general-statistics'];
delete json.data.relationships['order-statistics'];

return json;
}

});