Merge pull request #714 from adityadeshlahre/fix-705-rewriting-patien…

…t-report-screen Fix 705 rewriting patient report screen
I-TECH-UW · Mar 18, 2024 · 902157d · 902157d
2 parents a5645fc + fedfa1f
commit 902157d
Show file tree

Hide file tree

Showing 7 changed files with 890 additions and 23 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -37,7 +37,6 @@ import RoutineIndex from "./components/Reports/routine/Index.js";
 import StudyIndex from "./components/Reports/study/index.js";
 import PrintBarcode from "./components/printBarcode/Index";
 
-
 export default function App() {
   let i18nConfig = {
     locale: navigator.language.split(/[-_]/)[0],

diff --git a/frontend/src/components/Reports/Routine.js b/frontend/src/components/Reports/Routine.js
@@ -15,10 +15,7 @@ export const RoutineReportsMenu = {
       icon: IbmWatsonDiscovery,
       SideNavMenuItem: [
         {
-          link:
-            config.serverBaseUrl +
-            "/Report?type=patient&report=patientCILNSP_vreduit",
-
+          link: "/RoutineReport?type=patient&report=patientCILNSP_vreduit",
           label: <FormattedMessage id="sidenav.label.statusreport"/>,
         },
       ],

diff --git a/frontend/src/components/Reports/routine/Index.js b/frontend/src/components/Reports/routine/Index.js
@@ -11,7 +11,7 @@ import {
   Loading,
 } from "@carbon/react";
 import { injectIntl, FormattedMessage, useIntl } from "react-intl";
-import config from "../../../config.json";
+import PatientStatusReport from "./PatientStatusReport";
 import StatisticsReport from "./StatisticsReport";
 import SummaryOfAllTest from "./SummaryOfAllTest";
 import HIVTestSummary from "./HivTestSummary";
@@ -23,22 +23,14 @@ const RoutineIndex = () => {
 
   const [type, setType] = useState("");
   const [report, setReport] = useState("");
-  const [source, setSource] = useState("");
   const [isLoading, setIsLoading] = useState(true);
-
 
   useEffect(() => {
-
-
     const params = new URLSearchParams(window.location.search);
     const paramType = params.get("type");
     const paramReport = params.get("report");
-
     setType(paramType);
     setReport(paramReport);
-
-
-
     if (paramType && paramReport) {
       setIsLoading(false);
     } else {
@@ -54,7 +46,6 @@ const RoutineIndex = () => {
             <BreadcrumbItem href="/">
               {intl.formatMessage({ id: "home.label" })}
             </BreadcrumbItem>
-
           </Breadcrumb>
         </Column>
       </Grid>
@@ -74,7 +65,8 @@ const RoutineIndex = () => {
         {isLoading && <Loading />}
         {!isLoading && (
           <>
-
+            {type === "patient" && report === "patientCILNSP_vreduit" && 
+            (<PatientStatusReport />)}
 
             {type === "indicator" &&
               report === "statisticsReport" &&
@@ -84,11 +76,9 @@ const RoutineIndex = () => {
               report === "indicatorHaitiLNSPAllTests" &&
               ( <SummaryOfAllTest /> )}
 
-
             {type === "indicator" &&
               report === "indicatorCDILNSPHIV" &&
               (<HIVTestSummary/>)}
-
           </>
         )}
       </div>