Skip to content

fix: Add status "Withdrawn" and "canceled" into sessions and speakers column #5671

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

Merged
merged 1 commit into from
Nov 17, 2020
Merged

fix: Add status "Withdrawn" and "canceled" into sessions and speakers column #5671

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
4 changes: 4 additions & 0 deletions app/models/event-statistics-general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@ export default ModelBase.extend({
sessionsSubmitted : attr('number'),
sessionsRejected : attr('number'),
sessionsConfirmed : attr('number'),
sessionsWithdrawn : attr('number'),
sessionsCanceled : attr('number'),
identifier : attr('string'),
sessionsAccepted : attr('number'),
sessionsDraft : attr('number'),
speakersAccepted : attr('number'),
speakersConfirmed : attr('number'),
speakersPending : attr('number'),
speakersRejected : attr('number'),
speakersWithdrawn : attr('number'),
speakersCanceled : attr('number'),
event : belongsTo('event')
});
4 changes: 4 additions & 0 deletions app/serializers/event-statistics-general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ export default ApplicationSerializer.extend({
payload.data.attributes.speakersConfirmed = payload.data.attributes.speakers.confirmed;
payload.data.attributes.speakersPending = payload.data.attributes.speakers.pending;
payload.data.attributes.speakersRejected = payload.data.attributes.speakers.rejected;
payload.data.attributes.speakersWithdrawn = payload.data.attributes.speakers.withdrawn;
payload.data.attributes.speakersCanceled = payload.data.attributes.speakers.canceled;
payload.data.attributes.speakersTotal = payload.data.attributes.speakers.total;
return this._super(...arguments);
},
Expand All @@ -14,6 +16,8 @@ export default ApplicationSerializer.extend({
speakersConfirmed : 'speakersConfirmed',
speakersPending : 'speakersPending',
speakersRejected : 'speakersRejected',
speakersWithdrawn : 'speakersWithdrawn',
speakersCanceled : 'speakersCanceled',
speakers : 'speakersTotal'
}
});
2 changes: 2 additions & 0 deletions app/templates/components/ui-table/cell/cell-sessions-dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<div class="item">{{t 'Confirmed'}}: {{this.record.sessionsConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.sessionsPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.sessionsRejected}}</div>
<div class="item">{{t 'Withdrawn'}}: {{this.record.sessionsWithdrawn}}</div>
<div class="item">{{t 'Canceled'}}: {{this.record.sessionsCanceled}}</div>
</div>
{{else}}
{{t 'No Session Information Added Yet'}}
Expand Down
2 changes: 2 additions & 0 deletions app/templates/components/ui-table/cell/cell-speakers-dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<div class="item">{{t 'Confirmed'}}: {{this.record.speakersConfirmed}}</div>
<div class="item">{{t 'Pending'}}: {{this.record.speakersPending}}</div>
<div class="item">{{t 'Rejected'}}: {{this.record.speakersRejected}}</div>
<div class="item">{{t 'Withdrawn'}}: {{this.record.speakersWithdrawn}}</div>
<div class="item">{{t 'Canceled'}}: {{this.record.speakersCanceled}}</div>
</div>
{{else}}
{{t 'No Speaker Added Yet'}}
Expand Down