Skip to content

fix: Adjust table in Organizers Attendees Overview Page #5672

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 3 commits into from
Nov 18, 2020
Merged

fix: Adjust table in Organizers Attendees Overview Page #5672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e77ef3e
enhance-table
sachinchauhan2889 Nov 17, 2020
f94acf4
code-cleanup
sachinchauhan2889 Nov 18, 2020
d861f60
fix-identation
sachinchauhan2889 Nov 18, 2020
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
14 changes: 10 additions & 4 deletions app/controllers/events/view/tickets/attendees/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
},
{
name : 'Ticket Name',
width : 110,
width : 80,
valuePath : 'ticket.name'
},
{
name : 'Date and Time',
width : 140,
valuePath : 'order',
cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-date'
},
{
name : 'Ticket Price',
valuePath : 'ticket.price',
width : 100,
width : 90,
extraValuePaths : ['event', 'discountCode'],
cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-price'
},
Expand All @@ -39,12 +45,12 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
{
name : 'Email',
valuePath : 'email',
width : 160
width : 120
},
{
name : 'Actions',
valuePath : 'id',
width : 130,
width : 90,
extraValuePaths : ['order', 'isCheckedIn'],
cellComponent : 'ui-table/cell/events/view/tickets/attendees/cell-action',
actions : {
Expand Down
5 changes: 5 additions & 0 deletions app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-date.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{#if (eq @record.status 'completed')}}
{{moment-format @record.completedAt 'MMMM DD, YYYY - hh:mm A'}}
{{else}}
{{moment-format @record.createdAt 'MMMM DD, YYYY - hh:mm A'}}
{{/if}}
11 changes: 0 additions & 11 deletions app/templates/components/ui-table/cell/events/view/tickets/attendees/cell-order.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<div class="ui tiny header">
<LinkTo @route="orders.view" @model={{this.record.identifier}}>{{this.record.identifier}}</LinkTo>
<span class="weight-400">
{{t 'by'}}
{{this.extraRecords.user.email}}
</span>
<div class="ui basic mini {{order-color this.record.status}} label attendees-margin">
{{this.record.status}}
</div>
Expand All @@ -13,12 +9,5 @@
{{t 'Payment via'}} {{this.record.paidVia}}
</span>
{{/if}}
{{#if (eq this.record.status 'completed')}}
{{moment-format this.record.completedAt 'MMMM Do YYYY, h:mm A -'}}
{{moment-from-now this.record.completedAt}}
{{else}}
{{moment-format this.record.createdAt 'MMMM Do YYYY, h:mm A -'}}
{{moment-from-now this.record.createdAt}}
{{/if}}
</div>
</div>