Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) KHP3-7315: Follow up changes on HIE enhancement on the syncing of the providers attributes #557

Merged
merged 4 commits into from
Jan 21, 2025
Merged

(feat) KHP3-7315: Follow up changes on HIE enhancement on the syncing of the providers attributes #557

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42ce725
(feat) enhancement on the sync for providers
its-kios09 Jan 20, 2025
e6bc5b7
(refactor) reverting the disable functionality
its-kios09 Jan 20, 2025
654af7f
(refactor) updated as PR suggestion
its-kios09 Jan 21, 2025
f4c1038
Merge branch 'main' into sync-hwr
its-kios09 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions packages/esm-providers-app/src/modal/provider-sync-modal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
passportNumberUuid,
licenseNumberUuid,
identifierTypes,
phoneNumberUuid,
qualificationUuid,
providerAddressUuid,
providerHieFhirReference,
} = useConfig<ConfigObject>();

const providerNationalId = provider.attributes.find((attr) => attr.attributeType.uuid === providerNationalIdUuid);
Expand Down Expand Up @@ -84,6 +88,19 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
)?.period?.end,
),
);
const phoneNumber = healthWorker?.entry[0]?.resource?.telecom?.find(
(contact) => contact.system === 'phone',
)?.value;
const email = healthWorker?.entry[0]?.resource?.telecom?.find((contact) => contact.system === 'email')?.value;

const qualification =
healthWorker?.entry[0]?.resource?.qualification?.[0]?.code?.coding?.[0]?.display ||
healthWorker?.entry[0]?.resource?.extension?.find(
(ext) => ext.url === 'https://ts.kenya-hie.health/Codesystem/specialty',
its-kios09 marked this conversation as resolved.
Show resolved Hide resolved
)?.valueCodeableConcept?.coding?.[0]?.display;

const fhirBundle = JSON.stringify(healthWorker);

const updatableAttributes = [
{
attributeType: licenseNumberUuid,
Expand All @@ -97,6 +114,22 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
attributeType: licenseExpiryDateUuid,
value: parseDate(licenseDate),
},
{
attributeType: phoneNumberUuid,
value: phoneNumber,
},
{
attributeType: qualificationUuid,
value: qualification,
},
{
attributeType: providerHieFhirReference,
value: fhirBundle,
},
{
attributeType: providerAddressUuid,
value: email,
its-kios09 marked this conversation as resolved.
Show resolved Hide resolved
},
];

await Promise.all(
Expand Down
8 changes: 4 additions & 4 deletions packages/esm-providers-app/src/table/provider-details.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ const ProviderDetails: React.FC<ProviderDetailsProps> = ({ providerUuid }) => {
const licenseAttr = provider?.attributes?.find((attr) => attr.attributeType.display === 'Practising License Number');
const nationalID = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider National Id Number');
const dateAttr = provider?.attributes?.find((attr) => attr.attributeType.display === 'License Expiry Date');
const phoneNumber = provider?.attributes?.find((attr) => attr.attributeType.display === 'Phone number');
const qualification = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider qualification');
const phoneNumber = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider Telephone');
its-kios09 marked this conversation as resolved.
Show resolved Hide resolved
const qualification = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider Qualification');
const registrationNumber = provider?.attributes?.find((attr) => attr.attributeType.display === 'License Body');
const emailAddress = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider address');
const emailAddress = provider?.attributes?.find((attr) => attr.attributeType.display === 'Provider Address');

const formattedExpiryDate = dateAttr?.value ? dayjs(dateAttr.value).format('YYYY-MM-DD') : null;
const today = dayjs();
Expand Down Expand Up @@ -73,7 +73,7 @@ const ProviderDetails: React.FC<ProviderDetailsProps> = ({ providerUuid }) => {
</span>
<span className={styles.statusTag}>{getLicenseStatusTag()}</span>
<span className={styles.statusTag}>
{qualification?.value && <Tag type="cyan">{capitalize(qualification.value)}</Tag>}
{qualification?.value && <Tag type="cyan">{capitalize(qualification?.value)}</Tag>}
</span>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion packages/esm-providers-app/src/workspace/provider-form.workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ const providerFormSchema = z
gender: z.enum(['M', 'F'], { required_error: 'Gender is required' }),
licenseNumber: z.string().nonempty('License number is required'),
registrationNumber: z.string().nonempty('License number is required'),
phoneNumber: z.string().optional(),
phoneNumber: z
.string()
.regex(/^\d{10}$/, 'Phone number must be exactly 10 digits')
.optional(),
qualification: z.string().optional(),
providerAddress: z.string().optional(),
passportNumber: z.string().optional(),
Expand Down
Loading