Skip to content

Commit d4f5c41

Browse files
dartajaxdartajax
authored
Merge pull request #7902 from michaelchadwick/normalize-date-display-for-sessions-list
normalize date display format for sessions list
2 parents 3a0dfb8 + c19f8ae commit d4f5c41

File tree

11 files changed

+59
-59
lines changed

11 files changed

+59
-59
lines changed

‎packages/frontend/tests/acceptance/course/session/offerings-test.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ module('Acceptance | Session - Offerings', function (hooks) {
114114
);
115115
assert.strictEqual(
116116
blocks[0].startTime,
117-
'Starts: ' + DateTime.fromJSDate(this.offering1.startDate).toFormat('h:mm a'),
117+
'Starts: ' + DateTime.fromJSDate(this.offering1.startDate).toFormat('hh:mm a'),
118118
);
119119
assert.strictEqual(
120120
blocks[0].endTime,
@@ -134,7 +134,7 @@ module('Acceptance | Session - Offerings', function (hooks) {
134134
);
135135
assert.strictEqual(
136136
blocks[1].startTime,
137-
'Starts: ' + DateTime.fromJSDate(this.offering2.startDate).toFormat('h:mm a'),
137+
'Starts: ' + DateTime.fromJSDate(this.offering2.startDate).toFormat('hh:mm a'),
138138
);
139139
assert.strictEqual(
140140
blocks[1].endTime,
@@ -160,8 +160,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
160160
month: 'long',
161161
day: 'numeric',
162162
weekday: 'long',
163-
hour: 'numeric',
164-
minute: 'numeric',
163+
hour: '2-digit',
164+
minute: '2-digit',
165165
}),
166166
);
167167

@@ -326,8 +326,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
326326
assert.notOk(block.hasMultiDay);
327327
assert.strictEqual(block.dayOfWeek, 'Sunday');
328328
assert.strictEqual(block.dayOfMonth, 'September 11');
329-
assert.strictEqual(block.startTime, 'Starts: 2:15 AM');
330-
assert.strictEqual(block.endTime, 'Ends: 5:30 PM');
329+
assert.strictEqual(block.startTime, 'Starts: 02:15 AM');
330+
assert.strictEqual(block.endTime, 'Ends: 05:30 PM');
331331
assert.strictEqual(block.timeBlockOfferings.offerings.length, 1);
332332

333333
assert.strictEqual(block.timeBlockOfferings.offerings[0].learnerGroups.length, 2);
@@ -381,8 +381,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
381381
month: 'long',
382382
day: 'numeric',
383383
weekday: 'long',
384-
hour: 'numeric',
385-
minute: 'numeric',
384+
hour: '2-digit',
385+
minute: '2-digit',
386386
}),
387387
);
388388
assert.strictEqual(
@@ -392,8 +392,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
392392
month: 'long',
393393
day: 'numeric',
394394
weekday: 'long',
395-
hour: 'numeric',
396-
minute: 'numeric',
395+
hour: '2-digit',
396+
minute: '2-digit',
397397
}),
398398
);
399399
assert.strictEqual(block.timeBlockOfferings.offerings.length, 1);
@@ -439,8 +439,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
439439
assert.notOk(block.hasMultiDay);
440440
assert.strictEqual(block.dayOfWeek, 'Sunday');
441441
assert.strictEqual(block.dayOfMonth, 'September 11');
442-
assert.strictEqual(block.startTime, 'Starts: 2:15 AM');
443-
assert.strictEqual(block.endTime, 'Ends: 5:30 PM');
442+
assert.strictEqual(block.startTime, 'Starts: 02:15 AM');
443+
assert.strictEqual(block.endTime, 'Ends: 05:30 PM');
444444
assert.strictEqual(block.timeBlockOfferings.offerings.length, 2);
445445

