Skip to content

Fix EMSL shipping date inconsistency #1856

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

Open
cristina-stonepedraza wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix EMSL shipping date inconsistency #1856

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
50924a5
Use UTC time and change date format to YYYY-MM-DD
cristina-stonepedraza Nov 20, 2025
238ea69
Merge branch 'main' into 1237-emsl-inconsistent-date
pkalita-lbl Dec 4, 2025
197d02b
Use a utility function to format the date
cristina-stonepedraza Dec 19, 2025
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
11 changes: 10 additions & 1 deletion web/src/views/SubmissionPortal/Components/SubmissionContextShippingForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
import { addressToString } from '../store/api';
import SubmissionContextShippingSummary from './SubmissionContextShippingSummary.vue';
import { ValidationResult } from 'vuetify/lib/composables/validation.mjs';
import moment from 'moment';

export default defineComponent({
components: { SubmissionContextShippingSummary },
Expand Down Expand Up @@ -77,6 +78,13 @@ export default defineComponent({
expectedShippingDate.value = undefined;
}

function formatShippingDate (date: string | Date | null | undefined): string {
if(!date) {
return '';
}
return moment(date).format('YYYY-MM-DD');
}

return {
addressFormRef,
addressForm,
Expand All @@ -93,6 +101,7 @@ export default defineComponent({
canEditSubmissionMetadata,
requiredRules,
handleExpectedShippingDateClear,
formatShippingDate,
};
},
});
Expand Down Expand Up @@ -247,7 +256,7 @@ export default defineComponent({
>
<template #activator="{ props }">
<v-text-field
:model-value="expectedShippingDate?.toLocaleDateString()"
:model-value="formatShippingDate(expectedShippingDate)"
:rules="requiredRules('Expected Shipping Date is required', [])"
label="Expected Shipping Date *"
prepend-icon="mdi-calendar"
Expand Down
12 changes: 11 additions & 1 deletion web/src/views/SubmissionPortal/Components/SubmissionContextShippingSummary.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { computed, defineComponent } from 'vue';
import { addressForm } from '../store';
import { addressToString } from '../store/api';
import moment from 'moment';

export default defineComponent({
setup() {
Expand All @@ -18,6 +19,14 @@ export default defineComponent({
const existingShipperData = shipperData.filter((shipperDatum) => !!shipperDatum.trim());
return existingShipperData.join(', ');
});

function formatShippingDate (date: string | Date | null | undefined): string {
if(!date) {
return '';
}
return moment(date).format('YYYY-MM-DD');
}

const shipperAddressString = computed(() => addressToString(addressForm.shipper));
const shipperSummary = computed(() => {
let result = '';
Expand All @@ -27,7 +36,7 @@ export default defineComponent({
}
if (addressForm.expectedShippingDate) {
const date = new Date(addressForm.expectedShippingDate);
result += `\nExpected Shipping Date: ${date.toLocaleDateString()}`;
result += `\nExpected Shipping Date: ${formatShippingDate(date)}`;
}

return result.trim();
Expand Down Expand Up @@ -73,6 +82,7 @@ export default defineComponent({
shipperSummary,
addressForm,
sampleProperties,
formatShippingDate,
};
},
});
Expand Down