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.

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

Standardized Date and Time #5533

Closed
Closed
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/components/public/add-to-calender.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<i class="clock alternate outline icon pt-1"></i>
<div class="content">
{{#if this.isSingleDay}}
{{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY"}}<br>{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}}
{{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY"}}<br>{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}}
{{else}}
{{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}}
{{general-date @event.startsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, D MMMM, YYYY h:mm A"}}
{{/if}}
({{this.timezone}})
<br>
Expand Down
2 changes: 1 addition & 1 deletion app/components/public/session-item.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="right floated four wide column">
{{#if @session.startsAt}}
<div class=""><i class="icon map marker alternate"></i>{{@session.microlocation.name}}</div>
<div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt @timezone 'hh:mm a / DD-MM-YYYY (z)'}}</div>
<div class="small text"><i class="wait icon"></i>{{general-date @session.startsAt @timezone 'D MMM, YYYY h:mm A (z)'}}</div>
{{/if}}
</div>
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/account/billing/invoices/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/cell-date',
options : {
timezone : 'UTC',
dateFormat : 'MMMM DD, YYYY'
dateFormat : 'D MMM, YYYY'
}
},
{
Expand All @@ -37,7 +37,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/cell-date',
options : {
timezone : 'UTC',
dateFormat : 'MMMM DD, YYYY'
dateFormat : 'D MMM, YYYY'
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/messages/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ get columns() {
isSortable : true,
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
dateFormat: 'MMMM DD, YYYY - HH:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/admin/sales/invoices.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/cell-date',
options : {
timezone : 'UTC',
dateFormat : 'MMMM DD, YYYY'
dateFormat : 'D MMM, YYYY'
}
},
{
Expand All @@ -36,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/cell-date',
options : {
timezone : 'UTC',
dateFormat : 'MMMM DD, YYYY'
dateFormat : 'D MMM, YYYY'
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions app/controllers/admin/sessions/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
isSortable : true,
headerComponent : 'tables/headers/sort',
options : {
dateFormat: 'MMMM DD, YYYY - hh:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand All @@ -44,7 +44,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
isSortable : true,
headerComponent : 'tables/headers/sort',
options : {
dateFormat: 'MMMM DD, YYYY - hh:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand All @@ -54,7 +54,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
isSortable : true,
headerComponent : 'tables/headers/sort',
options : {
dateFormat: 'MMMM DD, YYYY - hh:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/admin/users/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
headerComponent : 'tables/headers/sort',
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
dateFormat: 'MMMM DD, YYYY - hh:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
}
];
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
headerComponent : 'tables/headers/sort',
cellComponent : 'ui-table/cell/cell-event-general',
options : {
dateFormat: 'MMMM DD, YYYY - HH:mm A'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/events/view/sessions/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'submittedAt',
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
dateFormat: 'MMMM DD, YYYY - HH:mm'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand All @@ -82,7 +82,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'lastModifiedAt',
cellComponent : 'ui-table/cell/cell-simple-date',
options : {
dateFormat: 'MMMM DD, YYYY - HH:mm'
dateFormat: 'D MMM, YYYY h:mm A'
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/events/view/tickets/orders/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
cellComponent : 'ui-table/cell/events/view/tickets/orders/cell-date',
headerComponent : 'tables/headers/sort',
width : 100,
dateFormat : 'MMMM DD, YYYY - HH:mm A',
dateFormat : 'D MMM, YYYY h:mm A',
isSortable : true
},
{
Expand Down
2 changes: 1 addition & 1 deletion app/templates/admin/sales/revenue.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{{order.name}}
</td>
<td>
{{moment-format order.eventDate 'MM/DD/YYYY'}}
{{moment-format order.eventDate 'D MMM, YYYY'}}
</td>
<td class="right aligned">
{{order.ticketCount}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/event-invoice/invoice-summary.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<tbody>
<tr>
<td>{{this.event.name}}</td>
<td>{{moment-format this.data.issuedAt 'MM/DD/YYYY'}}</td>
<td>{{moment-format this.data.completedAt 'MM/DD/YYYY'}}</td>
<td>{{moment-format this.data.issuedAt 'D MMM, YYYY'}}</td>
<td>{{moment-format this.data.completedAt 'D MMM, YYYY'}}</td>
<td>{{currency-symbol this.eventCurrency}} {{format-money this.data.amount}}</td>
</tr>
</tbody>
Expand Down
8 changes: 4 additions & 4 deletions app/templates/components/forms/wizard/basic-details-step.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<Widgets::Forms::DatePicker
@type="text"
@name="start_date"
@placeholder="MM/DD/YYYY"
@placeholder="D MMM, YYYY"
@value={{this.data.event.startsAtDate}}
@onChange={{pipe-action (action "updateSalesEndDate") (action "onChange")}} />
</div>
Expand All @@ -102,7 +102,7 @@
<Widgets::Forms::TimePicker
@type="text"
@name="start_time"
@placeholder="HH:MM"
@placeholder="h:mm"
@onChange={{action "onChange"}}
@value={{this.data.event.startsAtTime}} />
</div>
Expand All @@ -111,7 +111,7 @@
<Widgets::Forms::DatePicker
@type="text"
@name="end_date"
@placeholder="MM/DD/YYYY"
@placeholder="D MMM, YYYY"
@rangePosition="end"
@onChange={{action "onChange"}}
@value={{this.data.event.endsAtDate}} />
Expand All @@ -121,7 +121,7 @@
<Widgets::Forms::TimePicker
@type="text"
@name="end_time"
@placeholder="HH:MM"
@placeholder="h:mm"
@onChange={{action "onChange"}}
@value={{this.data.event.endsAtTime}} />
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</div>
<div class="{{unless this.device.isMobile 'four wide'}} field">
<div class="ui action input fluid">
<Widgets::Forms::TimePicker @value={{sessionType.length}} @placeholder="HH:MM" @icon={{false}} />
<Widgets::Forms::TimePicker @value={{sessionType.length}} @placeholder="h:mm" @icon={{false}} />
{{#if (gt this.sessionTypes.length 1)}}
<button class="ui icon red button" type="button" {{action 'removeItem' sessionType}}>
<i class="minus icon"></i>
Expand Down Expand Up @@ -134,15 +134,15 @@
</div>
<div class="two wide field">
<label for="start_time">&nbsp;</label>
<Widgets::Forms::TimePicker @type="text" @name="start_time" @placeholder="HH:MM" @onChange={{action "onChange"}} @value={{this.data.speakersCall.startsAtTime}} />
<Widgets::Forms::TimePicker @type="text" @name="start_time" @placeholder="h:mm" @onChange={{action "onChange"}} @value={{this.data.speakersCall.startsAtTime}} />
</div>
<div class="five wide field">
<label class="required" for="end_date">{{t 'Ends'}}</label>
<Widgets::Forms::DatePicker @type="text" @name="end_date" @placeholder="MM/DD/YYYY" @rangePosition="end" @onChange={{action "onChange"}} @value={{this.data.speakersCall.endsAtDate}} />
</div>
<div class="two wide field">
<label for="end_time">&nbsp;</label>
<Widgets::Forms::TimePicker @type="text" @name="end_time" @placeholder="HH:MM" @onChange={{action "onChange"}} @value={{this.data.speakersCall.endsAtTime}} />
<Widgets::Forms::TimePicker @type="text" @name="end_time" @placeholder="h:mm" @onChange={{action "onChange"}} @value={{this.data.speakersCall.endsAtTime}} />
</div>
<div class="five wide field">
<label class="required" for="timezone">{{t 'Timezone'}}</label>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/order-card.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</SmartOverflow>
<div class="meta">
<span class="date">
{{moment-format this.order.event.startsAt 'ddd, DD MMMM YYYY, h:mm A'}}
{{moment-format this.order.event.startsAt 'dddd, D MMMM, YYYY h:mm A'}}
</span>
</div>
<SmartOverflow @class="description">
Expand All @@ -46,7 +46,7 @@
</span>
<span>#{{this.order.identifier}}</span>
{{#if this.order.completedAt}}
<span>{{t 'on'}} {{moment-format this.order.completedAt 'MMMM DD, YYYY h:mm A'}}</span>
<span>{{t 'on'}} {{moment-format this.order.completedAt 'D MMM, YYYY h:mm A'}}</span>
{{/if}}
</span>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/templates/components/public/call-for-speakers.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
{{#if this.data.speakersCall.isOpen}}
<a href="#" class="ui basic green label">{{t 'Open'}}</a>
<div class="sub header">
{{t 'Call for Speakers is open until'}} {{moment-format this.data.speakersCall.endsAt 'ddd, MMM DD h:mm A'}}
{{t 'Call for Speakers is open until'}} {{moment-format this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
</div>
{{else}}
<a href="#" class="ui basic red label">{{t 'Closed'}}</a>
<div class="sub header">
{{#if this.data.speakersCall.isInFuture}}
{{t 'Call for Speakers will open at'}} {{moment-format this.data.speakersCall.startsAt 'ddd, MMM DD h:mm A' }}
{{t 'Call for Speakers will open at'}} {{moment-format this.data.speakersCall.startsAt 'dddd, D MMMM, YYYY h:mm A' }}
{{else}}
{{t 'Call for Speakers was closed at'}} {{moment-format this.data.speakersCall.endsAt 'ddd, MMM DD h:mm A'}}
{{t 'Call for Speakers was closed at'}} {{moment-format this.data.speakersCall.endsAt 'dddd, D MMMM, YYYY h:mm A'}}
{{/if}}
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/public/ticket-list.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<small class="ui gray-text tiny">{{ticket.description}}</small>
{{/if}}
<div>
<small class="ui gray-text small">Sale ends on {{moment-format ticket.salesEndsAt 'ddd, DD MMMM YY, h:mm A'}}</small>
<small class="ui gray-text small">Sale ends on {{moment-format ticket.salesEndsAt 'dddd, D MMMM, YYYY h:mm A'}}</small>
</div>
</td>
<td></td>
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/session-card.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="meta">
<span class="time">
{{#if this.session.startsAt}}
{{moment-format this.session.startsAt 'ddd, MMM DD h:mm A'}}
{{moment-format this.session.startsAt 'D MMM, YYYY h:mm A'}}
{{else}}
{{t 'Session Not Yet Scheduled'}}
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
</span>
{{else if this.record}}
<span>
{{moment-format this.record (if this.props.options.dateFormat this.props.options.dateFormat 'MMMM DD, YYYY - HH:mm A')}}
{{moment-format this.record (if this.props.options.dateFormat this.props.options.dateFormat 'D MMM, YYYY h:mm A')}}
</span>
{{/if}}
4 changes: 2 additions & 2 deletions app/templates/components/ui-table/cell/cell-validity.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<span>
{{moment-format this.record 'MMMM DD, YYYY - h:mm A'}}
{{moment-format this.record 'D MMM, YYYY h:mm A'}}
<br>To<br>
{{moment-format this.extraRecords.validTill 'MMMM DD, YYYY - h:mm A'}}
{{moment-format this.extraRecords.validTill 'D MMM, YYYY h:mm A'}}
</span>
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,12 @@
{{t 'Payment via'}} {{this.record.paidVia}}
</span>
{{/if}}
{{#if (eq this.record.status 'completed')}}
{{moment-format this.record.completedAt 'D MMM, YYYY h:mm A'}}
{{moment-from-now this.record.completedAt}}
{{else}}
{{moment-format this.record.createdAt 'D MMM, YYYY h:mm A'}}
{{moment-from-now this.record.createdAt}}
{{/if}}
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<span>
{{moment-format this.record 'MMMM Do YYYY, h:mm a'}}
{{moment-format this.record 'D MMM, YYYY h:mm A'}}
</span>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{#if this.record}}
<div>
{{moment-format this.record 'MMMM DD, YYYY - hh:mm A'}}
{{moment-format this.record 'D MMM, YYYY h:mm A'}}
</div>
{{else}}
<div>
{{moment-format this.extraRecords.createdAt 'MMMM DD, YYYY - hh:mm A'}}
{{moment-format this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}}
</div>
{{/if}}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
{{t 'Payment via'}} {{this.extraRecords.paidVia}}
</span>
{{/if}}
<span class="muted text">
{{#if this.extraRecords.completedAt}}
{{moment-format this.extraRecords.completedAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.completedAt}}
{{else}}
{{moment-format this.extraRecords.createdAt 'D MMM, YYYY h:mm A'}} {{moment-from-now this.extraRecords.createdAt}}
{{/if}}
</span>
</div>
</div>
<div class="ui horizontal compact basic buttons">
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/widgets/forms/ticket-input.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<Widgets::Forms::TimePicker
@type="text"
@name="ticket_start_time"
@placeholder="HH:MM"
@placeholder="h:mm"
@rangePosition="start"
@value={{this.ticket.salesStartAtTime}} />
</div>
Expand All @@ -159,7 +159,7 @@
<Widgets::Forms::TimePicker
@type="text"
@name="ticket_end_time"
@placeholder="HH:MM"
@placeholder="h:mm"
@rangePosition="end"
@value={{this.ticket.salesEndsAtTime}} />
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/event-invoice/review.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<strong>{{t 'Event Name'}}:</strong> {{this.model.event.name}}
</div>
<div class="item">
<strong>{{t 'Date Issued'}}:</strong> {{general-date this.model.issuedAt 'UTC' 'MMMM DD, YYYY'}}
<strong>{{t 'Date Issued'}}:</strong> {{general-date this.model.issuedAt 'UTC' 'D MMM, YYYY'}}
</div>
<div class="item">
<strong>{{t 'Due Date'}}:</strong> {{general-date this.model.dueAt 'UTC' 'MMMM DD, YYYY'}}
<strong>{{t 'Due Date'}}:</strong> {{general-date this.model.dueAt 'UTC' 'D MMM, YYYY'}}
</div>
<div class="item">
<strong>{{t 'Total Invoice Amount'}}:</strong> {{currency-symbol this.model.event.paymentCurrency}} {{format-money this.model.amount}}
Expand Down
4 changes: 2 additions & 2 deletions app/templates/explore.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
{{/if}}
{{#if this.filters.start_date}}
<div class="ui mini label">
{{moment-format this.filters.start_date 'ddd, MMM DD'}}
{{moment-format this.filters.start_date 'D MMM, YYYY'}}
<a href="#" role="button" {{action 'clearFilter' 'start_date'}}><i class="icon close"></i></a>
</div>
{{/if}}
{{#if this.filters.end_date}}
<div class="ui mini label">
{{moment-format this.filters.end_date 'ddd, MMM DD'}}
{{moment-format this.filters.end_date 'D MMM, YYYY'}}
<a href="#" role="button" {{action 'clearFilter' 'end_date'}}><i class="icon close"></i></a>
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/public/sessions.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="d-flex wrap">
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=null}} class="ui button mb-2">{{t 'All'}}</LinkTo>
{{#each this.allDates as |date|}}
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{moment-format date 'ddd, MMM Do'}}</LinkTo>
<LinkTo @route="public.sessions" @models={{array this.model.event.id}} @query={{hash date=(moment-format date "YYYY-MM-DD")}} class="ui button mb-2">{{moment-format date 'D MMM, YYYY'}}</LinkTo>
{{/each}}

<Widgets::TimeZonePicker
Expand Down