446446
assert.strictEqual(block.timeBlockOfferings.offerings[0].learnerGroups.length, 1);
@@ -511,7 +511,7 @@ module('Acceptance | Session - Offerings', function (hooks) {
511511
assert.strictEqual(block.dayOfWeek, 'Wednesday');
512512
assert.strictEqual(block.dayOfMonth, 'October 5');
513513
assert.strictEqual(block.startTime, 'Starts: 11:45 AM');
514-
assert.strictEqual(block.endTime, 'Ends: 5:55 PM');
514+
assert.strictEqual(block.endTime, 'Ends: 05:55 PM');
515515
assert.strictEqual(block.timeBlockOfferings.offerings.length, 1);
516516

517517
const offering = block.timeBlockOfferings.offerings[0];
@@ -563,8 +563,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
563563
assert.ok(block.hasEndTime);
564564
assert.notOk(block.hasMultiDay);
565565
assert.strictEqual(block.dayOfWeek, 'Friday');
566-
assert.strictEqual(block.startTime, 'Starts: 2:15 AM');
567-
assert.strictEqual(block.endTime, 'Ends: 3:23 PM');
566+
assert.strictEqual(block.startTime, 'Starts: 02:15 AM');
567+
assert.strictEqual(block.endTime, 'Ends: 03:23 PM');
568568
assert.strictEqual(block.timeBlockOfferings.offerings.length, 2);
569569
assert.strictEqual(block.timeBlockOfferings.offerings[0].learnerGroups.length, 1);
570570
assert.strictEqual(
@@ -640,8 +640,8 @@ module('Acceptance | Session - Offerings', function (hooks) {
640640
assert.ok(block.hasEndTime);
641641
assert.notOk(block.hasMultiDay);
642642
assert.strictEqual(block.dayOfWeek, 'Friday');
643-
assert.strictEqual(block.startTime, 'Starts: 2:15 AM');
644-
assert.strictEqual(block.endTime, 'Ends: 3:23 PM');
643+
assert.strictEqual(block.startTime, 'Starts: 02:15 AM');
644+
assert.strictEqual(block.endTime, 'Ends: 03:23 PM');
645645
assert.strictEqual(block.timeBlockOfferings.offerings.length, 1);
646646
assert.strictEqual(block.timeBlockOfferings.offerings[0].learnerGroups.length, 2);
647647
assert.strictEqual(block.timeBlockOfferings.offerings[0].location, 'Scottsdale Stadium');

‎packages/frontend/tests/acceptance/course/session/overview-test.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ module('Acceptance | Session - Overview', function (hooks) {
5656
assert.strictEqual(
5757
page.details.overview.ilmDueDateAndTime.value,
5858
this.intl.formatDate(ilmSession.dueDate, {
59-
month: 'numeric',
60-
day: 'numeric',
59+
month: '2-digit',
60+
day: '2-digit',
6161
year: '2-digit',
6262
hour12: true,
63-
hour: 'numeric',
64-
minute: 'numeric',
63+
hour: '2-digit',
64+
minute: '2-digit',
6565
}),
6666
);
6767

@@ -93,12 +93,12 @@ module('Acceptance | Session - Overview', function (hooks) {
9393
assert.strictEqual(
9494
page.details.overview.ilmDueDateAndTime.value,
9595
this.intl.formatDate(DateTime.fromObject({ hour: 17, minute: 0 }).plus({ weeks: 6 }), {
96-
month: 'numeric',
97-
day: 'numeric',
96+
month: '2-digit',
97+
day: '2-digit',
9898
year: '2-digit',
9999
hour12: true,
100-
hour: 'numeric',
101-
minute: 'numeric',
100+
hour: '2-digit',
101+
minute: '2-digit',
102102
}),
103103
);
104104
});
@@ -147,12 +147,12 @@ module('Acceptance | Session - Overview', function (hooks) {
147147
assert.strictEqual(
148148
page.details.overview.ilmDueDateAndTime.value,
149149
this.intl.formatDate(ilmSession.dueDate, {
150-
month: 'numeric',
151-
day: 'numeric',
150+
month: '2-digit',
151+
day: '2-digit',
152152
year: '2-digit',
153153
hour12: true,
154-
hour: 'numeric',
155-
minute: 'numeric',
154+
hour: '2-digit',
155+
minute: '2-digit',
156156
}),
157157
);
158158
await page.details.overview.ilmDueDateAndTime.edit();
@@ -165,12 +165,12 @@ module('Acceptance | Session - Overview', function (hooks) {
165165
assert.strictEqual(
166166
page.details.overview.ilmDueDateAndTime.value,
167167
this.intl.formatDate(newDate.toJSDate(), {
168-
month: 'numeric',
169-
day: 'numeric',
168+
month: '2-digit',
169+
day: '2-digit',
170170
year: '2-digit',
171171
hour12: true,
172-
hour: 'numeric',
173-
minute: 'numeric',
172+
hour: '2-digit',
173+
minute: '2-digit',
174174
}),
175175
);
176176
});

‎packages/frontend/tests/acceptance/course/sessionlist-test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,19 +165,19 @@ module('Acceptance | Course - Session List', function (hooks) {
165165
assert.strictEqual(offerings.dates[2].dayOfMonth, offering3StartDate.toFormat('MMMM d'));
166166

167167
assert.strictEqual(offerings.offerings.length, 3);
168-
assert.strictEqual(offerings.offerings[0].startTime, offering1StartDate.toFormat('h:mm a'));
168+
assert.strictEqual(offerings.offerings[0].startTime, offering1StartDate.toFormat('hh:mm a'));
169169
assert.strictEqual(offerings.offerings[0].location, 'room 0');
170170
assert.strictEqual(offerings.offerings[0].learners, '(2) 1 guy M. Mc1son, 2 guy...');
171171
assert.strictEqual(offerings.offerings[0].learnerGroups, '(2) learner group 0, learn...');
172172
assert.strictEqual(offerings.offerings[0].instructors, '(3) 3 guy M. Mc3son, 4 guy...');
173173

174-
assert.strictEqual(offerings.offerings[1].startTime, offering2StartDate.toFormat('h:mm a'));
174+
assert.strictEqual(offerings.offerings[1].startTime, offering2StartDate.toFormat('hh:mm a'));
175175
assert.strictEqual(offerings.offerings[1].location, 'room 1');
176176
assert.strictEqual(offerings.offerings[1].learners, '');
177177
assert.strictEqual(offerings.offerings[1].learnerGroups, '');
178178
assert.strictEqual(offerings.offerings[1].instructors, '');
179179

180-
assert.strictEqual(offerings.offerings[2].startTime, offering3StartDate.toFormat('h:mm a'));
180+
assert.strictEqual(offerings.offerings[2].startTime, offering3StartDate.toFormat('hh:mm a'));
181181
assert.strictEqual(offerings.offerings[2].location, 'room 2');
182182
assert.strictEqual(offerings.offerings[2].learners, '');
183183
assert.strictEqual(offerings.offerings[2].learnerGroups, '');
@@ -216,7 +216,7 @@ module('Acceptance | Course - Session List', function (hooks) {
216216
await sessions[0].row.expand();
217217
assert.strictEqual(
218218
expandedSessions[0].lastUpdated,
219-
'Last Update Last Update: 7/9/2019, 5:00 PM',
219+
'Last Update Last Update: 07/09/2019, 05:00 PM',
220220
);
221221
});
222222

‎packages/ilios-common/addon/components/session-offerings-list.hbs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<label class="offering-block-time-time-starts-label">
2323
{{t "general.starts"}}:
2424
</label>
25-
{{format-date offeringTimeBlock.startDate weekday="long" month="long" day="numeric" hour="numeric" minute="numeric"}}
25+
{{format-date offeringTimeBlock.startDate weekday="long" month="long" day="numeric" hour="2-digit" minute="2-digit"}}
2626
</div>
2727
<div class="offering-block-time-time-ends">
2828
<label class="offering-block-time-time-ends-label">
2929
{{t "general.ends"}}:
3030
</label>
31-
{{format-date offeringTimeBlock.endDate weekday="long" month="long" day="numeric" hour="numeric" minute="numeric"}}
31+
{{format-date offeringTimeBlock.endDate weekday="long" month="long" day="numeric" hour="2-digit" minute="2-digit"}}
3232
</div>
3333
</div>
3434
{{else}}
@@ -37,13 +37,13 @@
3737
<label class="offering-block-time-time-starttime-label">
3838
{{t "general.starts"}}:
3939
</label>
40-
{{format-date offeringTimeBlock.startDate hour="numeric" minute="numeric"}}
40+
{{format-date offeringTimeBlock.startDate hour="2-digit" minute="2-digit"}}
4141
</span>
4242
<span class="offering-block-time-time-endtime">
4343
<label class="offering-block-time-time-endtime-label">
4444
{{t "general.ends"}}:
4545
</label>
46-
{{format-date offeringTimeBlock.endDate hour="numeric" minute="numeric"}}
46+
{{format-date offeringTimeBlock.endDate hour="2-digit" minute="2-digit"}}
4747
</span>
4848
</div>
4949
{{/if}}

‎packages/ilios-common/addon/components/session-overview-ilm-duedate.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{{#if @ilmSession}}
99
{{#if @editable}}
1010
<EditableField
11-
@value={{format-date @ilmSession.dueDate month="numeric" day="numeric" year="2-digit" hour12=true hour="numeric" minute="numeric"}}
11+
@value={{format-date @ilmSession.dueDate month="2-digit" day="2-digit" year="2-digit" hour12=true hour="2-digit" minute="2-digit"}}
1212
@save={{perform this.save}}
1313
@close={{this.revert}}
1414
>
@@ -20,7 +20,7 @@
2020
<ValidationError @errors={{get-errors-for this.dueDate}} />
2121
</EditableField>
2222
{{else}}
23-
{{format-date @ilmSession.dueDate month="numeric" day="numeric" year="2-digit" hour12=true hour="numeric" minute="numeric"}}
23+
{{format-date @ilmSession.dueDate month="2-digit" day="2-digit" year="2-digit" hour12=true hour="2-digit" minute="2-digit"}}
2424
{{/if}}
2525
{{/if}}
2626
</span>

‎packages/ilios-common/addon/components/session/postrequisite-editor.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
>
7777
{{#if postrequisite.firstOfferingDate}}
7878
{{#if postrequisite.ilmSession}}
79-
<strong>{{t "general.ilm"}}: {{t "general.dueBy"}}</strong> {{format-date postrequisite.firstOfferingDate}}
79+
<strong>{{t "general.ilm"}}: {{t "general.dueBy"}}</strong> {{format-date postrequisite.firstOfferingDate month="2-digit" day="2-digit" year="numeric"}}
8080
{{else}}
81-
{{format-date postrequisite.firstOfferingDate month="numeric" day="numeric" year="numeric" hour12=true hour="numeric" minute="numeric"}}
81+
{{format-date postrequisite.firstOfferingDate month="2-digit" day="2-digit" year="numeric" hour12=true hour="2-digit" minute="2-digit"}}
8282
{{/if}}
8383
{{/if}}
8484
</button>

‎packages/ilios-common/addon/components/sessions-grid-last-updated.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="sessions-grid-last-updated">
22
<FaIcon @icon="clock-rotate-left" @title={{t "general.lastUpdate"}} />
33
{{t "general.lastUpdate"}}:
4-
{{format-date @session.updatedAt month="numeric" day="numeric" year="numeric" hour="numeric" minute="numeric"}}
4+
{{format-date @session.updatedAt month="2-digit" day="2-digit" year="numeric" hour="2-digit" minute="2-digit"}}
55
</div>

‎packages/ilios-common/addon/components/sessions-grid-loading.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{{random 1 99}}
2525
</span>
2626
<span class="session-grid-first-offering">
27-
{{format-date this.now}}
27+
{{format-date this.now day="2-digit" month="2-digit" year="numeric" hour12=true hour="2-digit" minute="2-digit"}}
2828
</span>
2929
<span class="session-grid-offerings">
3030
{{random 1 99}}

‎packages/ilios-common/addon/components/sessions-grid-offering-table-offerings.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@firstRow={{eq index 0}}
66
@even={{eq (mod index 2) 1}}
77
@span={{this.sortedOfferings.length}}
8-
@startTime={{format-date @offeringTimeBlock.startDate hour="numeric" minute="numeric"}}
8+
@startTime={{format-date @offeringTimeBlock.startDate hour="2-digit" minute="2-digit"}}
99
@durationHours={{@offeringTimeBlock.durationHours}}
1010
@durationMinutes={{@offeringTimeBlock.durationMinutes}}
1111
/>

‎packages/test-app/tests/integration/components/session-overview-ilm-duedate-test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
2929

3030
assert.ok(component.isVisible);
3131
assert.strictEqual(component.label, 'Due By:');
32-
assert.strictEqual(component.value, '5/19/21, 11:55 PM');
32+
assert.strictEqual(component.value, '05/19/21, 11:55 PM');
3333
assert.ok(component.isEditable);
3434
await a11yAudit(this.element);
3535
assert.ok(true, 'not a11y violations');
@@ -45,7 +45,7 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
4545
`);
4646

4747
assert.strictEqual(component.label, 'Due By:');
48-
assert.strictEqual(component.value, '5/19/21, 11:55 PM');
48+
assert.strictEqual(component.value, '05/19/21, 11:55 PM');
4949
assert.notOk(component.isEditable);
5050
await a11yAudit(this.element);
5151
assert.ok(true, 'not a11y violations');
@@ -58,9 +58,9 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
5858
@ilmSession={{this.ilmSession}}
5959
@editable={{this.editable}}
6060
/>
61-
`);
61+
`);
6262

63-
assert.strictEqual(component.value, '5/19/21, 11:55 PM');
63+
assert.strictEqual(component.value, '05/19/21, 11:55 PM');
6464
await component.edit();
6565
assert.strictEqual(component.datePicker.value, '5/19/2021');
6666
assert.strictEqual(component.timePicker.hour.value, '11');
@@ -71,7 +71,7 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
7171
await component.timePicker.minute.select('23');
7272
await component.timePicker.ampm.select('AM');
7373
await component.save();
74-
assert.strictEqual(component.value, '1/1/99, 5:23 AM');
74+
assert.strictEqual(component.value, '01/01/99, 05:23 AM');
7575
});
7676

7777
test('change date and time, then cancel', async function (assert) {
@@ -83,7 +83,7 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
8383
/>
8484
`);
8585

86-
assert.strictEqual(component.value, '5/19/21, 11:55 PM');
86+
assert.strictEqual(component.value, '05/19/21, 11:55 PM');
8787
await component.edit();
8888
assert.strictEqual(component.datePicker.value, '5/19/2021');
8989
assert.strictEqual(component.timePicker.hour.value, '11');
@@ -94,6 +94,6 @@ module('Integration | Component | session-overview-ilm-duedate', function (hooks
9494
await component.timePicker.minute.select('23');
9595
await component.timePicker.ampm.select('AM');
9696
await component.cancel();
97-
assert.strictEqual(component.value, '5/19/21, 11:55 PM');
97+
assert.strictEqual(component.value, '05/19/21, 11:55 PM');
9898
});
9999
});

0 commit comments

Comments
 (0)