Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 753 ReferredOutTests JSP component to React Component #786

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import PrintBarcode from "./components/printBarcode/Index";
import NonConformIndex from "./components/nonconform/index";
import SampleBatchEntrySetup from "./components/batchOrderEntry/SampleBatchEntrySetup.js";
import AuditTrailReportIndex from "./components/reports/auditTrailReport/Index.js";
import ReferredOutTests from "./components/resultPage/resultsReferredOut/ReferredOutTests.js";

export default function App() {
let i18nConfig = {
Expand Down Expand Up @@ -409,6 +410,12 @@ export default function App() {
component={() => <ResultSearch />}
role="Results"
/>
<SecureRoute
path="/ReferredOutTests"
exact
component={() => <ReferredOutTests />}
role="Results"
/>
<SecureRoute
path="/RoutineReports"
exact
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const ReferredOutTestsFormValues = {
labNumberInput: "",
selectedPatientId: "",
startDate: "",
endDate: "",
dateType: "",
dateOfBirth: "",
searchTypeValues: ["TEST_AND_DATES", "LAB_NUMBER", "PATIENT"],
};

export default ReferredOutTestsFormValues;
3 changes: 3 additions & 0 deletions frontend/src/components/resultPage/SearchResultForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import SearchResultFormValues from "../formModel/innitialValues/SearchResultForm
import { AlertDialog, NotificationKinds } from "../common/CustomNotification";
import { NotificationContext } from "../layout/Layout";
import SearchPatientForm from "../patient/SearchPatientForm";
import ReferredOutTests from "./resultsReferredOut/ReferredOutTests";
import { ConfigurationContext } from "../layout/Layout";
import config from "../../config.json";
import CustomDatePicker from "../common/CustomDatePicker";
Expand Down Expand Up @@ -695,6 +696,8 @@ export function SearchResultForm(props) {
</Grid>
</>
)}

{searchBy.type === "ReferredOutTests" && (<ReferredOutTests/>)}

<>
{pagination && (
Expand Down
Loading
Loading