@pih/esm-pathology-app 1.0.1 → 1.0.4

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,13 @@ import {
   postReferralStatusChangeObs,
   updateReferralStatusChangeObs,
   EncounterResult,
+  // postApproval,
+  // voidApprovalObs,
+  getUser,
   Concept,
+  getEncounter,
 } from "./ReportComponent.resource";
+import MyDocument from "../Print-to-PDF/Document-Component";
 import { Config } from "../config-schema";
 
 const ReportComponent = () => {
@@ -77,10 +83,18 @@ const ReportComponent = () => {
       key: "sampleDropOff",
       header: "Sample drop off?",
     },
+    {
+      key: "pathologicDiagnosisObs",
+      header: "Pathologic diagnosis",
+    },
     {
       key: "resultsEncounter",
       header: "Results",
     },
+    {
+      key: "PDFReport",
+      header: "Report",
+    },
   ];
 
   React.useEffect(() => {
@@ -95,7 +109,9 @@ const ReportComponent = () => {
     getEncounters(
       config.healthCenterAttrTypeUUID,
       config.pathologyFullAllowedLocationUUID
-    ).then(setEncountersList);
+    ).then(
+      setEncountersList
+      );
   }, []);
 
   const filteredEncList = encountersList
@@ -129,12 +145,6 @@ 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 {
@@ -192,7 +202,8 @@ 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 +239,7 @@ const ReportComponent = () => {
           onChange={(e) => sampleDropOffChange(encounterInfo)}
         />
       ),
+      pathologicDiagnosisObs: encounterInfo.pathologicDiagnosisObs,
       resultsEncounter: encounterInfo.resultsEncounterId ? (
         <a
           data-testid="resultsEncounter"
@@ -237,7 +249,8 @@ const ReportComponent = () => {
           Results{" "}
         </a>
       ) : (
-        !userLocation && (
+        (!userLocation ||
+          userLocation === config.pathologyFullAllowedLocationUUID) && (
           <a
             href={`/openmrs/module/htmlformentry/htmlFormEntry.form?personId=${encounterInfo.personId}&patientId=${encounterInfo.personId}&returnUrl=&formId=${config.pathologyResultsFromID}&uuid=${encounterInfo.encounterUuid}`}
           >
@@ -246,6 +259,18 @@ 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>
+            
+              
+           
+        )
+        
     };
   });
 
@@ -282,6 +307,7 @@ const ReportComponent = () => {
     }
   };
 
+
   const sampleStatusChange = (
     newStatus: { uuid: string; display: string },
     encounterInfo
@@ -371,6 +397,7 @@ const ReportComponent = () => {
       });
     }
   };
+  
 
   return (
     <div>
@@ -435,6 +462,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 }) => (
@@ -461,6 +489,15 @@ const ReportComponent = () => {
           )}
         </DataTable>
       </div>
+      <div>
+        {/* <PDFViewer>
+          <MyDocument />
+        </PDFViewer> */}
+        {/* <PDFDownloadLink document={<MyDocument />} fileName="Pathology Report">
+          {({loading}) => (loading ? 'loading...' : <button>Download</button>)}
+        </PDFDownloadLink> */}
+        
+      </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={}}}]);