Skip to content

Commit

Permalink
Merge pull request DIGI-UW#1215 from adityadeshlahre/fix-rewriting-Te…
Browse files Browse the repository at this point in the history
…stManagementConfigMenu-page

Fix rewriting test management config menu page
  • Loading branch information
mozzy11 authored Jan 29, 2025
2 parents a3f550f + 9d7bf93 commit 96b9de3
Show file tree
Hide file tree
Showing 76 changed files with 11,847 additions and 60 deletions.
3 changes: 1 addition & 2 deletions frontend/cypress/e2e/nonConform.cy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import LoginPage from "../pages/LoginPage";


let homePage = null;
let loginPage = null;
let nonConform = null;
Expand Down Expand Up @@ -64,7 +63,7 @@ describe("Report Non-Conforming Event", function () {
nonConform.enterSearchField(order.labNo);
nonConform.clickSearchButton();
nonConform.validateSearchResult(order.labNo);
nonConform.clickCheckbox({force: true});
nonConform.clickCheckbox({ force: true });
nonConform.clickGoToNceFormButton();
});

Expand Down
3 changes: 1 addition & 2 deletions frontend/cypress/pages/BatchOrderEntryPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ class BatchOrderEntry {
cy.get("h2").should("contain.text", "Batch Order Entry");
}


clickGenerateAndSaveBarcode() {
cy.get("[data-testid='generate-barcode-link-BatchOrderEntry']").click();
}
Expand All @@ -152,4 +151,4 @@ class BatchOrderEntry {
}
}

export default BatchOrderEntry;
export default BatchOrderEntry;
19 changes: 10 additions & 9 deletions frontend/cypress/pages/NonConformPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ class NonConform {
.invoke("text")
.should("eq", labNo);
}


