@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2128 → 5.4.2-pre.2131

package/src/relationships/relationship.resources.ts

@@ -5,6 +5,9 @@ import { Patient } from '../types';
 import { ConfigObject } from '../config-schema';
 import omit from 'lodash/omit';
 
+export const BOOLEAN_YES = '1065';
+export const BOOLEAN_NO = '1066';
+
 export const relationshipUpdateFormSchema = z
   .object({
     startDate: z.date({ coerce: true }).max(new Date(), 'Can not be a furture date'),
@@ -72,6 +75,15 @@ export const relationshipFormSchema = z.object({
   startDate: z.date({ coerce: true }),
   endDate: z.date({ coerce: true }).optional(),
   mode: z.enum(['create', 'search']).default('search'),
+  baselineStatus: z.string().optional(),
+  preferedPNSAproach: z.string().optional(),
+  livingWithClient: z.string().optional(),
+
+  physicalAssault: z.enum([BOOLEAN_YES, BOOLEAN_NO]).optional(),
+  threatened: z.enum([BOOLEAN_YES, BOOLEAN_NO]).optional(),
+  sexualAssault: z.enum([BOOLEAN_YES, BOOLEAN_NO]).optional(),
+  ipvOutCome: z.enum(['True', 'False']).optional(),
+
   personBInfo: z
     .object({
       givenName: z.string().min(1, 'Given name required'),
@@ -102,7 +114,7 @@ export const saveRelationship = async (
   data: z.infer<typeof relationshipFormSchema>,
   config: ConfigObject,
   session: Session,
-  extraAttributes: Array<{ attributeType: string; value: string }> = [],
+  extraAttributes: Array<{ attributeType: string; value: string; attribute?: string }> = [],
 ) => {
   // Handle patient creation
   let patient: string = data.personB;
@@ -155,14 +167,12 @@ export const saveRelationship = async (
   if (data.mode === 'search' && extraAttributes.length > 0) {
     const results = await Promise.allSettled(
       extraAttributes.map((attr) =>
-        openmrsFetch(`${restBaseUrl}/person/${patient}/attribute`, {
+        openmrsFetch(`${restBaseUrl}/person/${patient}/attribute/${attr.attribute ?? ''}`, {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
           },
-          body: JSON.stringify({
-            attr,
-          }),
+          body: JSON.stringify(omit(attr, ['attribute'])),
         }),
       ),
     );

package/src/relationships/tabs/relationships-tabs-component.tsx

@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next';
 import styles from './relationships-tabs.scss';
 import ContactList from '../../contact-list/contact-list.component';
 import FamilyHistory from '../../family-partner-history/family-history.component';
-import { OtherRelationships } from '../../other-relationships/other-relationships.component';
 
 interface RelationshipsTabProps {
   patientUuid: string;
@@ -18,7 +17,6 @@ export const RelationshipsTab: React.FC<RelationshipsTabProps> = ({ patientUuid
         <TabList className={styles.relationshipTablist} aria-label="List tabs" contained>
           <Tab className={styles.relationshipTab}>{t('family', 'Family')}</Tab>
           <Tab className={styles.relationshipTab}>{t('pnsContacts', 'PNS Contacts')}</Tab>
-          <Tab className={styles.relationshipTab}>{t('other', 'Other')}</Tab>
         </TabList>
         <TabPanels>
           <TabPanel>
@@ -27,9 +25,6 @@ export const RelationshipsTab: React.FC<RelationshipsTabProps> = ({ patientUuid
           <TabPanel>
             <ContactList patientUuid={patientUuid} />
           </TabPanel>
-          <TabPanel>
-            <OtherRelationships patientUuid={patientUuid} />
-          </TabPanel>
         </TabPanels>
       </Tabs>
     </main>

package/src/routes.json

@@ -18,14 +18,6 @@
       "online": true,
       "offline": false
     },
-    {
-      "name": "other-relationships",
-      "slot": "patient-chart-family-history-slot",
-      "component": "otherRelationships",
-      "order": 0,
-      "online": true,
-      "offline": false
-    },
     {
       "name": "relationships-link",
       "component": "relationshipsLink",
@@ -334,12 +326,6 @@
       "title": "Family Relationship Form",
       "type": "form"
     },
-    {
-      "name": "other-relationship-form",
-      "component": "otherRelationshipsForm",
-      "title": "Other Relationships Form",
-      "type": "form"
-    },
     {
       "name": "peers-form",
       "component": "peersForm",

package/translations/en.json

@@ -23,6 +23,8 @@
   "autopsyReport": "Autopsy report",
   "babyGivenVitaminD": "Baby Given Vitamin K",
   "baselineHivStatus": "Baseline HIV Status",
+  "baselineInformation": "Baseline Information",
+  "baselineStatus": "HIV Status",
   "beds": "Beds",
   "billingHistory": "Billing history",
   "birthInjuriesTrauma": "Birth Injuries/Trauma",
@@ -42,7 +44,7 @@
   "contact": "Contact",
   "contactCreated": "Contact created",
   "contacted": "Contacted",
-  "contactList": "Contact list",
+  "contactTracingForm": "Contact tracing form",
   "contactType": "Contact Type",
   "customViews": "In this section, you'll find custom clinical views tailored to patients' conditions and enrolled care programs.",
   "date": "Date",
@@ -107,6 +109,8 @@
   "inPatientView": "In Patient View",
   "inPatientVisitMessage": "in-patient encounter found for current  {{visitType}} visit",
   "ipvOutcome": "IPV Outcome",
+  "ipvOutCome": "IPV Outcome",
+  "ipvQuestions": "IPV Questions",
   "labourAndDelivery": "Labour and Delivery",
   "listingDate": "Listing date",
   "livingWithClient": "Living with client",
@@ -127,12 +131,12 @@
   "neonatalSummary": "Neonatal Summary",
   "nextPage": "Next page",
   "nextVisitDate": "Next visit date",
+  "no": "No",
   "noContactToDisplay": "There is no contact data to display for this patient.",
   "noEncounters": "No encounters found",
   "noEncounterToDisplay": "There are no encounters to display for this patient.",
   "noObservationsFound": "No observations found",
   "operatingDoctor": "Operating Doctor",
-  "otherRelationships": "Other Relationships",
   "otherSubstanceAbuse": "Other Substance Abuse",
   "partnerStatus": "HIV status of partner)",
   "partograph": "Partograph",
@@ -140,13 +144,16 @@
   "peerCalendar": "Peer Calendar",
   "pending": "Pending",
   "pendingDocumentations": "Pending Documentation",
+  "physicalAssault": "1. Has he/she ever hit, kicked, slapped, or otherwise physically hurt you?",
   "placeOfDelivery": "Place of Delivery",
   "pnsAproach": "PNS Aproach",
+  "pnsContactList": "PNS Contact list",
   "populationType": "Population type",
   "postnatalCare": "Postnatal Care",
   "postOperativeComplications": "Post Operative Complications",
   "postOperativeDiagnosis": "Post Operative Diagnosis",
   "pphCondition": "PPH present",
+  "preferedPNSAproach": "Prefered PNS Aproach",
   "previousPage": "Previous page",
   "primaryDiagnosis": "Primary Diagnosis",
   "priorityOfAdmission": "Priority Of Admission",
@@ -165,6 +172,7 @@
   "save": "Save",
   "savedRelationship": "Relationship ended successfully",
   "sex": "Sex",
+  "sexualAssault": "3.Has he/she ever forced you to do something sexually that made you feel uncomfortable?",
   "smoking": "Smoking",
   "smokingDuration": "Smoking Duration",
   "socialHistory": "Social History",
@@ -182,6 +190,7 @@
   "testingRecommended": "Testing recommended",
   "testStrategy": "Strategy",
   "therapiesPrescribed": "Therapies Prescribed",
+  "threatened": "2. Has he/she ever threatened to hurt you?",
   "timeRecorded": "Time Recorded",
   "total": "Total",
   "totalPeers": "Total Peers",
@@ -195,5 +204,6 @@
   "viewBeds": "View beds",
   "viewEncounter": "View",
   "visitDate": "Screening Date",
-  "visitType": "Visit type"
+  "visitType": "Visit type",
+  "yes": "Yes"
 }