Merge pull request I-TECH-UW#898 from mozzy11/develop_3x

Minor fixes

.gitpod.yml

@@ -6,7 +6,7 @@
 
 tasks:
  - name: Build the Dependencies and Start the docker containers
- init: cd dataexport && mvn clean install -DskipTests && cd .. && mvn clean install 
+ init: cd dataexport && mvn clean install -DskipTests && cd .. && mvn clean install && cd frontend && npm install && cd ..
  command: docker-compose -f dev.docker-compose.yml up -d 
 
 

frontend/src/App.js

@@ -22,8 +22,8 @@ import Workplan from "./components/workplan/Workplan";
 import AddOrder from "./components/addOrder/Index";
 import FindOrder from "./components/modifyOrder/Index";
 import ModifyOrder from "./components/modifyOrder/ModifyOrder";
-import RoutineReports from "./components/Reports/Routine";
-import StudyReports from "./components/Reports/Study";
+import RoutineReports from "./components/reports/Routine";
+import StudyReports from "./components/reports/Study";
 import StudyValidation from "./components/validation/Index";
 import PathologyDashboard from "./components/pathology/PathologyDashboard";
 import CytologyDashboard from "./components/cytology/CytologyDashBoard";
@@ -33,8 +33,8 @@ import ImmunohistochemistryDashboard from "./components/immunohistochemistry/Imm
 import ImmunohistochemistryCaseView from "./components/immunohistochemistry/ImmunohistochemistryCaseView";
 import RoutedResultsViewer from "./components/patient/resultsViewer/results-viewer.tsx";
 import EOrderPage from "./components/eOrder/Index";
-import RoutineIndex from "./components/Reports/routine/Index.js";
-import StudyIndex from "./components/Reports/study/index.js";
+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() {

frontend/src/components/Reports/Routine.js → frontend/src/components/reports/Routine.js

@@ -7,6 +7,9 @@ import {
  Microscope,
 } from "@carbon/icons-react";
 import config from "../../config.json";
+import PageBreadCrumb from "../common/PageBreadCrumb";
+
+let breadcrumbs = [{ label: "home.label", link: "/" }];
 export const RoutineReportsMenu = {
  className: "resultSideNav",
  sideNavMenuItems: [
@@ -144,6 +147,9 @@ export const RoutineReportsMenu = {
 const Routine = () => {
  return (
  <>
+ <div style={{marginLeft: '1%'}}>
+ <PageBreadCrumb breadcrumbs={breadcrumbs} />
+ </div> 
  <GlobalSideBar sideNav={RoutineReportsMenu} />
  </>
  );

frontend/src/components/Reports/Study.js → frontend/src/components/reports/Study.js

@@ -7,6 +7,9 @@ import {
  Microscope,
 } from "@carbon/icons-react";
 import config from "../../config.json";
+import PageBreadCrumb from "../common/PageBreadCrumb";
+
+let breadcrumbs = [{ label: "home.label", link: "/" }];
 export const RoutineReportsMenu = {
  className: "resultSideNav",
  sideNavMenuItems: [
@@ -145,7 +148,6 @@ export const RoutineReportsMenu = {
  {
  link: "/StudyReport?type=patient&report=retroCInonConformityBySectionReason",
  label:
- config.serverBaseUrl +
  <FormattedMessage id="sideNav.label.noncomformityreportsbyunit" />,
  },
  {
@@ -188,17 +190,21 @@ export const RoutineReportsMenu = {
  icon: IbmWatsonNaturalLanguageUnderstanding,
  SideNavMenuItem: [
  {
- link: "/StudyReport?type=study&report=auditTrail",
+ link: "/RoutineReport?type=routine&report=auditTrail",
  label: <FormattedMessage id="sideNav.label.audittrail" />,
  },
  ],
  },
  ],
  contentRoutes: [],
 };
+
 const Study = () => {
  return (
  <>
+ <div style={{marginLeft: '1%'}}>
+ <PageBreadCrumb breadcrumbs={breadcrumbs} />
+ </div>
  <GlobalSideBar sideNav={RoutineReportsMenu} />
  </>
  );