validateNCESearchResult(NCENo) {
cy.get("[data-testid='nce-number-result']")
Expand All @@ -44,7 +43,9 @@ class NonConform {

// Checkbox and navigation
clickCheckbox() {
cy.get("[data-testid='nce-sample-checkbox']").first().click({force:true});
cy.get("[data-testid='nce-sample-checkbox']")
.first()
.click({ force: true });
}

clickGoToNceFormButton() {
Expand Down Expand Up @@ -119,7 +120,7 @@ class NonConform {
}

selectActionType() {
cy.get("[data-testid='nce-action-checkbox']").click({force:true});
cy.get("[data-testid='nce-action-checkbox']").click({ force: true });
}

selectResolution() {
Expand All @@ -128,17 +129,17 @@ class NonConform {

clickRadioButtonNCE() {
cy.get("[data-testid='Radio-button']")
.eq(0) // 0 for first, 1 for second, 2 for third, etc.
.should('be.visible')
.click();
}
.eq(0) // 0 for first, 1 for second, 2 for third, etc.
.should("be.visible")
.click();
}
enterDateCompleted0(date) {
cy.get(".cds--date-picker-input__wrapper > #dateCompleted-0").type(date);
}

clickSubmitButton() {
cy.get("[data-testid='nce-submit-button']")
.should('not.be.disabled')
.should("not.be.disabled")
.click();
}
// Data management
Expand All @@ -157,4 +158,4 @@ class NonConform {
}
}

export default NonConform;
export default NonConform;
125 changes: 118 additions & 7 deletions frontend/src/components/admin/Admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
Bullhorn,
User,
BatchJob,
ResultNew,
Popup,
Search,
} from "@carbon/icons-react";
Expand Down Expand Up @@ -59,6 +60,35 @@ import BatchTestReassignmentAndCancelation from "./BatchTestReassignmentAndCance
import TestNotificationConfigMenu from "./testNotificationConfigMenu/TestNotificationConfigMenu.js";
import TestNotificationConfigEdit from "./testNotificationConfigMenu/TestNotificationConfigEdit.js";
import SearchIndexManagement from "./searchIndexManagement/SearchIndexManagement";
import TestManagementConfigMenu from "./testManagementConfigMenu/TestManagementConfigMenu.js";
import ResultSelectListAdd from "./testManagementConfigMenu/ResultSelectListAdd.js";
import TestAdd from "./testManagementConfigMenu/TestAdd.js";
import TestModifyEntry from "./testManagementConfigMenu/TestModifyEntry.js";
import TestOrderability from "./testManagementConfigMenu/TestOrderability.js";
import MethodManagement from "./testManagementConfigMenu/MethodManagement.js";
import MethodCreate from "./testManagementConfigMenu/MethodCreate.js";
import TestSectionManagement from "./testManagementConfigMenu/TestSectionManagement.js";
import TestSectionCreate from "./testManagementConfigMenu/TestSectionCreate.js";
import TestSectionOrder from "./testManagementConfigMenu/TestSectionOrder.js";
import SampleTypeManagement from "./testManagementConfigMenu/SampleTypeManagement.js";
import TestSectionTestAssign from "./testManagementConfigMenu/TestSectionTestAssign.js";
import SampleTypeOrder from "./testManagementConfigMenu/SampleTypeOrder.js";
import SampleTypeCreate from "./testManagementConfigMenu/SampleTypeCreate.js";
import SampleTypeTestAssign from "./testManagementConfigMenu/SampleTypeTestAssign.js";
import UomManagement from "./testManagementConfigMenu/UomManagement.js";
import UomCreate from "./testManagementConfigMenu/UomCreate.js";
import PanelManagement from "./testManagementConfigMenu/PanelManagement.js";
import PanelCreate from "./testManagementConfigMenu/PanelCreate.js";
import PanelOrder from "./testManagementConfigMenu/PanelOrder.js";
import PanelTestAssign from "./testManagementConfigMenu/PanelTestAssign.js";
import TestActivation from "./testManagementConfigMenu/TestActivation.js";
import TestRenameEntry from "./testManagementConfigMenu/TestRenameEntry.js";
import PanelRenameEntry from "./testManagementConfigMenu/PanelRenameEntry.js";
import SampleTypeRenameEntry from "./testManagementConfigMenu/SampleTypeRenameEntry.js";
import TestSectionRenameEntry from "./testManagementConfigMenu/TestSectionRenameEntry.js";
import UomRenameEntry from "./testManagementConfigMenu/UomRenameEntry.js";
import SelectListRenameEntry from "./testManagementConfigMenu/SelectListRenameEntry.js";
import MethodRenameEntry from "./testManagementConfigMenu/MethodRenameEntry.js";

function Admin() {
const intl = useIntl();
Expand Down Expand Up @@ -93,12 +123,6 @@ function Admin() {
<SideNavMenuItem href="#calculatedValue">
<FormattedMessage id="sidenav.label.admin.testmgt.calculated" />
</SideNavMenuItem>
<SideNavMenuItem href="#TestCatalog">
<FormattedMessage id="sidenav.label.admin.testmgt.ViewtestCatalog" />
</SideNavMenuItem>
<SideNavMenuItem href="#MethodManagment">
<FormattedMessage id="sidenav.label.admin.testmgt.ManageMethod" />
</SideNavMenuItem>
</SideNavMenu>
<SideNavLink href="#AnalyzerTestName" renderIcon={ListDropdown}>
<FormattedMessage id="sidenav.label.admin.analyzerTest" />
Expand Down Expand Up @@ -133,6 +157,9 @@ function Admin() {
<SideNavLink renderIcon={BatchJob} href="#batchTestReassignment">
<FormattedMessage id="configuration.batch.test.reassignment" />
</SideNavLink>
<SideNavLink renderIcon={ResultNew} href="#testManagementConfigMenu">
<FormattedMessage id="master.lists.page.test.management" />
</SideNavLink>
<SideNavMenu
title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
renderIcon={TableOfContents}
Expand Down Expand Up @@ -224,7 +251,7 @@ function Admin() {
<PathRoute path="#TestCatalog">
<TestCatalog />
</PathRoute>
<PathRoute path="#MethodManagment">
<PathRoute path="#MethodManagement">
<ManageMethod />
</PathRoute>
<PathRoute path="#AnalyzerTestName">
Expand Down Expand Up @@ -281,6 +308,90 @@ function Admin() {
<PathRoute path="#commonproperties">
<CommonProperties />
</PathRoute>
<PathRoute path="#testManagementConfigMenu">
<TestManagementConfigMenu />
</PathRoute>
<PathRoute path="#ResultSelectListAdd">
<ResultSelectListAdd />
</PathRoute>
<PathRoute path="#TestAdd">
<TestAdd />
</PathRoute>
<PathRoute path="#TestModifyEntry">
<TestModifyEntry />
</PathRoute>
<PathRoute path="#TestOrderability">
<TestOrderability />
</PathRoute>
<PathRoute path="#MethodCreate">
<MethodCreate />
</PathRoute>
<PathRoute path="#TestSectionManagement">
<TestSectionManagement />
</PathRoute>
<PathRoute path="#TestSectionCreate">
<TestSectionCreate />
</PathRoute>
<PathRoute path="#TestSectionOrder">
<TestSectionOrder />
</PathRoute>
<PathRoute path="#TestSectionTestAssign">
<TestSectionTestAssign />
</PathRoute>
<PathRoute path="#SampleTypeManagement">
<SampleTypeManagement />
</PathRoute>
<PathRoute path="#SampleTypeCreate">
<SampleTypeCreate />
</PathRoute>
<PathRoute path="#SampleTypeOrder">
<SampleTypeOrder />
</PathRoute>
<PathRoute path="#SampleTypeTestAssign">
<SampleTypeTestAssign />
</PathRoute>
<PathRoute path="#UomManagement">
<UomManagement />
</PathRoute>
<PathRoute path="#UomCreate">
<UomCreate />
</PathRoute>
<PathRoute path="#PanelManagement">
<PanelManagement />
</PathRoute>
<PathRoute path="#PanelCreate">
<PanelCreate />
</PathRoute>
<PathRoute path="#PanelOrder">
<PanelOrder />
</PathRoute>
<PathRoute path="#PanelTestAssign">
<PanelTestAssign />
</PathRoute>
<PathRoute path="#TestActivation">
<TestActivation />
</PathRoute>
<PathRoute path="#TestRenameEntry">
<TestRenameEntry />
</PathRoute>
<PathRoute path="#PanelRenameEntry">
<PanelRenameEntry />
</PathRoute>
<PathRoute path="#SampleTypeRenameEntry">
<SampleTypeRenameEntry />
</PathRoute>
<PathRoute path="#TestSectionRenameEntry">
<TestSectionRenameEntry />
</PathRoute>
<PathRoute path="#UomRenameEntry">
<UomRenameEntry />
</PathRoute>
<PathRoute path="#SelectListRenameEntry">
<SelectListRenameEntry />
</PathRoute>
<PathRoute path="#MethodRenameEntry">
<MethodRenameEntry />
</PathRoute>

<PathRoute path="#NonConformityConfigurationMenu">
<ConfigMenuDisplay
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import React, { useContext, useState, useEffect, useRef } from "react";
import {
Form,
Heading,
Button,
Loading,
Grid,
Column,
Section,
DataTable,
Table,
TableHead,
TableRow,
TableBody,
TableHeader,
TableCell,
TableSelectRow,
TableSelectAll,
TableContainer,
Pagination,
Search,
Select,
SelectItem,
Stack,
} from "@carbon/react";
import {
getFromOpenElisServer,
postToOpenElisServer,
postToOpenElisServerFormData,
postToOpenElisServerFullResponse,
postToOpenElisServerJsonResponse,
} from "../../utils/Utils.js";
import { NotificationContext } from "../../layout/Layout.js";
import {
AlertDialog,
NotificationKinds,
} from "../../common/CustomNotification.js";
import { FormattedMessage, injectIntl, useIntl } from "react-intl";
import PageBreadCrumb from "../../common/PageBreadCrumb.js";
import CustomCheckBox from "../../common/CustomCheckBox.js";
import ActionPaginationButtonType from "../../common/ActionPaginationButtonType.js";

let breadcrumbs = [
{ label: "home.label", link: "/" },
{ label: "breadcrums.admin.managment", link: "/MasterListsPage" },
{
label: "master.lists.page.test.management",
link: "/MasterListsPage#testManagementConfigMenu",
},
{
label: "configuration.testUnit.manage",
link: "/MasterListsPage#MethodManagement",
},
{
label: "configuration.method.create",
link: "/MasterListsPage#MethodCreate",
},
];

function MethodCreate() {
const { notificationVisible, setNotificationVisible, addNotification } =
useContext(NotificationContext);

const intl = useIntl();

const componentMounted = useRef(false);

return (
<>
{notificationVisible === true ? <AlertDialog /> : ""}
<div className="adminPageContent">
<PageBreadCrumb breadcrumbs={breadcrumbs} />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Heading>
<FormattedMessage id="banner.menu.patientEdit" />
</Heading>
</Section>
</Column>
</Grid>
<br />
<hr />
<br />
<Grid fullWidth={true}>
<Column lg={16} md={8} sm={4}>
<Section>
<Heading>
<FormattedMessage id="configuration.method.create" />
</Heading>
</Section>
</Column>
</Grid>
</div>
</>
);
}

export default injectIntl(MethodCreate);
Loading

0 comments on commit 96b9de3

Please sign in to comment.