Date: Fri, 3 Jan 2025 11:29:08 -0500
Subject: [PATCH 06/34] Only show profile reference if user is a logged in
veteran (#33865)
* render note if preparer is a logged in veteran
* update calls to ProfileNotUpdatedNote
* clean up
---
.../components/ProfileNotUpdatedNote.jsx | 13 ++++++++++---
.../pages/claimant/claimantContactMailing.js | 4 +---
.../pages/claimant/claimantContactPhoneEmail.js | 4 +---
.../pages/claimant/claimantPersonalInformation.js | 4 +---
.../pages/veteran/veteranContactMailing.js | 7 ++++++-
.../pages/veteran/veteranContactPhoneEmail.js | 6 +++++-
.../veteran/veteranContactPhoneEmailClaimant.js | 4 +---
.../pages/veteran/veteranIdentification.js | 6 +++++-
.../pages/veteran/veteranPersonalInformation.js | 7 +++++--
.../pages/veteran/veteranServiceInformation.js | 5 ++++-
10 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
index 55c3f28ac89f..f7d78e98ef72 100644
--- a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
+++ b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
@@ -7,11 +7,18 @@ import { CONTACTS } from '@department-of-veterans-affairs/component-library/cont
import { isLoggedIn } from 'platform/user/selectors';
function ProfileNotUpdatedNote(props) {
- const { loggedIn, includePrefix, includeLink, includePhone } = props;
+ const {
+ includeLink,
+ includePhone,
+ includePrefix,
+ loggedIn,
+ preparerIsVeteran,
+ } = props;
+ const isLoggedInVeteran = loggedIn && preparerIsVeteran;
return (
<>
- {loggedIn && (
+ {isLoggedInVeteran && (
<>
{includePrefix && Note: }
@@ -45,11 +52,11 @@ function ProfileNotUpdatedNote(props) {
}
ProfileNotUpdatedNote.propTypes = {
- formData: PropTypes.object,
includeLink: PropTypes.bool,
includePhone: PropTypes.bool,
includePrefix: PropTypes.bool,
loggedIn: PropTypes.bool,
+ preparerIsVeteran: PropTypes.bool,
};
function mapStateToProps(state) {
diff --git a/src/applications/representative-appoint/pages/claimant/claimantContactMailing.js b/src/applications/representative-appoint/pages/claimant/claimantContactMailing.js
index e2986398ea28..43e101593e05 100644
--- a/src/applications/representative-appoint/pages/claimant/claimantContactMailing.js
+++ b/src/applications/representative-appoint/pages/claimant/claimantContactMailing.js
@@ -13,9 +13,7 @@ export const uiSchema = {
'We’ll send any important information about your form to this address.',
),
profileNotUpdatedNote: {
- 'ui:description': formData => (
-
Date: Fri, 3 Jan 2025 11:36:45 -0500
Subject: [PATCH 07/34] edm-510 accessibility and content update (#33868)
---
.../components/profile/InstitutionProfile.jsx | 37 +++++++++----------
.../profile/YellowRibbonSelector.jsx | 36 +++++++++++++-----
src/applications/gi/sass/gi.scss | 24 +++++++-----
3 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/src/applications/gi/components/profile/InstitutionProfile.jsx b/src/applications/gi/components/profile/InstitutionProfile.jsx
index 2db71cbb4666..41ea6a993af2 100644
--- a/src/applications/gi/components/profile/InstitutionProfile.jsx
+++ b/src/applications/gi/components/profile/InstitutionProfile.jsx
@@ -206,16 +206,15 @@ export default function InstitutionProfile({
id="yellow-ribbon-program-information"
>
- The Yellow Ribbon program can be paid towards net tuition and fee
- costs not covered by the Post-9/11 GI Bill at participating
- institutions of higher learning (IHL). Schools that choose to
- participate in the Yellow Ribbon program will contribute up to a
- certain dollar amount toward the extra tuition. VA will match the
- participating school’s contribution
+ The Yellow Ribbon program pays towards net tuition and fee costs
+ not covered by the Post-9/11 GI Bill at participating institutions
+ of higher learning (IHL). Schools that choose to participate in
+ the Yellow Ribbon program will contribute up to a certain dollar
+ amount toward the extra tuition. VA will match the participating
+ school’s contribution{' '}
{type === 'FOREIGN' && `${` `}in United States Dollars (USD)`}, up
- to the total cost of the tuition and fees. Please contact the
- individual school to validate the number of students remaining to
- receive funding.
+ to the total cost of the tuition and fees. To confirm the number
+ of students eligible for funding, contact the individual school.
- Degree level: Type of degree such as Undergraduate, Graduate,
- Masters, or Doctorate.
+ Degree level: type of degree such as
+ Undergraduate, Graduate, Masters, or Doctorate.
- College or professional school: A school within a college or
- university that has a specialized professional or academic
- focus.
+ College or professional school: a school
+ within a college or university that has a specialized
+ professional or academic focus.
- Funding available: Total number of students eligible to
- receive funding.
+ Funding available: total number of students
+ eligible to receive funding.
- School contribution: Maximum amount the IHL will contribute
- per student each academic year toward unmet tuition and fee
- costs.
+ School contribution: maximum amount the IHL
+ will contribute per student each academic year toward unmet
+ tuition and fee costs.
diff --git a/src/applications/gi/components/profile/YellowRibbonSelector.jsx b/src/applications/gi/components/profile/YellowRibbonSelector.jsx
index e342e3d16e08..083a85e8bac6 100644
--- a/src/applications/gi/components/profile/YellowRibbonSelector.jsx
+++ b/src/applications/gi/components/profile/YellowRibbonSelector.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
import PropTypes from 'prop-types';
import {
VaSelect,
@@ -62,7 +62,7 @@ const YellowRibbonSelector = ({ programs }) => {
}));
console.table(mappedPrograms); // eslint-disable-line no-console
-
+ const resultsSummaryRef = useRef(null);
const [selectedOption, setSelectedOption] = useState('');
const [activeOption, setActiveOption] = useState('');
const [filteredPrograms, setFilteredPrograms] = useState([]);
@@ -118,10 +118,20 @@ const YellowRibbonSelector = ({ programs }) => {
const handleDisplayResults = () => {
setActiveOption(selectedOption);
filterPrograms(selectedOption);
+ setTimeout(() => {
+ if (resultsSummaryRef.current) {
+ resultsSummaryRef.current.focus();
+ }
+ }, 0);
};
const handlePageChange = page => {
setCurrentPage(page);
+ setTimeout(() => {
+ if (resultsSummaryRef.current) {
+ resultsSummaryRef.current.focus();
+ }
+ }, 0);
};
const totalPages = Math.ceil(filteredPrograms.length / itemsPerPage);
@@ -152,10 +162,11 @@ const YellowRibbonSelector = ({ programs }) => {
} else {
activeOptionLabel = `"${activeOption}" degree level`;
}
-
return (
{`Showing ${startIndex}-${endIndex} of ${
@@ -174,7 +185,7 @@ const YellowRibbonSelector = ({ programs }) => {
{
))}
-
{
{filteredPrograms.length > 0 && activeOption && renderResultsSummary()}
-
+ {/* eslint-disable-next-line jsx-a11y/no-redundant-roles */}
+
{currentPrograms.map((program, index) => (
-
+
{currentPrograms.length > 0 && (
Date: Fri, 3 Jan 2025 11:40:46 -0500
Subject: [PATCH 08/34] edm-397 connect api update ui mobile (#33800)
---
src/applications/gi/actions/index.js | 5 +-
.../components/profile/InstitutionProfile.jsx | 11 +-
.../gi/components/profile/Programs.jsx | 6 +-
src/applications/gi/containers/GiBillApp.jsx | 4 +-
.../gi/containers/ProgramsList.jsx | 108 +++++++++-------
src/applications/gi/sass/gi.scss | 49 ++++++--
.../components/profile/Programs.unit.spec.jsx | 7 +-
.../containers/ProgramsList.unit.spec.jsx | 118 +++++++++++++-----
.../gi/tests/utils/helpers.unit.spec.js | 101 +++++++++++++++
src/applications/gi/utils/helpers.js | 65 +++++++++-
10 files changed, 372 insertions(+), 102 deletions(-)
diff --git a/src/applications/gi/actions/index.js b/src/applications/gi/actions/index.js
index 187c647ecf7b..60cc48d3e781 100644
--- a/src/applications/gi/actions/index.js
+++ b/src/applications/gi/actions/index.js
@@ -102,8 +102,9 @@ export const fetchNationalExams = type => {
};
export const fetchInstitutionPrograms = (facilityCode, programType) => {
- const url = `https://dev-api.va.gov/v0/gi/institution_programs/search?type=${programType}&facility_code=${facilityCode}&disable_pagination=true`;
-
+ const url = `${
+ apiV0.url
+ }/institution_programs/search?type=${programType}&facility_code=${facilityCode}&disable_pagination=true`;
return async dispatch => {
dispatch({ type: FETCH_INSTITUTION_PROGRAMS_STARTED });
diff --git a/src/applications/gi/components/profile/InstitutionProfile.jsx b/src/applications/gi/components/profile/InstitutionProfile.jsx
index 41ea6a993af2..754f2de84fa8 100644
--- a/src/applications/gi/components/profile/InstitutionProfile.jsx
+++ b/src/applications/gi/components/profile/InstitutionProfile.jsx
@@ -47,7 +47,9 @@ export default function InstitutionProfile({
const programTypes = [
'Non College Degree',
'Institution of Higher Learning',
- 'On The Job Training',
+ 'On The Job Training/Apprenticeship',
+ 'Flight',
+ 'Correspondence',
];
const shouldShowSchoolLocations = facilityMap =>
@@ -55,6 +57,7 @@ export default function InstitutionProfile({
(facilityMap.main.extensions.length > 0 ||
facilityMap.main.branches.length > 0);
const { type, facilityCode, name } = institution;
+ localStorage.setItem('institutionName', name);
const scrollToLocations = () => {
scrollTo('school-locations', getScrollOptions());
};
@@ -307,11 +310,7 @@ export default function InstitutionProfile({
)}
{toggleGiProgramsFlag && (
-
)}
{!isOJT && (
diff --git a/src/applications/gi/components/profile/Programs.jsx b/src/applications/gi/components/profile/Programs.jsx
index d848d8c35eed..aa080f5b13e1 100644
--- a/src/applications/gi/components/profile/Programs.jsx
+++ b/src/applications/gi/components/profile/Programs.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
-const Programs = ({ programTypes, facilityCode, institutionName }) => {
+const Programs = ({ programTypes, facilityCode }) => {
return (
<>
The following programs are approved by the VA at this institution.
@@ -19,8 +19,8 @@ const Programs = ({ programTypes, facilityCode, institutionName }) => {
pathname: `/institution/${facilityCode}/${programType
.trim()
.toLowerCase()
- .replace(/\s+/g, '-')}`,
- state: { institutionName },
+ .replace(/\s+/g, '-')
+ .replace(/\//g, '-')}`,
}}
className="vads-u-display--flex vads-u-align-items--center"
>
diff --git a/src/applications/gi/containers/GiBillApp.jsx b/src/applications/gi/containers/GiBillApp.jsx
index f9c49aad7e41..c907c8cf8eb0 100644
--- a/src/applications/gi/containers/GiBillApp.jsx
+++ b/src/applications/gi/containers/GiBillApp.jsx
@@ -77,6 +77,7 @@ export function GiBillApp({
const onProfilePage = location.pathname.includes('/institution');
const onComparePage = location.pathname.includes('/compare');
const showDisclaimer = onComparePage || !compare.open;
+ const onProgramPage = /\/institution\/[^/]+\/[^/]+$/.test(location.pathname);
return (
@@ -107,7 +108,8 @@ export function GiBillApp({
)}
- {!onComparePage &&
diff --git a/src/applications/gi/containers/ProgramsList.jsx b/src/applications/gi/containers/ProgramsList.jsx
index 02a6f0241f45..e2a2dd47e6e3 100644
--- a/src/applications/gi/containers/ProgramsList.jsx
+++ b/src/applications/gi/containers/ProgramsList.jsx
@@ -1,47 +1,52 @@
import React, { useState, useEffect } from 'react';
import { useDispatch, useSelector } from 'react-redux';
-import { useLocation } from 'react-router-dom';
import PropTypes from 'prop-types';
import {
VaButton,
VaPagination,
VaTextInput,
} from '@department-of-veterans-affairs/component-library/dist/react-bindings';
-import { formatProgramType, generateMockPrograms } from '../utils/helpers';
-// import { fetchInstitutionPrograms } from '../../actions';
+import {
+ formatProgramType,
+ mapToAbbreviation,
+ getAbbreviationsAsArray,
+} from '../utils/helpers';
+import { fetchInstitutionPrograms } from '../actions';
const ProgramsList = ({ match }) => {
const dispatch = useDispatch();
- const { loading, error } = useSelector(state => state.institutionPrograms);
- const location = useLocation();
- const { institutionName } = location.state;
-
- const { programType } = match.params;
- // const { facilityCode } = match.params;
-
+ const { loading, error, institutionPrograms } = useSelector(
+ state => state.institutionPrograms,
+ );
+ const institutionName = localStorage.getItem('institutionName');
+ const { programType, facilityCode } = match.params;
const formattedProgramType = formatProgramType(programType);
+ const abbreviatedProgramTypes = mapToAbbreviation(programType);
+ const abbreviatedList = getAbbreviationsAsArray(abbreviatedProgramTypes);
const [currentPage, setCurrentPage] = useState(1);
const itemsPerPage = 20;
+
const [searchQuery, setSearchQuery] = useState('');
const [submittedQuery, setSubmittedQuery] = useState('');
- const [key, setKey] = useState(0);
-
const [searchError, setSearchError] = useState(null);
- const mockPrograms = generateMockPrograms(30);
+ const [key, setKey] = useState(0);
+
+ const triggerRerender = () => {
+ setKey(prevKey => prevKey + 1);
+ };
- const filteredPrograms = mockPrograms.filter(program =>
+ const filteredPrograms = institutionPrograms.filter(program =>
program.attributes.description
- .toLowerCase()
+ ?.toLowerCase()
.includes(submittedQuery.toLowerCase()),
);
useEffect(
() => {
window.scrollTo(0, 0);
- // dispatch(fetchInstitutionPrograms('3V000242', 'NCD'));
- // dispatch(fetchInstitutionPrograms(facilityCode, programType));
+ dispatch(fetchInstitutionPrograms(facilityCode, abbreviatedProgramTypes));
},
[dispatch],
);
@@ -51,12 +56,8 @@ const ProgramsList = ({ match }) => {
setSearchError(null);
};
- const triggerRerender = () => {
- setKey(prevKey => prevKey + 1); // Changing the key forces a re-render
- };
-
const handleSearchSubmit = e => {
- e?.preventDefault();
+ e.preventDefault();
if (!searchQuery.trim()) {
setSearchError('Please fill in a program name and then select search.');
return;
@@ -120,34 +121,55 @@ const ProgramsList = ({ match }) => {
}
return (
-
+
{institutionName}
{formattedProgramType}
-
e.key === 'Enter' && handleSearchSubmit(e)}
- show-input-error
- />
-
+ Abbreviation(s)
+
+ {/* eslint-disable-next-line jsx-a11y/no-redundant-roles */}
+
+ {abbreviatedList.map(abb => (
+
+ {abb}
+
+ ))}
+
+
+ {institutionPrograms.length > 20 && (
+
+ e.key === 'Enter' && handleSearchSubmit(e)}
+ show-input-error
+ />
+
+
+ )}
{filteredPrograms.length > 0 ? (
{submittedQuery ? (
@@ -174,9 +196,9 @@ const ProgramsList = ({ match }) => {
)}
{/* eslint-disable-next-line jsx-a11y/no-redundant-roles */}
- {currentPrograms.map(program => (
-
- {program.attributes.description}
+ {currentPrograms.map(({ id, attributes: { description } }) => (
+
+ {description}
))}
diff --git a/src/applications/gi/sass/gi.scss b/src/applications/gi/sass/gi.scss
index de8f4c840b08..f0e58ab909cd 100644
--- a/src/applications/gi/sass/gi.scss
+++ b/src/applications/gi/sass/gi.scss
@@ -336,20 +336,45 @@
background-color: transparent;
}
-.search-container {
- va-text-input::part(input) {
- width: 100%;
- min-width: 576px;
+.programs-list-container {
+ .abbreviations {
+ font-family: var(--font-source-sans);
}
-
- @media (max-width: 1024px) {
- va-text-input::part(input) {
- min-width: 420px;
- }
+ .list-style {
+ list-style: disc;
+ margin-top: 0;
+ margin-bottom: 8px;
}
- @media (max-width: 480px) {
- va-text-input::part(input) {
- min-width: 100%;
+ .search-container {
+ display: flex;
+ flex-direction: row;
+ .reset-search {
+ white-space: nowrap;
+ }
+ @media (max-width: $small-screen) {
+ flex-direction: column;
+ .search-input {
+ width: 100%;
+ }
+ .search-btn {
+ width: 100%;
+ margin-top: 16px;
+ }
+ .reset-search {
+ width: 100%;
+ margin-top: 16px;
+ margin-bottom: 24px;
+ }
+ }
+ @media (min-width: $small-screen) {
+ va-text-input::part(input) {
+ min-width: 400px;
+ }
+ }
+ @media (min-width: $medium-screen) {
+ va-text-input::part(input) {
+ min-width: 576px;
+ }
}
}
}
diff --git a/src/applications/gi/tests/components/profile/Programs.unit.spec.jsx b/src/applications/gi/tests/components/profile/Programs.unit.spec.jsx
index 95d80a8271d2..eb05cd7e71df 100644
--- a/src/applications/gi/tests/components/profile/Programs.unit.spec.jsx
+++ b/src/applications/gi/tests/components/profile/Programs.unit.spec.jsx
@@ -7,13 +7,8 @@ describe('
', () => {
it('should render', () => {
const programTypes = ['Undergraduate', 'Graduate', 'OJT'];
const facilityCode = '12345';
- const name = 'Example Institution';
const wrapper = shallow(
-
-
-
+ ,
);
};
it('should render institution name and program type when not loading', () => {
const wrapper = mountComponent();
-
- // Check that the institution name and program type are rendered
- expect(wrapper.find('h1').text()).to.equal('Institution 1');
+ expect(wrapper.find('h1').exists()).to.be.true;
expect(wrapper.find('h2').exists()).to.be.true;
// Check that relevant components like search input, button, and pagination exist
expect(wrapper.find('VaTextInput')).to.have.lengthOf(1);
- expect(wrapper.find('VaButton')).to.have.lengthOf(1);
+ expect(wrapper.find('VaButton')).to.have.lengthOf(2);
expect(wrapper.find('VaPagination')).to.have.lengthOf(1);
wrapper.unmount();
});
+ it('should cause a re-render when the key state is changed', () => {
+ const wrapper = mountComponent();
+ const firstRender = wrapper.find('VaTextInput').exists();
+ expect(firstRender).to.be.true;
+ wrapper.find('VaButton.reset-search').simulate('click');
+ wrapper.update();
+ const secondRender = wrapper.find('VaTextInput').exists();
+ expect(secondRender).to.be.true;
+ wrapper.unmount();
+ });
+
it('calculates the total number of pages correctly in VaPagination', () => {
const wrapper = mountComponent();
const itemsPerPage = 20;
@@ -175,10 +179,53 @@ describe('ProgramsList component', () => {
wrapper.unmount();
});
+ it('submits the search when Enter key is pressed in the search input', () => {
+ const wrapper = mountComponent();
+ const searchQuery = 'CISCO SYSTEMS - CCNA SECURITY';
+
+ const textInput = wrapper.find('VaTextInput.search-input');
+ expect(textInput.exists()).to.be.true;
+
+ textInput.simulate('input', { target: { value: searchQuery } });
+ wrapper.update();
+
+ textInput.simulate('keydown', { key: 'Enter', preventDefault: () => {} });
+ wrapper.update();
+ const filteredPrograms = store
+ .getState()
+ .institutionPrograms.institutionPrograms.filter(program =>
+ program.attributes.description.includes(searchQuery),
+ );
+ const displayedPrograms = wrapper.find('li').map(node => node.text());
+ const expectedPrograms = filteredPrograms.map(
+ program => program.attributes.description,
+ );
+ expect(displayedPrograms).to.deep.equal(expectedPrograms);
+ wrapper.unmount();
+ });
+ it('applies the correct class when the number of programs is less than 21', () => {
+ store = mockStore({
+ institutionPrograms: {
+ institutionPrograms: generateMockPrograms(10),
+ loading: false,
+ error: null,
+ },
+ });
+ const wrapper = mount(
+
+ ,
+ );
+ const abbreviationsDiv = wrapper.find('h4.abbreviations').parent('div');
+ expect(abbreviationsDiv.hasClass('vads-u-margin-bottom--4')).to.be.true;
+ wrapper.unmount();
+ });
it('displays an error when the search input is empty and submitted', () => {
const wrapper = mountComponent();
- wrapper.find('VaButton').simulate('click');
+ wrapper.find('VaButton.search-btn').simulate('click');
wrapper.update();
const errorMessage = wrapper.find('VaTextInput').prop('error');
expect(errorMessage).to.equal(
@@ -197,13 +244,9 @@ describe('ProgramsList component', () => {
const wrapper = mount(
-
-
+ ,
);
@@ -227,13 +270,9 @@ describe('ProgramsList component', () => {
const wrapper = mount(
-
-
+ ,
);
@@ -249,7 +288,7 @@ describe('ProgramsList component', () => {
);
// Check institution name and program type are displayed
- expect(wrapper.find('h1').text()).to.equal('Institution 1');
+ expect(wrapper.find('h1').exists()).to.be.true;
expect(
wrapper
.find('h2')
@@ -258,6 +297,29 @@ describe('ProgramsList component', () => {
.toUpperCase(),
).to.include('NCD'); // Convert text to uppercase for comparison
+ wrapper.unmount();
+ });
+ it('shows the "no-results-message" when no programs match the search query', () => {
+ const wrapper = mountComponent();
+ const impossibleQuery = 'ThisWillNotMatchAnyProgramName';
+ const textInput = wrapper.find('VaTextInput.search-input');
+ expect(textInput.exists()).to.be.true;
+
+ textInput.simulate('input', { target: { value: impossibleQuery } });
+ wrapper.update();
+
+ const searchButton = wrapper.find('VaButton.search-btn');
+ expect(searchButton.exists()).to.be.true;
+ searchButton.simulate('click');
+ wrapper.update();
+
+ const noResultsMessage = wrapper.find('#no-results-message');
+ expect(noResultsMessage.exists()).to.be.true;
+ expect(noResultsMessage.text()).to.include(
+ `We didn’t find any results for`,
+ );
+ expect(noResultsMessage.text()).to.include(impossibleQuery);
+
wrapper.unmount();
});
});
diff --git a/src/applications/gi/tests/utils/helpers.unit.spec.js b/src/applications/gi/tests/utils/helpers.unit.spec.js
index 52d7e186e260..1892efa167e7 100644
--- a/src/applications/gi/tests/utils/helpers.unit.spec.js
+++ b/src/applications/gi/tests/utils/helpers.unit.spec.js
@@ -29,6 +29,8 @@ import {
isSmallScreenLogic,
deriveMaxAmount,
deriveEligibleStudents,
+ capitalizeFirstLetter,
+ getAbbreviationsAsArray,
} from '../../utils/helpers';
describe('GIBCT helpers:', () => {
@@ -539,6 +541,35 @@ describe('GIBCT helpers:', () => {
expect(scrollByStub.called).to.be.false;
});
});
+ describe('capitalizeFirstLetter', () => {
+ it('should return null when the string is null', () => {
+ expect(capitalizeFirstLetter(null)).to.equal(null);
+ });
+
+ it('should return null when the string is undefined', () => {
+ expect(capitalizeFirstLetter(undefined)).to.equal(null);
+ });
+
+ it('should capitalize the first letter of a single word', () => {
+ expect(capitalizeFirstLetter('hello')).to.equal('Hello');
+ });
+
+ it('should return the string as is if the first letter is already uppercase', () => {
+ expect(capitalizeFirstLetter('Hello')).to.equal('Hello');
+ });
+
+ it('should handle empty strings and return null', () => {
+ expect(capitalizeFirstLetter('')).to.equal(null);
+ });
+
+ it('should handle strings with special characters correctly', () => {
+ expect(capitalizeFirstLetter('@hello')).to.equal('@hello');
+ });
+
+ it('should handle strings with numbers at the beginning correctly', () => {
+ expect(capitalizeFirstLetter('123hello')).to.equal('123hello');
+ });
+ });
describe('formatProgramType', () => {
it('should return an empty string when programType is null or undefined', () => {
@@ -566,6 +597,11 @@ describe('GIBCT helpers:', () => {
'Doctorate Program',
);
});
+ it('should return a formatted string for "on-the-job-training-apprenticeship"', () => {
+ expect(formatProgramType('on-the-job-training-apprenticeship')).to.equal(
+ 'On-the-job training/Apprenticeships',
+ );
+ });
});
describe('deriveMaxAmount', () => {
@@ -611,4 +647,69 @@ describe('GIBCT helpers:', () => {
expect(deriveEligibleStudents(50)).to.equal('50 students');
});
});
+ describe('getAbbreviationsAsArray', () => {
+ it('should return an empty array when value is null or undefined or an empty string', () => {
+ expect(getAbbreviationsAsArray(null)).to.deep.equal([]);
+ expect(getAbbreviationsAsArray(undefined)).to.deep.equal([]);
+ expect(getAbbreviationsAsArray('')).to.deep.equal([]);
+ });
+
+ it('should return the corresponding abbreviations for "OJT"', () => {
+ const result = getAbbreviationsAsArray('OJT');
+ expect(result).to.deep.equal([
+ 'APP: Apprenticeships',
+ 'OJT: On-the-job training',
+ ]);
+ });
+
+ it('should return the corresponding abbreviations for "NCD"', () => {
+ const result = getAbbreviationsAsArray('NCD');
+ expect(result).to.deep.equal([
+ 'CERT: Certification',
+ 'UG CERT: Undergraduate Certification',
+ ]);
+ });
+
+ it('should return the corresponding abbreviations for "IHL"', () => {
+ const result = getAbbreviationsAsArray('IHL');
+ expect(result).to.deep.equal([
+ 'AA: Associate of Arts',
+ 'AS: Associate of Science',
+ 'BA: Bachelor of Arts',
+ 'BS: Bachelor of Science',
+ 'GRAD CERT: Graduate Certification',
+ 'MA: Master of Arts',
+ 'MBA: Master of Business Administration',
+ 'MS: Master of Science',
+ ]);
+ });
+
+ it('should return the corresponding abbreviations for "CORR"', () => {
+ const result = getAbbreviationsAsArray('CORR');
+ expect(result).to.deep.equal([
+ 'AAS: Associate of Applied Science',
+ 'CERT: Certification',
+ ]);
+ });
+
+ it('should return the corresponding abbreviations for "FLGT"', () => {
+ const result = getAbbreviationsAsArray('FLGT');
+ expect(result).to.deep.equal([
+ 'AMEL: Airplane Multi Engine Land',
+ 'ASEL: Airplane Single Engine Land',
+ 'ATM: Airline Transport Multiengine',
+ 'ATP: Airline Transport Pilot',
+ 'ATS: Airline Transport Single Engine',
+ 'CFI: Certified Flight Instructor',
+ 'CFII: Certified Flight Instructor Instrument',
+ 'IR: Instrument Rating',
+ 'MEI: Multi Engine Instructor',
+ 'ROTO: Rotorcraft; Rotary-Wing Aircraft',
+ ]);
+ });
+
+ it('should return an empty array when the value is not found in the mapping', () => {
+ expect(getAbbreviationsAsArray('XYZ')).to.deep.equal([]);
+ });
+ });
});
diff --git a/src/applications/gi/utils/helpers.js b/src/applications/gi/utils/helpers.js
index 8e45f96631b6..7d52e6fdf801 100644
--- a/src/applications/gi/utils/helpers.js
+++ b/src/applications/gi/utils/helpers.js
@@ -583,9 +583,13 @@ export function capitalizeFirstLetter(string) {
return null;
}
-export const formatProgramType = programType => {
+export const formatProgramType = (programType = '') => {
if (!programType) return '';
+ if (programType === 'on-the-job-training-apprenticeship') {
+ return 'On-the-job training/Apprenticeships';
+ }
+
return programType
.split('-')
.filter(word => word.trim()) // Filter out empty strings caused by extra hyphens
@@ -660,3 +664,62 @@ export const deriveEligibleStudents = numberOfStudents => {
}
return `${numberOfStudents} students`;
};
+
+export const mapToAbbreviation = value => {
+ const mapping = {
+ 'on-the-job-training-apprenticeship': 'OJT',
+ 'non-college-degree': 'NCD',
+ 'institution-of-higher-learning': 'IHL',
+ flight: 'FLGT',
+ correspondence: 'CORR',
+ };
+
+ return mapping[value.toLowerCase()];
+};
+
+export const getAbbreviationsAsArray = value => {
+ if (!value) return [];
+ const mapping = {
+ OJT: [
+ { abbreviation: 'APP', description: 'Apprenticeships' },
+ { abbreviation: 'OJT', description: 'On-the-job training' },
+ ],
+ NCD: [
+ { abbreviation: 'CERT', description: 'Certification' },
+ { abbreviation: 'UG CERT', description: 'Undergraduate Certification' },
+ ],
+ IHL: [
+ { abbreviation: 'AA', description: 'Associate of Arts' },
+ { abbreviation: 'AS', description: 'Associate of Science' },
+ { abbreviation: 'BA', description: 'Bachelor of Arts' },
+ { abbreviation: 'BS', description: 'Bachelor of Science' },
+ { abbreviation: 'GRAD CERT', description: 'Graduate Certification' },
+ { abbreviation: 'MA', description: 'Master of Arts' },
+ { abbreviation: 'MBA', description: 'Master of Business Administration' },
+ { abbreviation: 'MS', description: 'Master of Science' },
+ ],
+ CORR: [
+ { abbreviation: 'AAS', description: 'Associate of Applied Science' },
+ { abbreviation: 'CERT', description: 'Certification' },
+ ],
+ FLGT: [
+ { abbreviation: 'AMEL', description: 'Airplane Multi Engine Land' },
+ { abbreviation: 'ASEL', description: 'Airplane Single Engine Land' },
+ { abbreviation: 'ATM', description: 'Airline Transport Multiengine' },
+ { abbreviation: 'ATP', description: 'Airline Transport Pilot' },
+ { abbreviation: 'ATS', description: 'Airline Transport Single Engine' },
+ { abbreviation: 'CFI', description: 'Certified Flight Instructor' },
+ {
+ abbreviation: 'CFII',
+ description: 'Certified Flight Instructor Instrument',
+ },
+ { abbreviation: 'IR', description: 'Instrument Rating' },
+ { abbreviation: 'MEI', description: 'Multi Engine Instructor' },
+ { abbreviation: 'ROTO', description: 'Rotorcraft; Rotary-Wing Aircraft' },
+ ],
+ };
+
+ const items = mapping[value.toUpperCase()] || [];
+
+ return items.map(item => `${item.abbreviation}: ${item.description}`);
+};
From 72cbc419742804ebc63a11bccd0a79e9e734ecea Mon Sep 17 00:00:00 2001
From: Adam Antonioli <132934480+adam-antonioli@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:44:05 -0500
Subject: [PATCH 09/34] MBMS-73710: Self-Service: Pre-Need: Integration:
Service Periods: New Component Design (#33504)
* MBMS-68435 change military history section flow pattern for pre-need form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* MBMS-68435 change military history section flow pattern for pre-need integration form
* Revert "MBMS-68435 change military history section flow pattern for pre-need integration form"
This reverts commit 3edd47bb0aaa323e692ddc5c4f6523a78daa188b.
* Revert "MBMS-68435 change military history section flow pattern for pre-need integration form"
This reverts commit 5a42e4cfa278f16eae0ba48309a12208c5fc74ca.
* Revert "MBMS-68435 change military history section flow pattern for pre-need integration form"
This reverts commit 22c713857bb2190533efb08abad92c9eccbbc248.
* MBMS-68435 update validation for military history section flow pattern for pre-need integration form
* MBMS-68435 update validation for military history section flow pattern for pre-need integration form
* MBMS-68435 Made highest rank work with platform components
* MBMS-68435 update validation for military history section flow pattern for pre-need integration form
* MBMS-73710 deleting unused files
* MBMS-73710 deleting unused function
* MBMS-73710 removing failing unit tests relating to new page and component for service periods for pre-need integration form
* MBMS-73710 refactoring form submit for pre-need integration
* MBMS-73710 removing commented code for pre-need integration
* MBMS-73710 reverting refactoring form submit for pre-need integration
* MBMS-73710 reapplying refactoring form submit for pre-need integration
* MBMS-73710 disabling another unit test for pre-need integration
* MBMS-73710 refactoring service period page titles for pre-need integration
* MBMS-73710 fix chapters for military history section of pre need integration form
* MBMS-73710 fix chapters for military history section of pre need integration form
* MBMS-73710 fix text of service periods of pre need integration form
---------
Co-authored-by: 122034971+ConnorJeff@users.noreply.github.com <122034971+ConnorJeff@users.noreply.github.com>
---
.../components/HighestRankAutoSuggest.jsx | 211 -
.../components/MilitaryAutoSuggestField.jsx | 96 -
.../pre-need-integration/config/form.jsx | 77 +-
.../config/pages/servicePeriodsPages.jsx | 570 +++
.../config/transformForSubmit.js | 21 +-
.../applicantMilitaryHistory.unit.spec.jsx | 104 +-
.../applicantMilitaryName.unit.spec.jsx | 114 +-
...icantMilitaryNameInformation.unit.spec.jsx | 126 +-
...itaryNameInformationPreparer.unit.spec.jsx | 126 +-
.../config/militaryDetails.unit.spec.jsx | 114 +-
.../tests/config/servicePeriods.unit.spec.jsx | 306 +-
...onsorMilitaryDetailsPreparer.unit.spec.jsx | 114 +-
.../sponsorMilitaryDetailsSelf.unit.spec.jsx | 114 +-
.../sponsorMilitaryHistory.unit.spec.jsx | 90 +-
.../config/sponsorMilitaryName.unit.spec.jsx | 114 +-
...onsorMilitaryNameInformation.unit.spec.jsx | 126 +-
.../pre-need-integration/utils/helpers.js | 105 +-
.../pre-need-integration/utils/rankEnums.js | 3951 +++++++++++++++
.../pre-need-integration/utils/rankLabels.js | 4369 +++++++++++++++++
19 files changed, 9720 insertions(+), 1128 deletions(-)
delete mode 100644 src/applications/pre-need-integration/components/HighestRankAutoSuggest.jsx
delete mode 100644 src/applications/pre-need-integration/components/MilitaryAutoSuggestField.jsx
create mode 100644 src/applications/pre-need-integration/config/pages/servicePeriodsPages.jsx
create mode 100644 src/applications/pre-need-integration/utils/rankEnums.js
create mode 100644 src/applications/pre-need-integration/utils/rankLabels.js
diff --git a/src/applications/pre-need-integration/components/HighestRankAutoSuggest.jsx b/src/applications/pre-need-integration/components/HighestRankAutoSuggest.jsx
deleted file mode 100644
index 3b51293f1772..000000000000
--- a/src/applications/pre-need-integration/components/HighestRankAutoSuggest.jsx
+++ /dev/null
@@ -1,211 +0,0 @@
-import React, { useEffect, useState, useCallback } from 'react';
-import { connect, useDispatch } from 'react-redux';
-import { setData } from 'platform/forms-system/src/js/actions';
-import PropTypes from 'prop-types';
-import AutoSuggest from './MilitaryAutoSuggestField';
-import jsonData from '../utils/Military Ranks.json';
-
-function HighestRankAutoSuggest({ formData, formContext, idSchema, uiSchema }) {
- const dispatch = useDispatch();
- const [branchOfService, setBranchOfService] = useState('');
- const [rankOptions, setRankOptions] = useState([]);
- const [rank, setRank] = useState('');
- const [index, setIndex] = useState(0);
- const [startDate, setStartDate] = useState('');
- const [endDate, setEndDate] = useState('');
-
- const extractIndex = id => {
- const match = id.match(/serviceRecords_(\d+)_highestRank/);
- return match ? parseInt(match[1], 10) : 0;
- };
-
- const handleSelectionChange = selection => {
- const highestRankTemp =
- typeof selection === 'string' ? selection : selection.key;
- if (selection.key)
- setRank(`${selection.key.toUpperCase()} - ${selection.value}`);
- else setRank(highestRankTemp);
-
- if (formData.application.veteran.serviceRecords) {
- const updatedFormData = {
- ...formData,
- application: {
- ...formData.application,
- veteran: {
- ...formData.application.veteran,
- serviceRecords: formData.application.veteran.serviceRecords.map(
- (record, idx) =>
- idx === index
- ? {
- ...record,
- highestRank: highestRankTemp,
- highestRankDescription: selection.value || undefined,
- }
- : record,
- ),
- },
- },
- };
-
- dispatch(setData(updatedFormData));
- }
- };
-
- // Parse the date string into a Date object. This is needed in order to play nicely
- // with the Military Ranks.json file
- const parseDate = dateString => {
- if (!dateString) return null;
- const parts = dateString.split('/');
- if (parts.length === 3) {
- const [month, day, year] = parts.map(part => part.padStart(2, '0'));
- return new Date(`${year}-${month}-${day}`);
- }
- return new Date(dateString);
- };
-
- // Get ranks for a specific branch and within the specified date range
- const getRanksForBranch = useCallback((branch, start, end) => {
- const serviceStartDate = start ? parseDate(start) : null;
- const serviceEndDate = end ? parseDate(end) : null;
-
- return jsonData
- .filter(row => {
- const rankStartDate = parseDate(row['Begin Date']);
- const rankEndDate = parseDate(row['End Date']);
- const isBranchMatch = row['Branch Of Service Code'] === branch;
-
- const isStartDateMatch =
- !serviceStartDate || !rankEndDate || rankEndDate >= serviceStartDate;
- const isEndDateMatch =
- !serviceEndDate || !rankStartDate || rankStartDate <= serviceEndDate;
-
- return isBranchMatch && isStartDateMatch && isEndDateMatch;
- })
- .map(row => ({
- key: row['Rank Code'],
- value: row['Rank Description'] || row['Rank Code'],
- }));
- }, []);
-
- useEffect(
- () => {
- const serviceRecords = formData?.application?.veteran?.serviceRecords;
- const currentIndex = extractIndex(idSchema?.$id);
- setIndex(currentIndex);
-
- if (serviceRecords) {
- const currentBranch = serviceRecords[currentIndex]?.serviceBranch;
- const currentStartDate = serviceRecords[currentIndex]?.dateRange?.from;
- const currentEndDate = serviceRecords[currentIndex]?.dateRange?.to;
-
- if (currentBranch !== branchOfService) {
- setBranchOfService(currentBranch);
- }
- if (currentStartDate !== startDate) {
- setStartDate(currentStartDate);
- }
- if (currentEndDate !== endDate) {
- setEndDate(currentEndDate);
- }
-
- const currentRank = serviceRecords[currentIndex];
- if (currentRank?.highestRank) {
- if (currentRank.highestRankDescription) {
- setRank(
- `${currentRank.highestRank} - ${
- currentRank.highestRankDescription
- }`,
- );
- } else if (typeof currentRank.highestRank !== 'object') {
- setRank(currentRank.highestRank);
- } else {
- setRank(' ');
- }
- }
- }
- },
- [formData, idSchema, branchOfService, startDate, endDate],
- );
-
- // Update rank options when branchOfService, startDate, or endDate changes
- useEffect(
- () => {
- if (branchOfService) {
- const newRankOptions = getRanksForBranch(
- branchOfService,
- startDate,
- endDate,
- );
- if (newRankOptions.length === 0) {
- const selection = { key: undefined, value: undefined };
- handleSelectionChange(selection);
- }
- setRankOptions(newRankOptions);
- }
- },
- [branchOfService, startDate, endDate, getRanksForBranch],
- );
-
- const hint = uiSchema['ui:options']?.hint || null;
-
- return (
-
- {!formContext.reviewMode &&
- hint &&
{hint}
}
- {!formContext.onReviewPage ||
- (formContext.onReviewPage && !formContext.reviewMode) ? (
-
- ) : (
-
- {rank}
-
- )}
-
{
- setValue(`${selection.key.toUpperCase()} - ${selection.value}`);
- onSelectionChange(selection);
- }}
- itemToString={itemToString}
- selectedItem={value}
- inputValue={inputValue}
- onInputValueChange={setInputValue}
- >
- {({ getInputProps, getItemProps, isOpen, highlightedIndex }) => (
-
-
{
- setInputValue(e.target.value);
- onSelectionChange(e.target.value);
- },
- })}
- />
- {isOpen && (
-
- {labels
- .map((label, index) => ({
- label,
- index,
- score: getMatchScore(inputValue, label),
- }))
- .filter(item => item.score > 0)
- .sort((a, b) => b.score - a.score)
- .slice(0, maxItems)
- .map((item, index) => (
-
- {`${item.label.key} - ${item.label.value}`}
-
- ))}
-
- )}
-
- );
-}
-
-export default MilitaryAutoSuggest;
diff --git a/src/applications/pre-need-integration/config/form.jsx b/src/applications/pre-need-integration/config/form.jsx
index 3876cfbb56de..1d6e3cd7216b 100644
--- a/src/applications/pre-need-integration/config/form.jsx
+++ b/src/applications/pre-need-integration/config/form.jsx
@@ -7,12 +7,9 @@ import preSubmitInfo from 'platform/forms/preSubmitInfo';
import { VA_FORM_IDS } from 'platform/forms/constants';
import { fileUploadUi } from '../utils/upload';
-import * as applicantMilitaryHistorySelf from './pages/applicantMilitaryHistorySelf';
-import * as applicantMilitaryHistoryPreparer from './pages/applicantMilitaryHistoryPreparer';
import * as applicantMilitaryName from './pages/applicantMilitaryName';
import * as applicantMilitaryNameInformation from './pages/applicantMilitaryNameInformation';
import * as applicantMilitaryNameInformationPreparer from './pages/applicantMilitaryNameInformationPreparer';
-import * as sponsorMilitaryHistory from './pages/sponsorMilitaryHistory';
import * as sponsorMilitaryName from './pages/sponsorMilitaryName';
import * as sponsorMilitaryNameInformation from './pages/sponsorMilitaryNameInformation';
import * as burialBenefits from './pages/burialBenefits';
@@ -41,6 +38,12 @@ import * as militaryDetailsSelf from './pages/militaryDetailsSelf';
import * as militaryDetailsPreparer from './pages/militaryDetailsPreparer';
import * as currentlyBuriedPersons from './pages/currentlyBuriedPersons';
import * as burialCemetery from './pages/burialCemetery';
+import {
+ servicePeriodsPagesVeteran,
+ servicePeriodsPagesNonVeteran,
+ servicePeriodsPagesPreparerVeteran,
+ servicePeriodsPagesPreparerNonVeteran,
+} from './pages/servicePeriodsPages';
import transformForSubmit from './transformForSubmit';
import prefillTransformer from './prefill-transformer';
@@ -442,7 +445,7 @@ const formConfig = {
},
},
},
- militaryHistory: {
+ militaryName: {
title: formData =>
isVeteran(formData)
? 'Applicant military history'
@@ -464,24 +467,21 @@ const formConfig = {
uiSchema: militaryDetailsPreparer.uiSchema,
schema: militaryDetailsPreparer.schema,
},
- // Two sets of military history pages dependent on
- // whether the applicant is the veteran or not.
- // If not, "Sponsor’s" precedes all the field labels.
- applicantMilitaryHistorySelf: {
- title: 'Your service period(s)',
- path: 'applicant-military-history',
+ sponsorMilitaryDetailsSelf: {
+ title: "Sponsor's military details",
+ path: 'sponsor-military-details',
depends: formData =>
- isVeteran(formData) && !isAuthorizedAgent(formData),
- uiSchema: applicantMilitaryHistorySelf.uiSchema,
- schema: applicantMilitaryHistorySelf.schema,
+ !isVeteran(formData) && !isAuthorizedAgent(formData),
+ uiSchema: sponsorMilitaryDetailsSelf.uiSchema,
+ schema: sponsorMilitaryDetailsSelf.schema,
},
- applicantMilitaryHistoryPreparer: {
- title: "Applicant's service period(s)",
- path: 'applicant-military-history-preparer',
+ sponsorMilitaryDetailsPreparer: {
+ title: "Sponsor's military details",
+ path: 'sponsor-military-details-preparer',
depends: formData =>
- isVeteran(formData) && isAuthorizedAgent(formData),
- uiSchema: applicantMilitaryHistoryPreparer.uiSchema,
- schema: applicantMilitaryHistoryPreparer.schema,
+ !isVeteran(formData) && isAuthorizedAgent(formData),
+ uiSchema: sponsorMilitaryDetailsPreparer.uiSchema,
+ schema: sponsorMilitaryDetailsPreparer.schema,
},
applicantMilitaryNameSelf: {
path: 'applicant-military-name',
@@ -518,29 +518,6 @@ const formConfig = {
uiSchema: applicantMilitaryNameInformationPreparer.uiSchema,
schema: applicantMilitaryNameInformationPreparer.schema,
},
- sponsorMilitaryDetailsSelf: {
- title: "Sponsor's military details",
- path: 'sponsor-military-details',
- depends: formData =>
- !isVeteran(formData) && !isAuthorizedAgent(formData),
- uiSchema: sponsorMilitaryDetailsSelf.uiSchema,
- schema: sponsorMilitaryDetailsSelf.schema,
- },
- sponsorMilitaryDetailsPreparer: {
- title: "Sponsor's military details",
- path: 'sponsor-military-details-preparer',
- depends: formData =>
- !isVeteran(formData) && isAuthorizedAgent(formData),
- uiSchema: sponsorMilitaryDetailsPreparer.uiSchema,
- schema: sponsorMilitaryDetailsPreparer.schema,
- },
- sponsorMilitaryHistory: {
- path: 'sponsor-military-history',
- title: 'Sponsor’s service period(s)',
- depends: formData => !isVeteran(formData),
- uiSchema: sponsorMilitaryHistory.uiSchema,
- schema: sponsorMilitaryHistory.schema,
- },
sponsorMilitaryName: {
path: 'sponsor-military-name',
depends: formData =>
@@ -568,6 +545,22 @@ const formConfig = {
},
},
},
+ militaryHistoryVeteran: {
+ title: 'Applicant service period(s)',
+ pages: servicePeriodsPagesVeteran,
+ },
+ militaryHistoryPreparerVeteran: {
+ title: 'Applicant’s service period(s)',
+ pages: servicePeriodsPagesPreparerVeteran,
+ },
+ militaryHistoryNonVeteran: {
+ title: 'Sponsor service period(s)',
+ pages: servicePeriodsPagesNonVeteran,
+ },
+ militaryHistoryPreparerNonVeteran: {
+ title: 'Sponsor service period(s)',
+ pages: servicePeriodsPagesPreparerNonVeteran,
+ },
burialBenefits: {
title: 'Burial benefits',
pages: {
diff --git a/src/applications/pre-need-integration/config/pages/servicePeriodsPages.jsx b/src/applications/pre-need-integration/config/pages/servicePeriodsPages.jsx
new file mode 100644
index 000000000000..8607067b48b8
--- /dev/null
+++ b/src/applications/pre-need-integration/config/pages/servicePeriodsPages.jsx
@@ -0,0 +1,570 @@
+import {
+ arrayBuilderItemFirstPageTitleUI,
+ arrayBuilderYesNoSchema,
+ arrayBuilderYesNoUI,
+ titleUI,
+} from '~/platform/forms-system/src/js/web-component-patterns';
+import { arrayBuilderPages } from '~/platform/forms-system/src/js/patterns/array-builder';
+import { formatReviewDate } from 'platform/forms-system/src/js/helpers';
+
+import * as autosuggest from 'platform/forms-system/src/js/definitions/autosuggest';
+import dateRangeUI from 'platform/forms-system/src/js/definitions/dateRange';
+import { serviceLabels } from '../../utils/labels';
+import {
+ isVeteran,
+ isAuthorizedAgent,
+ hasServiceRecord,
+ validateMilitaryHistory,
+} from '../../utils/helpers';
+import rankEnums from '../../utils/rankEnums';
+import { rankLabels } from '../../utils/rankLabels';
+
+/** @type {ArrayBuilderOptions} */
+const options = {
+ arrayPath: 'serviceRecords',
+ nounSingular: 'service period',
+ nounPlural: 'service periods',
+ required: true,
+ isItemIncomplete: item => !item?.serviceBranch, // include all required fields here
+ maxItems: 3,
+ text: {
+ getItemName: item => {
+ return item?.serviceBranch ? serviceLabels[item.serviceBranch] : null;
+ },
+ alertMaxItems: () =>
+ 'You have added the maximum number of allowed service periods for this application. You may edit or delete a service period or choose to continue the application.',
+ cardDescription: item => {
+ const dateRangeFrom = item?.dateRange?.from;
+ const dateRangeTo = item?.dateRange?.to;
+
+ let range = '';
+
+ if (dateRangeFrom) {
+ range += formatReviewDate(dateRangeFrom);
+ }
+
+ if (dateRangeFrom && dateRangeTo) {
+ range += ' - ';
+ }
+
+ if (dateRangeTo) {
+ range += formatReviewDate(dateRangeTo);
+ }
+
+ return range;
+ },
+ cancelAddTitle: props => {
+ const servicePeriodName = props.getItemName(props.itemData);
+
+ if (servicePeriodName === null) {
+ return `Cancel adding this service period`;
+ }
+ return `Cancel adding ${servicePeriodName} service period`;
+ },
+ cancelAddNo: () => 'No, keep this',
+ deleteTitle: props => {
+ const servicePeriodName = props.getItemName(props.itemData);
+
+ return `Are you sure you want to remove this ${servicePeriodName} service period?`;
+ },
+ deleteDescription: props => {
+ const servicePeriodName = props.getItemName(props.itemData);
+
+ return `This will remove ${servicePeriodName} and all the information from the service period records.`;
+ },
+ deleteNeedAtLeastOneDescription: () =>
+ 'If you remove this service period, we’ll take you to a screen where you can add another service period. You’ll need to list at least one service period for us to process this form.',
+ deleteYes: () => 'Yes, remove this',
+ deleteNo: () => 'No, keep this',
+ cancelEditTitle: props => {
+ const servicePeriodName = props.getItemName(props.itemData);
+
+ return `Cancel editing ${servicePeriodName} service period?`;
+ },
+ cancelEditDescription: () =>
+ 'If you cancel, you’ll lose any changes you made on this screen and you will be returned to the service periods review page.',
+ cancelEditYes: () => 'Yes, cancel',
+ cancelEditNo: () => 'No, keep this',
+ summaryTitle: formData =>
+ hasServiceRecord(formData)
+ ? 'Veteran’s service period(s)'
+ : 'Review service period records',
+ },
+};
+
+/** @returns {PageSchema} */
+const introPage = {
+ uiSchema: {
+ ...titleUI(
+ 'Service period(s)',
+ 'In the next few questions, we’ll ask you about service periods. You must add at least one branch of service. You can add up to 3 service periods.',
+ ),
+ },
+ schema: {
+ type: 'object',
+ properties: {},
+ },
+};
+
+/**
+ * This page is skipped on the first loop for required flow
+ * Cards are populated on this page above the uiSchema if items are present
+ *
+ * @returns {PageSchema}
+ */
+const summaryPage = {
+ uiSchema: {
+ 'view:hasServicePeriods': arrayBuilderYesNoUI(options),
+ },
+ schema: {
+ type: 'object',
+ properties: {
+ 'view:hasServicePeriods': arrayBuilderYesNoSchema,
+ },
+ required: ['view:hasServicePeriods'],
+ },
+};
+
+function handleTitle(isVet, isPrep, vetTitle, sponsorTitle, prepTitle) {
+ if (isVet) {
+ if (isPrep) {
+ return prepTitle;
+ }
+ return vetTitle;
+ }
+ return sponsorTitle;
+}
+
+/** @returns {PageSchema} */
+function servicePeriodInformationPage(isVet, isPrep) {
+ return {
+ uiSchema: {
+ ...arrayBuilderItemFirstPageTitleUI({
+ title: handleTitle(
+ isVet,
+ isPrep,
+ 'Your service period(s)',
+ 'Sponsor’s service periods(s)',
+ 'Applicant’s service period(s)',
+ ),
+ nounSingular: 'service period',
+ servicePeriod: options.servicePeriod,
+ hasMultipleItemPages: false,
+ }),
+ 'ui:order': [
+ 'serviceBranch',
+ 'dateRange',
+ 'highestRank',
+ 'dischargeType',
+ 'nationalGuardState',
+ ],
+ 'ui:validations': [validateMilitaryHistory],
+ 'ui:options': {
+ useAllFormData: true,
+ },
+ serviceBranch: autosuggest.uiSchema(
+ handleTitle(
+ isVet,
+ isPrep,
+ 'Branch of service',
+ 'Sponsor’s branch of service',
+ 'Applicant’s branch of service',
+ ),
+ null,
+ {
+ 'ui:options': {
+ labels: serviceLabels,
+ },
+ },
+ ),
+ dateRange: dateRangeUI(
+ handleTitle(
+ isVet,
+ isPrep,
+ 'Service start date',
+ 'Sponsor’s service start date',
+ 'Applicant’s service start date',
+ ),
+ handleTitle(
+ isVet,
+ isPrep,
+ 'Service end date',
+ 'Sponsor’s service end date',
+ 'Applicant’s service end date',
+ ),
+ ),
+ dischargeType: {
+ 'ui:title': handleTitle(
+ isVet,
+ isPrep,
+ 'Discharge character of service',
+ 'Sponsor’s discharge character of service',
+ 'Applicant’s discharge character of service',
+ ),
+ 'ui:options': {
+ labels: {
+ 1: 'Honorable',
+ 2: 'General',
+ 3: 'Entry Level Separation/Uncharacterized',
+ 4: 'Other Than Honorable',
+ 5: 'Bad Conduct',
+ 6: 'Dishonorable',
+ 7: 'Other',
+ },
+ },
+ },
+ highestRank: autosuggest.uiSchema('Highest rank attained', null, {
+ 'ui:options': {
+ labels: rankLabels,
+ hint:
+ 'This field may clear if the branch of service or service start and end dates are updated.',
+ },
+ }),
+ nationalGuardState: {
+ 'ui:title': 'State (for National Guard Service only)',
+ 'ui:options': {
+ hideIf: (formData, index) => {
+ if (index !== null) {
+ return !['AG', 'NG'].includes(
+ formData?.serviceRecords[index]?.serviceBranch,
+ );
+ }
+ return !['AG', 'NG'].includes(formData?.serviceBranch);
+ },
+ },
+ },
+ },
+ schema: {
+ type: 'object',
+ properties: {
+ dateRange: {
+ type: 'object',
+ properties: {
+ from: {
+ type: 'string',
+ format: 'date',
+ },
+ to: {
+ type: 'string',
+ format: 'date',
+ },
+ },
+ },
+ serviceBranch: {
+ type: 'string',
+ enum: [
+ 'AL',
+ 'FS',
+ 'FT',
+ 'ES',
+ 'CM',
+ 'C3',
+ 'C2',
+ 'C4',
+ 'C7',
+ 'C5',
+ 'GS',
+ 'CI',
+ 'FP',
+ 'CS',
+ 'CV',
+ 'XG',
+ 'CB',
+ 'FF',
+ 'GP',
+ 'MO',
+ 'NO',
+ 'NN',
+ 'NM',
+ 'PA',
+ 'PG',
+ 'KC',
+ 'PS',
+ 'RO',
+ 'CF',
+ 'CE',
+ 'AF',
+ 'XF',
+ 'AG',
+ 'AR',
+ 'AC',
+ 'AA',
+ 'AT',
+ 'NG',
+ 'XR',
+ 'CO',
+ 'CA',
+ 'CC',
+ 'GC',
+ 'CG',
+ 'XC',
+ 'MC',
+ 'MM',
+ 'NA',
+ 'XA',
+ 'CD',
+ 'PH',
+ 'GU',
+ 'WP',
+ 'WA',
+ 'WS',
+ 'WR',
+ ],
+ },
+ dischargeType: {
+ type: 'string',
+ enum: ['1', '2', '3', '4', '5', '6', '7'],
+ },
+ highestRank: {
+ type: 'string',
+ enum: rankEnums,
+ },
+ nationalGuardState: {
+ type: 'string',
+ maxLength: 3,
+ enum: [
+ 'AL',
+ 'AK',
+ 'AZ',
+ 'AR',
+ 'CA',
+ 'CO',
+ 'CT',
+ 'DE',
+ 'DC',
+ 'FL',
+ 'GA',
+ 'GU',
+ 'HI',
+ 'ID',
+ 'IL',
+ 'IN',
+ 'IA',
+ 'KS',
+ 'KY',
+ 'LA',
+ 'ME',
+ 'MD',
+ 'MA',
+ 'MI',
+ 'MN',
+ 'MS',
+ 'MO',
+ 'MT',
+ 'NE',
+ 'NV',
+ 'NH',
+ 'NJ',
+ 'NM',
+ 'NY',
+ 'NC',
+ 'ND',
+ 'OH',
+ 'OK',
+ 'OR',
+ 'PA',
+ 'PR',
+ 'RI',
+ 'SC',
+ 'SD',
+ 'TN',
+ 'TX',
+ 'UT',
+ 'VT',
+ 'VI',
+ 'VA',
+ 'WA',
+ 'WV',
+ 'WI',
+ 'WY',
+ ],
+ enumNames: [
+ 'Alabama',
+ 'Alaska',
+ 'Arizona',
+ 'Arkansas',
+ 'California',
+ 'Colorado',
+ 'Connecticut',
+ 'Delaware',
+ 'District Of Columbia',
+ 'Florida',
+ 'Georgia',
+ 'Guam',
+ 'Hawaii',
+ 'Idaho',
+ 'Illinois',
+ 'Indiana',
+ 'Iowa',
+ 'Kansas',
+ 'Kentucky',
+ 'Louisiana',
+ 'Maine',
+ 'Maryland',
+ 'Massachusetts',
+ 'Michigan',
+ 'Minnesota',
+ 'Mississippi',
+ 'Missouri',
+ 'Montana',
+ 'Nebraska',
+ 'Nevada',
+ 'New Hampshire',
+ 'New Jersey',
+ 'New Mexico',
+ 'New York',
+ 'North Carolina',
+ 'North Dakota',
+ 'Ohio',
+ 'Oklahoma',
+ 'Oregon',
+ 'Pennsylvania',
+ 'Puerto Rico',
+ 'Rhode Island',
+ 'South Carolina',
+ 'South Dakota',
+ 'Tennessee',
+ 'Texas',
+ 'Utah',
+ 'Vermont',
+ 'Virgin Islands',
+ 'Virginia',
+ 'Washington',
+ 'West Virginia',
+ 'Wisconsin',
+ 'Wyoming',
+ ],
+ },
+ },
+ required: ['serviceBranch'],
+ },
+ };
+}
+
+const servicePeriodInformationPageVeteran = servicePeriodInformationPage(
+ true,
+ false,
+);
+
+const servicePeriodInformationPagePreparerVeteran = servicePeriodInformationPage(
+ true,
+ true,
+);
+
+const servicePeriodInformationPageNonVeteran = servicePeriodInformationPage(
+ false,
+ false,
+);
+
+const servicePeriodInformationPagePreparerNonVeteran = servicePeriodInformationPage(
+ false,
+ true,
+);
+
+export const servicePeriodsPagesVeteran = arrayBuilderPages(
+ options,
+ pageBuilder => ({
+ servicePeriodsVeteran: pageBuilder.introPage({
+ title: 'Service periods',
+ path: 'service-periods-veteran',
+ uiSchema: introPage.uiSchema,
+ schema: introPage.schema,
+ depends: formData => isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ servicePeriodsSummaryVeteran: pageBuilder.summaryPage({
+ title: 'Your service period(s)',
+ path: 'service-periods-summary-veteran',
+ uiSchema: summaryPage.uiSchema,
+ schema: summaryPage.schema,
+ depends: formData => isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ servicePeriodInformationPageVeteran: pageBuilder.itemPage({
+ title: 'Service period',
+ path: 'service-periods-veteran/:index/service-period',
+ uiSchema: servicePeriodInformationPageVeteran.uiSchema,
+ schema: servicePeriodInformationPageVeteran.schema,
+ depends: formData => isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ }),
+);
+
+export const servicePeriodsPagesPreparerVeteran = arrayBuilderPages(
+ options,
+ pageBuilder => ({
+ servicePeriodsPreparerVeteran: pageBuilder.introPage({
+ title: 'Service periods',
+ path: 'service-periods-preparer-veteran',
+ uiSchema: introPage.uiSchema,
+ schema: introPage.schema,
+ depends: formData => isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ servicePeriodsSummaryPreparerVeteran: pageBuilder.summaryPage({
+ title: 'Applicant’s service period(s)',
+ path: 'service-periods-summary-preparer-veteran',
+ uiSchema: summaryPage.uiSchema,
+ schema: summaryPage.schema,
+ depends: formData => isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ servicePeriodInformationPagePreparerVeteran: pageBuilder.itemPage({
+ title: 'Service period',
+ path: 'service-periods-preparer-veteran/:index/service-period',
+ uiSchema: servicePeriodInformationPagePreparerVeteran.uiSchema,
+ schema: servicePeriodInformationPagePreparerVeteran.schema,
+ depends: formData => isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ }),
+);
+
+export const servicePeriodsPagesNonVeteran = arrayBuilderPages(
+ options,
+ pageBuilder => ({
+ servicePeriodsNonVeteran: pageBuilder.introPage({
+ title: 'Service periods',
+ path: 'service-periods-nonveteran',
+ uiSchema: introPage.uiSchema,
+ schema: introPage.schema,
+ depends: formData => !isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ servicePeriodsSummaryNonVeteran: pageBuilder.summaryPage({
+ title: 'Sponsor’s service period(s)',
+ path: 'service-periods-summary-nonveteran',
+ uiSchema: summaryPage.uiSchema,
+ schema: summaryPage.schema,
+ depends: formData => !isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ servicePeriodInformationPageNonVeteran: pageBuilder.itemPage({
+ title: 'Service period',
+ path: 'service-periods-nonveteran/:index/service-period',
+ uiSchema: servicePeriodInformationPageNonVeteran.uiSchema,
+ schema: servicePeriodInformationPageNonVeteran.schema,
+ depends: formData => !isVeteran(formData) && !isAuthorizedAgent(formData),
+ }),
+ }),
+);
+
+export const servicePeriodsPagesPreparerNonVeteran = arrayBuilderPages(
+ options,
+ pageBuilder => ({
+ servicePeriodsPreparerNonVeteran: pageBuilder.introPage({
+ title: 'Service periods',
+ path: 'service-periods-preparer-nonveteran',
+ uiSchema: introPage.uiSchema,
+ schema: introPage.schema,
+ depends: formData => !isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ servicePeriodsSummaryPreparerNonVeteran: pageBuilder.summaryPage({
+ title: 'Applicant’s service period(s)',
+ path: 'service-periods-summary-preparer-nonveteran',
+ uiSchema: summaryPage.uiSchema,
+ schema: summaryPage.schema,
+ depends: formData => !isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ servicePeriodInformationPagePreparerNonVeteran: pageBuilder.itemPage({
+ title: 'Service period',
+ path: 'service-periods-preparer-nonveteran/:index/service-period',
+ uiSchema: servicePeriodInformationPagePreparerNonVeteran.uiSchema,
+ schema: servicePeriodInformationPagePreparerNonVeteran.schema,
+ depends: formData => !isVeteran(formData) && isAuthorizedAgent(formData),
+ }),
+ }),
+);
diff --git a/src/applications/pre-need-integration/config/transformForSubmit.js b/src/applications/pre-need-integration/config/transformForSubmit.js
index ebc1516ab1d2..923b6e7a0f1f 100644
--- a/src/applications/pre-need-integration/config/transformForSubmit.js
+++ b/src/applications/pre-need-integration/config/transformForSubmit.js
@@ -13,17 +13,30 @@ const escapedCharacterReplacer = (_key, value) => {
};
export default function transformForSubmit(formConfig, form) {
+ const formCopy = {
+ ...form,
+ data: {
+ ...form.data,
+ application: {
+ ...form.data.application,
+ veteran: {
+ ...form.data.application.veteran,
+ serviceRecords: form.data.serviceRecords,
+ },
+ },
+ },
+ };
+ delete formCopy.data.serviceRecords;
const transformedData = JSON.parse(
- formsSystemTransformForSubmit(formConfig, form),
+ formsSystemTransformForSubmit(formConfig, formCopy),
);
-
if (
- form.data.application.applicant.applicantRelationshipToClaimant === 'Self'
+ formCopy.data.application.applicant.applicantRelationshipToClaimant ===
+ 'Self'
) {
delete transformedData.application.applicant.name;
delete transformedData.application.applicant.mailingAddress;
}
-
return JSON.stringify(
{
...transformedData,
diff --git a/src/applications/pre-need-integration/tests/config/applicantMilitaryHistory.unit.spec.jsx b/src/applications/pre-need-integration/tests/config/applicantMilitaryHistory.unit.spec.jsx
index 282155142206..587586d1196c 100644
--- a/src/applications/pre-need-integration/tests/config/applicantMilitaryHistory.unit.spec.jsx
+++ b/src/applications/pre-need-integration/tests/config/applicantMilitaryHistory.unit.spec.jsx
@@ -1,58 +1,58 @@
-import React from 'react';
-import { expect } from 'chai';
-import ReactTestUtils from 'react-dom/test-utils';
-import { Provider } from 'react-redux';
-import {
- getFormDOM,
- DefinitionTester,
-} from 'platform/testing/unit/schemaform-utils.jsx';
-import { $$ } from 'platform/forms-system/src/js/utilities/ui';
-import configureMockStore from 'redux-mock-store';
-import formConfig from '../../config/form';
+// import React from 'react';
+// import { expect } from 'chai';
+// import ReactTestUtils from 'react-dom/test-utils';
+// import { Provider } from 'react-redux';
+// import {
+// getFormDOM,
+// DefinitionTester,
+// } from 'platform/testing/unit/schemaform-utils.jsx';
+// import { $$ } from 'platform/forms-system/src/js/utilities/ui';
+// import configureMockStore from 'redux-mock-store';
+// import formConfig from '../../config/form';
-const mockStore = configureMockStore();
+// const mockStore = configureMockStore();
-const payload = {
- application: {
- veteran: {
- serviceRecords: [
- {
- serviceBranch: 'ARMY',
- highestRank: 'SGT',
- },
- ],
- },
- },
-};
+// const payload = {
+// application: {
+// veteran: {
+// serviceRecords: [
+// {
+// serviceBranch: 'ARMY',
+// highestRank: 'SGT',
+// },
+// ],
+// },
+// },
+// };
-const store = mockStore({
- form: {
- data: payload,
- },
-});
+// const store = mockStore({
+// form: {
+// data: payload,
+// },
+// });
-describe('Pre-need applicant military history', () => {
- const {
- schema,
- uiSchema,
- } = formConfig.chapters.militaryHistory.pages.applicantMilitaryHistorySelf;
+// describe('Pre-need applicant military history', () => {
+// const {
+// schema,
+// uiSchema,
+// } = formConfig.chapters.militaryHistory.pages.applicantMilitaryHistorySelf;
- it('should render HighestRankAutoSuggest without crashing', () => {
- const form = ReactTestUtils.renderIntoDocument(
- ,
- );
+// it('should render HighestRankAutoSuggest without crashing', () => {
+// const form = ReactTestUtils.renderIntoDocument(
+// ,
+// );
- const formDOM = getFormDOM(form);
- expect($$('input', formDOM).length).to.equal(4);
- expect($$('select', formDOM).length).to.equal(5);
- });
-});
+// const formDOM = getFormDOM(form);
+// expect($$('input', formDOM).length).to.equal(4);
+// expect($$('select', formDOM).length).to.equal(5);
+// });
+// });
diff --git a/src/applications/pre-need-integration/tests/config/applicantMilitaryName.unit.spec.jsx b/src/applications/pre-need-integration/tests/config/applicantMilitaryName.unit.spec.jsx
index 2b4b3bc0ac74..6dc54ed7668b 100644
--- a/src/applications/pre-need-integration/tests/config/applicantMilitaryName.unit.spec.jsx
+++ b/src/applications/pre-need-integration/tests/config/applicantMilitaryName.unit.spec.jsx
@@ -1,67 +1,67 @@
-import React from 'react';
-import { expect } from 'chai';
-import sinon from 'sinon';
-import { mount } from 'enzyme';
+// import React from 'react';
+// import { expect } from 'chai';
+// import sinon from 'sinon';
+// import { mount } from 'enzyme';
-import {
- DefinitionTester,
- selectRadio,
-} from 'platform/testing/unit/schemaform-utils.jsx';
-import formConfig from '../../config/form';
+// import {
+// DefinitionTester,
+// selectRadio,
+// } from 'platform/testing/unit/schemaform-utils.jsx';
+// import formConfig from '../../config/form';
-describe('Pre-need applicant military name', () => {
- const {
- schema,
- uiSchema,
- } = formConfig.chapters.militaryHistory.pages.applicantMilitaryNameSelf;
+// describe('Pre-need applicant military name', () => {
+// const {
+// schema,
+// uiSchema,
+// } = formConfig.chapters.militaryHistory.pages.applicantMilitaryNameSelf;
- it('should render', () => {
- const form = mount(
-
- ,
- );
-
- expect(form.find('input').length).to.equal(inputCount);
- expect(form.find('select').length).to.equal(5);
- form.unmount();
- });
-
- it('should not submit empty form', () => {
- const onSubmit = sinon.spy();
- const form = mount(
-
- ,
- );
-
- form.find('form').simulate('submit');
-
- expect(form.find('.usa-input-error').length).to.equal(2);
- expect(onSubmit.called).to.be.false;
- form.unmount();
- });
-
- it.skip('should add another service period', () => {
- const onSubmit = sinon.spy();
- const form = mount(
-
- ,
- );
-
- expect(form.find('input').length).to.equal(inputCount);
- expect(form.find('select').length).to.equal(5);
-
- form.find('.va-growable-add-btn').simulate('click');
-
- expect(
- form
- .find('.va-growable-background')
- .first()
- .text(),
- ).to.contain('Allied Forces');
- form.unmount();
- });
-
- it('should submit with valid data', () => {
- const onSubmit = sinon.spy();
- const form = mount(
-
- ,
- );
-
- fillDate(
- form,
- 'root_application_veteran_serviceRecords_0_dateRange_from',
- '2002-1-1',
- );
- fillDate(
- form,
- 'root_application_veteran_serviceRecords_0_dateRange_to',
- '2003-1-1',
- );
-
- form.find('form').simulate('submit');
-
- expect(form.find('.usa-input-error').length).to.equal(0);
- expect(onSubmit.called).to.be.true;
- form.unmount();
- });
- }
-
- const { sponsorMilitaryHistory } = formConfig.chapters.militaryHistory.pages;
- const {
- applicantMilitaryHistorySelf,
- } = formConfig.chapters.militaryHistory.pages;
-
- describe('sponsor', () => {
- servicePeriodsTests(sponsorMilitaryHistory);
- });
-
- describe('applicant', () => {
- servicePeriodsTests(applicantMilitaryHistorySelf);
- });
-});
+// import React from 'react';
+// import { expect } from 'chai';
+// import sinon from 'sinon';
+// import { mount } from 'enzyme';
+// import { Provider } from 'react-redux';
+// import configureMockStore from 'redux-mock-store';
+
+// import {
+// DefinitionTester,
+// fillDate,
+// } from 'platform/testing/unit/schemaform-utils.jsx';
+// import formConfig from '../../config/form';
+
+// const mockStore = configureMockStore();
+
+// const payload = {
+// application: {
+// claimant: {
+// dateOfBirth: '2000-1-1', // This DOB should be before the service dates being tested
+// },
+// veteran: {
+// serviceRecords: [
+// {
+// serviceBranch: 'AL',
+// dateRange: {
+// from: '2002-1-1',
+// to: '2003-1-1',
+// },
+// },
+// ],
+// },
+// },
+// };
+
+// const store = mockStore({
+// form: {
+// data: payload,
+// },
+// });
+
+// describe('Pre-need service periods', () => {
+// function servicePeriodsTests({ schema, uiSchema }, inputCount = 4) {
+// it('should render', () => {
+// const form = mount(
+//
+// ,
+// );
+
+// expect(form.find('input').length).to.equal(inputCount);
+// expect(form.find('select').length).to.equal(5);
+// form.unmount();
+// });
+
+// it('should not submit empty form', () => {
+// const onSubmit = sinon.spy();
+// const form = mount(
+//
+// ,
+// );
+
+// form.find('form').simulate('submit');
+
+// expect(form.find('.usa-input-error').length).to.equal(2);
+// expect(onSubmit.called).to.be.false;
+// form.unmount();
+// });
+
+// it.skip('should add another service period', () => {
+// const onSubmit = sinon.spy();
+// const form = mount(
+//
+// ,
+// );
+
+// expect(form.find('input').length).to.equal(inputCount);
+// expect(form.find('select').length).to.equal(5);
+
+// form.find('.va-growable-add-btn').simulate('click');
+
+// expect(
+// form
+// .find('.va-growable-background')
+// .first()
+// .text(),
+// ).to.contain('Allied Forces');
+// form.unmount();
+// });
+
+// it('should submit with valid data', () => {
+// const onSubmit = sinon.spy();
+// const form = mount(
+//
+// ,
+// );
+
+// fillDate(
+// form,
+// 'root_application_veteran_serviceRecords_0_dateRange_from',
+// '2002-1-1',
+// );
+// fillDate(
+// form,
+// 'root_application_veteran_serviceRecords_0_dateRange_to',
+// '2003-1-1',
+// );
+
+// form.find('form').simulate('submit');
+
+// expect(form.find('.usa-input-error').length).to.equal(0);
+// expect(onSubmit.called).to.be.true;
+// form.unmount();
+// });
+// }
+
+// const { sponsorMilitaryHistory } = formConfig.chapters.militaryHistory.pages;
+// const {
+// applicantMilitaryHistorySelf,
+// } = formConfig.chapters.militaryHistory.pages;
+
+// describe('sponsor', () => {
+// servicePeriodsTests(sponsorMilitaryHistory);
+// });
+
+// describe('applicant', () => {
+// servicePeriodsTests(applicantMilitaryHistorySelf);
+// });
+// });
diff --git a/src/applications/pre-need-integration/tests/config/sponsorMilitaryDetailsPreparer.unit.spec.jsx b/src/applications/pre-need-integration/tests/config/sponsorMilitaryDetailsPreparer.unit.spec.jsx
index baf71023bce3..048da80cd94e 100644
--- a/src/applications/pre-need-integration/tests/config/sponsorMilitaryDetailsPreparer.unit.spec.jsx
+++ b/src/applications/pre-need-integration/tests/config/sponsorMilitaryDetailsPreparer.unit.spec.jsx
@@ -1,67 +1,67 @@
-import React from 'react';
-import { expect } from 'chai';
-import sinon from 'sinon';
-import { mount } from 'enzyme';
+// import React from 'react';
+// import { expect } from 'chai';
+// import sinon from 'sinon';
+// import { mount } from 'enzyme';
-import {
- DefinitionTester,
- fillData,
-} from 'platform/testing/unit/schemaform-utils.jsx';
-import formConfig from '../../config/form';
+// import {
+// DefinitionTester,
+// fillData,
+// } from 'platform/testing/unit/schemaform-utils.jsx';
+// import formConfig from '../../config/form';
-describe('Pre-need sponsor military details', () => {
- const {
- schema,
- uiSchema,
- } = formConfig.chapters.militaryHistory.pages.sponsorMilitaryDetailsPreparer;
+// describe('Pre-need sponsor military details', () => {
+// const {
+// schema,
+// uiSchema,
+// } = formConfig.chapters.militaryHistory.pages.sponsorMilitaryDetailsPreparer;
- it('should render', () => {
- const form = mount(
-
- ,
- );
+// it('should render', () => {
+// const form = mount(
+//
+// ,
+// );
- expect(form.find('input').length).to.equal(4);
- expect(form.find('select').length).to.equal(5);
- form.unmount();
- });
-});
+// expect(form.find('input').length).to.equal(4);
+// expect(form.find('select').length).to.equal(5);
+// form.unmount();
+// });
+// });
diff --git a/src/applications/pre-need-integration/tests/config/sponsorMilitaryName.unit.spec.jsx b/src/applications/pre-need-integration/tests/config/sponsorMilitaryName.unit.spec.jsx
index 289a5d0d2a90..10811b6697b1 100644
--- a/src/applications/pre-need-integration/tests/config/sponsorMilitaryName.unit.spec.jsx
+++ b/src/applications/pre-need-integration/tests/config/sponsorMilitaryName.unit.spec.jsx
@@ -1,67 +1,67 @@
-import React from 'react';
-import { expect } from 'chai';
-import sinon from 'sinon';
-import { mount } from 'enzyme';
+// import React from 'react';
+// import { expect } from 'chai';
+// import sinon from 'sinon';
+// import { mount } from 'enzyme';
-import {
- DefinitionTester,
- selectRadio,
-} from 'platform/testing/unit/schemaform-utils.jsx';
-import formConfig from '../../config/form';
+// import {
+// DefinitionTester,
+// selectRadio,
+// } from 'platform/testing/unit/schemaform-utils.jsx';
+// import formConfig from '../../config/form';
-describe('Pre-need sponsor military name', () => {
- const {
- schema,
- uiSchema,
- } = formConfig.chapters.militaryHistory.pages.sponsorMilitaryName;
+// describe('Pre-need sponsor military name', () => {
+// const {
+// schema,
+// uiSchema,
+// } = formConfig.chapters.militaryHistory.pages.sponsorMilitaryName;
- it('should render', () => {
- const form = mount(
-
Date: Fri, 3 Jan 2025 11:45:46 -0500
Subject: [PATCH 10/34] Misc QA Update for Appoint a Representative MVP
(#33869)
* change 24/7 to Monday through Friday
* add note to /veteran-contact-mailing
---
.../components/ProfileNotUpdatedNote.jsx | 2 +-
.../pages/veteran/veteranContactMailing.js | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
index f7d78e98ef72..3440b61c783e 100644
--- a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
+++ b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
@@ -32,7 +32,7 @@ function ProfileNotUpdatedNote(props) {
you can call us at{' '}
Date: Fri, 3 Jan 2025 11:58:21 -0500
Subject: [PATCH 11/34] Use platform's renderWithStoreAndRouter (#33731)
Fix a flaky unit test
---
.../VAFacilityPageV2.eligibility.unit.spec.js | 8 +++--
src/applications/vaos/tests/mocks/setup.js | 30 ++++++-------------
2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/applications/vaos/new-appointment/components/VAFacilityPage/VAFacilityPageV2.eligibility.unit.spec.js b/src/applications/vaos/new-appointment/components/VAFacilityPage/VAFacilityPageV2.eligibility.unit.spec.js
index ef19c8a51200..772e0c040282 100644
--- a/src/applications/vaos/new-appointment/components/VAFacilityPage/VAFacilityPageV2.eligibility.unit.spec.js
+++ b/src/applications/vaos/new-appointment/components/VAFacilityPage/VAFacilityPageV2.eligibility.unit.spec.js
@@ -179,9 +179,11 @@ describe('VAOS Page: VAFacilityPage eligibility check', () => {
await waitFor(() => {
screen.queryByText(/San Diego VA Medical Center/i);
});
- expect(screen.baseElement).to.contain.text(
- 'You’ll need to call to schedule at this facility',
- );
+ expect(
+ await screen.findByText(
+ /You.ll need to call to schedule at this facility/,
+ ),
+ ).to.exist;
expect(await screen.queryByText(/Continue/)).not.to.exist;
});
diff --git a/src/applications/vaos/tests/mocks/setup.js b/src/applications/vaos/tests/mocks/setup.js
index 5d52d2459c72..38141a7a8b7b 100644
--- a/src/applications/vaos/tests/mocks/setup.js
+++ b/src/applications/vaos/tests/mocks/setup.js
@@ -1,7 +1,7 @@
/** @module testing/mocks/setup */
import React from 'react';
-import { Route, Router } from 'react-router-dom';
+import { Route } from 'react-router-dom';
import { createMemoryHistory } from 'history-v4';
import { combineReducers, applyMiddleware, createStore } from 'redux';
import thunk from 'redux-thunk';
@@ -10,7 +10,7 @@ import sinon from 'sinon';
import { fireEvent, waitFor } from '@testing-library/dom';
import { commonReducer } from '@department-of-veterans-affairs/platform-startup/store';
-import { renderInReduxProvider } from '@department-of-veterans-affairs/platform-testing/react-testing-library-helpers';
+import { renderWithStoreAndRouter as platformRenderWithStoreAndRouter } from '~/platform/testing/unit/react-testing-library-helpers';
import { cleanup } from '@testing-library/react';
import reducers from '../../redux/reducer';
@@ -101,25 +101,13 @@ export function renderWithStoreAndRouter(
ui,
{ initialState, store = null, path = '/', history = null },
) {
- const testStore =
- store ||
- createStore(
- combineReducers({ ...commonReducer, ...reducers }),
- initialState,
- applyMiddleware(thunk),
- );
-
- const historyObject = history || createTestHistory(path);
- const screen = renderInReduxProvider(
- {ui} ,
- {
- store: testStore,
- initialState,
- reducers,
- },
- );
-
- return { ...screen, history: historyObject };
+ return platformRenderWithStoreAndRouter(ui, {
+ initialState,
+ reducers,
+ store,
+ path,
+ history,
+ });
}
/**
From 2379526aa1022497306a0883b0f0e62593c6e502 Mon Sep 17 00:00:00 2001
From: Mike Moyer <87040148+mmoyer-va@users.noreply.github.com>
Date: Fri, 3 Jan 2025 12:08:55 -0500
Subject: [PATCH 12/34] Additional test coverage (#33660)
---
.../MissingRecordsError.unit.spec.jsx | 40 +++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 src/applications/mhv-medical-records/tests/components/DownloadRecords/MissingRecordsError.unit.spec.jsx
diff --git a/src/applications/mhv-medical-records/tests/components/DownloadRecords/MissingRecordsError.unit.spec.jsx b/src/applications/mhv-medical-records/tests/components/DownloadRecords/MissingRecordsError.unit.spec.jsx
new file mode 100644
index 000000000000..889d4fd409b4
--- /dev/null
+++ b/src/applications/mhv-medical-records/tests/components/DownloadRecords/MissingRecordsError.unit.spec.jsx
@@ -0,0 +1,40 @@
+import { expect } from 'chai';
+import React from 'react';
+import { renderWithStoreAndRouter } from '@department-of-veterans-affairs/platform-testing/react-testing-library-helpers';
+import reducer from '../../../reducers';
+import MissingRecordsError from '../../../components/DownloadRecords/MissingRecordsError';
+
+describe('MissingRecordsError', () => {
+ it('should not display if no records are missing (nothing passed)', () => {
+ const screen = renderWithStoreAndRouter(
Select records and download report
@@ -418,10 +434,12 @@ const DownloadFileType = props => {
onVaValueChange={e => {
setFileType(e.detail.value);
handleDdRum(e);
+ selectFileTypeHandler(e);
}}
+ error={fileTypeError}
>
-
-
+
+
{downloadStarted &&
}
@@ -449,6 +467,8 @@ const DownloadFileType = props => {
className="vads-u-margin-y--0p5"
data-testid="download-report-button"
onClick={() => {
+ selectFileTypeHandler();
+ focusOnErrorField();
if (fileType === 'pdf') {
generatePdf().then(() => history.push('/download'));
} else if (fileType === 'txt') {
diff --git a/src/applications/mhv-medical-records/components/MrBreadcrumbs.jsx b/src/applications/mhv-medical-records/components/MrBreadcrumbs.jsx
index 61205a9aaf92..d5debacfe2e8 100644
--- a/src/applications/mhv-medical-records/components/MrBreadcrumbs.jsx
+++ b/src/applications/mhv-medical-records/components/MrBreadcrumbs.jsx
@@ -29,7 +29,7 @@ const MrBreadcrumbs = () => {
const textContent = document.querySelector('h1')?.textContent;
const searchIndex = new URLSearchParams(window.location.search);
const page = searchIndex.get('page');
- const { labId } = useParams();
+ const { labId, vaccineId, summaryId, allergyId, conditionId } = useParams();
useEffect(
() => {
@@ -82,6 +82,11 @@ const MrBreadcrumbs = () => {
? crumbsList[crumbsList.length - 1].href
: `/${locationBasePath}`;
+ const backToAllergiesBreadcrumb = () =>
+ location.pathname.includes(`/allergies/${allergyId}`)
+ ? history.goBack()
+ : `/${locationBasePath}`;
+
if (!phase0p5Flag) {
// TODO: !crumbsList will always be truthy due to the useEffect above
// This should logic should be looked at and refactored when we deprecate the feature toggle
@@ -111,21 +116,28 @@ const MrBreadcrumbs = () => {
if (
phase0p5Flag &&
- location.pathname.includes(`/${locationBasePath}/${labId}`)
+ location.pathname.includes(
+ `/${locationBasePath}/${labId ||
+ vaccineId ||
+ summaryId ||
+ allergyId ||
+ conditionId}`,
+ )
) {
return (
-
+
Other reports you can download
{accessErrors()}
-
+
+
+ Continuity of Care Document (VA Health Summary)
+
This Continuity of Care Document (CCD) is a summary of your VA
medical records that you can share with non-VA providers in your
@@ -362,11 +361,8 @@ const DownloadReportPage = ({ runningUnitTest }) => {
/>
)}
-
+
+ Self-entered health information
This report includes all the health information you entered yourself
in the previous version of My HealtheVet.
diff --git a/src/applications/mhv-medical-records/tests/components/MrBreadcrumbs.unit.spec.jsx b/src/applications/mhv-medical-records/tests/components/MrBreadcrumbs.unit.spec.jsx
index c200964d66d3..1c4fc793bfe9 100644
--- a/src/applications/mhv-medical-records/tests/components/MrBreadcrumbs.unit.spec.jsx
+++ b/src/applications/mhv-medical-records/tests/components/MrBreadcrumbs.unit.spec.jsx
@@ -207,6 +207,6 @@ describe('MrBreadcrumbs component', () => {
},
);
const { getByTestId } = screen;
- expect(getByTestId('lab-id-breadcrumbs')).to.exist;
+ expect(getByTestId('mr-breadcrumbs')).to.exist;
});
});
diff --git a/src/applications/mhv-medical-records/tests/e2e/medical-records-validate-breadcrumbs.cypress.spec.js b/src/applications/mhv-medical-records/tests/e2e/medical-records-validate-breadcrumbs.cypress.spec.js
index 610d74278915..1d02efc565df 100644
--- a/src/applications/mhv-medical-records/tests/e2e/medical-records-validate-breadcrumbs.cypress.spec.js
+++ b/src/applications/mhv-medical-records/tests/e2e/medical-records-validate-breadcrumbs.cypress.spec.js
@@ -18,7 +18,7 @@ describe('Medical Records validate breadcrumbs', () => {
allergyDetail.id,
allergyDetail,
);
- const breadcrumbsText = 'Allergies and reactions';
+ const breadcrumbsText = 'Back';
AllergyDetailsPage.verifyBreadcrumbs(breadcrumbsText);
AllergyDetailsPage.clickBreadcrumbs(breadcrumbsText);
diff --git a/src/applications/mhv-medical-records/tests/e2e/pages/AllergyDetailsPage.js b/src/applications/mhv-medical-records/tests/e2e/pages/AllergyDetailsPage.js
index 921933b6a954..d683c9cc218b 100644
--- a/src/applications/mhv-medical-records/tests/e2e/pages/AllergyDetailsPage.js
+++ b/src/applications/mhv-medical-records/tests/e2e/pages/AllergyDetailsPage.js
@@ -48,16 +48,15 @@ class AllergyDetailsPage extends BaseDetailsPage {
};
verifyBreadcrumbs = breadcrumbsText => {
- cy.get('[data-testid="breadcrumbs"]').contains(`${breadcrumbsText}`, {
+ cy.get('[data-testid="mr-breadcrumbs"]').contains(`${breadcrumbsText}`, {
matchCase: false,
});
};
clickBreadcrumbs = breadcrumb => {
- cy.get('[data-testid="breadcrumbs"]')
- .find('span')
+ cy.get('[data-testid="mr-breadcrumbs"]')
+ .find('a')
.contains(breadcrumb)
- .parent()
.click({ waitForAnimations: true });
};
diff --git a/src/applications/mhv-medical-records/tests/e2e/pages/DownloadAllPage.js b/src/applications/mhv-medical-records/tests/e2e/pages/DownloadAllPage.js
index 1fd821618cea..1e010487c7d3 100644
--- a/src/applications/mhv-medical-records/tests/e2e/pages/DownloadAllPage.js
+++ b/src/applications/mhv-medical-records/tests/e2e/pages/DownloadAllPage.js
@@ -4,13 +4,13 @@ import DownloadAllPatient from '../fixtures/labs-and-tests/downloadAllPatient.js
class DownloadAllPage {
verifyBreadcrumbs = breadcrumbs => {
- cy.get('[data-testid="breadcrumbs"]').contains(breadcrumbs, {
+ cy.get('[data-testid="mr-breadcrumbs"]').contains(breadcrumbs, {
matchCase: false,
});
};
clickBreadcrumbs = breadcrumb => {
- cy.get('[data-testid="breadcrumbs"]')
+ cy.get('[data-testid="mr-breadcrumbs"]')
.find('span')
.contains(breadcrumb)
.parent()
diff --git a/src/applications/mhv-medical-records/tests/e2e/pages/NotesDetailsPage.js b/src/applications/mhv-medical-records/tests/e2e/pages/NotesDetailsPage.js
index b8cbb6fae589..4fd7310b3013 100644
--- a/src/applications/mhv-medical-records/tests/e2e/pages/NotesDetailsPage.js
+++ b/src/applications/mhv-medical-records/tests/e2e/pages/NotesDetailsPage.js
@@ -50,7 +50,7 @@ class NotesDetailsPage extends BaseDetailsPage {
clickBreadCrumbsLink = breadcrumb => {
// Click Back to Care summaries and notes
- cy.get('[data-testid="breadcrumbs"]')
+ cy.get('[data-testid="mr-breadcrumbs"]')
.find('a')
.eq(breadcrumb)
.click();
diff --git a/src/applications/mhv-medical-records/tests/e2e/pages/VitalsDetailsPage.js b/src/applications/mhv-medical-records/tests/e2e/pages/VitalsDetailsPage.js
index f3086ec17b1a..719d8bed5ed1 100644
--- a/src/applications/mhv-medical-records/tests/e2e/pages/VitalsDetailsPage.js
+++ b/src/applications/mhv-medical-records/tests/e2e/pages/VitalsDetailsPage.js
@@ -47,7 +47,7 @@ class VitalsDetailsPage extends BaseDetailsPage {
clickBreadCrumbsLink = (breadcrumb = 0) => {
// Click Back to "Vitals" Page
- cy.get('[data-testid="breadcrumbs"]')
+ cy.get('[data-testid="mr-breadcrumbs"]')
.find('a')
.eq(breadcrumb)
.click();
diff --git a/src/applications/mhv-medical-records/util/constants.js b/src/applications/mhv-medical-records/util/constants.js
index ad2c1d7f5897..9b2bf253392a 100644
--- a/src/applications/mhv-medical-records/util/constants.js
+++ b/src/applications/mhv-medical-records/util/constants.js
@@ -468,6 +468,22 @@ export const Breadcrumbs = {
WEIGHT: { href: Paths.WEIGHT, label: 'Weight', isRouterLink: true },
};
+export const DateRangeValues = {
+ ANY: 'any',
+ LAST3: 3,
+ LAST6: 6,
+ LAST12: 12,
+ CUSTOM: 'custom',
+};
+
+export const DateRangeOptions = [
+ { value: DateRangeValues.ANY, label: 'Any' },
+ { value: DateRangeValues.LAST3, label: 'Last 3 months' },
+ { value: DateRangeValues.LAST6, label: 'Last 6 months' },
+ { value: DateRangeValues.LAST12, label: 'Last 12 months' },
+ { value: DateRangeValues.CUSTOM, label: 'Custom' },
+];
+
export const CernerAlertContent = {
MR_LANDING_PAGE: {
linkPath: '/pages/health_record/comprehensive_record/health_summaries',
diff --git a/src/applications/mhv-medical-records/util/helpers.js b/src/applications/mhv-medical-records/util/helpers.js
index 2c75b8f95a01..9becdfdaac18 100644
--- a/src/applications/mhv-medical-records/util/helpers.js
+++ b/src/applications/mhv-medical-records/util/helpers.js
@@ -4,6 +4,7 @@ import { datadogRum } from '@datadog/browser-rum';
import { snakeCase } from 'lodash';
import { generatePdf } from '@department-of-veterans-affairs/platform-pdf/exports';
import { formatDateLong } from '@department-of-veterans-affairs/platform-utilities/exports';
+import { focusElement } from '@department-of-veterans-affairs/platform-utilities/ui';
import { format as dateFnsFormat, parseISO, isValid } from 'date-fns';
import {
EMPTY_FIELD,
@@ -678,6 +679,26 @@ export const formatDateInLocalTimezone = date => {
return `${formattedDate} ${localTimeZoneName}`;
};
+/**
+ * Form Helper to focus on error field
+ */
+export const focusOnErrorField = () => {
+ setTimeout(() => {
+ const errors = document.querySelectorAll('[error]:not([error=""])');
+ const firstError =
+ errors.length > 0 &&
+ (errors[0]?.shadowRoot?.querySelector('select, input, textarea') ||
+ errors[0]
+ ?.querySelector('va-checkbox')
+ ?.shadowRoot?.querySelector('input') ||
+ errors[0].querySelector('input'));
+
+ if (firstError) {
+ focusElement(firstError);
+ }
+ }, 300);
+};
+
export const formatUserDob = userProfile => {
return userProfile?.dob ? formatDateLong(userProfile.dob) : 'Not found';
};
From c61434e24d3de9f53c7da358c78b8b2be9f441cc Mon Sep 17 00:00:00 2001
From: Michael Clement <18408628+michaelclement@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:28:26 -0600
Subject: [PATCH 15/34] Cleanup imports and IVC TODOs - IVC CHAMPVA forms
(#33829)
* reference issue linked for address bug
* updated imports and tests for
* moved constant into shared
---
.../ivc-champva/10-10D/config/constants.js | 3 ---
.../ivc-champva/10-10D/config/form.js | 2 +-
.../10-7959C/chapters/applicantInformation.js | 2 +-
.../chapters/healthInsuranceInformation.js | 10 +++-----
.../10-7959C/chapters/medicareInformation.js | 11 +++-----
.../10-7959C/components/CustomAttestation.jsx | 2 +-
.../ivc-champva/10-7959C/config/form.js | 2 +-
.../ivc-champva/10-7959C/helpers/utilities.js | 25 ++++++++-----------
.../tests/helpers/utilities.unit.spec.js | 7 ++----
.../ApplicantRelationshipPage.jsx | 2 +-
.../ivc-champva/shared/constants.js | 3 +++
.../ivc-champva/shared/tests/helpers.js | 1 +
.../ivc-champva/shared/utilities.js | 2 +-
13 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/src/applications/ivc-champva/10-10D/config/constants.js b/src/applications/ivc-champva/10-10D/config/constants.js
index 8c1ea16dc68a..a897ecca9583 100644
--- a/src/applications/ivc-champva/10-10D/config/constants.js
+++ b/src/applications/ivc-champva/10-10D/config/constants.js
@@ -67,6 +67,3 @@ export const FILE_UPLOAD_ORDER = [
'applicantOhiCard',
'applicantOtherInsuranceCertification',
];
-
-export const ADDITIONAL_FILES_HINT =
- 'Depending on your response, you may need to submit additional documents with this application.';
diff --git a/src/applications/ivc-champva/10-10D/config/form.js b/src/applications/ivc-champva/10-10D/config/form.js
index d6cc34d60785..1128df06b39d 100644
--- a/src/applications/ivc-champva/10-10D/config/form.js
+++ b/src/applications/ivc-champva/10-10D/config/form.js
@@ -50,7 +50,7 @@ import {
certifierNameValidation,
certifierAddressValidation,
} from '../helpers/validations';
-import { ADDITIONAL_FILES_HINT } from './constants';
+import { ADDITIONAL_FILES_HINT } from '../../shared/constants';
import { applicantWording, getAgeInYears } from '../../shared/utilities';
import { sponsorNameDobConfig } from '../pages/Sponsor/sponsorInfoConfig';
import { acceptableFiles } from '../components/Sponsor/sponsorFileUploads';
diff --git a/src/applications/ivc-champva/10-7959C/chapters/applicantInformation.js b/src/applications/ivc-champva/10-7959C/chapters/applicantInformation.js
index e273271bf763..d8ec946548f8 100644
--- a/src/applications/ivc-champva/10-7959C/chapters/applicantInformation.js
+++ b/src/applications/ivc-champva/10-7959C/chapters/applicantInformation.js
@@ -15,7 +15,7 @@ import {
titleUI,
titleSchema,
} from 'platform/forms-system/src/js/web-component-patterns';
-import { nameWording } from '../helpers/utilities';
+import { nameWording } from '../../shared/utilities';
export const blankSchema = { type: 'object', properties: {} };
diff --git a/src/applications/ivc-champva/10-7959C/chapters/healthInsuranceInformation.js b/src/applications/ivc-champva/10-7959C/chapters/healthInsuranceInformation.js
index cc88fe0f74c3..ceb4fcc24ee3 100644
--- a/src/applications/ivc-champva/10-7959C/chapters/healthInsuranceInformation.js
+++ b/src/applications/ivc-champva/10-7959C/chapters/healthInsuranceInformation.js
@@ -12,18 +12,16 @@ import {
yesNoUI,
yesNoSchema,
} from 'platform/forms-system/src/js/web-component-patterns';
-import { nameWording, nameWordingExt } from '../helpers/utilities';
+import { nameWording } from '../../shared/utilities';
+import { nameWordingExt } from '../helpers/utilities';
import {
fileWithMetadataSchema,
fileUploadBlurb,
} from '../../shared/components/fileUploads/attachments';
import { fileUploadUi as fileUploadUI } from '../../shared/components/fileUploads/upload';
+import { ADDITIONAL_FILES_HINT } from '../../shared/constants';
import { blankSchema } from './applicantInformation';
-// TODO: move to /shared
-const additionalFilesHint =
- 'Depending on your response, you may need to submit additional documents with this application.';
-
const MEDIGAP = {
A: 'Medigap Plan A',
B: 'Medigap Plan B',
@@ -64,7 +62,7 @@ export function applicantHasInsuranceSchema(isPrimary) {
isPrimary ? '' : 'any other'
} medical health insurance information to provide or update at this time?`,
'ui:options': {
- hint: additionalFilesHint,
+ hint: ADDITIONAL_FILES_HINT,
},
};
},
diff --git a/src/applications/ivc-champva/10-7959C/chapters/medicareInformation.js b/src/applications/ivc-champva/10-7959C/chapters/medicareInformation.js
index c33bf171b042..354c758b762e 100644
--- a/src/applications/ivc-champva/10-7959C/chapters/medicareInformation.js
+++ b/src/applications/ivc-champva/10-7959C/chapters/medicareInformation.js
@@ -11,16 +11,13 @@ import {
radioUI,
radioSchema,
} from 'platform/forms-system/src/js/web-component-patterns';
-import { nameWording } from '../helpers/utilities';
+import { nameWording } from '../../shared/utilities';
import { fileUploadUi as fileUploadUI } from '../../shared/components/fileUploads/upload';
import {
fileWithMetadataSchema,
fileUploadBlurb,
} from '../../shared/components/fileUploads/attachments';
-
-// TODO put in /shared
-const additionalFilesHint =
- 'Depending on your response, you may need to submit additional documents with this application.';
+import { ADDITIONAL_FILES_HINT } from '../../shared/constants';
const effectiveDateHint =
'You may find your effective date on the front of your Medicare card near "Coverage starts" or "Effective date."';
@@ -45,7 +42,7 @@ export const applicantHasMedicareSchema = {
false,
true,
)} have Medicare information to provide or update at this time?`,
- 'ui:options': { hint: additionalFilesHint },
+ 'ui:options': { hint: ADDITIONAL_FILES_HINT },
};
},
}),
@@ -282,7 +279,7 @@ export const applicantHasMedicareDSchema = {
false,
true,
)} have Medicare Part D information to provide or update at this time?`,
- 'ui:options': { hint: additionalFilesHint },
+ 'ui:options': { hint: ADDITIONAL_FILES_HINT },
};
},
}),
diff --git a/src/applications/ivc-champva/10-7959C/components/CustomAttestation.jsx b/src/applications/ivc-champva/10-7959C/components/CustomAttestation.jsx
index 54a9fb44b076..6220d71e21b0 100644
--- a/src/applications/ivc-champva/10-7959C/components/CustomAttestation.jsx
+++ b/src/applications/ivc-champva/10-7959C/components/CustomAttestation.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import FormSignature from 'platform/forms-system/src/js/components/FormSignature';
import get from 'platform/utilities/data/get';
-import { nameWording } from '../helpers/utilities';
+import { nameWording } from '../../shared/utilities';
/*
Custom attestation/signature/statement of truth component.
diff --git a/src/applications/ivc-champva/10-7959C/config/form.js b/src/applications/ivc-champva/10-7959C/config/form.js
index 98767b71fb78..172f195e027e 100644
--- a/src/applications/ivc-champva/10-7959C/config/form.js
+++ b/src/applications/ivc-champva/10-7959C/config/form.js
@@ -6,7 +6,7 @@ import manifest from '../manifest.json';
import IntroductionPage from '../containers/IntroductionPage';
import ConfirmationPage from '../containers/ConfirmationPage';
import transformForSubmit from './submitTransformer';
-import { nameWording } from '../helpers/utilities';
+import { nameWording } from '../../shared/utilities';
import FileFieldWrapped from '../components/FileUploadWrapper';
import { prefillTransformer } from './prefillTransformer';
import SubmissionError from '../../shared/components/SubmissionError';
diff --git a/src/applications/ivc-champva/10-7959C/helpers/utilities.js b/src/applications/ivc-champva/10-7959C/helpers/utilities.js
index 36a23a3cea9f..1e48d0726316 100644
--- a/src/applications/ivc-champva/10-7959C/helpers/utilities.js
+++ b/src/applications/ivc-champva/10-7959C/helpers/utilities.js
@@ -1,4 +1,4 @@
-import { nameWording as sharedNameWording } from '../../shared/utilities';
+import { nameWording } from '../../shared/utilities';
export function isRequiredFile(formContext, requiredFiles) {
return Object.keys(formContext?.schema?.properties || {}).filter(v =>
@@ -8,19 +8,16 @@ export function isRequiredFile(formContext, requiredFiles) {
: '(Optional)';
}
-// Return either 'your' or the applicant's name depending
-export function nameWording(
- formData,
- isPosessive = true,
- cap = true,
- firstNameOnly = false,
-) {
- // Moved contents of this function to shared utilities file,
- // leaving this stub in place so existing imports still work.
- // TODO: update all imports of nameWording to point directly to shared
- return sharedNameWording(formData, isPosessive, cap, firstNameOnly);
-}
-
+/**
+ * Return a few different forms of direct address to the user.
+ * Main logic is housed in `nameWording` fn.
+ * e.g.,
+ * posessive: ["your" | "Jim's"],
+ * nonPosessive: ["you" | "Jim"],
+ * beingVerb: ["you're" | "Jim is"]
+ * @param {Object} formData Obj containing `certifierRole` and `applicantName` properties
+ * @returns Object with three properties, each mapped to a string value
+ */
export function nameWordingExt(formData) {
const posessive = nameWording(formData, true, false, true);
const nonPosessive = nameWording(formData, false, false, true);
diff --git a/src/applications/ivc-champva/10-7959C/tests/helpers/utilities.unit.spec.js b/src/applications/ivc-champva/10-7959C/tests/helpers/utilities.unit.spec.js
index 8c0f182a8e02..810764bbe98b 100644
--- a/src/applications/ivc-champva/10-7959C/tests/helpers/utilities.unit.spec.js
+++ b/src/applications/ivc-champva/10-7959C/tests/helpers/utilities.unit.spec.js
@@ -1,13 +1,10 @@
import { expect } from 'chai';
-import {
- isRequiredFile,
- nameWording,
- nameWordingExt,
-} from '../../helpers/utilities';
+import { isRequiredFile, nameWordingExt } from '../../helpers/utilities';
import { requiredFiles } from '../../config/constants';
import {
concatStreets,
getObjectsWithAttachmentId,
+ nameWording,
} from '../../../shared/utilities';
describe('isRequiredFile', () => {
diff --git a/src/applications/ivc-champva/shared/components/applicantLists/ApplicantRelationshipPage.jsx b/src/applications/ivc-champva/shared/components/applicantLists/ApplicantRelationshipPage.jsx
index 99560429cb56..dea49ddfb1f7 100644
--- a/src/applications/ivc-champva/shared/components/applicantLists/ApplicantRelationshipPage.jsx
+++ b/src/applications/ivc-champva/shared/components/applicantLists/ApplicantRelationshipPage.jsx
@@ -8,7 +8,7 @@ import { titleUI } from 'platform/forms-system/src/js/web-component-patterns';
import FormNavButtons from 'platform/forms-system/src/js/components/FormNavButtons';
import PropTypes from 'prop-types';
-import { ADDITIONAL_FILES_HINT } from '../../../10-10D/config/constants';
+import { ADDITIONAL_FILES_HINT } from '../../constants';
import { applicantWording } from '../../utilities';
/*
diff --git a/src/applications/ivc-champva/shared/constants.js b/src/applications/ivc-champva/shared/constants.js
index 4547e6ccc69c..7a63523e6b0f 100644
--- a/src/applications/ivc-champva/shared/constants.js
+++ b/src/applications/ivc-champva/shared/constants.js
@@ -21,3 +21,6 @@ export const ConfirmationPagePropTypes = {
}),
name: PropTypes.string,
};
+
+export const ADDITIONAL_FILES_HINT =
+ 'Depending on your response, you may need to submit additional documents with this application.';
diff --git a/src/applications/ivc-champva/shared/tests/helpers.js b/src/applications/ivc-champva/shared/tests/helpers.js
index b1c644e6c6aa..94dac1498fe2 100644
--- a/src/applications/ivc-champva/shared/tests/helpers.js
+++ b/src/applications/ivc-champva/shared/tests/helpers.js
@@ -44,6 +44,7 @@ export const fillAddressWebComponentPattern = (fieldName, addressObject) => {
fillTextWebComponent(`${fieldName}_street3`, addressObject.street3);
// List loop fields sometimes fail on this because the state renders as a text input
// TODO: look into that bug. For now, set the test to check which field type we have
+ // https://github.com/department-of-veterans-affairs/va.gov-team/issues/83806
cy.get('body').then(body => {
if (body.find(`va-select[name="root_${fieldName}_state"]`).length > 0)
selectDropdownWebComponent(`${fieldName}_state`, addressObject.state);
diff --git a/src/applications/ivc-champva/shared/utilities.js b/src/applications/ivc-champva/shared/utilities.js
index 7596b7c15321..84c0904bc8b2 100644
--- a/src/applications/ivc-champva/shared/utilities.js
+++ b/src/applications/ivc-champva/shared/utilities.js
@@ -5,7 +5,7 @@ import { waitForShadowRoot } from 'platform/utilities/ui/webComponents';
* Returns either a form of 'you', or the applicant's full name based
* on the formData's `certifierRole` property. Assumes presences of an
* `applicantName` key.
- * @param {object} formData Obj containing `certifierRole` and `applicantName
+ * @param {object} formData Obj containing `certifierRole` and `applicantName`
* @param {boolean} isPosessive `true` if we want posessive form, `false` otherwise
* @param {boolean} cap `true` if we want to capitalize first letter, `false` to leave as-is
* @param {boolean} firstNameOnly `true` if we want just applicant's first name, `false` for full name
From fd997c40d7b58a0879b1cd3d7383cdace847fc94 Mon Sep 17 00:00:00 2001
From: Hemesh Patel <49699643+hemeshvpatel@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:30:04 -0600
Subject: [PATCH 16/34] add mock for health facility, fix logic for postal and
location of residence, clean up, fix confirmation page (#33855)
---
.../ask-va/components/RequireSignInModal.jsx | 2 +-
src/applications/ask-va/config/helpers.jsx | 78 +-
.../config/schema-helpers/formFlowHelper.js | 16 +-
src/applications/ask-va/constants.js | 1 +
src/applications/ask-va/containers/App.jsx | 6 +
.../ask-va/containers/ConfirmationPage.jsx | 2 +-
.../ask-va/containers/DashboardCards.jsx | 4 +-
.../ask-va/containers/DashboardCardsMock.jsx | 284 ------
.../ask-va/containers/ResponseInboxPage.jsx | 2 +-
.../containers/ResponseInboxPageMock.jsx | 269 -----
.../containers/YourVAHealthFacility.jsx | 16 +
.../ask-va/containers/mockInquiryReplyData.js | 304 ------
src/applications/ask-va/utils/mockData.js | 938 +++++-------------
13 files changed, 378 insertions(+), 1544 deletions(-)
delete mode 100644 src/applications/ask-va/containers/DashboardCardsMock.jsx
delete mode 100644 src/applications/ask-va/containers/ResponseInboxPageMock.jsx
delete mode 100644 src/applications/ask-va/containers/mockInquiryReplyData.js
diff --git a/src/applications/ask-va/components/RequireSignInModal.jsx b/src/applications/ask-va/components/RequireSignInModal.jsx
index fd539d544d3b..16d0a6e4c94b 100644
--- a/src/applications/ask-va/components/RequireSignInModal.jsx
+++ b/src/applications/ask-va/components/RequireSignInModal.jsx
@@ -1,9 +1,9 @@
import { VaModal } from '@department-of-veterans-affairs/component-library/dist/react-bindings';
+import { toggleLoginModal } from '@department-of-veterans-affairs/platform-site-wide/actions';
import { focusElement } from 'platform/utilities/ui';
import PropTypes from 'prop-types';
import React, { useEffect } from 'react';
import { useDispatch } from 'react-redux';
-import { toggleLoginModal } from '~/platform/site-wide/user-nav/actions';
const RequireSignInModal = ({ onClose, show, restrictedItem, message }) => {
const dispatch = useDispatch();
diff --git a/src/applications/ask-va/config/helpers.jsx b/src/applications/ask-va/config/helpers.jsx
index 2c4cd0c3b57e..baeefa6c0427 100644
--- a/src/applications/ask-va/config/helpers.jsx
+++ b/src/applications/ask-va/config/helpers.jsx
@@ -5,6 +5,7 @@ import React from 'react';
import {
CategoryEducation,
CategoryGuardianshipCustodianshipFiduciaryIssues,
+ CategoryHealthCare,
CategoryHousingAssistanceAndHomeLoans,
CategoryVeteranReadinessAndEmployment,
CHAPTER_3,
@@ -264,7 +265,6 @@ export const isLocationOfResidenceRequired = data => {
selectTopic,
whoIsYourQuestionAbout,
isQuestionAboutVeteranOrSomeoneElse,
- yourHealthFacility,
} = data;
// Check if location is required based on contact preference
@@ -272,7 +272,7 @@ export const isLocationOfResidenceRequired = data => {
return false;
}
- // Guardianship and VR&E rules
+ // Guardianship, VR&E , and Health rules
const GuardianshipAndVRE =
(selectCategory === CategoryGuardianshipCustodianshipFiduciaryIssues ||
selectCategory === CategoryVeteranReadinessAndEmployment) &&
@@ -353,11 +353,6 @@ export const isLocationOfResidenceRequired = data => {
return true;
}
- // Medical Facility was required
- if (yourHealthFacility) {
- return true;
- }
-
// Default to false if none of the conditions are met
return false;
};
@@ -382,7 +377,7 @@ export const isPostalCodeRequired = data => {
return false;
}
- // Guardianship and VR&E rules
+ // Guardianship, VR&E , and Health rules
const GuardianshipAndVRE =
(selectCategory === CategoryGuardianshipCustodianshipFiduciaryIssues ||
selectCategory === CategoryVeteranReadinessAndEmployment) &&
@@ -392,6 +387,10 @@ export const isPostalCodeRequired = data => {
selectCategory === CategoryEducation &&
selectTopic === TopicVeteranReadinessAndEmploymentChapter31;
+ const HealthCare = selectCategory === CategoryHealthCare;
+
+ const HealthFacilityNotSelected = !yourHealthFacility;
+
// About myself
// Flow 1.1
if (
@@ -402,6 +401,14 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.MYSELF &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.VETERAN &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// Flow 1.2
if (
@@ -412,6 +419,14 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.MYSELF &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.FAMILY_MEMBER &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// About someone else
// Flow 2.1
@@ -423,6 +438,14 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.SOMEONE_ELSE &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.VETERAN &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// Flow 2.2.1
if (
@@ -435,6 +458,16 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.SOMEONE_ELSE &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.FAMILY_MEMBER &&
+ isQuestionAboutVeteranOrSomeoneElse ===
+ isQuestionAboutVeteranOrSomeoneElseLabels.VETERAN &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// Flow 2.2.2
if (
@@ -447,6 +480,16 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.SOMEONE_ELSE &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.FAMILY_MEMBER &&
+ isQuestionAboutVeteranOrSomeoneElse ===
+ isQuestionAboutVeteranOrSomeoneElseLabels.SOMEONE_ELSE &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// Flow 2.3
if (
@@ -459,17 +502,32 @@ export const isPostalCodeRequired = data => {
) {
return true;
}
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.SOMEONE_ELSE &&
+ relationshipToVeteran === relationshipOptionsSomeoneElse.WORK &&
+ isQuestionAboutVeteranOrSomeoneElse ===
+ isQuestionAboutVeteranOrSomeoneElseLabels.VETERAN &&
+ HealthFacilityNotSelected
+ ) {
+ return true;
+ }
// Flow 3.1
// eslint-disable-next-line sonarjs/prefer-single-boolean-return
if (
+ (GuardianshipAndVRE || EducationAndVRE) &&
whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.GENERAL &&
statesRequiringPostalCode.includes(veteransLocationOfResidence)
) {
return true;
}
-
- if (selectCategory === 'Health care' && !yourHealthFacility) {
+ // eslint-disable-next-line sonarjs/prefer-single-boolean-return
+ if (
+ HealthCare &&
+ whoIsYourQuestionAbout === whoIsYourQuestionAboutLabels.GENERAL &&
+ HealthFacilityNotSelected
+ ) {
return true;
}
diff --git a/src/applications/ask-va/config/schema-helpers/formFlowHelper.js b/src/applications/ask-va/config/schema-helpers/formFlowHelper.js
index 995f20e19484..9cf9e234518d 100644
--- a/src/applications/ask-va/config/schema-helpers/formFlowHelper.js
+++ b/src/applications/ask-va/config/schema-helpers/formFlowHelper.js
@@ -519,11 +519,11 @@ export const aboutMyselfRelationshipFamilyMemberPages = flowPages(
const aboutSomeoneElseRelationshipVeteran = [
'aboutYourRelationshipToFamilyMember',
'aboutYourFamilyMember',
- 'familyMembersLocationOfResidence',
- 'familyMembersPostalCode',
'yourVAHealthFacility',
'theirVREInformation',
'theirVRECounselor',
+ 'familyMembersLocationOfResidence',
+ 'familyMembersPostalCode',
'stateOfProperty',
'aboutYourself',
'yourBranchOfService',
@@ -551,11 +551,11 @@ const aboutSomeoneElseRelationshipFamilyMemberAboutVeteran = [
'moreAboutYourRelationshipToVeteran',
'aboutTheVeteran',
'dateOfDeath',
- 'veteransLocationOfResidence',
- 'veteransPostalCode',
'yourVAHealthFacility',
'theirVREInformation',
'theirVRECounselor',
+ 'veteransLocationOfResidence',
+ 'veteransPostalCode',
'stateOfProperty',
'aboutYourselfRelationshipFamilyMember',
'yourContactInformation',
@@ -571,11 +571,11 @@ export const aboutSomeoneElseRelationshipFamilyMemberAboutVeteranPages = flowPag
const aboutSomeoneElseRelationshipFamilyMemberAboutFamilyMember = [
'theirRelationshipToVeteran',
'aboutYourFamilyMember',
- 'familyMembersLocationOfResidence',
- 'familyMembersPostalCode',
'yourVAHealthFacility',
'theirVREInformation',
'theirVRECounselor',
+ 'familyMembersLocationOfResidence',
+ 'familyMembersPostalCode',
'stateOfProperty',
'aboutTheVeteran',
'dateOfDeath',
@@ -605,11 +605,11 @@ const aboutSomeoneElseRelationshipConnectedThroughWork = [
'yourRole',
'aboutTheVeteran',
'dateOfDeath',
- 'veteransLocationOfResidence',
- 'veteransPostalCode',
'yourVAHealthFacility',
'theirVREInformation',
'theirVRECounselor',
+ 'veteransLocationOfResidence',
+ 'veteransPostalCode',
'stateOfProperty',
'aboutYourself',
'yourContactInformation',
diff --git a/src/applications/ask-va/constants.js b/src/applications/ask-va/constants.js
index 133b75981faf..8e5e209f06c0 100644
--- a/src/applications/ask-va/constants.js
+++ b/src/applications/ask-va/constants.js
@@ -63,6 +63,7 @@ export const branchesOfService = [
// Categories
export const CategoryEducation = 'Education benefits and work study';
+export const CategoryHealthCare = 'Health care';
export const CategoryVeteranReadinessAndEmployment =
'Veteran Readiness and Employment';
export const CategoryGuardianshipCustodianshipFiduciaryIssues =
diff --git a/src/applications/ask-va/containers/App.jsx b/src/applications/ask-va/containers/App.jsx
index 73ec5d8c5740..e77aa3757817 100644
--- a/src/applications/ask-va/containers/App.jsx
+++ b/src/applications/ask-va/containers/App.jsx
@@ -1,4 +1,5 @@
import RoutedSavableApp from 'platform/forms/save-in-progress/RoutedSavableApp';
+import PropTypes from 'prop-types';
import React from 'react';
import BreadCrumbs from '../components/BreadCrumbs';
import ProgressBar from '../components/ProgressBar';
@@ -15,3 +16,8 @@ export default function App({ location, children }) {
);
}
+
+App.propTypes = {
+ children: PropTypes.node,
+ location: PropTypes.object,
+};
diff --git a/src/applications/ask-va/containers/ConfirmationPage.jsx b/src/applications/ask-va/containers/ConfirmationPage.jsx
index 8d5effb7259c..d945e8b2d882 100644
--- a/src/applications/ask-va/containers/ConfirmationPage.jsx
+++ b/src/applications/ask-va/containers/ConfirmationPage.jsx
@@ -51,7 +51,7 @@ const ConfirmationPage = ({ location }) => {
);
- const actionLink = currentlyLoggedIn ?? (
+ const actionLink = currentlyLoggedIn && (
{
const getApiData = url => {
if (mockTestingFlag) {
- const res = mockInquries;
+ const res = mockInquiries;
const transformedInquiries = res.data.map(inquiry => ({
...inquiry,
diff --git a/src/applications/ask-va/containers/DashboardCardsMock.jsx b/src/applications/ask-va/containers/DashboardCardsMock.jsx
deleted file mode 100644
index f4309b4a2279..000000000000
--- a/src/applications/ask-va/containers/DashboardCardsMock.jsx
+++ /dev/null
@@ -1,284 +0,0 @@
-// import {
-// VaPagination,
-// VaSelect,
-// } from '@department-of-veterans-affairs/component-library/dist/react-bindings';
-// import { focusElement } from '@department-of-veterans-affairs/platform-utilities/ui';
-// import { compareAsc, compareDesc, parse } from 'date-fns';
-// import React, { useEffect, useState } from 'react';
-// import { Link } from 'react-router';
-// import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
-// import { ServerErrorAlert } from '../config/helpers';
-// import { formatDate } from '../utils/helpers';
-// import { mockInquiryDataBusinessAndPersonal } from '../utils/mockData';
-
-// const DashboardCards = () => {
-// const [error, hasError] = useState(false);
-// const [inquiries, setInquiries] = useState([]);
-// const [lastUpdatedFilter, setLastUpdatedFilter] = useState('newestToOldest');
-// const [statusFilter, setStatusFilter] = useState('All');
-// const [categoryFilter, setCategoryFilter] = useState('All');
-// const [categories, setCategories] = useState([]);
-// const [loading, setLoading] = useState(true);
-
-// const [currentPage, setCurrentPage] = useState(1);
-// const itemsPerPage = 4;
-
-// const hasBusinessLevelAuth =
-// inquiries.length > 0 &&
-// inquiries.some(
-// card => card.attributes.levelOfAuthentication === 'Business',
-// );
-
-// const getApiData = () => {
-// setLoading(true);
-// const res = mockInquiryDataBusinessAndPersonal;
-// setInquiries(res.data);
-// const uniqueCategories = [
-// ...new Set(res.data.map(item => item.attributes.categoryName)),
-// ];
-// setCategories(uniqueCategories);
-// setLoading(false);
-// hasError(false);
-// };
-
-// useEffect(() => {
-// focusElement('.schemaform-title > h1');
-// getApiData();
-// }, []);
-
-// const filterAndSortInquiries = loa => {
-// return inquiries
-// .filter(
-// card =>
-// categoryFilter === 'All' ||
-// card.attributes.categoryName === categoryFilter,
-// )
-// .filter(
-// card =>
-// statusFilter === 'All' || card.attributes.status === statusFilter,
-// )
-// .filter(
-// card => loa === 'All' || card.attributes.levelOfAuthentication === loa,
-// )
-// .sort((a, b) => {
-// const dateA = parse(a.attributes.lastUpdate, 'MM/dd/yy', new Date());
-// const dateB = parse(b.attributes.lastUpdate, 'MM/dd/yy', new Date());
-// if (lastUpdatedFilter === 'newestToOldest') {
-// return compareDesc(dateA, dateB);
-// }
-// return compareAsc(dateA, dateB);
-// });
-// };
-
-// const handlePageChange = newPage => {
-// setCurrentPage(newPage);
-// };
-
-// const handleTabChange = () => {
-// setCurrentPage(1);
-// };
-
-// const inquiriesGridView = category => {
-// const filteredInquiries = filterAndSortInquiries(category);
-// const indexOfLastItem = currentPage * itemsPerPage;
-// const indexOfFirstItem = indexOfLastItem - itemsPerPage;
-// const currentInquiries = filteredInquiries.slice(
-// indexOfFirstItem,
-// indexOfLastItem,
-// );
-// const totalPages = Math.ceil(filteredInquiries.length / itemsPerPage);
-
-// if (filteredInquiries.length === 0) {
-// return (
-//
-//
-// No questions match your filter
-//
-//
-// {currentInquiries.map(card => (
-//
-//
-//
-//
-// {card.attributes.status}
-//
-//
-// {`Submitted on ${formatDate(card.attributes.createdOn)}`}
-//
-//
-//
-//
-// Last updated:
-// {' '}
-// {formatDate(card.attributes.lastUpdate)}
-//
-//
-// Category: {' '}
-// {card.attributes.categoryName}
-//
-//
-// {card.attributes.submitterQuestion}
-//
-//
-//
-// ))}
-//
handlePageChange(e.detail.page)}
-// className="vads-u-border-top--0 vads-u-padding-top--0 vads-u-padding-bottom--5"
-// />
-// )}
-//
-// );
-// };
-
-// if (error) {
-// return (
-//
-//
-// );
-// }
-
-// if (loading) {
-// return (
-//
-//
-// Your questions
-//
-// {inquiries.length > 0 ? (
-// <>
-//
-//
-// {
-// setLastUpdatedFilter(
-// event.target.value ? event.target.value : 'newestToOldest',
-// );
-// setCurrentPage(1);
-// }}
-// >
-// Newest to oldest
-// Oldest to newest
-//
-//
-//
-// {
-// setCategoryFilter(
-// event.target.value ? event.target.value : 'All',
-// );
-// setCurrentPage(1);
-// }}
-// >
-// All
-// {categories.map(category => (
-//
-// {category}
-//
-// ))}
-//
-//
-//
-// {
-// setStatusFilter(
-// event.target.value ? event.target.value : 'All',
-// );
-// setCurrentPage(1);
-// }}
-// >
-// All
-// In Progress
-// Replied
-// Reopened
-//
-//
-//
-// {hasBusinessLevelAuth ? (
-//
-//
-//
-// Business
-// Personal
-//
-// {inquiriesGridView('Business')}
-// {inquiriesGridView('Personal')}
-//
-//
-// ) : (
-// inquiriesGridView('Personal')
-// )}
-//
-// ) : (
-//
-//
-//
-// You haven’t submitted a question yet.
-//
-//
-//
-// )}
-//
-//
-// {fileName}
-//
-//
-// {' '}
-// {}} secondary text={RESPONSE_PAGE.DELETE_FILE} />
-//
-//
-// {message}
-//
-// );
-// const getReplySubHeader = messageType => messageType.split(':')[1].trim();
-
-// const ResponseInboxPage = ({ router }) => {
-// const [error, hasError] = useState(false);
-// const [sendReply, setSendReply] = useState({ reply: '', attachments: [] });
-// const [loading, isLoading] = useState(true);
-// const [inquiryData, setInquiryData] = useState([]);
-
-// const getLastSegment = () => {
-// const pathArray = window.location.pathname.split('/');
-// return pathArray[pathArray.length - 1];
-// };
-// const inquiryId = getLastSegment();
-
-// const handlers = {
-// onInput: event => {
-// setSendReply({ ...sendReply, reply: event.target.value });
-// },
-
-// onSubmit: event => {
-// event.preventDefault();
-// router.push('/response-sent');
-// },
-// };
-
-// const getInquiryData = async () => {
-// const inquiryMock = mockInquiryDataBusinessAndPersonal.data.find(
-// inquiry => inquiry.id === inquiryId,
-// );
-// setInquiryData(inquiryMock);
-// hasError(false);
-// isLoading(false);
-// };
-
-// useEffect(() => {
-// getInquiryData();
-// }, []);
-
-// useEffect(
-// () => {
-// focusElement('h1');
-// },
-// [loading],
-// );
-
-// // render loading indicator while we fetch
-// if (loading) {
-// return (
-//
-//
-//
-//
{RESPONSE_PAGE.QUESTION_DETAILS}
-//
-//
-//
Status
-//
-//
-// {inquiryData.attributes.status}
-//
-//
-//
-//
-//
-// Submitted:
-//
-//
-// {' '}
-// {formatDate(inquiryData.attributes.createdOn)}
-//
-//
-//
-//
-// Last updated:
-//
-//
-// {' '}
-// {formatDate(inquiryData.attributes.lastUpdate)}
-//
-//
-//
-//
-// Category:
-//
-//
-// {' '}
-// {inquiryData.attributes.categoryName}
-//
-//
-//
-//
-// Reference number:
-//
-//
-// {' '}
-// {inquiryData.attributes.inquiryNumber}
-//
-//
-//
-
-//
-//
-// {RESPONSE_PAGE.YOUR_CONVERSATION}
-//
-// window.print()}
-// >
-//
-//
-//
-// PRINT
-//
-//
-//
-
-//
-// {inquiryData.attributes.reply.data.length === 0 ? (
-//
-// {emptyMessage(RESPONSE_PAGE.EMPTY_INBOX)}
-//
-// ) : (
-//
-//
-// {inquiryData.attributes.reply.data.map((message, ix) => (
-//
-// {message.attributes.reply}
-// {message.attributes.attachmentNames.length > 0 && (
-//
-// {RESPONSE_PAGE.ATTACHMENTS}
-//
-// )}
-// {message.attributes.attachmentNames.length > 0 &&
-// message.attributes.attachmentNames.map(attachment => (
-//
-// {attachmentBox(attachment.name)}
-//
-// ))}
-//
-// ))}
-//
-//
-// )}
-
-//
{RESPONSE_PAGE.SEND_REPLY}
-//
-//
-//
-//
-// {}}
-// primary
-// text="Sign in with Approved User"
-// />
-//
-//
-// );
-// };
-
-// ResponseInboxPage.propTypes = {
-// router: PropTypes.object.isRequired,
-// loggedIn: PropTypes.bool,
-// params: PropTypes.object,
-// };
-
-// function mapStateToProps(state) {
-// return {
-// loggedIn: isLoggedIn(state),
-// };
-// }
-
-// export default connect(mapStateToProps)(withRouter(ResponseInboxPage));
diff --git a/src/applications/ask-va/containers/YourVAHealthFacility.jsx b/src/applications/ask-va/containers/YourVAHealthFacility.jsx
index 6b5cc29dff98..11c52b93d7a1 100644
--- a/src/applications/ask-va/containers/YourVAHealthFacility.jsx
+++ b/src/applications/ask-va/containers/YourVAHealthFacility.jsx
@@ -9,6 +9,10 @@ import SearchItem from '../components/search/SearchItem';
import { getHealthFacilityTitle } from '../config/helpers';
import { CHAPTER_3, URL, envUrl } from '../constants';
import { convertToLatLng } from '../utils/mapbox';
+import { mockHealthFacilityResponse } from '../utils/mockData';
+
+// Toggle this when testing locally to load health facility search results
+const mockTestingFlag = false;
const facilities = { data: [] };
@@ -31,6 +35,18 @@ const YourVAHealthFacilityPage = props => {
const getApiData = url => {
setIsSearching(true);
+
+ if (mockTestingFlag) {
+ // Simulate API delay
+ return new Promise(resolve => {
+ setTimeout(() => {
+ setApiData(mockHealthFacilityResponse);
+ setIsSearching(false);
+ resolve(mockHealthFacilityResponse);
+ }, 500);
+ });
+ }
+
return apiRequest(url, options)
.then(res => {
setApiData(res);
diff --git a/src/applications/ask-va/containers/mockInquiryReplyData.js b/src/applications/ask-va/containers/mockInquiryReplyData.js
deleted file mode 100644
index dc318c36a55f..000000000000
--- a/src/applications/ask-va/containers/mockInquiryReplyData.js
+++ /dev/null
@@ -1,304 +0,0 @@
-// Dashboard cards based on Wed Dec 18 for User 119
-export const mockInquries = {
- data: [
- {
- id: '251a31bd-24b7-ef11-b8e9-001dd8053a71',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241210-308771',
- attachments: null,
- categoryName: 'Health care',
- createdOn: '12/10/2024 6:29:52 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Audiology and hearing aids',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/12/2024 12:00:00 AM',
- queueId: 'f9d63862-d81f-ed11-b83c-001dd8069009',
- queueName: 'VHA Audiology',
- status: 'InProgress',
- submitterQuestion: 'testing crm staging fix',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '41851774-2ab7-ef11-b8e9-001dd8053a71',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241210-308772',
- attachments: null,
- categoryName: 'Veteran Readiness and Employment',
- createdOn: '12/10/2024 7:10:47 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Financial issues',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/12/2024 12:00:00 AM',
- queueId: '807de9d5-1b6b-eb11-b0b0-001dd8309f34',
- queueName: 'VBA Pittsburgh RO-VR&E',
- status: 'Reopened',
- submitterQuestion: 'test',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '5791b367-37b3-ef11-b8e9-001dd805523c',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241205-308673',
- attachments: null,
- categoryName: 'Benefits issues outside the U.S.',
- createdOn: '12/5/2024 6:33:24 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Disability compensation',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/12/2024 12:00:00 AM',
- queueId: 'b7eaf81b-1b6b-eb11-b0b0-001dd8309f34',
- queueName: 'VBA ART',
- status: 'InProgress',
- submitterQuestion: 'test',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '3df87e62-a8bc-ef11-b8e9-001dd805523c',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241217-308837',
- attachments: null,
- categoryName: 'Defense Enrollment Eligibility Reporting System (DEERS)',
- createdOn: '12/17/2024 6:54:54 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Adding requests',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/17/2024 12:00:00 AM',
- queueId: 'e9a4bc5e-d5fa-eb11-94ef-001dd83015a1',
- queueName: 'EVSS Data Mismatch',
- status: 'New',
- submitterQuestion: 'Hemesh Test on Dec 17 for dashboard',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '46a76c10-5bbd-ef11-b8e9-001dd805523c',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241218-308843',
- attachments: null,
- categoryName: 'Veteran ID Card (VIC)',
- createdOn: '12/18/2024 4:13:54 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic:
- 'Veteran Health Identification Card (VHIC) for health appointments',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/18/2024 12:00:00 AM',
- queueId: '39552049-1717-ec11-b6e6-001dd804cf90',
- queueName: 'Veteran Identification Card (VIC)',
- status: 'New',
- submitterQuestion: 'test',
- schoolFacilityCode: null,
- veteranRelationship: 'Spouse_SurvivingSpouse',
- },
- },
- {
- id: '37d37e1b-36b7-ef11-b8e9-001dd809b958',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241210-308784',
- attachments: null,
- categoryName: 'Veteran Readiness and Employment',
- createdOn: '12/10/2024 8:34:12 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Financial issues',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/12/2024 12:00:00 AM',
- queueId: '807de9d5-1b6b-eb11-b0b0-001dd8309f34',
- queueName: 'VBA Pittsburgh RO-VR&E',
- status: 'InProgress',
- submitterQuestion: 'Demo test',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: 'a79c4e2c-a9b8-ef11-b8e9-001dd809b958',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241212-308810',
- attachments: null,
- categoryName: 'Education benefits and work study',
- createdOn: '12/12/2024 4:50:26 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Work study',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/12/2024 12:00:00 AM',
- queueId: '4e7de9d5-1b6b-eb11-b0b0-001dd8309f34',
- queueName: 'Muskogee Work Study',
- status: 'InProgress',
- submitterQuestion:
- 'This is a test question for the devs to see formatted replies',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '3ac11cee-2ebe-ef11-b8e9-001dd809b958',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241219-308852',
- attachments: [
- {
- id: '4ec11cee-2ebe-ef11-b8e9-001dd809b958',
- name: '2e577b0c43ca9c706002872fedcb02c3_exif.jpg',
- },
- ],
- categoryName: 'Education benefits and work study',
- createdOn: '12/19/2024 5:30:28 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'On-the-job training and apprenticeships',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/19/2024 12:00:00 AM',
- queueId: '527de9d5-1b6b-eb11-b0b0-001dd8309f34',
- queueName: 'Muskogee OJT/Apprenticeship',
- status: 'Solved',
- submitterQuestion: 'Testing Dec 19 files',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '678b6a15-d1b0-ef11-b8e9-001dd830a0af',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241202-308617',
- attachments: null,
- categoryName: 'Veteran ID Card (VIC)',
- createdOn: '12/2/2024 5:15:58 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic: 'Veteran ID Card (VIC) for discounts',
- levelOfAuthentication: 'Unauthenticated',
- lastUpdate: '12/2/2024 12:00:00 AM',
- queueId: '39552049-1717-ec11-b6e6-001dd804cf90',
- queueName: 'Veteran Identification Card (VIC)',
- status: 'Reopened',
- submitterQuestion: 'test',
- schoolFacilityCode: null,
- veteranRelationship: null,
- },
- },
- {
- id: '1aed76e7-5bbd-ef11-b8e9-001dd830a0af',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241218-308845',
- attachments: null,
- categoryName: 'Veteran ID Card (VIC)',
- createdOn: '12/18/2024 4:19:58 PM',
- correspondences: null,
- hasBeenSplit: false,
- inquiryTopic:
- 'Veteran Health Identification Card (VHIC) for health appointments',
- levelOfAuthentication: 'Personal',
- lastUpdate: '12/18/2024 12:00:00 AM',
- queueId: '39552049-1717-ec11-b6e6-001dd804cf90',
- queueName: 'Veteran Identification Card (VIC)',
- status: 'Solved',
- submitterQuestion: 'test',
- schoolFacilityCode: null,
- veteranRelationship: 'Spouse_SurvivingSpouse',
- },
- },
- ],
-};
-
-// Based on Wed Dec 18 for User 119 staging response when clicking 'Review Conversation' for inquiryNumber: 'A-20241210-308784',
-export const mockInquiryResponse = {
- data: {
- id: '37d37e1b-36b7-ef11-b8e9-001dd809b958',
- type: 'inquiry',
- attributes: {
- inquiryNumber: 'A-20241210-308784',
- attachments: null,
- categoryName: 'Veteran Readiness and Employment',
- createdOn: '12/10/2024 8:34:12 PM',
- correspondences: {
- data: [
- {
- id: '21f69e12-b2b8-ef11-b8e9-001dd804fa0e',
- type: 'correspondence',
- attributes: {
- messageType: 'Notification',
- createdOn: '12/12/2024 5:54:10 PM',
- modifiedOn: '12/12/2024 5:54:16 PM',
- statusReason: 'PendingSend',
- description:
- 'Dear Glen,
\nA new message has been posted to your Ask VA (AVA) inbox. To view your message please log in to https://Ask.VA.gov
\nPlease DO NOT reply to this email as it is system generated.
\nIf you are in immediate danger, please call 911. Please do not use the Ask VA inquiry for urgent needs or medical emergencies.
\nFor immediate help in dealing with a suicidal crisis, please call 988 and Press 1, chat online at VeteransCrisisLine.net/Chat (https://www.veteranscrisisline.net/get-help/chat/) or text 838255. "
',
- enableReply: true,
- attachments: null,
- },
- },
- {
- id: 'b8816670-b1b8-ef11-b8e9-001dd805523c',
- type: 'correspondence',
- attributes: {
- messageType: 'ResponseFromVA',
- createdOn: '12/12/2024 5:49:37 PM',
- modifiedOn: '12/12/2024 5:54:08 PM',
- statusReason: 'Completed',
- description:
- 'Dear Glen,This is a test response from Tyler 12/12. I\'m going to copy a standard text that the Education team uses without changing their formatting.
Dear Glen,
\nA new message has been posted to your Ask VA (AVA) inbox. To view your message please log in to https://Ask.VA.gov
\nPlease DO NOT reply to this email as it is system generated.
\nIf you are in immediate danger, please call 911. Please do not use the Ask VA inquiry for urgent needs or medical emergencies.
\nFor immediate help in dealing with a suicidal crisis, please call 988 and Press 1, chat online at VeteransCrisisLine.net/Chat (https://www.veteranscrisisline.net/get-help/chat/) or text 838255. "
',
enableReply: true,
- attributes: {
- reply:
- 'When I click on benefits in the VA app and then check on a current claim status, the app shuts down. I didn’t have this issue a week ago. I can navigate through the entire app with no issues except claim status. Can someone help?',
- attachmentNames: [],
- },
+ attachments: null,
},
- {
- id: 'a6c3af1b-ec8c-ee11-8178-001dd804e107',
- modifiedOn: 'Nov. 14, 2024 at 10:24 a.m. E.T.',
- statusReason: 'Completed/Sent',
- messageType: '722310001: Response from VA',
+ },
+ {
+ id: 'b8816670-b1b8-ef11-b8e9-001dd805523c',
+ type: 'correspondence',
+ attributes: {
+ messageType: 'ResponseFromVA',
+ createdOn: '12/12/2024 5:49:37 PM',
+ modifiedOn: '12/12/2024 5:54:08 PM',
+ statusReason: 'Completed',
+ description:
+ 'Dear Glen,This is a test response from Tyler 12/12. I\'m going to copy a standard text that the Education team uses without changing their formatting.
Date: Fri, 3 Jan 2025 12:32:11 -0500
Subject: [PATCH 17/34] fix extra } in VaSearchInput label (#33873)
---
.../caregivers/components/FormFields/FacilitySearch.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/applications/caregivers/components/FormFields/FacilitySearch.jsx b/src/applications/caregivers/components/FormFields/FacilitySearch.jsx
index 4460d29c3ecf..dae89bfcd262 100644
--- a/src/applications/caregivers/components/FormFields/FacilitySearch.jsx
+++ b/src/applications/caregivers/components/FormFields/FacilitySearch.jsx
@@ -322,7 +322,7 @@ const FacilitySearch = props => {
Date: Fri, 3 Jan 2025 10:50:02 -0700
Subject: [PATCH 18/34] added back logic to trigger CCD download error alert on
download error (#33726)
---
.../containers/DownloadReportPage.jsx | 49 +++++++++----------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/applications/mhv-medical-records/containers/DownloadReportPage.jsx b/src/applications/mhv-medical-records/containers/DownloadReportPage.jsx
index 628816b40c97..86b5039af76e 100644
--- a/src/applications/mhv-medical-records/containers/DownloadReportPage.jsx
+++ b/src/applications/mhv-medical-records/containers/DownloadReportPage.jsx
@@ -56,29 +56,6 @@ const getFailedDomainList = (failed, displayMap) => {
return modFailed.map(domain => displayMap[domain]);
};
-/**
- * Checks if CCD retry is needed and returns a formatted timestamp or null.
- */
-const getCCDRetryTimestamp = () => {
- const errorTimestamp = localStorage.getItem('lastCCDError');
- if (!errorTimestamp) return null;
-
- const retryDate = add(new Date(errorTimestamp), { hours: 24 });
- if (compareAsc(retryDate, new Date()) >= 0) {
- const options = {
- year: 'numeric',
- month: 'long',
- day: 'numeric',
- hour: 'numeric',
- minute: 'numeric',
- hour12: true,
- timeZoneName: 'short',
- };
- return new Intl.DateTimeFormat('en-US', options).format(retryDate);
- }
- return null;
-};
-
// --- Main component ---
const DownloadReportPage = ({ runningUnitTest }) => {
const dispatch = useDispatch();
@@ -88,7 +65,7 @@ const DownloadReportPage = ({ runningUnitTest }) => {
mr: {
downloads: {
generatingCCD,
- ccdError,
+ error: ccdError,
bbDownloadSuccess: successfulBBDownload,
},
blueButton: { failedDomains: failedBBDomains },
@@ -115,7 +92,29 @@ const DownloadReportPage = ({ runningUnitTest }) => {
const activeAlert = useAlerts(dispatch);
- const CCDRetryTimestamp = useMemo(() => getCCDRetryTimestamp(), [ccdError]);
+ // Checks if CCD retry is needed and returns a formatted timestamp or null.
+ const CCDRetryTimestamp = useMemo(
+ () => {
+ const errorTimestamp = localStorage.getItem('lastCCDError');
+ if (errorTimestamp !== null) {
+ const retryDate = add(new Date(errorTimestamp), { hours: 24 });
+ if (compareAsc(retryDate, new Date()) >= 0) {
+ const options = {
+ year: 'numeric',
+ month: 'long',
+ day: 'numeric',
+ hour: 'numeric',
+ minute: 'numeric',
+ hour12: true,
+ timeZoneName: 'short', // Include the time zone abbreviation
+ };
+ return new Intl.DateTimeFormat('en-US', options).format(retryDate);
+ }
+ }
+ return null;
+ },
+ [ccdError],
+ );
// Initial page setup effect
useEffect(
From 7a54bc365b55748b900e145448e340f898a11726 Mon Sep 17 00:00:00 2001
From: Belle Poopongpanit
Date: Fri, 3 Jan 2025 10:06:56 -0800
Subject: [PATCH 19/34] [#262] Update prefill signed-in alert language in
SaveInProgressIntro component (#33729)
* Updated prefill signed-in alert language in platform/forms/SaveInProgressIntro
* Refined SaveInProgressIntro unit test to account for new prefill signed-in alert language
* Added space after the prefill alert
* Added space after the prefill alert
* Fixed SaveInProgressIntro unit test and fixed text in the component
* Fixed linting errors including deleting moment and using native Date
* Updated cypress e2e test timeout to 120 min to resolve timeout error
---------
Co-authored-by: Belle P
---
.github/workflows/continuous-integration.yml | 2 +-
.../save-in-progress/SaveInProgressIntro.jsx | 13 ++--
.../SaveInProgressIntro.unit.spec.jsx | 78 +++++++++++++++----
3 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 9b9c1dc80c0e..88c5d6b6196c 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -663,7 +663,7 @@ jobs:
cypress-tests:
name: Cypress E2E Tests
runs-on: ubuntu-16-cores-latest
- timeout-minutes: 60
+ timeout-minutes: 120
needs: [build, tests-prep, fetch-ecr-credentials]
if: |
needs.build.result == 'success' &&
diff --git a/src/platform/forms/save-in-progress/SaveInProgressIntro.jsx b/src/platform/forms/save-in-progress/SaveInProgressIntro.jsx
index 819562fa9d23..54ddb535c944 100644
--- a/src/platform/forms/save-in-progress/SaveInProgressIntro.jsx
+++ b/src/platform/forms/save-in-progress/SaveInProgressIntro.jsx
@@ -168,13 +168,11 @@ class SaveInProgressIntro extends React.Component {
} else if (prefillAvailable && !verifiedPrefillAlert) {
alert = (
-
-
- Note: Since you’re signed in to your account,
- we can prefill part of your {appType} based on your account
- details. You can also save your {appType} in progress and come
- back later to finish filling it out.
-
+
+ We've prefilled some of your information
+ Since you’re signed in, we can prefill part of your application
+ based on your profile details. You can also save your application
+ in progress and come back later to finish filling it out.
', () => {
form: VA_FORM_IDS.FORM_10_10EZ,
metadata: {
lastUpdated,
- expiresAt: moment().unix() + 2000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
},
},
],
@@ -98,7 +98,7 @@ describe('Schemaform ', () => {
form: VA_FORM_IDS.FORM_10_10EZ,
metadata: {
lastUpdated: 946684800,
- expiresAt: moment().unix() + 2000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
},
},
],
@@ -230,7 +230,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [VA_FORM_IDS.FORM_10_10EZ],
@@ -267,7 +270,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -310,7 +316,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -406,9 +415,20 @@ describe('Schemaform ', () => {
/>,
);
- expect(tree.find('va-alert').text()).to.contain(
- 'Note: Since you’re signed in to your account, we can prefill part of your application based on your account details. You can also save your application in progress and come back later to finish filling it out.',
+ expect(tree.find('va-alert h3').text()).to.equal(
+ "We've prefilled some of your information",
);
+
+ const alertText = tree
+ .find('va-alert')
+ .children()
+ .not('h3')
+ .text();
+
+ expect(alertText).to.contain(
+ 'Since you’re signed in, we can prefill part of your application based on your profile details. You can also save your application in progress and come back later to finish filling it out.',
+ );
+
expect(tree.find('withRouter(FormStartControls)').exists()).to.be.true;
tree.unmount();
});
@@ -420,7 +440,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -459,7 +482,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -494,7 +520,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000),
+ },
},
],
prefillsAvailable: [],
@@ -532,7 +561,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -572,7 +604,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -611,7 +646,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -649,7 +687,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -689,7 +730,10 @@ describe('Schemaform ', () => {
savedForms: [
{
form: VA_FORM_IDS.FORM_10_10EZ,
- metadata: { lastUpdated: 3000, expiresAt: moment().unix() + 2000 },
+ metadata: {
+ lastUpdated: 3000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
+ },
},
],
prefillsAvailable: [],
@@ -800,7 +844,7 @@ describe('Schemaform ', () => {
form: VA_FORM_IDS.FORM_10_10EZ,
metadata: {
lastUpdated: 946684800,
- expiresAt: moment().unix() + 2000,
+ expiresAt: Math.floor(Date.now() / 1000) + 2000,
},
},
],
From d5d61b6e4985ed92fddade9589af34a7a86d4fdf Mon Sep 17 00:00:00 2001
From: Kyle Cardwell <79024398+KyleCardwell@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:07:16 -0700
Subject: [PATCH 20/34] Mhv 61284 attachment error (#33828)
* removing a file will clear any attachment errors
* added attach file error state to ReplyDraftItem
* updated unit tests
* code cleanup
---
.../components/AttachmentsList.jsx | 9 +-
.../components/ComposeForm/ComposeForm.jsx | 5 +
.../components/ComposeForm/FileInput.jsx | 23 +-
.../components/ComposeForm/ReplyDraftItem.jsx | 5 +
.../BlockedTriageGroupAlert.unit.spec.jsx | 2 +-
.../Compose/ComposeForm.unit.spec.jsx | 213 ++++++++++++++++++
.../Compose/FileInput.unit.spec.jsx | 136 -----------
7 files changed, 243 insertions(+), 150 deletions(-)
diff --git a/src/applications/mhv-secure-messaging/components/AttachmentsList.jsx b/src/applications/mhv-secure-messaging/components/AttachmentsList.jsx
index 69ce7d2bac7b..7fadf61a8aa7 100644
--- a/src/applications/mhv-secure-messaging/components/AttachmentsList.jsx
+++ b/src/applications/mhv-secure-messaging/components/AttachmentsList.jsx
@@ -23,6 +23,7 @@ const AttachmentsList = props => {
setAttachFileSuccess,
forPrint,
attachmentScanError,
+ setAttachFileError,
} = props;
const dispatch = useDispatch();
const attachmentReference = useRef(null);
@@ -105,6 +106,7 @@ const AttachmentsList = props => {
setAttachments(newAttArr);
setIsAttachmentRemoved(true);
setAttachFileSuccess(false);
+ setAttachFileError(null);
if (newAttArr.some(item => item.name !== file.name)) {
setRecentlyRemovedFile(true);
@@ -123,7 +125,7 @@ const AttachmentsList = props => {
const handleRemoveAllAttachments = () => {
setAttachments([]);
- dispatch(closeAlert()).then(() =>
+ dispatch(closeAlert()).then(() => {
setTimeout(
() =>
setFocusedElement(
@@ -132,8 +134,9 @@ const AttachmentsList = props => {
.shadowRoot.querySelector('button'),
),
400,
- ),
- );
+ );
+ setAttachFileError(null);
+ });
};
const handleSuccessAlertClose = () => {
diff --git a/src/applications/mhv-secure-messaging/components/ComposeForm/ComposeForm.jsx b/src/applications/mhv-secure-messaging/components/ComposeForm/ComposeForm.jsx
index 227dca687f20..80df42979b6f 100644
--- a/src/applications/mhv-secure-messaging/components/ComposeForm/ComposeForm.jsx
+++ b/src/applications/mhv-secure-messaging/components/ComposeForm/ComposeForm.jsx
@@ -62,6 +62,7 @@ const ComposeForm = props => {
const [selectedRecipientId, setSelectedRecipientId] = useState(null);
const [isSignatureRequired, setIsSignatureRequired] = useState(null);
const [checkboxMarked, setCheckboxMarked] = useState(false);
+ const [attachFileError, setAttachFileError] = useState(null);
useEffect(
() => {
@@ -915,6 +916,8 @@ const ComposeForm = props => {
setNavigationError={setNavigationError}
editingEnabled
attachmentScanError={attachmentScanError}
+ attachFileError={attachFileError}
+ setAttachFileError={setAttachFileError}
/>
{
setAttachments={setAttachments}
setAttachFileSuccess={setAttachFileSuccess}
attachmentScanError={attachmentScanError}
+ attachFileError={attachFileError}
+ setAttachFileError={setAttachFileError}
/>
))}
diff --git a/src/applications/mhv-secure-messaging/components/ComposeForm/FileInput.jsx b/src/applications/mhv-secure-messaging/components/ComposeForm/FileInput.jsx
index 9dbbe322b25b..ae8546cb6b20 100644
--- a/src/applications/mhv-secure-messaging/components/ComposeForm/FileInput.jsx
+++ b/src/applications/mhv-secure-messaging/components/ComposeForm/FileInput.jsx
@@ -13,9 +13,10 @@ const FileInput = props => {
setAttachFileSuccess,
draftSequence,
attachmentScanError,
+ attachFileError,
+ setAttachFileError,
} = props;
- const [error, setError] = useState();
const fileInputRef = useRef();
const errorRef = useRef(null);
const [selectedFileId, setSelectedFileId] = useState(null);
@@ -36,10 +37,10 @@ const FileInput = props => {
if (!selectedFile) return;
const fileExtension =
selectedFile.name && selectedFile.name.split('.').pop();
- setError(null);
+ setAttachFileError(null);
if (selectedFile.size === 0) {
- setError({
+ setAttachFileError({
message: ErrorMessages.ComposeForm.ATTACHMENTS.FILE_EMPTY,
});
fileInputRef.current.value = null;
@@ -47,7 +48,7 @@ const FileInput = props => {
}
if (!fileExtension || !acceptedFileTypes[fileExtension.toLowerCase()]) {
- setError({
+ setAttachFileError({
message: ErrorMessages.ComposeForm.ATTACHMENTS.INVALID_FILE_TYPE,
});
fileInputRef.current.value = null;
@@ -55,7 +56,7 @@ const FileInput = props => {
}
if (attachments.filter(a => a.name === selectedFile.name).length > 0) {
- setError({
+ setAttachFileError({
message: ErrorMessages.ComposeForm.ATTACHMENTS.FILE_DUPLICATE,
});
fileInputRef.current.value = null;
@@ -63,7 +64,7 @@ const FileInput = props => {
}
if (selectedFile.size > Attachments.MAX_FILE_SIZE) {
- setError({
+ setAttachFileError({
message: ErrorMessages.ComposeForm.ATTACHMENTS.FILE_TOO_LARGE,
});
fileInputRef.current.value = null;
@@ -74,7 +75,7 @@ const FileInput = props => {
currentTotalSize + selectedFile.size >
Attachments.TOTAL_MAX_FILE_SIZE
) {
- setError({
+ setAttachFileError({
message:
ErrorMessages.ComposeForm.ATTACHMENTS.TOTAL_MAX_FILE_SIZE_EXCEEDED,
});
@@ -134,12 +135,12 @@ const FileInput = props => {
vads-u-font-weight--bold
vads-u-color--secondary-dark
${
- error
+ attachFileError
? 'vads-u-margin-left--neg2 vads-u-border-left--4px vads-u-border-color--secondary-dark vads-u-padding-left--2'
: ''
}`}
>
- {error && (
+ {attachFileError && (
{
tabIndex="-1"
aria-live="polite"
>
- {error.message}
+ {attachFileError.message}
)}
@@ -195,9 +196,11 @@ const FileInput = props => {
};
FileInput.propTypes = {
+ attachFileError: PropTypes.object,
attachmentScanError: PropTypes.bool,
attachments: PropTypes.array,
draftSequence: PropTypes.number,
+ setAttachFileError: PropTypes.func,
setAttachFileSuccess: PropTypes.func,
setAttachments: PropTypes.func,
};
diff --git a/src/applications/mhv-secure-messaging/components/ComposeForm/ReplyDraftItem.jsx b/src/applications/mhv-secure-messaging/components/ComposeForm/ReplyDraftItem.jsx
index 30d442e84888..549980b9226e 100644
--- a/src/applications/mhv-secure-messaging/components/ComposeForm/ReplyDraftItem.jsx
+++ b/src/applications/mhv-secure-messaging/components/ComposeForm/ReplyDraftItem.jsx
@@ -78,6 +78,7 @@ const ReplyDraftItem = props => {
const [focusToTextarea, setFocusToTextarea] = useState(false);
const [draftId, setDraftId] = useState(null);
const [savedDraft, setSavedDraft] = useState(false);
+ const [attachFileError, setAttachFileError] = useState(null);
const alertsList = useSelector(state => state.sm.alerts.alertList);
const attachmentScanError = useMemo(
@@ -544,6 +545,8 @@ const ReplyDraftItem = props => {
setAttachFileSuccess={setAttachFileSuccess}
draftSequence={draftSequence}
attachmentScanError={attachmentScanError}
+ attachFileError={attachFileError}
+ setAttachFileError={setAttachFileError}
/>
{
setAttachFileSuccess={setAttachFileSuccess}
draftSequence={draftSequence}
attachmentScanError={attachmentScanError}
+ attachFileError={attachFileError}
+ setAttachFileError={setAttachFileError}
/>
)}
diff --git a/src/applications/mhv-secure-messaging/tests/components/Compose/BlockedTriageGroupAlert.unit.spec.jsx b/src/applications/mhv-secure-messaging/tests/components/Compose/BlockedTriageGroupAlert.unit.spec.jsx
index ad363a994735..b57fc2c356f2 100644
--- a/src/applications/mhv-secure-messaging/tests/components/Compose/BlockedTriageGroupAlert.unit.spec.jsx
+++ b/src/applications/mhv-secure-messaging/tests/components/Compose/BlockedTriageGroupAlert.unit.spec.jsx
@@ -142,7 +142,7 @@ describe('BlockedTriageGroupAlert component', () => {
parentComponent: ParentComponent.FOLDER_HEADER,
alertStyle: BlockedTriageAlertStyles.INFO,
});
- screen.debug(undefined, 10000);
+
await waitFor(() => {
expect(
screen.queryByTestId('blocked-triage-group-alert'),
diff --git a/src/applications/mhv-secure-messaging/tests/components/Compose/ComposeForm.unit.spec.jsx b/src/applications/mhv-secure-messaging/tests/components/Compose/ComposeForm.unit.spec.jsx
index eae080f9ee56..75739e380e02 100644
--- a/src/applications/mhv-secure-messaging/tests/components/Compose/ComposeForm.unit.spec.jsx
+++ b/src/applications/mhv-secure-messaging/tests/components/Compose/ComposeForm.unit.spec.jsx
@@ -973,4 +973,217 @@ describe('Compose form component', () => {
expect(checkbox).to.have.attribute('error', '');
});
});
+
+ it('should display an error message when a file is 0B', async () => {
+ const screen = setup(initialState, Paths.COMPOSE);
+ const file = new File([''], 'test.png', { type: 'image/png' });
+
+ const uploader = screen.getByTestId('attach-file-input');
+
+ await waitFor(() =>
+ fireEvent.change(uploader, {
+ target: { files: [file] },
+ }),
+ );
+
+ const error = screen.getByTestId('file-input-error-message');
+ expect(error).to.exist;
+ expect(error.textContent).to.equal(
+ ErrorMessages.ComposeForm.ATTACHMENTS.FILE_EMPTY,
+ );
+ });
+
+ it('should display an error message when a file is not an accepted file type', async () => {
+ const file = new File(['(⌐□_□)'], 'test.zip', {
+ type: 'application/zip',
+ });
+ const screen = setup(initialState, Paths.COMPOSE);
+
+ const uploader = screen.getByTestId('attach-file-input');
+
+ await waitFor(() =>
+ fireEvent.change(uploader, {
+ target: { files: [file] },
+ }),
+ );
+
+ const error = screen.getByTestId('file-input-error-message');
+ expect(error).to.exist;
+ expect(error.textContent).to.equal(
+ ErrorMessages.ComposeForm.ATTACHMENTS.INVALID_FILE_TYPE,
+ );
+ });
+
+ it('should display an error message when a file is a duplicate', async () => {
+ const file = new File(['(⌐□_□)'], 'test.png', { type: 'image/png' });
+ const customDraftMessage = {
+ ...draftMessage,
+ recipientId: 1013155,
+ recipientName: '***MEDICATION_AWARENESS_100% @ MOH_DAYT29',
+ triageGroupName: '***MEDICATION_AWARENESS_100% @ MOH_DAYT29',
+ attachments: [file],
+ };
+
+ const customState = {
+ ...draftState,
+ sm: {
+ ...draftState.sm,
+ draftDetails: { customDraftMessage },
+ },
+ };
+
+ const screen = renderWithStoreAndRouter(
+
Date: Fri, 3 Jan 2025 13:33:53 -0500
Subject: [PATCH 21/34] Use relative link in update address alert (#33803)
---
.../components/TypeOfCarePage/UpdateAddressAlert.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/applications/vaos/new-appointment/components/TypeOfCarePage/UpdateAddressAlert.jsx b/src/applications/vaos/new-appointment/components/TypeOfCarePage/UpdateAddressAlert.jsx
index e3407b7b3ca5..aa44c6ba46bd 100644
--- a/src/applications/vaos/new-appointment/components/TypeOfCarePage/UpdateAddressAlert.jsx
+++ b/src/applications/vaos/new-appointment/components/TypeOfCarePage/UpdateAddressAlert.jsx
@@ -18,7 +18,7 @@ export default function UpdateAddressAlert({ onClickUpdateAddress }) {
time for your address update to process through our system.
onClickUpdateAddress(headline)}
renderAriaLabel={false}
>
From f7e9207fa463a93996d637e59a0a9995ff9f6424 Mon Sep 17 00:00:00 2001
From: John Luo
Date: Fri, 3 Jan 2025 13:34:12 -0500
Subject: [PATCH 22/34] Make facility name bold in cerner alert (#33806)
---
src/applications/vaos/components/CernerAlert.jsx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/applications/vaos/components/CernerAlert.jsx b/src/applications/vaos/components/CernerAlert.jsx
index 0a09abc36580..09bb30883060 100644
--- a/src/applications/vaos/components/CernerAlert.jsx
+++ b/src/applications/vaos/components/CernerAlert.jsx
@@ -32,8 +32,9 @@ export default function CernerAlert({ className, pageTitle, level = 2 }) {
{cernerFacilities.length === 1 ? (
Some of your appointments may be in a different portal. To view
- or manage appointments at {cernerFacilities[0].vamcFacilityName}
- , go to My VA Health.
+ or manage appointments at{' '}
+ {cernerFacilities[0].vamcFacilityName} My VA
+ Health.
) : (
<>
From aee472288219b41ab5069a6d4d43a28874cadf73 Mon Sep 17 00:00:00 2001
From: John Luo
Date: Fri, 3 Jan 2025 13:34:58 -0500
Subject: [PATCH 23/34] Fix required span font size (#33814)
---
.../vaos/covid-19-vaccine/components/SelectDate1Page.jsx | 2 +-
.../vaos/new-appointment/components/DateTimeRequestPage/VA.jsx | 2 +-
.../vaos/new-appointment/components/TypeOfCarePage/index.jsx | 2 +-
src/applications/vaos/sass/vaos.scss | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/applications/vaos/covid-19-vaccine/components/SelectDate1Page.jsx b/src/applications/vaos/covid-19-vaccine/components/SelectDate1Page.jsx
index f1dd4affbc02..39bc52d84bdf 100644
--- a/src/applications/vaos/covid-19-vaccine/components/SelectDate1Page.jsx
+++ b/src/applications/vaos/covid-19-vaccine/components/SelectDate1Page.jsx
@@ -155,7 +155,7 @@ export default function SelectDate1Page({ changeCrumb }) {
{pageTitle}
-
+
(*Required)
diff --git a/src/applications/vaos/new-appointment/components/DateTimeRequestPage/VA.jsx b/src/applications/vaos/new-appointment/components/DateTimeRequestPage/VA.jsx
index 8d8583138055..6a7ee8ec0efe 100644
--- a/src/applications/vaos/new-appointment/components/DateTimeRequestPage/VA.jsx
+++ b/src/applications/vaos/new-appointment/components/DateTimeRequestPage/VA.jsx
@@ -86,7 +86,7 @@ export default function VARequest({ changeCrumb }) {
{pageTitle}
-
+
(*Required)
diff --git a/src/applications/vaos/new-appointment/components/TypeOfCarePage/index.jsx b/src/applications/vaos/new-appointment/components/TypeOfCarePage/index.jsx
index d1927b8db8fa..02d9183e73a1 100644
--- a/src/applications/vaos/new-appointment/components/TypeOfCarePage/index.jsx
+++ b/src/applications/vaos/new-appointment/components/TypeOfCarePage/index.jsx
@@ -107,7 +107,7 @@ export default function TypeOfCarePage() {
{pageTitle}
-
+
(*Required)
diff --git a/src/applications/vaos/sass/vaos.scss b/src/applications/vaos/sass/vaos.scss
index b937785abb16..df8ecd5faecf 100644
--- a/src/applications/vaos/sass/vaos.scss
+++ b/src/applications/vaos/sass/vaos.scss
@@ -92,6 +92,7 @@ va-radio::part(legend) {
margin-top: 16px;
}
+.schemaform-required-span,
body {
font-size: 1.06rem; // same as 16.96px
}
\ No newline at end of file
From b688a90de580e6ad3a965f95bf6874de5dc146a8 Mon Sep 17 00:00:00 2001
From: robertbylight <107279507+robertbylight@users.noreply.github.com>
Date: Fri, 3 Jan 2025 13:51:17 -0500
Subject: [PATCH 24/34] Mhv 64987 create older prescriptions section (#33824)
* [mhv-64987] create grouped medications component and added it to the VA Prescription component under FF.
* [mhv-64987] add unit test.
* [mhv-64987] removed truncatedGroupedMedications from dependency list to avoid infinite loop.
* [mhv-64987] hide grouping component when there are no grouped medications.
* [mhv-64987] added null check, removed unessesary constant, removed span tag..
* [mhv-64987] changed the spacing according to UCD input.
* adds null check
* [mhv-64987] create grouped medications component and added it to the VA Prescription component under FF.
* [mhv-64987] add unit test.
* [mhv-64987] removed truncatedGroupedMedications from dependency list to avoid infinite loop.
* [mhv-64987] hide grouping component when there are no grouped medications.
* [mhv-64987] added null check, removed unessesary constant, removed span tag..
* [mhv-64987] changed the spacing according to UCD input.
* adds null check
* e2e previous prescriptions
added e2e for previous prescriptions
---------
Co-authored-by: agravell047
Co-authored-by: raji.venkatesh
---
.../GroupedMedications.jsx | 106 +
.../PrescriptionDetails/VaPrescription.jsx | 19 +-
.../sass/prescription-details.scss | 5 +
.../GroupedMedications.unit.spec.jsx | 51 +
.../fixtures/grouped-prescriptions-list.json | 4347 +++++++++++++++++
.../fixtures/older-prescription-details.json | 768 +++
...tions-section-details-page.cypress.spec.js | 31 +
.../tests/e2e/pages/MedicationsDetailsPage.js | 14 +
.../tests/e2e/pages/MedicationsLandingPage.js | 14 +
.../tests/e2e/utils/constants.js | 6 +
.../fixtures/groupedMedicationsList.json | 830 ++++
11 files changed, 6187 insertions(+), 4 deletions(-)
create mode 100644 src/applications/mhv-medications/components/PrescriptionDetails/GroupedMedications.jsx
create mode 100644 src/applications/mhv-medications/tests/components/PrescriptionDetails/GroupedMedications.unit.spec.jsx
create mode 100644 src/applications/mhv-medications/tests/e2e/fixtures/grouped-prescriptions-list.json
create mode 100644 src/applications/mhv-medications/tests/e2e/fixtures/older-prescription-details.json
create mode 100644 src/applications/mhv-medications/tests/e2e/medications-previous-prescriptions-section-details-page.cypress.spec.js
create mode 100644 src/applications/mhv-medications/tests/fixtures/groupedMedicationsList.json
diff --git a/src/applications/mhv-medications/components/PrescriptionDetails/GroupedMedications.jsx b/src/applications/mhv-medications/components/PrescriptionDetails/GroupedMedications.jsx
new file mode 100644
index 000000000000..4ee83a2b8859
--- /dev/null
+++ b/src/applications/mhv-medications/components/PrescriptionDetails/GroupedMedications.jsx
@@ -0,0 +1,106 @@
+import { VaPagination } from '@department-of-veterans-affairs/component-library/dist/react-bindings';
+import { waitForRenderThenFocus } from '@department-of-veterans-affairs/platform-utilities/ui';
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { EMPTY_FIELD } from '../../util/constants';
+import { dateFormat, fromToNumbs } from '../../util/helpers';
+import LastFilledInfo from '../shared/LastFilledInfo';
+
+const MAX_PAGE_LIST_LENGTH = 10;
+const MAX_GROUPED_LIST_LENGTH = 26;
+
+const GroupedMedications = props => {
+ const { groupedMedicationsList } = props;
+
+ const truncatedGroupedMedicationsList = groupedMedicationsList?.slice(
+ 0,
+ MAX_GROUPED_LIST_LENGTH,
+ );
+ const totalListCount = truncatedGroupedMedicationsList?.length;
+ const [currentGroupedList, setCurrentGroupedList] = useState([]);
+ const [currentPage, setCurrentPage] = useState(1);
+
+ useEffect(
+ () => {
+ const indexOfLastItem = currentPage * MAX_PAGE_LIST_LENGTH;
+ const indexOfFirstItem = indexOfLastItem - MAX_PAGE_LIST_LENGTH;
+ const currentItems = truncatedGroupedMedicationsList?.slice(
+ indexOfFirstItem,
+ indexOfLastItem,
+ );
+ setCurrentGroupedList(currentItems);
+ },
+ [currentPage, groupedMedicationsList],
+ );
+
+ const onPageChange = page => {
+ setCurrentPage(page);
+ waitForRenderThenFocus('#list-showing-info', document);
+ };
+
+ const displayNums = fromToNumbs(
+ currentPage,
+ totalListCount,
+ currentGroupedList?.length,
+ MAX_PAGE_LIST_LENGTH,
+ );
+
+ return (
+
+
+ Previous prescriptions
+
+ {`Showing ${displayNums[0]} - ${
+ displayNums[1]
+ } of ${totalListCount} prescriptions, from newest to oldest`}
+
+
+
+ {currentGroupedList &&
+ currentGroupedList.map(rx => {
+ return (
+
+
+ Prescription number: {rx.prescriptionNumber}
+
+
+
+ Quantity: {rx.quantity}
+
+ Prescribed on: {dateFormat(rx.orderedDate, 'MMMM D, YYYY')}
+
+
+ Prescribed by:{' '}
+ {(rx.providerFirstName && rx.providerLastName) || EMPTY_FIELD}
+
+
+ );
+ })}
+ {totalListCount > MAX_PAGE_LIST_LENGTH && (
+ onPageChange(e.detail.page)}
+ max-page-list-length={MAX_PAGE_LIST_LENGTH}
+ className="vads-u-justify-content--center no-print vads-u-margin-top--3"
+ page={currentPage}
+ pages={Math.ceil(totalListCount / MAX_PAGE_LIST_LENGTH)}
+ uswds
+ />
+ )}
+
+
Refill history
- {refillHistory.length > 1 &&
+ {refillHistory?.length > 1 &&
refillHistory.some(rx => rx.cmopNdcNumber) && (
Note: Images on this page are for
@@ -172,7 +177,7 @@ const VaPrescription = prescription => {
)}
- {(refillHistory.length > 1 ||
+ {(refillHistory?.length > 1 ||
refillHistory[0].dispensedDate !== undefined) &&
refillHistory.map((entry, i) => {
const { shape, color, backImprint, frontImprint } = entry;
@@ -302,10 +307,16 @@ const VaPrescription = prescription => {
);
})}
- {refillHistory.length <= 1 &&
+ {refillHistory?.length <= 1 &&
refillHistory[0].dispensedDate === undefined && (
You haven’t filled this prescription yet.
)}
+ {showGroupingContent &&
+ prescription?.groupedMedications?.length > 0 && (
+
+ )}
);
diff --git a/src/applications/mhv-medications/sass/prescription-details.scss b/src/applications/mhv-medications/sass/prescription-details.scss
index f17287142d8a..9e6b1f8bf8a0 100644
--- a/src/applications/mhv-medications/sass/prescription-details.scss
+++ b/src/applications/mhv-medications/sass/prescription-details.scss
@@ -7,6 +7,11 @@
}
}
+.last-filled-info-grouped-rx p{
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
.refill-entry {
page-break-inside: avoid;
}
diff --git a/src/applications/mhv-medications/tests/components/PrescriptionDetails/GroupedMedications.unit.spec.jsx b/src/applications/mhv-medications/tests/components/PrescriptionDetails/GroupedMedications.unit.spec.jsx
new file mode 100644
index 000000000000..4d597ad004e3
--- /dev/null
+++ b/src/applications/mhv-medications/tests/components/PrescriptionDetails/GroupedMedications.unit.spec.jsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { renderWithStoreAndRouter } from '@department-of-veterans-affairs/platform-testing/react-testing-library-helpers';
+import { expect } from 'chai';
+import { waitFor } from '@testing-library/dom';
+import GroupedMedications from '../../../components/PrescriptionDetails/GroupedMedications';
+import groupedMedicationsList from '../../fixtures/groupedMedicationsList.json';
+
+describe('Grouped medications component', () => {
+ const setup = () => {
+ return renderWithStoreAndRouter(
+
,
+ {
+ initialState: {},
+ reducers: {},
+ path: '/prescriptions/1234567891',
+ },
+ );
+ };
+
+ it('renders without errors', () => {
+ const screen = setup();
+ expect(screen.findByText('Previous prescriptions'));
+ });
+
+ it('displays "showing ..." information ', async () => {
+ const screen = setup();
+ await waitFor(() => {
+ expect(
+ screen.getByText(
+ `Showing 1 - 10 of ${
+ groupedMedicationsList.length
+ } prescriptions, from newest to oldest`,
+ ),
+ ).to.exist;
+ });
+ });
+
+ it('displays the prescription number of one of the meds on the list', async () => {
+ const screen = setup();
+ await waitFor(() => {
+ expect(screen);
+ expect(
+ screen.getByText(
+ `Prescription number: ${
+ groupedMedicationsList[0].prescriptionNumber
+ }`,
+ ),
+ ).to.exist;
+ });
+ });
+});
diff --git a/src/applications/mhv-medications/tests/e2e/fixtures/grouped-prescriptions-list.json b/src/applications/mhv-medications/tests/e2e/fixtures/grouped-prescriptions-list.json
new file mode 100644
index 000000000000..f4124936eca7
--- /dev/null
+++ b/src/applications/mhv-medications/tests/e2e/fixtures/grouped-prescriptions-list.json
@@ -0,0 +1,4347 @@
+{
+ "data": [
+ {
+ "id": "23298058",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23298058,
+ "prescriptionNumber": "2720848",
+ "prescriptionName": "ALUMINUM HYDROXIDE GEL 320MG/5ML SUSP",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-13T05:00:00.000Z",
+ "refillDate": "2024-12-30T05:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-02-19T05:00:00.000Z",
+ "quantity": 500,
+ "expirationDate": "2025-02-19T05:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": true,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "USE 1 TO MOUTH DAILY FOR 30 DAYS TEST",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active",
+ "ndc": "00054-3035-63",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 13 Dec 2024 00:00:00 EST",
+ "refillDate": "Mon, 19 Feb 2024 00:00:00 EST",
+ "refillRemaining": 0,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24934482,
+ "sig": null,
+ "orderedDate": "Mon, 30 Dec 2024 00:00:00 EST",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2720848",
+ "prescriptionName": "ALUMINUM HYDROXIDE GEL 320MG/5ML SUSP",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24934482,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00054-3035-63",
+ "reason": null,
+ "prescriptionNumberIndex": "RF3",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 24 May 2024 00:00:00 EDT",
+ "refillDate": "Mon, 19 Feb 2024 00:00:00 EST",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23838274,
+ "sig": null,
+ "orderedDate": "Tue, 10 Dec 2024 00:00:00 EST",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2720848",
+ "prescriptionName": "ALUMINUM HYDROXIDE GEL 320MG/5ML SUSP",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23838274,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00054-3035-63",
+ "reason": null,
+ "prescriptionNumberIndex": "RF2",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Wed, 20 Mar 2024 00:00:00 EDT",
+ "refillDate": "Mon, 19 Feb 2024 00:00:00 EST",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23298420,
+ "sig": null,
+ "orderedDate": "Sun, 17 Mar 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2720848",
+ "prescriptionName": "ALUMINUM HYDROXIDE GEL 320MG/5ML SUSP",
+ "dispensedDate": "Mon, 18 Mar 2024 00:00:00 EDT",
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-0848",
+ "cmopNdcNumber": "00013264681",
+ "id": 23298420,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832720848",
+ "dispStatus": "Suspended",
+ "ndc": "00054-3035-63",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "ALUMINUM HYDROXIDE",
+ "sortedDispensedDate": "2024-03-18",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23298058",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "24929167",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 24929167,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "prescriptionImage": null,
+ "refillStatus": "active",
+ "refillSubmitDate": "2024-12-12T05:00:00.000Z",
+ "refillDate": "2025-01-01T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-12-12T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-12-13T05:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": true,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2721063",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 12 Dec 2024 00:00:00 EST",
+ "refillDate": "Thu, 12 Dec 2024 00:00:00 EST",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24930426,
+ "sig": null,
+ "orderedDate": "Wed, 01 Jan 2025 00:00:00 EST",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24930426,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": [
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063Y",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063X",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063W",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063V",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063U",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063T",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063S",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063R",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063Q",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063P",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063O",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063N",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063M",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063L",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063K",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063K",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063J",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063J",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063I",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063I",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063H",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063H",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063G",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063G",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063G",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063F",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063E",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063D",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063C",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063C",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063B",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063B",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063A",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063B",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ }
+ ]
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/24929167",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "24997143",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 24997143,
+ "prescriptionNumber": "2721272",
+ "prescriptionName": "CLOBETASOL PROPIONATE 0.05% CREAM",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-23T05:00:00.000Z",
+ "refillDate": "2025-01-12T05:00:00.000Z",
+ "refillRemaining": 4,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-12-23T05:00:00.000Z",
+ "quantity": 60,
+ "expirationDate": "2025-12-24T05:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "APPLY SMALL AMOUNT DAILY FOR 30 DAYS TEST",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "RAJASREE",
+ "providerLastName": "VENKATESH",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "51672-1258-02",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Mon, 23 Dec 2024 00:00:00 EST",
+ "refillDate": "Mon, 23 Dec 2024 00:00:00 EST",
+ "refillRemaining": 4,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24998139,
+ "sig": null,
+ "orderedDate": "Sun, 12 Jan 2025 00:00:00 EST",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721272",
+ "prescriptionName": "CLOBETASOL PROPIONATE 0.05% CREAM",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24998139,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "51672-1258-02",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "CLOBETASOL",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/24997143",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "23845198",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23845198,
+ "prescriptionNumber": "2721016",
+ "prescriptionName": "DACRIOSE OPHTH SOLN 30 ML",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-06-05T04:00:00.000Z",
+ "refillDate": "2024-06-18T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-04-29T04:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-04-30T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "IRRIGATE 1 DROP DAILY FOR 30 DAYS TEST",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00058-0727-30",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Wed, 05 Jun 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23875434,
+ "sig": null,
+ "orderedDate": "Tue, 18 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721016",
+ "prescriptionName": "DACRIOSE OPHTH SOLN 30 ML",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23875434,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00058-0727-30",
+ "reason": null,
+ "prescriptionNumberIndex": "RF2",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 31 May 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23859027,
+ "sig": null,
+ "orderedDate": "Sun, 19 May 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721016",
+ "prescriptionName": "DACRIOSE OPHTH SOLN 30 ML",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23859027,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00058-0727-30",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "DACRIOSE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23845198",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "23915785",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23915785,
+ "prescriptionNumber": "2721069",
+ "prescriptionName": "DANAZOL 100MG CAP",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-10-03T04:00:00.000Z",
+ "refillDate": "2024-10-03T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-06-14T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-06-15T04:00:00.000Z",
+ "dispensedDate": "2024-06-16T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": "00013264681",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "TAKE ONE CAPSULE BY MOUTH DAILY FOR 30 DAYS",
+ "cmopDivisionPhone": "(783)272-1069",
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721069",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00024-0304-06",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "refillDate": "Sat, 15 Jun 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24515666,
+ "sig": null,
+ "orderedDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721069",
+ "prescriptionName": "DANAZOL 100MG CAP",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24515666,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00024-0304-06",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "DANAZOL",
+ "sortedDispensedDate": "2024-06-16",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": [
+ {
+ "prescriptionId": 24936580,
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-10-03T04:00:00.000Z",
+ "refillDate": "2024-10-03T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-12-11T05:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-06-15T04:00:00.000Z",
+ "prescriptionNumber": "2721069",
+ "sig": "TAKE ONE CAPSULE BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "DANAZOL 100MG CAP",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "partial",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "0024-0304-06",
+ "reason": null,
+ "prescriptionNumberIndex": "PF1",
+ "prescriptionSource": "PF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "refillDate": "Sat, 15 Jun 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24515666,
+ "sig": null,
+ "orderedDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721069",
+ "prescriptionName": "DANAZOL 100MG CAP",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24515666,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00024-0304-06",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "DANAZOL",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ }
+ ]
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23915785",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "24212585",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 24212585,
+ "prescriptionNumber": "2721081",
+ "prescriptionName": "ECONAZOLE NITRATE 1% CREAM",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-10-03T04:00:00.000Z",
+ "refillDate": "2024-10-03T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-05-28T04:00:00.000Z",
+ "quantity": 3,
+ "expirationDate": "2025-05-29T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "APPLY SMALL AMOUNT TO AFFECTED AREA DAILY",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00168-0312-30",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "refillDate": "Thu, 27 Jun 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24515667,
+ "sig": null,
+ "orderedDate": "Thu, 03 Oct 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721081",
+ "prescriptionName": "ECONAZOLE NITRATE 1% CREAM",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24515667,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00168-0312-30",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "ECONAZOLE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/24212585",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "24158300",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 24158300,
+ "prescriptionNumber": "2721075",
+ "prescriptionName": "ERGOCALCIFEROL (VITAMIN D) 50000 UNT CAP",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-06-24T04:00:00.000Z",
+ "refillDate": "2024-06-24T04:00:00.000Z",
+ "refillRemaining": 3,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-05-25T04:00:00.000Z",
+ "quantity": 3,
+ "expirationDate": "2025-05-26T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "TAKE 1 BY MOUTH DAILY FOR 30 DAYS --DO NOT CRUSH OR CHEW--",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00904-0291-60",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [],
+ "tracking": false,
+ "orderableItem": "ERGOCALCIFEROL",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/24158300",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "23845320",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23845320,
+ "prescriptionNumber": "2721020",
+ "prescriptionName": "IBUPROFEN 400MG TAB",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-06-13T04:00:00.000Z",
+ "refillDate": "2024-06-18T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-04-29T04:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-04-30T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "TAKE ONE TABLET DAILY FOR 30 DAYS TEST --TAKE WITH FOOD IF GI UPSET OCCURS/DO NOT CRUSH OR CHEW--",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "53746-0131-05",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 13 Jun 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23906771,
+ "sig": null,
+ "orderedDate": "Tue, 18 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721020",
+ "prescriptionName": "IBUPROFEN 400MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23906771,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "53746-0131-05",
+ "reason": null,
+ "prescriptionNumberIndex": "RF2",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 31 May 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23859029,
+ "sig": null,
+ "orderedDate": "Sun, 19 May 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721020",
+ "prescriptionName": "IBUPROFEN 400MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23859029,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "53746-0131-05",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "IBUPROFEN",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23845320",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "23845321",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23845321,
+ "prescriptionNumber": "2721021",
+ "prescriptionName": "KARAYA PASTE (2 OUNCES)",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-06-13T04:00:00.000Z",
+ "refillDate": "2024-06-18T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-04-29T04:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-04-30T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "APPLY 1 TO AFFECTED AREA DAILY FOR 30 DAYS TEST",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": null,
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 13 Jun 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23906772,
+ "sig": null,
+ "orderedDate": "Tue, 18 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721021",
+ "prescriptionName": "KARAYA PASTE (2 OUNCES)",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23906772,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": null,
+ "reason": null,
+ "prescriptionNumberIndex": "RF2",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 31 May 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23859030,
+ "sig": null,
+ "orderedDate": "Sun, 19 May 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721021",
+ "prescriptionName": "KARAYA PASTE (2 OUNCES)",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23859030,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": null,
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "KARAYA",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23845321",
+ "tracking": ""
+ }
+ },
+ {
+ "id": "23845319",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 23845319,
+ "prescriptionNumber": "2721019",
+ "prescriptionName": "LABETALOL 5MG/ML INJ 20ML",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-06-18T04:00:00.000Z",
+ "refillDate": "2024-06-18T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-04-29T04:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-04-30T04:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "INJECT 1 IVP DAILY FOR 30 DAYS TEST",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00085-0362-07",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": "TEST",
+ "indicationForUseFlag": "1",
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Tue, 18 Jun 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23993951,
+ "sig": null,
+ "orderedDate": "Tue, 18 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721019",
+ "prescriptionName": "LABETALOL 5MG/ML INJ 20ML",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23993951,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00085-0362-07",
+ "reason": null,
+ "prescriptionNumberIndex": "RF2",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ },
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Fri, 31 May 2024 00:00:00 EDT",
+ "refillDate": "Mon, 29 Apr 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23859028,
+ "sig": null,
+ "orderedDate": "Sun, 19 May 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721019",
+ "prescriptionName": "LABETALOL 5MG/ML INJ 20ML",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 23859028,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00085-0362-07",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "LABETALOL",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/23845319",
+ "tracking": ""
+ }
+ }
+ ],
+ "meta": {
+ "updatedAt": "Thu, 02 Jan 2025 09:19:39 EST",
+ "failedStationList": "",
+ "sort": {
+ "dispStatus": "ASC",
+ "prescriptionName": "ASC",
+ "dispensedDate": "ASC"
+ },
+ "pagination": {
+ "currentPage": 1,
+ "perPage": 10,
+ "totalPages": 10,
+ "totalEntries": 97
+ },
+ "filterCount": {
+ "allMedications": 97,
+ "active": 24,
+ "recentlyRequested": 15,
+ "renewal": 22,
+ "nonActive": 67
+ }
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions?page=1&per_page=10&query_parameters%5Bpage%5D=2&query_parameters%5Bper_page%5D=10&query_parameters%5Bsort%5D%5B%5D=disp_status&query_parameters%5Bsort%5D%5B%5D=prescription_name&query_parameters%5Bsort%5D%5B%5D=dispensed_date",
+ "first": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions?page=1&per_page=10&query_parameters%5Bpage%5D=2&query_parameters%5Bper_page%5D=10&query_parameters%5Bsort%5D%5B%5D=disp_status&query_parameters%5Bsort%5D%5B%5D=prescription_name&query_parameters%5Bsort%5D%5B%5D=dispensed_date",
+ "prev": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions?page=1&per_page=10&query_parameters%5Bpage%5D=2&query_parameters%5Bper_page%5D=10&query_parameters%5Bsort%5D%5B%5D=disp_status&query_parameters%5Bsort%5D%5B%5D=prescription_name&query_parameters%5Bsort%5D%5B%5D=dispensed_date",
+ "next": null,
+ "last": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions?page=1&per_page=10&query_parameters%5Bpage%5D=2&query_parameters%5Bper_page%5D=10&query_parameters%5Bsort%5D%5B%5D=disp_status&query_parameters%5Bsort%5D%5B%5D=prescription_name&query_parameters%5Bsort%5D%5B%5D=dispensed_date"
+ }
+}
\ No newline at end of file
diff --git a/src/applications/mhv-medications/tests/e2e/fixtures/older-prescription-details.json b/src/applications/mhv-medications/tests/e2e/fixtures/older-prescription-details.json
new file mode 100644
index 000000000000..56b4877e2d2a
--- /dev/null
+++ b/src/applications/mhv-medications/tests/e2e/fixtures/older-prescription-details.json
@@ -0,0 +1,768 @@
+{
+ "data": {
+ "id": "24929167",
+ "type": "prescription_details",
+ "attributes": {
+ "prescriptionId": 24929167,
+ "prescriptionNumber": "2721063A",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-12T05:00:00.000Z",
+ "refillDate": "2025-01-01T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "Dayton Medical Center",
+ "orderedDate": "2024-12-12T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-12-13T05:00:00.000Z",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopNdcNumber": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "cmopDivisionPhone": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2721063",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ {
+ "refillStatus": "suspended",
+ "refillSubmitDate": "Thu, 12 Dec 2024 00:00:00 EST",
+ "refillDate": "Thu, 12 Dec 2024 00:00:00 EST",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 24930426,
+ "sig": null,
+ "orderedDate": "Wed, 01 Jan 2025 00:00:00 EST",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063A",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": null,
+ "cmopNdcNumber": null,
+ "id": 24930426,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Suspended",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": true,
+ "notRenewableReason": null,
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": [
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063C",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063B",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063A",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 23906992,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2024-06-20T04:00:00.000Z",
+ "refillDate": "2024-06-11T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-05-15T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2025-05-16T04:00:00.000Z",
+ "prescriptionNumber": "2721063",
+ "sig": "TAKE ONE TABLET BY MOUTH DAILY FOR 30 DAYS --AVOID GRAPEFRUIT JUICE/AVOID ANTACIDS--",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": "2024-06-12T04:00:00.000Z",
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 22496029,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2025-01-02T14:19:39.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ [
+ "rf_record",
+ [
+ {
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "Fri, 14 Jun 2024 00:00:00 EDT",
+ "refillDate": "Wed, 15 May 2024 00:00:00 EDT",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "isRefillable": false,
+ "isTrackable": false,
+ "prescriptionId": 23907169,
+ "sig": null,
+ "orderedDate": "Tue, 11 Jun 2024 00:00:00 EDT",
+ "quantity": null,
+ "expirationDate": null,
+ "prescriptionNumber": "2721063",
+ "prescriptionName": "ATORVASTATIN CALCIUM 10MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": null,
+ "cmopDivisionPhone": "(783)272-1063",
+ "cmopNdcNumber": "00013264681",
+ "id": 23907169,
+ "userId": 22496029,
+ "providerFirstName": null,
+ "providerLastName": null,
+ "remarks": null,
+ "divisionName": null,
+ "modifiedDate": null,
+ "institutionId": null,
+ "dialCmopDivisionPhone": "7832721063",
+ "dispStatus": "Discontinued",
+ "ndc": "00071-0155-23",
+ "reason": null,
+ "prescriptionNumberIndex": "RF1",
+ "prescriptionSource": "RF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "orderableItem": null,
+ "shape": null,
+ "color": null,
+ "frontImprint": null,
+ "backImprint": null,
+ "dataSourceSystem": "VISTA",
+ "isRenewable": false,
+ "notRenewableReason": "Duplicate Rx Renewal Request.",
+ "trackingList": null,
+ "rxRfRecords": null,
+ "tracking": false
+ }
+ ]
+ ]
+ ],
+ "tracking": false,
+ "orderableItem": "ATORVASTATIN 10MG",
+ "sortedDispensedDate": "2024-06-12",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ }
+ ]
+ },
+ "links": {
+ "self": "http://0a260ce6724bf8b2d278aa933eea8132-api.review.vetsgov-internal/my_health/v1/prescriptions/24929167",
+ "tracking": ""
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/applications/mhv-medications/tests/e2e/medications-previous-prescriptions-section-details-page.cypress.spec.js b/src/applications/mhv-medications/tests/e2e/medications-previous-prescriptions-section-details-page.cypress.spec.js
new file mode 100644
index 000000000000..76764ced8656
--- /dev/null
+++ b/src/applications/mhv-medications/tests/e2e/medications-previous-prescriptions-section-details-page.cypress.spec.js
@@ -0,0 +1,31 @@
+import MedicationsSite from './med_site/MedicationsSite';
+import MedicationsLandingPage from './pages/MedicationsLandingPage';
+import medicationsList from './fixtures/grouped-prescriptions-list.json';
+import MedicationsDetailsPage from './pages/MedicationsDetailsPage';
+import olderRxDetails from './fixtures/older-prescription-details.json';
+import { Data } from './utils/constants';
+
+describe('Medications Details Page Grouping', () => {
+ it('visits Medications Details Page Grouping Pagination', () => {
+ const site = new MedicationsSite();
+ const landingPage = new MedicationsLandingPage();
+ const detailsPage = new MedicationsDetailsPage();
+ site.login();
+ landingPage.visitLandingPageURL();
+ landingPage.visitMedicationsListPage(medicationsList);
+ cy.injectAxe();
+ cy.axeCheck('main');
+ detailsPage.clickMedicationDetailsLink(olderRxDetails, 2);
+ detailsPage.verifyPreviousPrescriptionsPaginationTextOnDetailsPage(
+ Data.PREVIOUS_PRESCRIPTION_PAGINATION,
+ );
+ detailsPage.clickNextButtonForPreviousPrescriptionPagination();
+ detailsPage.verifyPaginationTextIsFocusedAfterClickingNext(
+ Data.PREVIOUS_PRESCRIPTION_PAGINATION_SECOND,
+ );
+ detailsPage.clickNextButtonForPreviousPrescriptionPagination();
+ detailsPage.verifyPaginationTextIsFocusedAfterClickingNext(
+ Data.PREVIOUS_PRESCRIPTION_PAGINATION_THIRD,
+ );
+ });
+});
diff --git a/src/applications/mhv-medications/tests/e2e/pages/MedicationsDetailsPage.js b/src/applications/mhv-medications/tests/e2e/pages/MedicationsDetailsPage.js
index 0289f739816c..f272da3bd90a 100644
--- a/src/applications/mhv-medications/tests/e2e/pages/MedicationsDetailsPage.js
+++ b/src/applications/mhv-medications/tests/e2e/pages/MedicationsDetailsPage.js
@@ -454,6 +454,20 @@ class MedicationsDetailsPage {
'Download a text file',
);
};
+
+ verifyPreviousPrescriptionsPaginationTextOnDetailsPage = text => {
+ cy.get('[data-testid="grouping-showing-info"]').should('have.text', text);
+ };
+
+ clickNextButtonForPreviousPrescriptionPagination = () => {
+ cy.contains('Next').click({ force: true });
+ };
+
+ verifyPaginationTextIsFocusedAfterClickingNext = text => {
+ cy.get('[data-testid="grouping-showing-info"]')
+ .should('have.text', text)
+ .and('have.focus');
+ };
}
export default MedicationsDetailsPage;
diff --git a/src/applications/mhv-medications/tests/e2e/pages/MedicationsLandingPage.js b/src/applications/mhv-medications/tests/e2e/pages/MedicationsLandingPage.js
index 9aa9353207ad..89d65fc82624 100644
--- a/src/applications/mhv-medications/tests/e2e/pages/MedicationsLandingPage.js
+++ b/src/applications/mhv-medications/tests/e2e/pages/MedicationsLandingPage.js
@@ -3,6 +3,7 @@ import emptyPrescriptionsList from '../fixtures/empty-prescriptions-list.json';
import prescriptions from '../fixtures/prescriptions.json';
import { Paths } from '../utils/constants';
import rxList from '../fixtures/listOfPrescriptions.json';
+import allergies from '../fixtures/allergies.json';
class MedicationsLandingPage {
clickExpandAllAccordionButton = () => {
@@ -130,5 +131,18 @@ class MedicationsLandingPage {
cy.visit(medicationsUrls.MEDICATIONS_ABOUT);
cy.intercept('GET', Paths.LANDING_LIST, emptyPrescriptionsList);
};
+
+ visitMedicationsListPage = prescriptionsList => {
+ cy.intercept('GET', `${Paths.MED_LIST}`).as('medicationsList');
+ cy.intercept(
+ 'GET',
+ '/my_health/v1/medical_records/allergies',
+ allergies,
+ ).as('allergies');
+ cy.intercept('GET', Paths.MED_LIST, prescriptionsList).as(
+ 'medicationsList',
+ );
+ cy.get('[data-testid ="prescriptions-nav-link"]').click({ force: true });
+ };
}
export default MedicationsLandingPage;
diff --git a/src/applications/mhv-medications/tests/e2e/utils/constants.js b/src/applications/mhv-medications/tests/e2e/utils/constants.js
index 1a6073059e0f..b1d8c4a8fa83 100644
--- a/src/applications/mhv-medications/tests/e2e/utils/constants.js
+++ b/src/applications/mhv-medications/tests/e2e/utils/constants.js
@@ -12,6 +12,12 @@ export const Data = {
'Showing 1 - 10 of 29 recently requested medications, alphabetically by status',
ACTIVE_REFILL_IN_PROCESS: 'We expect to fill this prescription on',
ACTIVE_NON_VA: 'You can’t manage this medication in this online tool.',
+ PREVIOUS_PRESCRIPTION_PAGINATION:
+ 'Showing 1 - 10 of 26 prescriptions, from newest to oldest',
+ PREVIOUS_PRESCRIPTION_PAGINATION_SECOND:
+ 'Showing 11 - 20 of 26 prescriptions, from newest to oldest',
+ PREVIOUS_PRESCRIPTION_PAGINATION_THIRD:
+ 'Showing 21 - 26 of 26 prescriptions, from newest to oldest',
};
export const Paths = {
LANDING_LIST:
diff --git a/src/applications/mhv-medications/tests/fixtures/groupedMedicationsList.json b/src/applications/mhv-medications/tests/fixtures/groupedMedicationsList.json
new file mode 100644
index 000000000000..8397ddc9e03b
--- /dev/null
+++ b/src/applications/mhv-medications/tests/fixtures/groupedMedicationsList.json
@@ -0,0 +1,830 @@
+[
+ {
+ "prescriptionId": 24956729,
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-09T05:00:00.000Z",
+ "refillDate": "2024-12-26T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-12-14T05:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-12-07T05:00:00.000Z",
+ "prescriptionNumber": "1",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "test",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-12-30T14:40:26.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "PF1",
+ "prescriptionSource": "PF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22625964,
+ "prescriptionImage": null,
+ "refillStatus": "expired",
+ "refillSubmitDate": "2024-10-31T04:00:00.000Z",
+ "refillDate": "2024-08-06T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-10-31T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-10-31T04:00:00.000Z",
+ "prescriptionNumber": "2",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466A",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-11-01T14:01:47.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Expired",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22565799,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-10-24T04:00:00.000Z",
+ "refillDate": "2023-09-12T04:00:00.000Z",
+ "refillRemaining": 3,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-09-11T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-09-11T04:00:00.000Z",
+ "prescriptionNumber": "3",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-09-12T04:10:06.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 21871320,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-04-11T22:20:39.000Z",
+ "refillDate": "2023-03-21T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-02-04T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-02-05T05:00:00.000Z",
+ "prescriptionNumber": "4",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-02-06T08:35:42.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": "2023-03-21",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 24956729,
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-09T05:00:00.000Z",
+ "refillDate": "2024-12-26T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-12-14T05:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-12-07T05:00:00.000Z",
+ "prescriptionNumber": "5",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "test",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-12-30T14:40:26.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "PF1",
+ "prescriptionSource": "PF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22625964,
+ "prescriptionImage": null,
+ "refillStatus": "expired",
+ "refillSubmitDate": "2024-10-31T04:00:00.000Z",
+ "refillDate": "2024-08-06T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-10-31T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-10-31T04:00:00.000Z",
+ "prescriptionNumber": "6",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466A",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-11-01T14:01:47.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Expired",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22565799,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-10-24T04:00:00.000Z",
+ "refillDate": "2023-09-12T04:00:00.000Z",
+ "refillRemaining": 3,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-09-11T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-09-11T04:00:00.000Z",
+ "prescriptionNumber": "7",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-09-12T04:10:06.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 21871320,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-04-11T22:20:39.000Z",
+ "refillDate": "2023-03-21T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-02-04T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-02-05T05:00:00.000Z",
+ "prescriptionNumber": "8",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-02-06T08:35:42.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": "2023-03-21",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 24956729,
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-09T05:00:00.000Z",
+ "refillDate": "2024-12-26T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-12-14T05:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-12-07T05:00:00.000Z",
+ "prescriptionNumber": "9",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "test",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-12-30T14:40:26.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "PF1",
+ "prescriptionSource": "PF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22625964,
+ "prescriptionImage": null,
+ "refillStatus": "expired",
+ "refillSubmitDate": "2024-10-31T04:00:00.000Z",
+ "refillDate": "2024-08-06T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-10-31T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-10-31T04:00:00.000Z",
+ "prescriptionNumber": "10",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466A",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-11-01T14:01:47.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Expired",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22565799,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-10-24T04:00:00.000Z",
+ "refillDate": "2023-09-12T04:00:00.000Z",
+ "refillRemaining": 3,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-09-11T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-09-11T04:00:00.000Z",
+ "prescriptionNumber": "11",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-09-12T04:10:06.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 21871320,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-04-11T22:20:39.000Z",
+ "refillDate": "2023-03-21T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-02-04T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-02-05T05:00:00.000Z",
+ "prescriptionNumber": "12",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-02-06T08:35:42.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": "2023-03-21",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 24956729,
+ "prescriptionImage": null,
+ "refillStatus": "refillinprocess",
+ "refillSubmitDate": "2024-12-09T05:00:00.000Z",
+ "refillDate": "2024-12-26T05:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2024-12-14T05:00:00.000Z",
+ "quantity": 2,
+ "expirationDate": "2025-12-07T05:00:00.000Z",
+ "prescriptionNumber": "13",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "test",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-12-30T14:40:26.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Active: Refill in Process",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "PF1",
+ "prescriptionSource": "PF",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22625964,
+ "prescriptionImage": null,
+ "refillStatus": "expired",
+ "refillSubmitDate": "2024-10-31T04:00:00.000Z",
+ "refillDate": "2024-08-06T04:00:00.000Z",
+ "refillRemaining": 1,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-10-31T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-10-31T04:00:00.000Z",
+ "prescriptionNumber": "14",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466A",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-11-01T14:01:47.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Expired",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 22565799,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-10-24T04:00:00.000Z",
+ "refillDate": "2023-09-12T04:00:00.000Z",
+ "refillRemaining": 3,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-09-11T04:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-09-11T04:00:00.000Z",
+ "prescriptionNumber": "15",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": "RENEWED FROM RX # 2720466",
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-09-12T04:10:06.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": null,
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ },
+ {
+ "prescriptionId": 21871320,
+ "prescriptionImage": null,
+ "refillStatus": "discontinued",
+ "refillSubmitDate": "2023-04-11T22:20:39.000Z",
+ "refillDate": "2023-03-21T04:00:00.000Z",
+ "refillRemaining": 2,
+ "facilityName": "DAYT29",
+ "facilityApiName": "Dayton Medical Center",
+ "orderedDate": "2023-02-04T05:00:00.000Z",
+ "quantity": 30,
+ "expirationDate": "2024-02-05T05:00:00.000Z",
+ "prescriptionNumber": "16",
+ "sig": "TAKE 10MG BY MOUTH DAILY FOR 30 DAYS",
+ "prescriptionName": "ABACAVIR SO4 600MG/LAMIVUDINE 300MG TAB",
+ "dispensedDate": null,
+ "stationNumber": "989",
+ "isRefillable": false,
+ "isTrackable": false,
+ "cmopDivisionPhone": null,
+ "inCernerTransition": false,
+ "notRefillableDisplayMessage": "A refill request cannot be submitted at this time. Please review the prescription status and fill date. If you need more of this medication, please call the pharmacy phone number on your prescription label.",
+ "cmopNdcNumber": null,
+ "userId": 17621060,
+ "providerFirstName": "MOHAMMAD",
+ "providerLastName": "ISLAM",
+ "remarks": null,
+ "divisionName": "DAYTON",
+ "modifiedDate": "2024-02-06T08:35:42.000Z",
+ "institutionId": null,
+ "dialCmopDivisionPhone": "",
+ "dispStatus": "Discontinued",
+ "ndc": "00173-0742-00",
+ "reason": null,
+ "prescriptionNumberIndex": "RX",
+ "prescriptionSource": "RX",
+ "disclaimer": null,
+ "indicationForUse": null,
+ "indicationForUseFlag": null,
+ "category": "Rx Medication",
+ "trackingList": [],
+ "rxRfRecords": [
+ ],
+ "tracking": false,
+ "orderableItem": "ABACAVIR/LAMIVUDINE",
+ "sortedDispensedDate": "2023-03-21",
+ "shape": null,
+ "color": null,
+ "backImprint": null,
+ "frontImprint": null,
+ "groupedMedications": []
+ }
+]
\ No newline at end of file
From 43db5b66f471fb79a8d3fa01b871e61950a9be0e Mon Sep 17 00:00:00 2001
From: Juan Castillo <178949868+juancstlm-a6@users.noreply.github.com>
Date: Fri, 3 Jan 2025 12:02:24 -0800
Subject: [PATCH 25/34] Remove unused keys (#33848)
* Remove unused keys
* Revert removing Update keys
This reverts commit 1596cb7adc7d1713cf2effd9f7aea41c2a1b283d.
---
src/applications/check-in/locales/en/translation.json | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/applications/check-in/locales/en/translation.json b/src/applications/check-in/locales/en/translation.json
index 9d81da944815..28cf0adbcc29 100644
--- a/src/applications/check-in/locales/en/translation.json
+++ b/src/applications/check-in/locales/en/translation.json
@@ -365,10 +365,7 @@
"sign-in-to-find-appointment": "Sign in to VA.gov to find your appointment",
"phone-appointment": "Phone appointment",
"phone-error-help-text": "Your provider will call you at the appointment time. You may need to wait 15 minutes for their call.",
- "pre-check-in-no-longer-available": "Pre-check-in is no longer available for your appointment time.",
"something-went-wrong-please-try-again": "Something went wrong on our end. Please try again.",
- "if-you-have-questions-call": "If you have questions about your appointments, call your VA health facility.",
- "something-went-wrong": "Something went wrong. If you have questions about your appointments, call your VA health facility.",
"clinic-phone": "Clinic phone",
"need-to-make-changes": "Need to make changes?",
"contact-this-facility": "Contact this facility if you need to reschedule or cancel your appointment.",
@@ -384,12 +381,9 @@
"review-your-information-now": "Review your information now",
"your-information-is-up-to-date": "Your information is up to date",
"day-of-week-month-day-time": "{{ date, day }}, {{ date, monthDay }}, {{ date, time }}",
- "in-person-appointments": "In-person appointments",
"phone-appointments": "Phone appointments",
"check-in-now-for-your-date-time-appointment": "Check in now for appointment on {{ date, day }}, {{ date, monthDay }} at {{ date, time }}",
"details-for-appointment-on-date-at-time": "Details for {{ type }} appointment on {{ dateTime, date }} at {{ dateTime, time }}",
- "appointment-on-date-at-time": "Appointment on {{dateTime, date}} at {{ dateTime, time}}",
- "submit-claim": "Submit claim",
"review-body-text-unified": "You can submit your claim now or choose to file later. Either way, you can still complete the check-in process.",
"we-cant-find-any-upcoming-appointments": "We can’t find any upcoming VA medical appointments for you",
"canceled": "Canceled",
@@ -399,7 +393,6 @@
"video": "Video",
"we-cant-access-appointments": "We can’t access your appointments right now",
"were-sorry-theres-a-problem-with-system": "We’re sorry. There’s a problem with our system.",
- "when-time-to-check-in-for-appointment-well-send-another-text": "When it’s time to check in for your appointment, we’ll send you another text.",
"what-if-cant-find-appointments-in-list": "What if I can’t find my appointments in this list?",
"youve-successfully-reviewed-your-contact-information": "You’ve successfully reviewed your contact information",
"todays-appointments-at-this-facility": "Today’s appointments at this facility",
@@ -430,7 +423,6 @@
"review-todays-appointments": "Review today’s appointments",
"were-sorry-weve-run-into-a-problem": "We’re sorry. We’ve run into a problem.",
"were-having-trouble-getting-your-upcoming-appointments": "We’re having trouble getting your upcoming appointments. Please try again later.",
- "to-file-another-claim-for-different-date": "To file another claim for a different date, you can visit the Beneficiary Travel Self-Service System (BTSSS). You must file within 30 days of the appointment.",
"find-a-full-list-of-things-to-bring": "Find a full list of things to bring to your appointment",
"find-out-how-to-check-in-opens-in-new-tab": "Find out how to check in (opens in new tab)",
"we-cant-show-all-information": "We can’t show all your information right now",
From 02ccd711d773a25365cb394ab7968a457241921e Mon Sep 17 00:00:00 2001
From: Jeana Clark <117098918+jeana-adhoc@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:43:03 -0600
Subject: [PATCH 26/34] update card for file upload (#33870)
---
.../components/CustomReviewTopContent.jsx | 41 +++++++++++--------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/applications/simple-forms/form-upload/components/CustomReviewTopContent.jsx b/src/applications/simple-forms/form-upload/components/CustomReviewTopContent.jsx
index 2bcbbdace781..bbac40ed232a 100644
--- a/src/applications/simple-forms/form-upload/components/CustomReviewTopContent.jsx
+++ b/src/applications/simple-forms/form-upload/components/CustomReviewTopContent.jsx
@@ -25,25 +25,32 @@ const CustomReviewTopContent = () => {
} = form?.data;
const renderFileInfo = file => (
-
-
-
-
-
-
{file.name}
-
- {getFileSize(file.size)}
+
+
+
+
+
+
+
+ {file.name}
+
+
+ {getFileSize(file.size)}
+
+
);
const renderPersonalInfo = () => (
From bd2befb21f9d5e94836473dfe0d47a51a75b5ac6 Mon Sep 17 00:00:00 2001
From: John Luo
Date: Fri, 3 Jan 2025 15:50:31 -0500
Subject: [PATCH 27/34] Update DS review page (#33781)
* Update DS review page
* Remove description
* Update Type of care section
* Facility section
* Update facilities, date and time sections
* Revert covid review page changes
---
.../vaos/covid-19-vaccine/flow.js | 4 +-
.../components/ReviewPage/AppointmentDate.jsx | 30 ++++++
.../ContactDetailSection.jsx | 91 ++++++-------------
.../ReasonForAppointmentSection.jsx | 43 +++------
.../ReviewDirectScheduleInfo/Description.jsx | 42 ---------
.../ReviewDirectScheduleInfo.jsx | 13 +--
.../TypeOfAppointmentSection.jsx | 27 +-----
.../VAAppointmentSection/FacilitySection.jsx | 18 ++--
.../ReviewPage/ReviewRequestInfo/index.jsx | 6 +-
.../ReviewPage/index.direct.unit.spec.js | 49 +++++-----
.../new-appointment/newAppointmentFlow.js | 4 +-
.../vaos/services/mocks/v2/slots.json | 8 ++
.../ophthalmology.cypress.spec.js | 7 +-
.../primary-care.cypress.spec.js | 42 +++------
14 files changed, 147 insertions(+), 237 deletions(-)
delete mode 100644 src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ReviewDirectScheduleInfo/Description.jsx
diff --git a/src/applications/vaos/covid-19-vaccine/flow.js b/src/applications/vaos/covid-19-vaccine/flow.js
index 6fb7f36cbd1e..ac508035704f 100644
--- a/src/applications/vaos/covid-19-vaccine/flow.js
+++ b/src/applications/vaos/covid-19-vaccine/flow.js
@@ -147,11 +147,11 @@ export function routeToNextAppointmentPage(history, current, data) {
}
/* Function to get label from the flow
- * The URL displayed in the browser address bar is compared to the
+ * The URL displayed in the browser address bar is compared to the
* flow URL
*
* @export
- * @param {object} state
+ * @param {object} state
* @param {string} location - the pathname
* @returns {string} the label string
*/
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/AppointmentDate.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/AppointmentDate.jsx
index c5a40a62fcba..800f9a198b85 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/AppointmentDate.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/AppointmentDate.jsx
@@ -11,9 +11,38 @@ export default function AppointmentDate({
dates,
facilityId,
level = 3,
+ directSchedule = false,
}) {
const Heading = `h${level}`;
const timezone = getTimezoneByFacilityId(facilityId);
+ const timezoneAbbr = getTimezoneAbbrByFacilityId(facilityId);
+
+ if (directSchedule) {
+ return (
+ <>
+
+ Date and time
+
+ {dates?.map(selected => {
+ const dateTime =
+ selected.endsWith('Z') && timezone
+ ? moment(selected).tz(timezone)
+ : moment(selected, 'YYYY-MM-DDTHH:mm:ssZ');
+ return (
+ <>
+ {dateTime.format('dddd, MMMM D, YYYY')}
+
+ {dateTime.format('h:mm a')} {timezoneAbbr}
+
+
+ );
+ })}
+
+ );
+ }
if (dates[0].endsWith('Z') && timezone) {
return dates?.map((selected, i) => (
@@ -38,5 +67,6 @@ AppointmentDate.propTypes = {
dates: PropTypes.array.isRequired,
facilityId: PropTypes.string.isRequired,
classes: PropTypes.string,
+ directSchedule: PropTypes.bool,
level: PropTypes.oneOf([PropTypes.string, PropTypes.number]),
};
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ContactDetailSection.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ContactDetailSection.jsx
index 6d6a1a6fbd7f..8d8d9c7ecd2c 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ContactDetailSection.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ContactDetailSection.jsx
@@ -4,11 +4,11 @@ import PropTypes from 'prop-types';
import { useHistory } from 'react-router-dom';
import { useSelector } from 'react-redux';
-import { FACILITY_TYPES, FLOW_TYPES } from '../../../../utils/constants';
-import { getFlowType, getFormData } from '../../../redux/selectors';
+import { FACILITY_TYPES } from '../../../../utils/constants';
+import { getFormData } from '../../../redux/selectors';
import getNewAppointmentFlow from '../../../newAppointmentFlow';
-function formatBestTimetoCall(bestTime) {
+function formatBestTimeToCall(bestTime) {
const times = [];
let output = '';
if (bestTime?.morning) {
@@ -24,7 +24,7 @@ function formatBestTimetoCall(bestTime) {
}
if (times.length === 1) {
- output = times[0];
+ [output] = times;
} else if (times.length === 2) {
output = `${times[0]} or ${times[1]}`;
} else {
@@ -48,66 +48,8 @@ function handleClick(history, home, contactInfo) {
};
}
-function getContent({ data, flowType, formData }) {
- if (FLOW_TYPES.DIRECT === flowType)
- return (
- <>
- Your contact details
-
- {data.email}
- Call {formatBestTimetoCall(data.bestTimeToCall)}
-
- )}
-
-
- );
-
- return (
- <>
-
- Your contact information
-
-
- Email:
- {data.email}
- Phone number:
- Best time to call:
- {/* The following line tag is for italics not an icon */}
- {/* eslint-disable-next-line @department-of-veterans-affairs/prefer-icon-component */}
- Call {formatBestTimetoCall(data.bestTimeToCall)}
-
- )}
-
-
- );
-}
-
export default function ContactDetailSection({ data }) {
const formData = useSelector(getFormData);
- const flowType = useSelector(getFlowType);
const history = useHistory();
const { home, contactInfo } = useSelector(getNewAppointmentFlow);
@@ -119,7 +61,30 @@ export default function ContactDetailSection({ data }) {
className="vads-u-flex--1 vads-u-padding-right--1"
data-dd-privacy="mask"
>
- {getContent({ data, flowType, formData })}
+
+ Your contact information
+
+
+ Email:
+ {data.email}
+ Phone number:
+ Best time to call:
+ {/* The following line tag is for italics not an icon */}
+ {/* eslint-disable-next-line @department-of-veterans-affairs/prefer-icon-component */}
+ Call {formatBestTimeToCall(data.bestTimeToCall)}
+
+ )}
+
{
@@ -27,41 +26,29 @@ export default function ReasonForAppointmentSection({ data }) {
const { home, reasonForAppointment: reason } = useSelector(
getNewAppointmentFlow,
);
- const flowType = useSelector(getFlowType);
return (
<>
- {FLOW_TYPES.DIRECT === flowType && (
-
- {PURPOSE_TEXT_V2.find(
- purpose => purpose.id === reasonForAppointment,
- )?.short || 'Additional details'}
-
- )}
- {FLOW_TYPES.REQUEST === flowType && (
+
+ Details you’d like to share with your provider
+
+ {reasonForAppointment && (
<>
-
- Details you’d like to share with your provider
-
- {reasonForAppointment && (
- <>
-
- {
- PURPOSE_TEXT_V2.find(
- purpose => purpose.id === reasonForAppointment,
- )?.short
- }
-
-
-
- )}
- {!reasonForAppointment &&
- !reasonAdditionalInfo &&
No details shared }
+
+ {
+ PURPOSE_TEXT_V2.find(
+ purpose => purpose.id === reasonForAppointment,
+ )?.short
+ }
+
+
)}
+ {!reasonForAppointment &&
+ !reasonAdditionalInfo &&
No details shared }
- {isDirectSchedule && (
- <>
-
- You're scheduling {isVowel ? 'an' : 'a'} {description} appointment
-
-
- Make sure the information is correct. Then confirm your appointment.
- If you need to update any details, click Edit to go back to the
- screen where you entered the information. After you update your
- information, you'll need to go through the tool again to schedule
- your appointment.
-
-
- )}
-
- );
-}
-Description.propTypes = {
- data: PropTypes.object,
- flowType: PropTypes.string,
-};
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ReviewDirectScheduleInfo/ReviewDirectScheduleInfo.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ReviewDirectScheduleInfo/ReviewDirectScheduleInfo.jsx
index 2c82f028474c..de1da4ca24c7 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ReviewDirectScheduleInfo/ReviewDirectScheduleInfo.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/ReviewDirectScheduleInfo/ReviewDirectScheduleInfo.jsx
@@ -1,12 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { FLOW_TYPES } from '../../../../../utils/constants';
import ReasonForAppointmentSection from '../ReasonForAppointmentSection';
import ContactDetailSection from '../ContactDetailSection';
import AppointmentDate from '../../AppointmentDate';
-import Description from './Description';
import TypeOfAppointmentSection from '../TypeOfAppointmentSection';
-import State from '../../../../../components/State';
+import FacilitySection from '../VAAppointmentSection/FacilitySection';
export default function ReviewDirectScheduleInfo({
data,
@@ -17,19 +15,16 @@ export default function ReviewDirectScheduleInfo({
return (
{pageTitle}
-
+
+
-
{clinic.serviceName}
- {facility.name}
-
- {facility.address?.city},
-
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/TypeOfAppointmentSection.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/TypeOfAppointmentSection.jsx
index 8d9f56cc3ced..94a441914f32 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/TypeOfAppointmentSection.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/TypeOfAppointmentSection.jsx
@@ -1,34 +1,17 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { FLOW_TYPES } from '../../../../utils/constants';
+import { sentenceCase } from '../../../../utils/formatters';
import { getTypeOfCare } from '../../../redux/selectors';
-export default function TypeOfAppointmentSection({ data, flowType }) {
- const typeOfCare = getTypeOfCare(data)?.name;
-
- let typeOfAppt = 'VA Appointment';
-
- if (FLOW_TYPES.REQUEST === flowType) {
- typeOfAppt = 'Type of care';
-
- return (
- <>
-
- {typeOfAppt}
-
-
{typeOfCare}
-
- );
- }
+export default function TypeOfAppointmentSection({ data }) {
+ const typeOfCare = sentenceCase(getTypeOfCare(data)?.name);
return (
<>
- {typeOfAppt}
+ Type of care
-
- {typeOfCare}
-
+
{typeOfCare}
);
}
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/VAAppointmentSection/FacilitySection.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/VAAppointmentSection/FacilitySection.jsx
index 6e30a6598f5e..f2884ad78a45 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/VAAppointmentSection/FacilitySection.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/VAAppointmentSection/FacilitySection.jsx
@@ -5,26 +5,26 @@ import { FLOW_TYPES } from '../../../../../utils/constants';
import State from '../../../../../components/State';
import { getFlowType } from '../../../../redux/selectors';
-export default function FacilitySection({ facility }) {
+export default function FacilitySection({ facility, clinic }) {
const flowType = useSelector(getFlowType);
- if (FLOW_TYPES.DIRECT === flowType)
- return (
- <>
-
{facility.name}
- {facility.address?.city},
-
- );
-
return (
<>
Facility
{facility.name}
{facility.address?.city},
+ {FLOW_TYPES.DIRECT === flowType && (
+ <>
+
+
+
Clinic: {clinic.serviceName || 'Not available'}
+
+ )}
);
}
FacilitySection.propTypes = {
facility: PropTypes.object.isRequired,
+ clinic: PropTypes.object,
};
diff --git a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/index.jsx b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/index.jsx
index bdd502d0d85d..3390ca644560 100644
--- a/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/index.jsx
+++ b/src/applications/vaos/new-appointment/components/ReviewPage/ReviewRequestInfo/index.jsx
@@ -1,10 +1,9 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { FACILITY_TYPES, FLOW_TYPES } from '../../../../utils/constants';
+import { FACILITY_TYPES } from '../../../../utils/constants';
import TypeOfAppointmentSection from './TypeOfAppointmentSection';
import VAAppointmentSection from './VAAppointmentSection';
import CommunityCareSection from './CommunityCareSection/CommunityCareSection';
-import Description from './ReviewDirectScheduleInfo/Description';
export default function ReviewRequestInfo({
data,
@@ -18,8 +17,7 @@ export default function ReviewRequestInfo({
return (
{pageTitle}
-
-
+
{isCommunityCare && (
{
+describe('VAOS Page: ReviewPage direct scheduling', () => {
let store;
let start;
@@ -116,36 +116,43 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
expect(screen.getByText('Primary care')).to.have.tagName('span');
const [
pageHeading,
- descHeading,
typeOfCareHeading,
+ facilityHeading,
dateHeading,
- clinicHeading,
reasonHeading,
contactHeading,
] = screen.getAllByRole('heading');
- expect(pageHeading).to.contain.text('Review your appointment details');
- expect(descHeading).to.contain.text(
- 'scheduling a primary care appointment',
+ expect(pageHeading).to.contain.text(
+ 'Review and confirm your appointment details',
);
- expect(typeOfCareHeading).to.contain.text('VA Appointment');
+ expect(typeOfCareHeading).to.contain.text('Type of care');
expect(screen.baseElement).to.contain.text('Primary care');
- expect(dateHeading).to.contain.text(
- start.tz('America/Denver').format('dddd, MMMM D, YYYY [at] h:mm a'),
- );
-
- expect(clinicHeading).to.contain.text('Some VA clinic');
+ expect(facilityHeading).to.contain.text('Facility');
expect(screen.baseElement).to.contain.text('Cheyenne VA Medical Center');
+ expect(screen.baseElement).to.contain.text('Cheyenne, WyomingWY');
+ expect(screen.baseElement).to.contain.text('Clinic: Some VA clinic');
+
+ expect(dateHeading).to.contain.text('Date and time');
+ expect(screen.baseElement).to.contain.text(
+ start.tz('America/Denver').format('dddd, MMMM D, YYYY'),
+ );
+ expect(screen.baseElement).to.contain.text(
+ start.tz('America/Denver').format('h:mm a'),
+ );
- expect(reasonHeading).to.contain.text('Routine/Follow-up');
+ expect(reasonHeading).to.contain.text(
+ 'Details you’d like to share with your provider',
+ );
+ expect(screen.baseElement).to.contain.text('Routine/Follow-up');
expect(screen.baseElement).to.contain.text('I need an appt');
- expect(contactHeading).to.contain.text('Your contact details');
- expect(screen.baseElement).to.contain.text('joeblow@gmail.com');
+ expect(contactHeading).to.contain.text('Your contact information');
+ expect(screen.baseElement).to.contain.text('Email: joeblow@gmail.com');
expect(screen.getByTestId('patient-telephone')).to.exist;
expect(screen.baseElement).to.not.contain.text(
'Call anytime during the day',
@@ -172,7 +179,7 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
userEvent.click(screen.getByText(/Confirm appointment/i));
await waitFor(() => {
@@ -214,7 +221,7 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
userEvent.click(screen.getByText(/Confirm appointment/i));
@@ -259,7 +266,7 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
userEvent.click(screen.getByText(/Confirm appointment/i));
@@ -298,7 +305,7 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
userEvent.click(screen.getByText(/Confirm appointment/i));
@@ -337,7 +344,7 @@ describe('VAOS Page: ReviewPage direct scheduling with v2 api', () => {
store,
});
- await screen.findByText(/scheduling a primary care appointment/i);
+ await screen.findByText('Primary care');
userEvent.click(screen.getByText(/Confirm appointment/i));
diff --git a/src/applications/vaos/new-appointment/newAppointmentFlow.js b/src/applications/vaos/new-appointment/newAppointmentFlow.js
index 0ed089541a73..ff7546089f95 100644
--- a/src/applications/vaos/new-appointment/newAppointmentFlow.js
+++ b/src/applications/vaos/new-appointment/newAppointmentFlow.js
@@ -317,7 +317,7 @@ const flow = {
},
review: {
url: '/new-appointment/review',
- label: 'Review your appointment details',
+ label: 'Review and confirm your appointment details',
},
};
@@ -416,7 +416,7 @@ export default function getNewAppointmentFlow(state) {
...flow.review,
label:
FLOW_TYPES.DIRECT === flowType
- ? 'Review your appointment details'
+ ? 'Review and confirm your appointment details'
: 'Review and submit your request',
url: featureBreadcrumbUrlUpdate ? 'review' : '/new-appointment/review',
},
diff --git a/src/applications/vaos/services/mocks/v2/slots.json b/src/applications/vaos/services/mocks/v2/slots.json
index 53953514e5c5..17434cf16eaf 100644
--- a/src/applications/vaos/services/mocks/v2/slots.json
+++ b/src/applications/vaos/services/mocks/v2/slots.json
@@ -2487,6 +2487,14 @@
"start": "2024-08-22T21:15:00Z",
"end": "2024-08-22T00:00:00Z"
}
+ },
+ {
+ "id": "1913",
+ "type": "slots",
+ "attributes": {
+ "start": "2025-02-22T21:15:00Z",
+ "end": "2025-02-22T00:00:00Z"
+ }
}
]
}
\ No newline at end of file
diff --git a/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/ophthalmology.cypress.spec.js b/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/ophthalmology.cypress.spec.js
index 41fe0e10b870..efb25332d12e 100644
--- a/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/ophthalmology.cypress.spec.js
+++ b/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/ophthalmology.cypress.spec.js
@@ -143,12 +143,9 @@ describe('VAOS request schedule flow - Audiology', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling an ophthalmology appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /ophthalmology/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
diff --git a/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/primary-care.cypress.spec.js b/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/primary-care.cypress.spec.js
index 4955a341b9d1..d205052fe2cf 100644
--- a/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/primary-care.cypress.spec.js
+++ b/src/applications/vaos/tests/e2e/workflows/direct-schedule-workflow/primary-care.cypress.spec.js
@@ -137,12 +137,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
@@ -209,12 +206,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
@@ -291,12 +285,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
@@ -481,12 +472,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
@@ -548,12 +536,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
@@ -711,12 +696,9 @@ describe('VAOS direct schedule flow - Primary care', () => {
ReviewPageObject.assertUrl()
.assertHeading({
- name: /Review your appointment details/i,
- })
- .assertHeading({
- level: 2,
- name: /You.re scheduling a primary care appointment/i,
+ name: /Review and confirm your appointment details/i,
})
+ .assertText({ text: /primary care/i })
.clickConfirmButton();
ConfirmationPageObject.assertUrl().assertText({
From dbac3beaa620dfdc397e8d164bb0e09dbd1c1586 Mon Sep 17 00:00:00 2001
From: John Luo
Date: Fri, 3 Jan 2025 16:09:18 -0500
Subject: [PATCH 28/34] Update formSubmitTransformers to use v2 logic and
remove v1 implementation (#33732)
---
.../vaos/covid-19-vaccine/redux/actions.js | 2 +-
.../redux/helpers/formSubmitTransformers.js | 44 +-
.../helpers/formSubmitTransformers.v2.js | 23 -
.../vaos/new-appointment/redux/actions.js | 2 +-
.../redux/helpers/formSubmitTransformers.js | 311 +++---
.../formSubmitTransformers.unit.spec.js | 991 +++---------------
.../helpers/formSubmitTransformers.v2.js | 167 ---
.../formSubmitTransformers.v2.unit.spec.js | 208 ----
8 files changed, 291 insertions(+), 1457 deletions(-)
delete mode 100644 src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.v2.js
delete mode 100644 src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.js
delete mode 100644 src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.unit.spec.js
diff --git a/src/applications/vaos/covid-19-vaccine/redux/actions.js b/src/applications/vaos/covid-19-vaccine/redux/actions.js
index b02caa8a9de4..598b062abd15 100644
--- a/src/applications/vaos/covid-19-vaccine/redux/actions.js
+++ b/src/applications/vaos/covid-19-vaccine/redux/actions.js
@@ -39,7 +39,7 @@ import {
STARTED_NEW_APPOINTMENT_FLOW,
} from '../../redux/sitewide';
import { createAppointment } from '../../services/appointment';
-import { transformFormToVAOSAppointment } from './helpers/formSubmitTransformers.v2';
+import { transformFormToVAOSAppointment } from './helpers/formSubmitTransformers';
export const FORM_PAGE_OPENED = 'covid19Vaccine/FORM_PAGE_OPENED';
export const FORM_DATA_UPDATED = 'covid19Vaccine/FORM_DATA_UPDATED';
diff --git a/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.js b/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.js
index b7630af5b15b..7e93bd69b3b5 100644
--- a/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.js
+++ b/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.js
@@ -1,45 +1,23 @@
-import moment from 'moment';
import {
getChosenClinicInfo,
getChosenSlot,
selectCovid19VaccineFormData,
} from '../selectors';
-import { getClinicId, getSiteCode } from '../../../services/healthcare-service';
+import { getClinicId } from '../../../services/healthcare-service';
-export function transformFormToAppointment(state) {
- const clinic = getChosenClinicInfo(state);
+export function transformFormToVAOSAppointment(state) {
const data = selectCovid19VaccineFormData(state);
-
+ const clinic = getChosenClinicInfo(state);
const slot = getChosenSlot(state);
- const appointmentLength = moment(slot.end).diff(slot.start, 'minutes');
+
return {
- appointmentType: 'Vaccine',
- clinic: {
- siteCode: getSiteCode(clinic),
- clinicId: getClinicId(clinic),
- clinicName: clinic.serviceName,
- clinicFriendlyLocationName: clinic.serviceName,
- institutionName: clinic.stationName,
- institutionCode: clinic.stationId,
+ kind: 'clinic',
+ status: 'booked',
+ clinic: getClinicId(clinic),
+ slot: { id: slot.id },
+ extension: {
+ desiredDate: slot.start,
},
-
- // These times are a lie, they're actually in local time, but the upstream
- // service expects the 0 offset.
- desiredDate: `${moment(slot.start).format('YYYY-MM-DD')}T00:00:00+00:00`,
- dateTime: `${slot.start}+00:00`,
- duration: appointmentLength,
- bookingNotes: '',
- preferredEmail: data.email,
- // defaulted values
- apptType: 'P',
- purpose: '9',
- lvl: '1',
- ekg: '',
- lab: '',
- xRay: '',
- schedulingRequestType: 'NEXT_AVAILABLE_APPT',
- type: 'REGULAR',
- appointmentKind: 'TRADITIONAL',
- schedulingMethod: 'direct',
+ locationId: data.vaFacility,
};
}
diff --git a/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.v2.js b/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.v2.js
deleted file mode 100644
index 7e93bd69b3b5..000000000000
--- a/src/applications/vaos/covid-19-vaccine/redux/helpers/formSubmitTransformers.v2.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import {
- getChosenClinicInfo,
- getChosenSlot,
- selectCovid19VaccineFormData,
-} from '../selectors';
-import { getClinicId } from '../../../services/healthcare-service';
-
-export function transformFormToVAOSAppointment(state) {
- const data = selectCovid19VaccineFormData(state);
- const clinic = getChosenClinicInfo(state);
- const slot = getChosenSlot(state);
-
- return {
- kind: 'clinic',
- status: 'booked',
- clinic: getClinicId(clinic),
- slot: { id: slot.id },
- extension: {
- desiredDate: slot.start,
- },
- locationId: data.vaFacility,
- };
-}
diff --git a/src/applications/vaos/new-appointment/redux/actions.js b/src/applications/vaos/new-appointment/redux/actions.js
index 68e31d45d931..aa4abf2ce044 100644
--- a/src/applications/vaos/new-appointment/redux/actions.js
+++ b/src/applications/vaos/new-appointment/redux/actions.js
@@ -43,7 +43,7 @@ import {
transformFormToVAOSAppointment,
transformFormToVAOSCCRequest,
transformFormToVAOSVARequest,
-} from './helpers/formSubmitTransformers.v2';
+} from './helpers/formSubmitTransformers';
import {
resetDataLayer,
recordItemsRetrieved,
diff --git a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.js b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.js
index 374b48fbe12b..4de0467d499b 100644
--- a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.js
+++ b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.js
@@ -1,238 +1,167 @@
-import moment from 'moment';
-import environment from '@department-of-veterans-affairs/platform-utilities/environment';
import titleCase from 'platform/utilities/data/titleCase';
import { selectVAPResidentialAddress } from 'platform/user/selectors';
-import { getTimezoneByFacilityId } from '../../../utils/timezone';
-import {
- PURPOSE_TEXT_V2,
- TYPE_OF_VISIT,
- LANGUAGES,
-} from '../../../utils/constants';
+import moment from '../../../lib/moment-tz';
+import { LANGUAGES } from '../../../utils/constants';
import {
getTypeOfCare,
getFormData,
- getChosenClinicInfo,
- getChosenFacilityInfo,
- getSiteIdForChosenFacility,
getChosenCCSystemById,
+ getChosenClinicInfo,
getChosenSlot,
} from '../selectors';
-import { getClinicId, getSiteCode } from '../../../services/healthcare-service';
-
-const CC_PURPOSE = 'other';
-
-function getUserMessage(data) {
- const label = PURPOSE_TEXT_V2.find(
- purpose => purpose.id === data.reasonForAppointment,
- ).short;
-
- return `${label}: ${data.reasonAdditionalInfo}`;
-}
-
-function getTestFacilityName(id, name) {
- if (!environment.isProduction() && id.startsWith('983')) {
- return `CHYSHR-${name}`;
- }
-
- if (!environment.isProduction() && id.startsWith('984')) {
- // The extra space here is intentional, that appears to be how it is named
- // in CDW
- return `DAYTSHR -${name}`;
- }
-
- return name;
-}
-
-function getRequestedDates(data) {
- return data.selectedDates.reduce(
- (acc, date, index) => ({
- ...acc,
- [`optionDate${index + 1}`]: moment(date).format('MM/DD/YYYY'),
- [`optionTime${index + 1}`]: moment(date).hour() >= 12 ? 'PM' : 'AM',
- }),
- {
- optionDate1: 'No Date Selected',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'No Time Selected',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- },
- );
-}
-
-export function transformFormToVARequest(state) {
- const facility = getChosenFacilityInfo(state);
- const data = getFormData(state);
- const typeOfCare = getTypeOfCare(data);
- const siteId = getSiteIdForChosenFacility(state);
- const facilityId = facility.id;
- const facilityName = getTestFacilityName(facilityId, facility.name);
-
- return {
- typeOfCare: typeOfCare.id,
- typeOfCareId: typeOfCare.id,
- appointmentType: typeOfCare.name,
- facility: {
- name: facilityName,
- facilityCode: facilityId,
- parentSiteCode: siteId,
- },
- purposeOfVisit: PURPOSE_TEXT_V2.find(
- purpose => purpose.id === data.reasonForAppointment,
- )?.serviceName,
- otherPurposeOfVisit:
- data.reasonForAppointment === 'other'
- ? 'See additional information'
- : null,
- visitType: TYPE_OF_VISIT.find(type => type.id === data.visitType)
- ?.serviceName,
- phoneNumber: data.phoneNumber,
- verifyPhoneNumber: data.phoneNumber,
- ...getRequestedDates(data),
- // The bad camel casing here is intentional, to match downstream
- // system
- bestTimetoCall: Object.entries(data.bestTimeToCall)
- .filter(item => item[1])
- .map(item => titleCase(item[0])),
- emailPreferences: {
- emailAddress: data.email,
- // defaulted values
- notificationFrequency: 'Each new message',
- emailAllowed: true,
- textMsgAllowed: false,
- textMsgPhNumber: '',
- },
- email: data.email,
- // defaulted values
- status: 'Submitted',
- schedulingMethod: 'clerk',
- requestedPhoneCall: false,
- providerId: '0',
- providerOption: '',
- };
-}
+import { getClinicId } from '../../../services/healthcare-service';
+import { getTimezoneByFacilityId } from '../../../utils/timezone';
+import { getReasonCode } from './getReasonCode';
-export function transformFormToCCRequest(state) {
+export function transformFormToVAOSCCRequest(state) {
const data = getFormData(state);
const provider = data.communityCareProvider;
- let preferredProviders = [];
+ const residentialAddress = selectVAPResidentialAddress(state);
+ const parentFacility = getChosenCCSystemById(state);
+ let practitioners = [];
- if (
- !!data.communityCareProvider &&
- Object.keys(data.communityCareProvider).length
- ) {
- preferredProviders = [
+ if (provider?.identifier) {
+ practitioners = [
{
+ identifier: [
+ {
+ system: 'http://hl7.org/fhir/sid/us-npi',
+ value: data.communityCareProvider.identifier.find(
+ item => item.system === 'PPMS',
+ )?.value,
+ },
+ ],
address: {
- street: provider.address.line.join(', '),
+ line: provider.address.line,
city: provider.address.city,
state: provider.address.state,
- zipCode: provider.address.postalCode,
+ postalCode: provider.address.postalCode,
},
- practiceName: provider.name,
},
];
}
- const residentialAddress = selectVAPResidentialAddress(state);
- const organization = getChosenCCSystemById(state);
- let cityState;
+ let preferredLocation;
if (
residentialAddress &&
- residentialAddress.addressType !== 'MILITARY OVERSEAS'
+ residentialAddress.addressType !== 'OVERSEAS MILITARY'
) {
- cityState = {
- preferredCity: residentialAddress.city,
- preferredState: residentialAddress.stateCode,
+ preferredLocation = {
+ city: residentialAddress.city,
+ state: residentialAddress.stateCode,
};
- } else {
- cityState = {
- preferredCity: organization.address?.city,
- preferredState: organization.address?.state,
+ } else if (parentFacility.address) {
+ preferredLocation = {
+ city: parentFacility.address.city,
+ state: parentFacility.address.state,
};
}
const typeOfCare = getTypeOfCare(data);
-
+ const facilityTimezone = getTimezoneByFacilityId(data.communityCareSystemId);
return {
- typeOfCare: typeOfCare.ccId,
- typeOfCareId: typeOfCare.ccId,
- appointmentType: typeOfCare.name,
- facility: {
- name: organization.name,
- facilityCode: organization.id,
- parentSiteCode: organization.vistaId,
+ kind: 'cc',
+ status: 'proposed',
+ locationId: data.communityCareSystemId,
+ serviceType: typeOfCare.idV2 || typeOfCare.ccId,
+ // comment: data.reasonAdditionalInfo,
+ reasonCode: getReasonCode({
+ data,
+ isCC: true,
+ isDS: false,
+ }),
+ contact: {
+ telecom: [
+ {
+ type: 'phone',
+ value: data.phoneNumber,
+ },
+ {
+ type: 'email',
+ value: data.email,
+ },
+ ],
},
- purposeOfVisit: CC_PURPOSE,
- phoneNumber: data.phoneNumber,
- verifyPhoneNumber: data.phoneNumber,
- // The bad camel casing here is intentional, to match downstream
- // system
- bestTimetoCall: Object.entries(data.bestTimeToCall)
+ requestedPeriods: data.selectedDates.map(date => ({
+ start: moment
+ .tz(date, facilityTimezone)
+ .utc()
+ .format(),
+ end: moment
+ .tz(date, facilityTimezone)
+ .utc()
+ .add(12, 'hours')
+ .subtract(1, 'minute')
+ .format(),
+ })),
+ // These four fields aren't in the current schema, but probably should be
+ preferredTimesForPhoneCall: Object.entries(data.bestTimeToCall || {})
.filter(item => item[1])
.map(item => titleCase(item[0])),
- preferredProviders,
- newMessage: data.reasonAdditionalInfo,
preferredLanguage: LANGUAGES.find(
lang => lang.id === data.preferredLanguage,
)?.value,
- ...getRequestedDates(data),
- ...cityState,
- // defaulted values
- visitType: 'Office Visit',
- requestedPhoneCall: false,
- email: data.email,
- officeHours: [],
- reasonForVisit: '',
- distanceWillingToTravel: 40,
- secondRequest: false,
- secondRequestSubmitted: false,
- inpatient: false,
- status: 'Submitted',
- providerId: '0',
- providerOption: '',
+ preferredLocation,
+ practitioners,
};
}
-export function transformFormToAppointment(state) {
+export function transformFormToVAOSVARequest(state) {
const data = getFormData(state);
- const clinic = getChosenClinicInfo(state);
- const timezone = getTimezoneByFacilityId(data.vaFacility);
+ const typeOfCare = getTypeOfCare(data);
+ return {
+ kind: data.visitType,
+ status: 'proposed',
+ locationId: data.vaFacility,
+ // This may need to change when we get the new service type ids
+ serviceType: typeOfCare.idV2,
+ reasonCode: getReasonCode({
+ data,
+ isCC: false,
+ isDS: false,
+ }),
+ // comment: data.reasonAdditionalInfo,
+ requestedPeriods: [
+ {
+ start: moment.utc(data.selectedDates[0]).format(),
+ end: moment
+ .utc(data.selectedDates[0])
+ .add(12, 'hours')
+ .subtract(1, 'minute')
+ .format(),
+ },
+ ],
+ // This field isn't in the schema yet
+ preferredTimesForPhoneCall: Object.entries(data.bestTimeToCall || {})
+ .filter(item => item[1])
+ .map(item => titleCase(item[0])),
+ };
+}
+
+export function transformFormToVAOSAppointment(state) {
+ const data = getFormData(state);
+ const clinic = getChosenClinicInfo(state);
const slot = getChosenSlot(state);
- const purpose = getUserMessage(data);
- const appointmentLength = moment(slot.end).diff(slot.start, 'minutes');
+
+ // slot start and end times are not allowed on a booked va appointment.
+ delete slot.start;
+ delete slot.end;
+
return {
- appointmentType: getTypeOfCare(data).name,
- clinic: {
- siteCode: getSiteCode(clinic),
- clinicId: getClinicId(clinic),
- clinicName: clinic.serviceName,
- clinicFriendlyLocationName: clinic.serviceName,
- institutionName: clinic.stationName,
- institutionCode: clinic.stationId,
+ kind: 'clinic',
+ status: 'booked',
+ clinic: getClinicId(clinic),
+ slot,
+ extension: {
+ desiredDate: `${data.preferredDate}T00:00:00+00:00`,
},
-
- // These times are a lie, they're actually in local time, but the upstream
- // service expects the 0 offset.
- desiredDate: `${data.preferredDate}T00:00:00+00:00`,
- dateTime: `${slot.start}+00:00`,
- duration: appointmentLength,
- bookingNotes: purpose,
- preferredEmail: data.email,
- timeZone: timezone,
- // defaulted values
- apptType: 'P',
- purpose: '9',
- lvl: '1',
- ekg: '',
- lab: '',
- xRay: '',
- schedulingRequestType: 'NEXT_AVAILABLE_APPT',
- type: 'REGULAR',
- appointmentKind: 'TRADITIONAL',
- schedulingMethod: 'direct',
+ locationId: data.vaFacility,
+ reasonCode: getReasonCode({
+ data,
+ isCC: false,
+ isDS: true,
+ }),
};
}
diff --git a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.unit.spec.js b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.unit.spec.js
index 50dd9eaa328e..0fd36480ec83 100644
--- a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.unit.spec.js
+++ b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.unit.spec.js
@@ -1,490 +1,154 @@
import { expect } from 'chai';
import {
- transformFormToCCRequest,
- transformFormToVARequest,
- transformFormToAppointment,
+ transformFormToVAOSAppointment,
+ transformFormToVAOSVARequest,
} from './formSubmitTransformers';
-import {
- FETCH_STATUS,
- FLOW_TYPES,
- VHA_FHIR_ID,
-} from '../../../utils/constants';
+import { FLOW_TYPES, VHA_FHIR_ID } from '../../../utils/constants';
+import { getReasonCode } from './getReasonCode';
-describe('VAOS data transformation', () => {
- it('should transform form into VA request', () => {
- const state = {
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- visitType: 'clinic',
- reasonForAppointment: 'other',
- reasonAdditionalInfo: 'Testing',
- selectedDates: ['2019-11-20T12:00:00.000'],
- vaParent: '983A6',
- vaFacility: '983GB',
- facilityType: 'vamc',
- typeOfCareId: '323',
- },
- parentFacilities: [
- {
- id: '983A6',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983A6',
- },
- ],
- partOf: {
- reference: 'Organization/983',
+describe('VAOS V2 data transformation', () => {
+ describe('VA booked', () => {
+ it('remove slot.start and slot.end from new appointment object', () => {
+ const state = {
+ user: {
+ profile: {
+ vapContactInfo: {},
+ },
+ },
+ newAppointment: {
+ data: {
+ phoneNumber: '5035551234',
+ bestTimeToCall: {
+ morning: true,
+ },
+ email: 'test@va.gov',
+ reasonForAppointment: 'routine-follow-up',
+ reasonAdditionalInfo: 'asdfasdf',
+ selectedDates: ['2019-11-22T09:30:00'],
+ preferredDate: '2019-12-02',
+ clinicId: '983_308',
+ vaParent: '983',
+ vaFacility: '983',
+ facilityType: 'vamc',
+ typeOfCareId: '323',
+ },
+ availableSlots: [
+ {
+ start: '2019-12-22T09:30:00',
+ end: '2019-12-22T10:00:00',
},
- },
- ],
- facilities: {
- '323': [
{
- id: '983GB',
+ start: '2019-11-22T09:30:00',
+ end: '2019-11-22T10:00:00',
+ },
+ ],
+ parentFacilities: [
+ {
+ id: '983',
identifier: [
{
system: VHA_FHIR_ID,
- value: '983GB',
+ value: '983',
},
],
- name: 'Cheyenne VA Medical Center',
address: {
city: 'Cheyenne',
state: 'WY',
},
- legacyVAR: {
- institutionTimezone: 'America/Denver',
- },
},
],
- },
- flowType: FLOW_TYPES.REQUEST,
- },
- featureToggles: {},
- };
- const data = transformFormToVARequest(state);
- expect(data).to.deep.equal({
- typeOfCare: '323',
- typeOfCareId: '323',
- appointmentType: 'Primary care',
- status: 'Submitted',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983GB',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'Other',
- otherPurposeOfVisit: 'See additional information',
- visitType: 'Office Visit',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- bestTimetoCall: ['Morning'],
- emailPreferences: {
- emailAddress: 'test@va.gov',
- notificationFrequency: 'Each new message',
- emailAllowed: true,
- textMsgAllowed: false,
- textMsgPhNumber: '',
- },
- email: 'test@va.gov',
- schedulingMethod: 'clerk',
- requestedPhoneCall: false,
- providerId: '0',
- providerOption: '',
- });
- });
- it('should transform form for Sleep Care into VA request', () => {
- const state = {
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- visitType: 'clinic',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'Testing',
- selectedDates: ['2019-11-20T12:00:00.000'],
- vaParent: '983',
- vaFacility: '983GB',
- facilityType: 'vamc',
- typeOfCareId: 'SLEEP',
- typeOfSleepCareId: '349',
- },
- parentFacilities: [
- {
- id: '983',
- identifier: [
+ facilities: {
+ '323': [
{
- system: VHA_FHIR_ID,
- value: '983',
+ id: '983',
+ identifier: [
+ {
+ system: VHA_FHIR_ID,
+ value: '983',
+ },
+ ],
+ name: 'Cheyenne VA Medical Center',
+ address: {
+ city: 'Cheyenne',
+ state: 'WY',
+ },
+ legacyVAR: {
+ institutionTimezone: 'America/Denver',
+ },
},
],
},
- ],
- facilities: {
- '349': [
- {
- id: '983GB',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983GB',
- },
- ],
- name: 'Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- legacyVAR: {
- institutionTimezone: 'America/Denver',
+ clinics: {
+ '983_323': [
+ {
+ id: '983_308',
+ serviceName: 'Green Team Clinic1',
+ stationId: '983',
+ stationName: 'CHYSHR-Cheyenne VA Medical Center',
},
- },
- ],
- },
- flowType: FLOW_TYPES.REQUEST,
- },
- featureToggles: {},
- };
- const data = transformFormToVARequest(state);
- expect(data).to.deep.equal({
- typeOfCare: '349',
- typeOfCareId: '349',
- appointmentType: 'Continuous Positive Airway Pressure (CPAP)',
- status: 'Submitted',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983GB',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'Routine Follow-up',
- otherPurposeOfVisit: null,
- visitType: 'Office Visit',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- bestTimetoCall: ['Morning'],
- emailPreferences: {
- emailAddress: 'test@va.gov',
- notificationFrequency: 'Each new message',
- emailAllowed: true,
- textMsgAllowed: false,
- textMsgPhNumber: '',
- },
- email: 'test@va.gov',
- schedulingMethod: 'clerk',
- requestedPhoneCall: false,
- providerId: '0',
- providerOption: '',
- });
- });
-
- it('should transform form into CC request', () => {
- const state = {
- user: {
- profile: {
- vapContactInfo: {},
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- afternoon: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdf',
- communityCareSystemId: '983',
- preferredLanguage: 'english',
- hasCommunityCareProvider: true,
- communityCareProvider: {
- firstName: 'asdf',
- lastName: 'asdf',
- name: 'Practice',
- address: {
- line: ['456 elm st', 'sfasdf'],
- state: 'MA',
- city: 'northampton',
- postalCode: '01050',
- },
- phone: '2342444444',
- },
- selectedDates: ['2019-11-20T12:00:00.000'],
- facilityType: 'communityCare',
- typeOfCareId: '323',
- },
- facilities: {},
- facilityDetails: {},
- clinics: {},
- eligibility: {},
- ccEnabledSystems: [
- {
- id: '983',
- vistaId: '983',
- name: 'CHYSHR-Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- {
- id: '984',
- vistaId: '984',
- address: {
- city: 'Dayton',
- state: 'OH',
- },
- },
- ],
- pageChangeInProgress: false,
- parentFacilitiesStatus: FETCH_STATUS.succeeded,
- eligibilityStatus: FETCH_STATUS.succeeded,
- facilityDetailsStatus: FETCH_STATUS.succeeded,
- pastAppointments: null,
- submitStatus: 'succeeded',
- },
- featureToggles: {},
- };
- const data = transformFormToCCRequest(state);
- expect(data).to.deep.equal({
- typeOfCare: 'CCPRMYRTNE',
- typeOfCareId: 'CCPRMYRTNE',
- appointmentType: 'Primary care',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'other',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- bestTimetoCall: ['Afternoon'],
- preferredProviders: [
- {
- address: {
- street: '456 elm st, sfasdf',
- city: 'northampton',
- state: 'MA',
- zipCode: '01050',
+ ],
},
- practiceName: 'Practice',
},
- ],
- newMessage: 'asdf',
- preferredLanguage: 'English',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- preferredCity: 'Cheyenne',
- preferredState: 'WY',
- requestedPhoneCall: false,
- email: 'test@va.gov',
- officeHours: [],
- reasonForVisit: '',
- visitType: 'Office Visit',
- distanceWillingToTravel: 40,
- secondRequest: false,
- secondRequestSubmitted: false,
- inpatient: false,
- status: 'Submitted',
- providerId: '0',
- providerOption: '',
- });
- });
+ };
- it('should transform audiology form into audiology CC request', () => {
- const state = {
- user: {
- profile: {
- vapContactInfo: {},
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- afternoon: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdf',
- communityCareSystemId: '983',
- preferredLanguage: 'english',
- hasCommunityCareProvider: true,
- communityCareProvider: {
- firstName: 'asdf',
- lastName: 'asdf',
- name: 'Practice',
- address: {
- line: ['456 elm st', 'sfasdf'],
- state: 'MA',
- city: 'northampton',
- postalCode: '01050',
- },
- phone: '2342444444',
- },
- selectedDates: ['2019-11-20T12:00:00.000'],
- facilityType: 'communityCare',
- typeOfCareId: '203',
- audiologyType: 'CCAUDHEAR',
- },
- facilities: {},
- facilityDetails: {},
- clinics: {},
- eligibility: {},
- ccEnabledSystems: [
- {
- id: '983',
- vistaId: '983',
- name: 'CHYSHR-Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- {
- id: '984',
- vistaId: '984',
- address: {
- city: 'Dayton',
- state: 'OH',
- },
- },
- ],
- pageChangeInProgress: false,
- parentFacilitiesStatus: FETCH_STATUS.succeeded,
- eligibilityStatus: FETCH_STATUS.succeeded,
- facilityDetailsStatus: FETCH_STATUS.succeeded,
- pastAppointments: null,
- submitStatus: 'succeeded',
- },
- featureToggles: {},
- };
- const data = transformFormToCCRequest(state);
- expect(data).to.deep.equal({
- typeOfCare: 'CCAUDHEAR',
- typeOfCareId: 'CCAUDHEAR',
- appointmentType: 'Hearing aid support',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'other',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- bestTimetoCall: ['Afternoon'],
- preferredProviders: [
- {
- address: {
- street: '456 elm st, sfasdf',
- city: 'northampton',
- state: 'MA',
- zipCode: '01050',
- },
- practiceName: 'Practice',
+ // when the reason text is combined with appointment information
+ const reasonTextTransformed = getReasonCode({
+ data: state.newAppointment.data,
+ isCC: false,
+ isDS: true,
+ });
+
+ const stateWithSlotId = {
+ ...state,
+ newAppointment: {
+ ...state.newAppointment,
+ availableSlots: [
+ { ...state.newAppointment.availableSlots[0], id: 'test' },
+ { ...state.newAppointment.availableSlots[1], id: 'test2' },
+ ],
},
- ],
- newMessage: 'asdf',
- preferredLanguage: 'English',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- preferredCity: 'Cheyenne',
- preferredState: 'WY',
- requestedPhoneCall: false,
- email: 'test@va.gov',
- officeHours: [],
- reasonForVisit: '',
- visitType: 'Office Visit',
- distanceWillingToTravel: 40,
- secondRequest: false,
- secondRequestSubmitted: false,
- inpatient: false,
- status: 'Submitted',
- providerId: '0',
- providerOption: '',
+ };
+
+ const data = transformFormToVAOSAppointment(stateWithSlotId);
+ expect(data).to.deep.equal({
+ kind: 'clinic',
+ status: 'booked',
+ clinic: '308',
+ slot: {
+ id: 'test2',
+ },
+ extension: { desiredDate: '2019-12-02T00:00:00+00:00' },
+ locationId: '983',
+ reasonCode: reasonTextTransformed,
+ });
});
});
- it('should transform form into VA appointment', () => {
- const state = {
- user: {
- profile: {
- vapContactInfo: {},
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdfasdf',
- selectedDates: ['2019-11-22T09:30:00'],
- preferredDate: '2019-12-02',
- clinicId: '983_308',
- vaParent: '983',
- vaFacility: '983',
- facilityType: 'vamc',
- typeOfCareId: '323',
- },
- availableSlots: [
- {
- start: '2019-12-22T09:30:00',
- end: '2019-12-22T10:00:00',
- },
- {
- start: '2019-11-22T09:30:00',
- end: '2019-11-22T10:00:00',
- },
- ],
- parentFacilities: [
- {
- id: '983',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983',
- },
- ],
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- ],
- facilities: {
- '323': [
+ describe('VA request', () => {
+ it('request body is valid', () => {
+ const superLongText =
+ 'The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog.';
+ // Given the VA request is submitted
+ const state = {
+ newAppointment: {
+ data: {
+ phoneNumber: '5035551234',
+ bestTimeToCall: {
+ morning: true,
+ },
+ email: 'test@va.gov',
+ visitType: 'clinic',
+ reasonForAppointment: 'other',
+ reasonAdditionalInfo: superLongText,
+ selectedDates: ['2019-11-20T12:00:00.000'],
+ vaParent: '983',
+ vaFacility: '983GB',
+ facilityType: 'vamc',
+ typeOfCareId: 'SLEEP',
+ typeOfSleepCareId: '349',
+ },
+ parentFacilities: [
{
id: '983',
identifier: [
@@ -493,391 +157,52 @@ describe('VAOS data transformation', () => {
value: '983',
},
],
- name: 'Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- legacyVAR: {
- institutionTimezone: 'America/Denver',
- },
},
],
- },
- clinics: {
- '983_323': [
- {
- id: '983_308',
- serviceName: 'Green Team Clinic1',
- stationId: '983',
- stationName: 'CHYSHR-Cheyenne VA Medical Center',
- },
- ],
- },
- },
- featureToggles: {},
- };
- const data = transformFormToAppointment(state);
- expect(data).to.deep.equal({
- clinic: {
- siteCode: '983',
- clinicId: '308',
- clinicName: 'Green Team Clinic1',
- clinicFriendlyLocationName: 'Green Team Clinic1',
- institutionName: 'CHYSHR-Cheyenne VA Medical Center',
- institutionCode: '983',
- },
- desiredDate: '2019-12-02T00:00:00+00:00',
- dateTime: '2019-11-22T09:30:00+00:00',
- duration: 30,
- bookingNotes: 'Routine/Follow-up: asdfasdf',
- preferredEmail: 'test@va.gov',
- timeZone: 'America/Denver',
- apptType: 'P',
- purpose: '9',
- lvl: '1',
- ekg: '',
- lab: '',
- xRay: '',
- schedulingRequestType: 'NEXT_AVAILABLE_APPT',
- type: 'REGULAR',
- appointmentKind: 'TRADITIONAL',
- appointmentType: 'Primary care',
- schedulingMethod: 'direct',
- });
- });
-
- it('should transform form for Eye Care into VA request', () => {
- const state = {
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- visitType: 'clinic',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'Testing',
- selectedDates: ['2019-11-20T12:00:00.000'],
- vaParent: '983',
- vaFacility: '983GB',
- facilityType: 'vamc',
- typeOfCareId: 'EYE',
- typeOfEyeCareId: '407',
- },
- parentFacilities: [
- {
- id: '983',
- identifier: [
+ facilities: {
+ '349': [
{
- system: VHA_FHIR_ID,
- value: '983',
- },
- ],
- },
- ],
- facilities: {
- '407': [
- {
- id: '983GB',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983GB',
+ id: '983GB',
+ identifier: [
+ {
+ system: VHA_FHIR_ID,
+ value: '983GB',
+ },
+ ],
+ name: 'Cheyenne VA Medical Center',
+ address: {
+ city: 'Cheyenne',
+ state: 'WY',
+ },
+ legacyVAR: {
+ institutionTimezone: 'America/Denver',
},
- ],
- name: 'Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- legacyVAR: {
- institutionTimezone: 'America/Denver',
},
- },
- ],
- },
- flowType: FLOW_TYPES.REQUEST,
- },
- featureToggles: {},
- };
- const data = transformFormToVARequest(state);
- expect(data).to.deep.equal({
- typeOfCare: '407',
- typeOfCareId: '407',
- appointmentType: 'Ophthalmology',
- status: 'Submitted',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983GB',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'Routine Follow-up',
- otherPurposeOfVisit: null,
- visitType: 'Office Visit',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- bestTimetoCall: ['Morning'],
- emailPreferences: {
- emailAddress: 'test@va.gov',
- notificationFrequency: 'Each new message',
- emailAllowed: true,
- textMsgAllowed: false,
- textMsgPhNumber: '',
- },
- email: 'test@va.gov',
- schedulingMethod: 'clerk',
- requestedPhoneCall: false,
- providerId: '0',
- providerOption: '',
- });
- });
-
- it('should transform form using provider selection into CC request', () => {
- const state = {
- user: {
- profile: {
- facilities: [{ facilityId: '983', isCerner: false }],
- vapContactInfo: {
- residentialAddress: {
- addressLine1: '123 big sky st',
- city: 'Cincinnati',
- stateCode: 'OH',
- zipCode: '45220',
- latitude: 39.1,
- longitude: -84.6,
- },
- },
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- afternoon: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdf',
- communityCareSystemId: '983',
- preferredLanguage: 'english',
- communityCareProvider: {
- name: 'Practice',
- address: {
- line: ['456 elm st', 'sfasdf'],
- state: 'MA',
- city: 'northampton',
- postalCode: '01050',
- },
- },
- selectedDates: ['2019-11-20T12:00:00.000'],
- facilityType: 'communityCare',
- typeOfCareId: '323',
- },
- facilities: {},
- facilityDetails: {},
- clinics: {},
- eligibility: {},
- ccEnabledSystems: [
- {
- id: '983',
- vistaId: '983',
- name: 'CHYSHR-Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- {
- id: '984',
- vistaId: '984',
- address: {
- city: 'Dayton',
- state: 'OH',
- },
- },
- ],
- pageChangeInProgress: false,
- parentFacilitiesStatus: FETCH_STATUS.succeeded,
- eligibilityStatus: FETCH_STATUS.succeeded,
- facilityDetailsStatus: FETCH_STATUS.succeeded,
- pastAppointments: null,
- submitStatus: 'succeeded',
- },
- featureToggles: {},
- };
- const data = transformFormToCCRequest(state);
- expect(data).to.deep.equal({
- typeOfCare: 'CCPRMYRTNE',
- typeOfCareId: 'CCPRMYRTNE',
- appointmentType: 'Primary care',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'other',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- bestTimetoCall: ['Afternoon'],
- preferredProviders: [
- {
- address: {
- street: '456 elm st, sfasdf',
- city: 'northampton',
- state: 'MA',
- zipCode: '01050',
+ ],
},
- practiceName: 'Practice',
+ flowType: FLOW_TYPES.REQUEST,
},
- ],
- newMessage: 'asdf',
- preferredLanguage: 'English',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- preferredCity: 'Cincinnati',
- preferredState: 'OH',
- requestedPhoneCall: false,
- email: 'test@va.gov',
- officeHours: [],
- reasonForVisit: '',
- visitType: 'Office Visit',
- distanceWillingToTravel: 40,
- secondRequest: false,
- secondRequestSubmitted: false,
- inpatient: false,
- status: 'Submitted',
- providerId: '0',
- providerOption: '',
- });
- });
+ };
+ // when the reason text is combined with appointment information
+ const reasonTextTransformed = getReasonCode({
+ data: state.newAppointment.data,
+ isCC: false,
+ isDS: false,
+ });
- it('should transform form using provider selection into CC request when residential address is missing', () => {
- const state = {
- user: {
- profile: {
- facilities: [{ facilityId: '983', isCerner: false }],
- vapContactInfo: {
- residentialAddress: null,
- },
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- afternoon: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdf',
- communityCareSystemId: '983',
- preferredLanguage: 'english',
- communityCareProvider: {
- name: 'Practice',
- address: {
- line: ['456 elm st', 'sfasdf'],
- state: 'MA',
- city: 'northampton',
- postalCode: '01050',
- },
- firstName: 'test',
- lastName: 'mctesty',
- },
- selectedDates: ['2019-11-20T12:00:00.000'],
- facilityType: 'communityCare',
- typeOfCareId: '323',
- },
- facilities: {},
- facilityDetails: {},
- clinics: {},
- eligibility: {},
- ccEnabledSystems: [
- {
- id: '983',
- vistaId: '983',
- name: 'CHYSHR-Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- {
- id: '984',
- vistaId: '984',
- address: {
- city: 'Dayton',
- state: 'OH',
- },
- },
+ const data = transformFormToVAOSVARequest(state);
+ // Then the request body will transform
+ expect(data).to.deep.equal({
+ kind: 'clinic',
+ status: 'proposed',
+ locationId: '983GB',
+ serviceType: 'cpap',
+ reasonCode: reasonTextTransformed,
+ requestedPeriods: [
+ { start: '2019-11-20T12:00:00Z', end: '2019-11-20T23:59:00Z' },
],
- pageChangeInProgress: false,
- parentFacilitiesStatus: FETCH_STATUS.succeeded,
- eligibilityStatus: FETCH_STATUS.succeeded,
- facilityDetailsStatus: FETCH_STATUS.succeeded,
- pastAppointments: null,
- submitStatus: 'succeeded',
- },
- featureToggles: {},
- };
- const data = transformFormToCCRequest(state);
- expect(data).to.deep.equal({
- typeOfCare: 'CCPRMYRTNE',
- typeOfCareId: 'CCPRMYRTNE',
- appointmentType: 'Primary care',
- facility: {
- name: 'CHYSHR-Cheyenne VA Medical Center',
- facilityCode: '983',
- parentSiteCode: '983',
- },
- purposeOfVisit: 'other',
- phoneNumber: '5035551234',
- verifyPhoneNumber: '5035551234',
- bestTimetoCall: ['Afternoon'],
- preferredProviders: [
- {
- address: {
- street: '456 elm st, sfasdf',
- city: 'northampton',
- state: 'MA',
- zipCode: '01050',
- },
- practiceName: 'Practice',
- },
- ],
- newMessage: 'asdf',
- preferredLanguage: 'English',
- optionDate1: '11/20/2019',
- optionDate2: 'No Date Selected',
- optionDate3: 'No Date Selected',
- optionTime1: 'PM',
- optionTime2: 'No Time Selected',
- optionTime3: 'No Time Selected',
- preferredCity: 'Cheyenne',
- preferredState: 'WY',
- requestedPhoneCall: false,
- email: 'test@va.gov',
- officeHours: [],
- reasonForVisit: '',
- visitType: 'Office Visit',
- distanceWillingToTravel: 40,
- secondRequest: false,
- secondRequestSubmitted: false,
- inpatient: false,
- status: 'Submitted',
- providerId: '0',
- providerOption: '',
+ preferredTimesForPhoneCall: ['Morning'],
+ });
});
});
});
diff --git a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.js b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.js
deleted file mode 100644
index 4de0467d499b..000000000000
--- a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import titleCase from 'platform/utilities/data/titleCase';
-import { selectVAPResidentialAddress } from 'platform/user/selectors';
-import moment from '../../../lib/moment-tz';
-import { LANGUAGES } from '../../../utils/constants';
-import {
- getTypeOfCare,
- getFormData,
- getChosenCCSystemById,
- getChosenClinicInfo,
- getChosenSlot,
-} from '../selectors';
-import { getClinicId } from '../../../services/healthcare-service';
-import { getTimezoneByFacilityId } from '../../../utils/timezone';
-import { getReasonCode } from './getReasonCode';
-
-export function transformFormToVAOSCCRequest(state) {
- const data = getFormData(state);
- const provider = data.communityCareProvider;
- const residentialAddress = selectVAPResidentialAddress(state);
- const parentFacility = getChosenCCSystemById(state);
- let practitioners = [];
-
- if (provider?.identifier) {
- practitioners = [
- {
- identifier: [
- {
- system: 'http://hl7.org/fhir/sid/us-npi',
- value: data.communityCareProvider.identifier.find(
- item => item.system === 'PPMS',
- )?.value,
- },
- ],
- address: {
- line: provider.address.line,
- city: provider.address.city,
- state: provider.address.state,
- postalCode: provider.address.postalCode,
- },
- },
- ];
- }
-
- let preferredLocation;
-
- if (
- residentialAddress &&
- residentialAddress.addressType !== 'OVERSEAS MILITARY'
- ) {
- preferredLocation = {
- city: residentialAddress.city,
- state: residentialAddress.stateCode,
- };
- } else if (parentFacility.address) {
- preferredLocation = {
- city: parentFacility.address.city,
- state: parentFacility.address.state,
- };
- }
-
- const typeOfCare = getTypeOfCare(data);
- const facilityTimezone = getTimezoneByFacilityId(data.communityCareSystemId);
- return {
- kind: 'cc',
- status: 'proposed',
- locationId: data.communityCareSystemId,
- serviceType: typeOfCare.idV2 || typeOfCare.ccId,
- // comment: data.reasonAdditionalInfo,
- reasonCode: getReasonCode({
- data,
- isCC: true,
- isDS: false,
- }),
- contact: {
- telecom: [
- {
- type: 'phone',
- value: data.phoneNumber,
- },
- {
- type: 'email',
- value: data.email,
- },
- ],
- },
- requestedPeriods: data.selectedDates.map(date => ({
- start: moment
- .tz(date, facilityTimezone)
- .utc()
- .format(),
- end: moment
- .tz(date, facilityTimezone)
- .utc()
- .add(12, 'hours')
- .subtract(1, 'minute')
- .format(),
- })),
- // These four fields aren't in the current schema, but probably should be
- preferredTimesForPhoneCall: Object.entries(data.bestTimeToCall || {})
- .filter(item => item[1])
- .map(item => titleCase(item[0])),
- preferredLanguage: LANGUAGES.find(
- lang => lang.id === data.preferredLanguage,
- )?.value,
- preferredLocation,
- practitioners,
- };
-}
-
-export function transformFormToVAOSVARequest(state) {
- const data = getFormData(state);
- const typeOfCare = getTypeOfCare(data);
-
- return {
- kind: data.visitType,
- status: 'proposed',
- locationId: data.vaFacility,
- // This may need to change when we get the new service type ids
- serviceType: typeOfCare.idV2,
- reasonCode: getReasonCode({
- data,
- isCC: false,
- isDS: false,
- }),
- // comment: data.reasonAdditionalInfo,
- requestedPeriods: [
- {
- start: moment.utc(data.selectedDates[0]).format(),
- end: moment
- .utc(data.selectedDates[0])
- .add(12, 'hours')
- .subtract(1, 'minute')
- .format(),
- },
- ],
- // This field isn't in the schema yet
- preferredTimesForPhoneCall: Object.entries(data.bestTimeToCall || {})
- .filter(item => item[1])
- .map(item => titleCase(item[0])),
- };
-}
-
-export function transformFormToVAOSAppointment(state) {
- const data = getFormData(state);
- const clinic = getChosenClinicInfo(state);
- const slot = getChosenSlot(state);
-
- // slot start and end times are not allowed on a booked va appointment.
- delete slot.start;
- delete slot.end;
-
- return {
- kind: 'clinic',
- status: 'booked',
- clinic: getClinicId(clinic),
- slot,
- extension: {
- desiredDate: `${data.preferredDate}T00:00:00+00:00`,
- },
- locationId: data.vaFacility,
- reasonCode: getReasonCode({
- data,
- isCC: false,
- isDS: true,
- }),
- };
-}
diff --git a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.unit.spec.js b/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.unit.spec.js
deleted file mode 100644
index 297633f5c8da..000000000000
--- a/src/applications/vaos/new-appointment/redux/helpers/formSubmitTransformers.v2.unit.spec.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import { expect } from 'chai';
-
-import {
- transformFormToVAOSAppointment,
- transformFormToVAOSVARequest,
-} from './formSubmitTransformers.v2';
-import { FLOW_TYPES, VHA_FHIR_ID } from '../../../utils/constants';
-import { getReasonCode } from './getReasonCode';
-
-describe('VAOS V2 data transformation', () => {
- describe('VA booked', () => {
- it('remove slot.start and slot.end from new appointment object', () => {
- const state = {
- user: {
- profile: {
- vapContactInfo: {},
- },
- },
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- reasonForAppointment: 'routine-follow-up',
- reasonAdditionalInfo: 'asdfasdf',
- selectedDates: ['2019-11-22T09:30:00'],
- preferredDate: '2019-12-02',
- clinicId: '983_308',
- vaParent: '983',
- vaFacility: '983',
- facilityType: 'vamc',
- typeOfCareId: '323',
- },
- availableSlots: [
- {
- start: '2019-12-22T09:30:00',
- end: '2019-12-22T10:00:00',
- },
- {
- start: '2019-11-22T09:30:00',
- end: '2019-11-22T10:00:00',
- },
- ],
- parentFacilities: [
- {
- id: '983',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983',
- },
- ],
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- },
- ],
- facilities: {
- '323': [
- {
- id: '983',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983',
- },
- ],
- name: 'Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- legacyVAR: {
- institutionTimezone: 'America/Denver',
- },
- },
- ],
- },
- clinics: {
- '983_323': [
- {
- id: '983_308',
- serviceName: 'Green Team Clinic1',
- stationId: '983',
- stationName: 'CHYSHR-Cheyenne VA Medical Center',
- },
- ],
- },
- },
- };
-
- // when the reason text is combined with appointment information
- const reasonTextTransformed = getReasonCode({
- data: state.newAppointment.data,
- isCC: false,
- isDS: true,
- });
-
- const stateWithSlotId = {
- ...state,
- newAppointment: {
- ...state.newAppointment,
- availableSlots: [
- { ...state.newAppointment.availableSlots[0], id: 'test' },
- { ...state.newAppointment.availableSlots[1], id: 'test2' },
- ],
- },
- };
-
- const data = transformFormToVAOSAppointment(stateWithSlotId);
- expect(data).to.deep.equal({
- kind: 'clinic',
- status: 'booked',
- clinic: '308',
- slot: {
- id: 'test2',
- },
- extension: { desiredDate: '2019-12-02T00:00:00+00:00' },
- locationId: '983',
- reasonCode: reasonTextTransformed,
- });
- });
- });
-
- describe('VA request', () => {
- it('request body is valid', () => {
- const superLongText =
- 'The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog. The quick brown fox jumped over the lazy dog.';
- // Given the VA request is submitted
- const state = {
- newAppointment: {
- data: {
- phoneNumber: '5035551234',
- bestTimeToCall: {
- morning: true,
- },
- email: 'test@va.gov',
- visitType: 'clinic',
- reasonForAppointment: 'other',
- reasonAdditionalInfo: superLongText,
- selectedDates: ['2019-11-20T12:00:00.000'],
- vaParent: '983',
- vaFacility: '983GB',
- facilityType: 'vamc',
- typeOfCareId: 'SLEEP',
- typeOfSleepCareId: '349',
- },
- parentFacilities: [
- {
- id: '983',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983',
- },
- ],
- },
- ],
- facilities: {
- '349': [
- {
- id: '983GB',
- identifier: [
- {
- system: VHA_FHIR_ID,
- value: '983GB',
- },
- ],
- name: 'Cheyenne VA Medical Center',
- address: {
- city: 'Cheyenne',
- state: 'WY',
- },
- legacyVAR: {
- institutionTimezone: 'America/Denver',
- },
- },
- ],
- },
- flowType: FLOW_TYPES.REQUEST,
- },
- };
- // when the reason text is combined with appointment information
- const reasonTextTransformed = getReasonCode({
- data: state.newAppointment.data,
- isCC: false,
- isDS: false,
- });
-
- const data = transformFormToVAOSVARequest(state);
- // Then the request body will transform
- expect(data).to.deep.equal({
- kind: 'clinic',
- status: 'proposed',
- locationId: '983GB',
- serviceType: 'cpap',
- reasonCode: reasonTextTransformed,
- requestedPeriods: [
- { start: '2019-11-20T12:00:00Z', end: '2019-11-20T23:59:00Z' },
- ],
- preferredTimesForPhoneCall: ['Morning'],
- });
- });
- });
-});
From 22e1d6be2b7637de62eedfdc2b2c6d02aa788199 Mon Sep 17 00:00:00 2001
From: fatmakhan0395 <145523589+fatmakhan0395@users.noreply.github.com>
Date: Fri, 3 Jan 2025 13:18:01 -0800
Subject: [PATCH 29/34] vebt-943 and vebt-944 : text removal and correction in
22-10282 (#33847)
* vebt-943 and vebt-944 - text correction in 22-10282
* deleted download link on confirmation page
* Removed text for downloading form as a PDF on confirmation page
---
.../10282/containers/ConfirmationPage.jsx | 14 ++------------
.../10282/containers/IntroductionPage.jsx | 3 +--
.../pages/applicantInformation/applicantGender.js | 2 +-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/applications/edu-benefits/10282/containers/ConfirmationPage.jsx b/src/applications/edu-benefits/10282/containers/ConfirmationPage.jsx
index 4718bc3bb279..11ec36e5074e 100644
--- a/src/applications/edu-benefits/10282/containers/ConfirmationPage.jsx
+++ b/src/applications/edu-benefits/10282/containers/ConfirmationPage.jsx
@@ -56,10 +56,7 @@ export class ConfirmationPage extends React.Component {
Confirmation for your records
- You can print this confirmation page for your records. You can
- also download your completed application as a PDF.
-
+ You can print this confirmation page for your records.
{/* eslint-disable-next-line @department-of-veterans-affairs/prefer-button-component */}
Print this page
-
What to expect next
If you're accepted into the SkillsBuild program, you'll receive an
email from sbuser@us.ibm.com {' '}
- with your login informatia. If you don't receive an email, check
+ with your login information. If you don't receive an email, check
your spam folder.
diff --git a/src/applications/edu-benefits/10282/containers/IntroductionPage.jsx b/src/applications/edu-benefits/10282/containers/IntroductionPage.jsx
index 3fd8bea7ff62..27a7c16c1bfa 100644
--- a/src/applications/edu-benefits/10282/containers/IntroductionPage.jsx
+++ b/src/applications/edu-benefits/10282/containers/IntroductionPage.jsx
@@ -39,8 +39,7 @@ const IntroductionPage = ({ router }) => {
After you submit your form, you can print the confirmation page for
- your records. You can also download a copy of your completed form as a
- PDF.
+ your records.
After we review your form, we’ll email you a decision. If we need more
diff --git a/src/applications/edu-benefits/10282/pages/applicantInformation/applicantGender.js b/src/applications/edu-benefits/10282/pages/applicantInformation/applicantGender.js
index b20a6f392675..057677b35823 100644
--- a/src/applications/edu-benefits/10282/pages/applicantInformation/applicantGender.js
+++ b/src/applications/edu-benefits/10282/pages/applicantInformation/applicantGender.js
@@ -29,7 +29,7 @@ export const genderInfoHelpText = (
Sharing your gender identity in your VA.gov profile is optional. If
you get healthcare at VA, this information can help your care team
- better better assess your health needs and risks.
+ better assess your health needs and risks.
But you should know that any information you share in your VA.gov
From e22526e37b56f0d730b0bc8d879e05a128d2264a Mon Sep 17 00:00:00 2001
From: Holden Hinkle
Date: Fri, 3 Jan 2025 16:39:52 -0500
Subject: [PATCH 30/34] =?UTF-8?q?Fix=20bug=20with=20using=20formData=20in?=
=?UTF-8?q?=20the=20schema=20files=20when=20calling=20ProfileN=E2=80=A6=20?=
=?UTF-8?q?(#33881)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix bug with using formData in the schema files when calling ProfileNotUpdatedNote
* fix failing tests
---
.../components/ProfileNotUpdatedNote.jsx | 8 +++++---
.../pages/veteran/veteranContactMailing.js | 9 +--------
.../pages/veteran/veteranContactPhoneEmail.js | 9 ++-------
.../pages/veteran/veteranIdentification.js | 8 ++------
.../pages/veteran/veteranPersonalInformation.js | 7 +------
.../pages/veteran/veteranServiceInformation.js | 7 +------
.../claimant/claimantContactPhoneEmail.unit.spec.jsx | 1 +
.../claimant/claimantPersonalInformation.unit.spec.jsx | 1 +
.../pages/veteran/veteranContactPhoneEmail.unit.spec.jsx | 1 +
.../veteranContactPhoneEmailClaimant.unit.spec.jsx | 1 +
.../pages/veteran/veteranIdentification.unit.spec.jsx | 1 +
.../veteran/veteranPersonalInformation.unit.spec.jsx | 1 +
.../veteran/veteranServiceInformation.unit.spec.jsx | 1 +
13 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
index 3440b61c783e..92d413892d85 100644
--- a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
+++ b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
@@ -5,16 +5,17 @@ import PropTypes from 'prop-types';
import { CONTACTS } from '@department-of-veterans-affairs/component-library/contacts';
import { isLoggedIn } from 'platform/user/selectors';
+import { preparerIsVeteran } from '../utilities/helpers';
function ProfileNotUpdatedNote(props) {
const {
+ formData,
includeLink,
includePhone,
includePrefix,
loggedIn,
- preparerIsVeteran,
} = props;
- const isLoggedInVeteran = loggedIn && preparerIsVeteran;
+ const isLoggedInVeteran = loggedIn && preparerIsVeteran({ formData });
return (
<>
@@ -52,16 +53,17 @@ function ProfileNotUpdatedNote(props) {
}
ProfileNotUpdatedNote.propTypes = {
+ formData: PropTypes.object,
includeLink: PropTypes.bool,
includePhone: PropTypes.bool,
includePrefix: PropTypes.bool,
loggedIn: PropTypes.bool,
- preparerIsVeteran: PropTypes.bool,
};
function mapStateToProps(state) {
return {
loggedIn: isLoggedIn(state),
+ formData: state.form.data,
};
}
diff --git a/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js b/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js
index c355f5e6dd76..6d9424f3d280 100644
--- a/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js
+++ b/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js
@@ -7,7 +7,6 @@ import {
titleSchema,
} from 'platform/forms-system/src/js/web-component-patterns';
import ProfileNotUpdatedNote from '../../components/ProfileNotUpdatedNote';
-import { preparerIsVeteran } from '../../utilities/helpers';
export const uiSchema = {
...titleUI(
@@ -15,13 +14,7 @@ export const uiSchema = {
'We’ll send any important information about your form to this address.',
),
profileNotUpdatedNote: {
- 'ui:description': formData => (
- At this time, there isn’t a way to submit this form online.
Mail your completed form and all supporting documents to the{' '}
{abbr} at:
{determineVenueAddress(formResponses, true)}
+ At this time, there isn’t a way to submit this form online.
{
+ if (option === PREV_APPLICATION_DADT) {
+ return formResponses.REASON === RESPONSES.REASON_DD215_UPDATE_TO_DD214;
+ }
if (
[RESPONSES.NAVY, RESPONSES.MARINE_CORPS].includes(
formResponses.SERVICE_BRANCH,
diff --git a/src/applications/discharge-wizard/components/v2/resultsComponents/StepThree.jsx b/src/applications/discharge-wizard/components/v2/resultsComponents/StepThree.jsx
index 6bbf3c98056e..c1506175e6ac 100644
--- a/src/applications/discharge-wizard/components/v2/resultsComponents/StepThree.jsx
+++ b/src/applications/discharge-wizard/components/v2/resultsComponents/StepThree.jsx
@@ -7,16 +7,16 @@ import {
} from '../../../constants/question-data-map';
import { BCNR, BCMR, DRB, AFDRB } from '../../../constants';
import {
+ determineBoardName,
determineBoardObj,
determineVenueAddress,
- getBoardExplanation,
isPreviousApplicationYear,
} from '../../../helpers';
const StepThree = ({ formResponses }) => {
let onlineSubmissionMsg;
const boardToSubmit = determineBoardObj(formResponses);
- const boardExplanation = getBoardExplanation(formResponses);
+ const boardName = determineBoardName(formResponses.SERVICE_BRANCH);
if (
boardToSubmit.abbr === DRB &&
@@ -54,10 +54,19 @@ const StepThree = ({ formResponses }) => {
return (
+ {formResponses.SERVICE_BRANCH === RESPONSES.AIR_FORCE ? (
+
+ Based on your answers, you need to complete an Application for
+ Correction of Military Record (DD 149). You can download this form
+ from the Air Force Review Boards Agency Website and Portal.
+
+ ) : (
+ ''
+ )}
There are a number of different boards that handle discharge upgrades
and corrections. Based on your answers on the previous page, you need to
- apply to {boardExplanation}
+ apply to the {boardName}.
{boardToSubmit.abbr === AFDRB ? (
<>
diff --git a/src/applications/discharge-wizard/constants/question-data-map.js b/src/applications/discharge-wizard/constants/question-data-map.js
index c2d54852b36e..c5936fa836c6 100644
--- a/src/applications/discharge-wizard/constants/question-data-map.js
+++ b/src/applications/discharge-wizard/constants/question-data-map.js
@@ -10,7 +10,8 @@ export const QUESTION_MAP = Object.freeze({
COURT_MARTIAL: 'Was your discharge the outcome of a general court-martial?',
PREV_APPLICATION:
'Have you previously applied for and been denied a discharge upgrade for this period of service?',
- PREV_APPLICATION_TYPE: 'How did you apply for a discharge upgrade last time?',
+ PREV_APPLICATION_TYPE:
+ 'How did you previously apply for a discharge upgrade?',
PREV_APPLICATION_YEAR: 'What year did you apply for a discharge upgrade?',
PRIOR_SERVICE:
'Did you complete a period of service in which your character of service was Honorable or General Under Honorable Conditions?',
@@ -75,6 +76,8 @@ export const RESPONSES = Object.freeze({
'I applied to a Board for Correction of Military Records (BCMR).',
PREV_APPLICATION_BCNR:
'I applied to the Board for Correction of Naval Records (BCNR).',
+ PREV_APPLICATION_DADT:
+ 'I haven’t previously applied for a discharge upgrade, but I received an upgrade from the Defense Department (DOD) due to the Don’t Ask, Don’t Tell policy.',
YES: 'Yes',
NO: 'No',
PREV_APPLICATION_BEFORE_2014: '2014 or earlier',
diff --git a/src/applications/discharge-wizard/helpers/index.jsx b/src/applications/discharge-wizard/helpers/index.jsx
index dbf4b8841a4a..c3e9b541c469 100644
--- a/src/applications/discharge-wizard/helpers/index.jsx
+++ b/src/applications/discharge-wizard/helpers/index.jsx
@@ -797,3 +797,25 @@ export const renderMedicalRecordInfo = formResponses => {
}
return null;
};
+
+export const determineBoardName = branch => {
+ let boardName;
+
+ switch (branch) {
+ case RESPONSES.AIR_FORCE:
+ boardName = 'Air Force Board for Correction of Military Records';
+ break;
+ case RESPONSES.ARMY:
+ case RESPONSES.COAST_GUARD:
+ boardName = 'Board for Correction of Military Records (BCMR)';
+ break;
+ case RESPONSES.NAVY:
+ case RESPONSES.MARINE_CORPS:
+ boardName = 'Board for Correction of Naval Records (BCNR)';
+ break;
+ default:
+ boardName = '';
+ break;
+ }
+ return boardName;
+};
From 13d8f503ff9164fd74de0a5a1dba1fddbb543d59 Mon Sep 17 00:00:00 2001
From: wafimohamed <158514667+wafimohamed@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:31:00 -0500
Subject: [PATCH 32/34] fixed typeo with payload (#33889)
---
src/applications/verify-your-enrollment/actions/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/applications/verify-your-enrollment/actions/index.js b/src/applications/verify-your-enrollment/actions/index.js
index a1560f24faad..5c67d98a21e7 100644
--- a/src/applications/verify-your-enrollment/actions/index.js
+++ b/src/applications/verify-your-enrollment/actions/index.js
@@ -237,7 +237,7 @@ export const verifyEnrollmentAction = verifications => {
verifiedThroughDate: lastVerification?.verificationEndDate,
verificationMethod: 'VYE',
appCommunication: {
- responseype: 'Y',
+ responseType: 'Y',
},
};
})()
From 78fcb0c8990122cecd0cbed7669dc48247f09db2 Mon Sep 17 00:00:00 2001
From: Taras Kurilo
Date: Sat, 4 Jan 2025 10:14:54 -0500
Subject: [PATCH 33/34] edm-510 css fix and link update (#33885)
---
.../gi/components/profile/InstitutionProfile.jsx | 16 ++++++++--------
src/applications/gi/sass/gi.scss | 5 +++++
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/applications/gi/components/profile/InstitutionProfile.jsx b/src/applications/gi/components/profile/InstitutionProfile.jsx
index 754f2de84fa8..25f1488e5a2d 100644
--- a/src/applications/gi/components/profile/InstitutionProfile.jsx
+++ b/src/applications/gi/components/profile/InstitutionProfile.jsx
@@ -141,6 +141,13 @@ export default function InstitutionProfile({
jumpToId="calculate-your-benefits"
/>
)}
+ {institution.yr === true &&
+ toggleValue && (
+
{showSchoolContentBasedOnType(type) &&
@@ -214,7 +214,7 @@ export default function InstitutionProfile({
of higher learning (IHL). Schools that choose to participate in
the Yellow Ribbon program will contribute up to a certain dollar
amount toward the extra tuition. VA will match the participating
- school’s contribution{' '}
+ school’s contribution
{type === 'FOREIGN' && `${` `}in United States Dollars (USD)`}, up
to the total cost of the tuition and fees. To confirm the number
of students eligible for funding, contact the individual school.
diff --git a/src/applications/gi/sass/gi.scss b/src/applications/gi/sass/gi.scss
index f0e58ab909cd..be45135bf02a 100644
--- a/src/applications/gi/sass/gi.scss
+++ b/src/applications/gi/sass/gi.scss
@@ -429,6 +429,7 @@
height: auto;
display: flex;
width: 100%;
+ max-width: 305px;
.degree-level-card {
flex: 1;
width: 100%;
@@ -441,6 +442,10 @@
@media screen and (max-width: $medium-screen) {
.degree-level-results {
flex-direction: column;
+ .degree-item {
+ width: 100%;
+ max-width: 100%;
+ }
}
}
}
From 5e0dfcc4ffe773a4c60bae6251a947fddad3d58d Mon Sep 17 00:00:00 2001
From: Alexander Garcia <67602137+asg5704@users.noreply.github.com>
Date: Sun, 5 Jan 2025 19:07:33 -0500
Subject: [PATCH 34/34] removes unneeded css (#33854)
---
src/platform/site-wide/user-nav/sass/user-nav.scss | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/platform/site-wide/user-nav/sass/user-nav.scss b/src/platform/site-wide/user-nav/sass/user-nav.scss
index 64881f27c1e3..2957576bdcd0 100644
--- a/src/platform/site-wide/user-nav/sass/user-nav.scss
+++ b/src/platform/site-wide/user-nav/sass/user-nav.scss
@@ -218,15 +218,6 @@
}
.login.login-modal {
- // temporary solution until DST can fix va-modal large property
- margin-left: -1rem;
- margin-right: 4rem;
-
- @include media($medium-screen) {
- margin-left: unset;
- margin-right: unset;
- }
-
.downtime-notification.row {
margin: 0 0 1em;
}