Merge pull request #7898 from michaelchadwick/normalize-date-display-…

…for-offering-form normalize date display format for offering form
ilios · Jun 20, 2024 · be5957f · be5957f
2 parents 7a92e44 + 1f0351f
commit be5957f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 33 deletions.
diff --git a/packages/ilios-common/addon/components/offering-form.hbs b/packages/ilios-common/addon/components/offering-form.hbs
@@ -88,7 +88,7 @@
             </label>
             {{#if this.endDate}}
               <div class="text">
-                {{format-date this.endDate month="numeric" day="numeric" year="numeric" hour="numeric" minute="numeric"}}
+                {{format-date this.endDate month="2-digit" day="2-digit" year="numeric" hour="2-digit" minute="2-digit"}}
               </div>
             {{/if}}
           </div>

diff --git a/packages/test-app/tests/integration/components/offering-form-test.js b/packages/test-app/tests/integration/components/offering-form-test.js
@@ -383,22 +383,22 @@ module('Integration | Component | offering form', function (hooks) {
     const newStartDate = DateTime.fromObject({ hour: 9 }).plus({ days: 1 });
     assert.strictEqual(
       this.intl.formatDate(DateTime.fromObject({ hour: 9, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );
     await component.startDate.datePicker.set(newStartDate.toJSDate());
     assert.strictEqual(
       this.intl.formatDate(newStartDate.set({ hour: 9, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );
@@ -410,11 +410,11 @@ module('Integration | Component | offering form', function (hooks) {
     assert.strictEqual(
       component.endDate.value,
       this.intl.formatDate(DateTime.fromObject({ hour: 9, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
     );
     await component.startTime.timePicker.hour.select('2');
@@ -423,11 +423,11 @@ module('Integration | Component | offering form', function (hooks) {
     assert.strictEqual(
       component.endDate.value,
       this.intl.formatDate(DateTime.fromObject({ hour: 15, minute: 15 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
     );
   });
@@ -437,23 +437,23 @@ module('Integration | Component | offering form', function (hooks) {
 `);
     assert.strictEqual(
       this.intl.formatDate(DateTime.fromObject({ hour: 9, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );
     await component.duration.hours.set('2');
     await component.duration.minutes.set('15');
     assert.strictEqual(
       this.intl.formatDate(DateTime.fromObject({ hour: 10, minute: 15 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );
@@ -465,11 +465,11 @@ module('Integration | Component | offering form', function (hooks) {
 `);
     assert.strictEqual(
       this.intl.formatDate(DateTime.fromObject({ hour: 9, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );
@@ -480,11 +480,11 @@ module('Integration | Component | offering form', function (hooks) {
     await component.duration.minutes.set('50');
     assert.strictEqual(
       this.intl.formatDate(DateTime.fromObject({ hour: 17, minute: 0 }).toJSDate(), {
-        month: 'numeric',
-        day: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
         year: 'numeric',
-        hour: 'numeric',
-        minute: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
       }),
       component.endDate.value,
     );