@pih/esm-pathology-app 1.0.3 → 1.0.6

package/src/pathology-report/ReportComponent.resource.ts

@@ -1,4 +1,6 @@
 import { openmrsFetch } from "@openmrs/esm-framework";
+import cloneDeep from "lodash-es/cloneDeep";
+
 
 export interface EncounterResult {
   family_name: string;
@@ -15,6 +17,11 @@ export interface EncounterResult {
   referralStatusObs: string;
   sampleDropoffObs: string;
   resultsEncounterId: string;
+  resultsEncounterUuid: string;
+  resultsEncounter: [];
+  approvedBy: string;
+  approvalObsUuid: string;
+  pathologicDiagnosisObs: string;
 }
 export interface Patient {
   uuid: string;
@@ -24,6 +31,7 @@ export interface Concept {
   name: string;
   display: string;
 }
+
 export interface Obs {
   patientUuid: string;
   obsDateTime: string;
@@ -34,35 +42,9 @@ export interface Obs {
   encounterUuid: string;
   valueCodedName: string;
   voided: boolean;
+  resultsEncounterUuid: string;
 }
 
-// export async function getPatientEncounters(patientUuid): Promise<Array<EncounterResult>> {
-//   const searchPatientEncounters = await openmrsFetch(
-//     `/ws/rest/v1/encounter?encounterType=${ENCOUNTERTYPEUUID}&patient=${patientUuid}`,
-//   );
-//   const fullPatientEncounterData = searchPatientEncounters.data.results.map(async (searchEnc) => {
-//     const enc = await openmrsFetch(`/ws/rest/v1/encounter/${searchEnc.uuid}?v=full`);
-//     const searchPatient = await openmrsFetch(`/ws/rest/v1/patient/${patientUuid}?v=full`);
-//     const retrievedObject = {
-//       patientName: searchPatient.data.person.names[0],
-//       patientPhoneNumber: searchPatient.data.person.attributes.filter(
-//         (attribute) => attribute.attributeType.uuid == PHONENUMBERATTRUUID,
-//       )[0],
-//       patientHealthCenter: searchPatient.data.person.attributes.filter(
-//         (attribute) => attribute.attributeType.uuid == HEALTHCENTERATTRTYPEUUID,
-//       )[0],
-//       patientUuid: searchPatient.data.uuid,
-//       encUuid: enc.data.uuid,
-//       encounterDatetime: enc.data.encounterDatetime,
-//       sampleStatusObs: enc.data.obs.filter((obs) => obs.concept.uuid === SAMPLESTATUSUUID)[0],
-//       referralStatusObs: enc.data.obs.filter((obs) => obs.concept.uuid === REFERRALSTATUSUUID)[0],
-//       sampleDropoffObs: enc.data.obs.filter((obs) => obs.concept.uuid === SAMPLEDROPOFFUUID)[0],
-//     };
-
-//     return retrievedObject;
-//   });
-//   return Promise.all(fullPatientEncounterData);
-// }
 
 export async function getUserLocation(healthCenterAttrTypeUUID) {
   const session = await openmrsFetch(`/ws/rest/v1/session`);
@@ -73,7 +55,7 @@ export async function getUserLocation(healthCenterAttrTypeUUID) {
   const hcPersonAttribute = person.data.results.filter(
     (attr) => attr.attributeType.uuid === healthCenterAttrTypeUUID
   );
-  return hcPersonAttribute[0]?.value.uuid;
+  return hcPersonAttribute[0] && hcPersonAttribute[0].value.uuid;
 }
 
 export async function getConceptAnswers(conceptUuid) {
@@ -89,11 +71,6 @@ export async function getLocations() {
   return location.data.results;
 }
 
-// export async function getPatient(patientUuid): Promise<Patient> {
-//   const searchPatient = await openmrsFetch(`/ws/rest/v1/patient/c604dabc-2700-102b-80cb-0017a47871b2?v=full`);
-//   return searchPatient.data;
-// }
-
 export async function getEncounters(
   healthCenterAttrTypeUUID: string,
   pathologyFullAllowedLocationUUID: string
@@ -113,7 +90,20 @@ export async function getEncounters(
       `/ws/rest/v1/reportingrest/reportdata/996cf192-ff54-11eb-a63a-080027ce9ca0`
     );
   }
-  return searchEncounter.data.dataSets[0].rows;
+
+  const EncListClone = searchEncounter.data.dataSets[0].rows.map(async (encObject)=>{
+    if(encObject.resultsEncounterUuid){
+      const encIndex = searchEncounter.data.dataSets[0].rows.findIndex(
+         (enc) => enc.encounterUuid == encObject.encounterUuid
+      );
+      const resultsEnc =await getEncounter(encObject.resultsEncounterUuid);
+      encObject.resultsEncounter = resultsEnc;
+      
+    }
+    return encObject; 
+  });
+  
+  return Promise.all(EncListClone);
 }
 
 export async function postSampleDropoffObs(
@@ -274,3 +264,16 @@ export async function updateReferralStatusChangeObs(
 
   return response;
 }
+
+
+
+export async function getUser(userUuid: string) {
+  const user = await openmrsFetch(`/ws/rest/v1/user/${userUuid}`);
+
+  return user.data;
+}
+export async function getEncounter(encounterUuid) {
+  const encResult = await openmrsFetch(`/ws/rest/v1/encounter/${encounterUuid}?v=full`);
+  
+  return encResult.data;
+}

package/src/pathology-report/ReportComponent.tsx

@@ -9,6 +9,7 @@ import DataTable, {
   TableBody,
   TableCell,
 } from "carbon-components-react/es/components/DataTable";
+import { PDFDownloadLink, PDFViewer } from "@react-pdf/renderer";
 
 import styles from "./ReportComponent.css";
 import {
@@ -23,8 +24,11 @@ import {
   postReferralStatusChangeObs,
   updateReferralStatusChangeObs,
   EncounterResult,
+  getUser,
   Concept,
+  getEncounter,
 } from "./ReportComponent.resource";
+import MyDocument from "../Print-to-PDF/Document-Component";
 import { Config } from "../config-schema";
 
 const ReportComponent = () => {
@@ -77,10 +81,18 @@ const ReportComponent = () => {
       key: "sampleDropOff",
       header: "Sample drop off?",
     },
+    {
+      key: "pathologicDiagnosisObs",
+      header: "Pathologic diagnosis",
+    },
     {
       key: "resultsEncounter",
       header: "Results",
     },
+    {
+      key: "PDFReport",
+      header: "Report",
+    },
   ];
 
   React.useEffect(() => {
@@ -129,17 +141,9 @@ const ReportComponent = () => {
         );
       }
     });
-  //replace(/\s+/g, '');
-  // const rows = filteredEncList.map(
-  //   (encounterInfo) => {
-  //       return {
-  //           // patientLink: <a href={`/openmrs/patientDashboard.form?patientId=${encounterInfo.personId}`} >Link</a>,
-  //           ...
 
   const rows = filteredEncList.map((encounterInfo) => {
     return {
-      // rows.push({
-      // patientLink: <a href={`/openmrs/patientDashboard.form?patientId=${encounterInfo.personId}`} >Link</a>,
       id: encounterInfo.encounterId,
       patientNames: (
         <a
@@ -192,7 +196,10 @@ const ReportComponent = () => {
           ))}
         </select>
       ),
-      dateOfRequest: encounterInfo.encounterDatetime,
+      dateOfRequest: new Date(encounterInfo.encounterDatetime).toLocaleString(
+        ["en-GB", "en-US", "en", "fr-RW"],
+        { day: "numeric", month: "numeric", year: "numeric" }
+      ),
       referralStatus: (
         <select
           onChange={(e) =>
@@ -228,6 +235,7 @@ const ReportComponent = () => {
           onChange={(e) => sampleDropOffChange(encounterInfo)}
         />
       ),
+      pathologicDiagnosisObs: encounterInfo.pathologicDiagnosisObs,
       resultsEncounter: encounterInfo.resultsEncounterId ? (
         <a
           data-testid="resultsEncounter"
@@ -247,6 +255,19 @@ const ReportComponent = () => {
           </a>
         )
       ),
+      PDFReport: encounterInfo.resultsEncounterId &&
+        encounterInfo.approvedBy && (
+          <PDFDownloadLink
+            document={
+              <MyDocument encounterInfo={encounterInfo} config={config} />
+            }
+            fileName="Pathology Report"
+          >
+            {({ loading }) =>
+              loading ? "loading..." : <button>Download</button>
+            }
+          </PDFDownloadLink>
+        ),
     };
   });
 
@@ -276,7 +297,6 @@ const ReportComponent = () => {
           );
           tempEncList[encIndex].sampleDropoffObs = "";
           tempEncList[encIndex].sampleDropoffObsUuid = "";
-
           setEncountersList(tempEncList);
         }
       });
@@ -436,6 +456,7 @@ const ReportComponent = () => {
           onChange={(e) => setPatientName(e.target.value)}
         />
       </div>
+      {console.log(encountersList)}
       <div className={styles.tableContainer}>
         <DataTable rows={rows} headers={headers}>
           {({ rows, headers, getTableProps, getHeaderProps, getRowProps }) => (
@@ -462,6 +483,7 @@ const ReportComponent = () => {
           )}
         </DataTable>
       </div>
+      <div></div>
     </div>
   );
 };

package/webpack.config.js

@@ -1 +1,30 @@
-module.exports = require("openmrs/default-webpack-config");
+
+const config = require("openmrs/default-webpack-config");
+const webpack = require("webpack");
+
+config.additionalConfig.resolve = {
+  fallback: {
+    process: require.resolve("process/browser"),
+    zlib: require.resolve("browserify-zlib"),
+    stream: require.resolve("stream-browserify"),
+    util: require.resolve("util"),
+    buffer: require.resolve("buffer"),
+    asset: require.resolve("assert"),
+  },
+}
+config.additionalConfig.plugins = [
+  new webpack.ProvidePlugin({
+    Buffer: ["buffer", "Buffer"],
+    process: "process/browser",
+  }),
+]
+config.additionalConfig.module= {
+  rules:[
+     {
+       test: /\.(woff|woff2|eot|ttf|otf)$/i,
+       type: 'asset/resource',
+     },
+  ]
+}
+module.exports = config;
+

package/dist/574.pih-esm-pathology-app.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunk_pih_esm_pathology_app=self.webpackChunk_pih_esm_pathology_app||[]).push([[574],{574:p=>{p.exports={}}}]);